diff --git a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java index 0ff8743bb..f77e350af 100644 --- a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java +++ b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java @@ -29,6 +29,7 @@ public class FileDigestCfg extends BaseCfg { private Long rawLen; private String digest; private Integer cfdsLevel; + private String fileUrl; public static String getTablename() { return tableName; @@ -54,5 +55,11 @@ public class FileDigestCfg extends BaseCfg { public void setCfdsLevel(Integer cfdsLevel) { this.cfdsLevel = cfdsLevel; } + public String getFileUrl() { + return fileUrl; + } + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl; + } } diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index 67d4ac184..63db81f2b 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -18,8 +18,9 @@ import net.sf.json.JsonConfig; import org.glassfish.jersey.media.multipart.FormDataMultiPart; import org.glassfish.jersey.media.multipart.file.FileDataBodyPart; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import com.jcraft.jsch.Logger; import com.nis.domain.log.ReportResultLog; import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult.ResponseData; @@ -27,6 +28,7 @@ import com.nis.exceptions.MaatConvertException; import com.nis.util.httpclient.ClientUtil; public class ConfigServiceUtil { + private static Logger logger = LoggerFactory.getLogger(ConfigServiceUtil.class); /*public static class MapTypeAdapter extends TypeAdapter { @Override public Object read(JsonReader in) throws IOException { @@ -285,6 +287,7 @@ public class ConfigServiceUtil { Response response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); if( response.getStatus() == 200){ result= response.readEntity(String.class); + logger.info("获取文件摘要响应结果"+result); JSONObject resObject = JSONObject.fromObject(result); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml index dd9b94751..f08e8248a 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -94,6 +94,7 @@ + @@ -171,7 +172,7 @@ a.expr_type,a.match_method,a.is_hexbin,a.area_effective_ids,a.function_id,a.cfg_region_code - a.CFG_ID,a.CFG_DESC,a.raw_len,a.digest,a.cfds_level,a.ACTION,a.IS_VALID,a.IS_AUDIT, + a.CFG_ID,a.CFG_DESC,a.raw_len,a.digest,a.cfds_level,a.file_url,a.ACTION,a.IS_VALID,a.IS_AUDIT, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,cfg_type,cfg_region_code @@ -584,6 +585,7 @@ RAW_LEN, DIGEST, CFDS_LEVEL, + FILE_URL, ACTION, IS_VALID, IS_AUDIT, @@ -609,6 +611,7 @@ #{rawLen,jdbcType=BIGINT}, #{digest,jdbcType=VARCHAR}, #{cfdsLevel,jdbcType=INTEGER}, + #{fileUrl,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, 0, 0, @@ -812,6 +815,9 @@ CFG_TYPE =#{cfgType,jdbcType=VARCHAR}, + + + FILE_URL =#{fileUrl,jdbcType=VARCHAR}, diff --git a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml index 8a1a7ef28..d563503e1 100644 --- a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml @@ -94,6 +94,7 @@ + @@ -136,7 +137,7 @@ a.expr_type,a.match_method,a.is_hexbin,a.area_effective_ids,a.function_id,a.cfg_region_code - a.CFG_ID,a.CFG_DESC,a.raw_len,a.digest,a.cfds_level,a.ACTION,a.IS_VALID,a.IS_AUDIT, + a.CFG_ID,a.CFG_DESC,a.raw_len,a.digest,a.cfds_level,a.file_url,a.ACTION,a.IS_VALID,a.IS_AUDIT, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,cfg_type,cfg_region_code @@ -579,7 +580,8 @@ AREA_EFFECTIVE_IDS, function_id, cfg_type, - cfg_region_code + cfg_region_code, + file_url )values ( #{cfgDesc,jdbcType=VARCHAR}, #{rawLen,jdbcType=BIGINT}, @@ -604,7 +606,8 @@ #{areaEffectiveIds,jdbcType=VARCHAR}, #{functionId,jdbcType=INTEGER}, #{cfgType,jdbcType=VARCHAR}, - #{cfgRegionCode,jdbcType=INTEGER} + #{cfgRegionCode,jdbcType=INTEGER}, + #{fileUrl,jdbcType=VARCHAR} ) diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index 8bfd4388a..179f759cc 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -345,6 +345,7 @@ public class FileTransferCfgService extends CrudService { if(result!=null && result.getData()!=null){ cfg.setRawLen(result.getData().getRawLen()); cfg.setDigest(result.getData().getDigest()); + cfg.setFileUrl(result.getData().getAccessUrl()); } mailCfgDao.saveMailFileDigestCfg(cfg); } @@ -166,6 +167,7 @@ public class MailCfgService extends CrudService { if(result!=null && result.getData()!=null){ cfg.setRawLen(result.getData().getRawLen()); cfg.setDigest(result.getData().getDigest()); + cfg.setFileUrl(result.getData().getAccessUrl()); } mailCfgDao.saveMailFileDigestCfg(cfg); } diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index f3c157b2e..61971ee99 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -263,6 +263,7 @@ + @@ -295,6 +296,12 @@ ${indexCfg.rawLen } ${indexCfg.cfdsLevel } + + + ${fn:substring(indexCfg.fileUrl,0,20) } + + diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp index a9f2a0668..4cec4c381 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp @@ -27,7 +27,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+