File Digest整体功能提交

修改FileUtils getPrefix方法截取下标
修改音视频文本列表超长信息查看样式

src/main/java/com/nis/util/FileUtils.java

@@ -682,7 +682,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 			if (!isDot) {
 				pos = pos - 1;
 			}
-			prefix = filename.substring(0,pos);
+			prefix = filename.substring(0,pos+1);
 		}
 		return prefix;
 	}

src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java

@@ -16,6 +16,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
 import com.nis.domain.basics.SysDictInfo;
@@ -24,6 +25,7 @@ import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.AvContIpCfg;
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.exceptions.MaatConvertException;
 import com.nis.domain.configuration.AvVoipIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
@@ -99,22 +101,28 @@ public class AvContentController extends BaseController  {
 	}
 	
 	
-	//修改VOIP例配置状态
+	//修改VOIP配置状态
 	@RequestMapping(value = {"/updateAvVoipValid"})
 	@RequiresPermissions(value={"avVoip:config"})
-	public String updateVoipValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
+	public String updateVoipValid(Integer isAudit,Integer isValid,String ids,Integer functionId) {
 		avContentCfgService.updateAvVoipValid(isAudit,isValid,ids,functionId);
 		return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId;
 	}
 	//修改VOIP配置审核状态
 	@RequestMapping(value = {"/auditAvVoip"})
 	@RequiresPermissions(value={"avVoip:audit"})
-	public String auditVoip(Integer isAudit,Integer isValid,String ids,Integer functionId){
+	public String auditVoip(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
 			for(String id :idArray){
-				avContentCfgService.auditAvVoip(isAudit,isValid,functionId,id,auditTime);
+				try {
+					avContentCfgService.auditAvVoip(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					e.printStackTrace();
+					logger.info("VOIP配置下发失败："+e.getMessage());
+					addMessage(redirectAttributes, e.getMessage());
+				}
 			}
 			
 		}
@@ -191,12 +199,19 @@ public class AvContentController extends BaseController  {
 	//修改CONTIP配置审核
 	@RequestMapping(value = {"/auditAvContIp"})
 	@RequiresPermissions(value={"avContIp:audit"})
-	public String auditContIp(Integer isAudit,Integer isValid,String ids,Integer functionId){
+	public String auditContIp(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
 			for(String id :idArray){
-				avContentCfgService.auditContIp(isAudit,isValid,functionId,id,auditTime);
+				try {
+					avContentCfgService.auditContIp(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					e.printStackTrace();
+					logger.info("Cont Ip配置下发失败："+e.getMessage());
+					addMessage(redirectAttributes, e.getMessage());
+				}
+				
 			}
 			
 		}
@@ -255,12 +270,18 @@ public class AvContentController extends BaseController  {
 	//修改CONTIP配置审核
 	@RequestMapping(value = {"/auditPicIp"})
 	@RequiresPermissions(value={"avPicIp:audit"})
-	public String auditPicIp(Integer isAudit,Integer isValid,String ids,Integer functionId){
+	public String auditPicIp(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
 			for(String id :idArray){
-				avContentCfgService.auditPicIp(isAudit,isValid,functionId,id,auditTime);
+				try {
+					avContentCfgService.auditPicIp(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					e.printStackTrace();
+					logger.info("Pic Ip配置下发失败："+e.getMessage());
+					addMessage(redirectAttributes, e.getMessage());
+				}
 			}
 			
 		}
@@ -320,12 +341,18 @@ public class AvContentController extends BaseController  {
 	//修改CONTUrl配置审核
 	@RequestMapping(value = {"/auditAvContUrl"})
 	@RequiresPermissions(value={"avContUrl:audit"})
-	public String auditContUrl(Integer isAudit,Integer isValid,String ids,Integer functionId){
+	public String auditContUrl(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
 			for(String id :idArray){
-				avContentCfgService.auditContUrl(isAudit,isValid,functionId,id,auditTime);
+				try {
+					avContentCfgService.auditContUrl(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					e.printStackTrace();
+					logger.info("Cont Url配置下发失败："+e.getMessage());
+					addMessage(redirectAttributes, e.getMessage());
+				}
 			}
 			
 		}
@@ -385,12 +412,18 @@ public class AvContentController extends BaseController  {
 	//修改CONTUrl配置审核
 	@RequestMapping(value = {"/auditAvPicUrl"})
 	@RequiresPermissions(value={"avPicUrl:audit"})
-	public String auditPicUrl(Integer isAudit,Integer isValid,String ids,Integer functionId){
+	public String auditPicUrl(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
 			for(String id :idArray){
-				avContentCfgService.auditPicUrl(isAudit,isValid,functionId,id,auditTime);
+				try {
+					avContentCfgService.auditPicUrl(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					e.printStackTrace();
+					logger.info("Pic Url配置下发失败："+e.getMessage());
+					addMessage(redirectAttributes, e.getMessage());
+				}
 			}
 			
 		}

src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java

@@ -34,6 +34,7 @@ import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
 
@@ -128,4 +129,95 @@ public class FileTransferCfgController  extends BaseController{
 		}
 		return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId;
 	}
+	
+	@RequestMapping(value = {"fileDigestList"})
+	@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
+	public String fileDigestList(Model model,@ModelAttribute("cfg")FileDigestCfg cfg,HttpServletRequest request,HttpServletResponse response) {
+		Page<FileDigestCfg> searchPage=new Page<FileDigestCfg>(request,response,"a");
+		Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(searchPage, cfg);
+		model.addAttribute("page", page);
+		initPageCondition(model,cfg);
+		return "/cfg/fileTransfer/fileDigestList";
+	}
+	
+	@RequestMapping(value = {"fileDigestForm"})
+	@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
+	public String fileDigestForm(Model model,String ids,FileDigestCfg entity) {
+		if(StringUtils.isNotBlank(ids)){
+			entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids));
+			initUpdateFormCondition(model,entity);
+		}else{
+			initFormCondition(model,entity);
+		}
+		model.addAttribute("_cfg", entity);
+		return "/cfg/fileTransfer/fileDigestForm";
+	}
+	@RequestMapping(value = {"saveFileDigestCfg"})
+	@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
+	public String saveFileDigestCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
+			FileDigestCfg entity,MultipartFile file) {
+		try {
+			Date fileTime=null;
+			Date date=new Date();
+			if(!StringUtil.isEmpty(entity.getCfgId())){
+				entity.setEditTime(date);
+				fileTime=entity.getEditTime();
+			}else{
+				entity.setCreateTime(date);
+				fileTime=entity.getCreateTime();
+			}
+			ToMaatResult result = null;
+			if(file!=null && file.getSize()>0 && entity!=null){
+				String sep = System.getProperty("file.separator");
+				String digestFilePath = request.getRealPath("/")+"digestFile";
+				FileUtils.createDirectory(digestFilePath);
+				String fileName = UUID.randomUUID()+FileUtils.getSuffix(file.getOriginalFilename(), true);
+				File uploadFile = new File(digestFilePath+sep+fileName);
+				FileCopyUtils.copy(file.getBytes(), uploadFile);
+				Date creatTime = entity.getCreateTime();
+				//获取文件摘要接口调用
+				Map<String,Object> fileMap = new HashMap();
+				fileMap.put("filetype", FileUtils.getSuffix(file.getOriginalFilename(), false));
+				fileMap.put("datatype", "dbSystem");//源文件存入数据中心
+				
+				fileMap.put("createTime",fileTime);
+				fileMap.put("key",FileUtils.getPrefix(file.getOriginalFilename(), false));
+				fileMap.put("fileName", file.getOriginalFilename());
+				String md5 = DigestUtils.md5Hex(file.getBytes());
+				fileMap.put("checksum", md5);
+				result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap));
+				logger.info("获取文件摘要响应信息："+result);
+			}			
+			fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+entity.getFunctionId();
+	}
+	@RequestMapping(value = {"updateFileDigestValid"})
+	@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
+	public String updateFileDigestValid(Integer isValid,String ids,Integer functionId) {
+		fileTransferCfgService.updateFileDigestCfgValid(isValid,ids,functionId);
+		return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId;
+	}
+	
+	@RequestMapping(value = {"auditFileDigestCfg"})
+	@RequiresPermissions(value={"fileTransfer:fileDigest:audit"})
+	public String auditFileDigestCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
+		if(!StringUtil.isEmpty(ids)){
+			String[] idArray = ids.split(",");
+			Date auditTime=new Date();
+			for(String id :idArray){
+				try {
+					fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					e.printStackTrace();
+					logger.info("File Digest配置下发失败："+e.getMessage());
+					addMessage(redirectAttributes, e.getMessage());
+				}
+			}
+			
+		}
+		return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId;
+	}
 }

src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java

@@ -82,12 +82,12 @@ public class MailCfgController  extends BaseController{
 				Date creatTime = entity.getCreateTime();
 				//获取文件摘要接口调用
 				Map<String,Object> fileMap = new HashMap();
-				fileMap.put("filetype", FileUtils.getSuffix(file.getName(), false));
+				fileMap.put("filetype", FileUtils.getSuffix(file.getOriginalFilename(), false));
 				fileMap.put("datatype", "dbSystem");//源文件存入数据中心
 				
 				fileMap.put("createTime",creatTime);
-				fileMap.put("key",FileUtils.getPrefix(file.getName(), false));
-				fileMap.put("fileName", file.getName());
+				fileMap.put("key",FileUtils.getPrefix(file.getOriginalFilename(), false));
+				fileMap.put("fileName", file.getOriginalFilename());
 				String md5 = DigestUtils.md5Hex(file.getBytes());
 				fileMap.put("checksum", md5);
 				result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap));

src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java

@@ -23,15 +23,16 @@ public interface FileTransferCfgDao extends CrudDao<CfgIndexInfo> {
 	public List<CfgIndexInfo> getFtpList(CfgIndexInfo entity);
 	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
 	public List<BaseStringCfg> getFtpKeywordList(CfgIndexInfo entity);
-	public List<FileDigestCfg> getFtpFileDigestList(CfgIndexInfo entity);
+	public List<FileDigestCfg> getFileDigestList(FileDigestCfg entity);
 	public void saveCfgIndex(CfgIndexInfo entity);
 	public void saveIpPortCfg(IpPortCfg entity);
 	public void saveFtpKeywordCfg(BaseStringCfg entity);
-	public void saveFtpFileDigestCfg(FileDigestCfg entity);
 	public void deleteFtpIpCfg(CfgIndexInfo entity);
 	public void deleteFtpKeywordCfg(CfgIndexInfo entity);
 	public void deleteFtpFileDigestCfg(CfgIndexInfo entity);
 	public void updateCfgIndex(CfgIndexInfo entity);
 	public void updateCfgValid(BaseCfg entity);
 	public void auditCfg(BaseCfg entity);
+	public FileDigestCfg getFileDigest(Long id);
+	public void updateFileDigestCfg(FileDigestCfg entity);
 }

src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml

@@ -308,15 +308,6 @@
 	    <if test="cfgType != null and cfgType != ''">
   				and  a.cfg_type =#{cfgType,jdbcType=VARCHAR}
    		</if>
-  </select>
-   <!-- 文件摘要查询 -->
-  <select id="getFileDigestList" resultMap="digestCfgMap" parameterType="com.nis.domain.configuration.FileDigestCfg">
-		 SELECT 
-	     <include refid="DigestCfg_Column" />
-	    FROM file_digest_cfg a where compile_id=#{compileId} and function_id=#{functionId}
-	    <if test="cfgType != null and cfgType != ''">
-  				and  a.cfg_type =#{cfgType,jdbcType=VARCHAR}
-   		</if>
   </select>
    <!-- insert cfgIndexInfox -->
   <insert id="saveCfgIndex" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
@@ -652,4 +643,178 @@
   <delete id="deleteFileDigestCfg">
   	delete from file_digest_cfg where compile_id=#{compileId} and function_id=#{functionId}
   </delete>
+  
+  
+  
+  <!-- File Digest Cfg -->
+  <select id="getFileDigestList" resultMap="digestCfgMap" parameterType="com.nis.domain.configuration.FileDigestCfg" >
+		SELECT 
+	    <include refid="DigestCfg_Column" />
+	    <trim prefix="," prefixOverrides=",">
+			, s.name as creator_name,e.name as editor_name,u.name as auditor_name
+			,ri.request_title as requestName
+		</trim>
+	    FROM file_digest_cfg a
+	    left join sys_user s on a.creator_id=s.id
+		left join sys_user e on a.editor_id=e.id
+		left join sys_user u on a.auditor_id=u.id
+		left join request_info ri on a.request_id=ri.id
+		
+	    <trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
+	 		<if test="cfgId != null">
+	   			AND a.CFG_ID=#{cfgId,jdbcType=BIGINT}
+	   		</if>
+	    	<if test="cfgDesc != null and cfgDesc != ''">
+	    		AND a.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	<if test="cfdsLevel != null">
+	   			AND a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER}
+	   		</if>
+	    	<if test="action != null">
+	    		AND a.ACTION=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid != null">
+	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND a.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="creatorName != null and creatorName != ''">
+	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="editorName != null and editorName != ''">
+	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="auditorName != null and auditorName != ''">
+	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="serviceId != null">
+	    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="requestId != null">
+	    		AND a.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileId != null">
+	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isAreaEffective != null">
+	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="classify != null and classify != ''">
+	    		AND a.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="attribute != null and attribute != ''">
+	    		AND a.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="lable != null and lable != ''">
+	    		AND a.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+	    		AND a.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}
+	    </trim>
+	    <choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.CFG_ID desc
+			</otherwise>
+		</choose>
+  </select>
+  
+  <select id="getFileDigest" resultMap="digestCfgMap" parameterType="java.lang.Long">
+		 SELECT 
+	    <include refid="DigestCfg_Column" />
+	    FROM file_digest_cfg a where cfg_id=#{cfgId}
+  </select>
+  
+  <update id="updateFileDigestCfg" parameterType="com.nis.domain.configuration.FileDigestCfg" >
+    update file_digest_cfg
+    <set >
+      <trim suffixOverrides=",">
+      <if test="cfgDesc != null and cfgDesc != ''" >
+        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="action != null" >
+        action = #{action,jdbcType=INTEGER},
+      </if>
+      <if test="isValid != null" >
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null" >
+        is_audit = #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null" >
+        creator_id = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null and createTime != ''" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="editorId != null" >
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+      <if test="editTime != null and editTime != ''" >
+        edit_time = #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="auditorId != null" >
+        auditor_id = #{auditorId,jdbcType=INTEGER},
+      </if>
+      <if test="auditTime != null and auditTime != ''" >
+        audit_time = #{auditTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="serviceId != null" >
+        service_id = #{serviceId,jdbcType=INTEGER},
+      </if>
+      <if test="requestId != null" >
+        request_id = #{requestId,jdbcType=INTEGER},
+      </if>
+      <if test="isAreaEffective != null" >
+        is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
+      </if>
+      <if test="classify != null and classify != ''" >
+        classify = #{classify,jdbcType=VARCHAR},
+      </if>
+      <if test="attribute != null and attribute != ''" >
+        attribute = #{attribute,jdbcType=VARCHAR},
+      </if>
+      <if test="lable != null and lable != ''" >
+        lable = #{lable,jdbcType=VARCHAR},
+      </if>
+      <if test="areaEffectiveIds != null" >
+        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
+      </if>
+      <if test="functionId != null" >
+        function_id =  #{functionId,jdbcType=INTEGER},
+      </if>
+      <if test="rawLen != null" >
+        RAW_LEN =  #{rawLen,jdbcType=INTEGER},
+      </if>
+      <if test="digest != null and digest != ''" >
+        digest =  #{digest,jdbcType=VARCHAR},
+      </if>
+      <if test="cfdsLevel != null" >
+        CFDS_LEVEL =  #{cfdsLevel,jdbcType=INTEGER},
+      </if>
+      <if test="cfgRegionCode != null">
+   		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
+   	  </if>
+   	  <if test="cfgType != null and cfgType != ''">
+   		CFG_TYPE =#{cfgType,jdbcType=VARCHAR},
+      </if>
+      </trim>
+    </set>
+    where cfg_id = #{cfgId,jdbcType=BIGINT}
+  </update>
 </mapper>

src/main/java/com/nis/web/service/configuration/AvContentCfgService.java

@@ -384,7 +384,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.initDefaultValue();
 			BeanUtils.copyProperties(entity, maatCfg);
 			maatCfg.setAction(entity.getAction());
-			maatCfg.setAuditTime(entity.getAuditTime());
+			maatCfg.setAuditTime(auditTime);
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);
@@ -397,7 +397,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(entity.getIsValid());
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.INSERT_ACTION);
@@ -414,7 +414,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(0);//无效
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.UPDATE_ACTION);
@@ -674,7 +674,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.initDefaultValue();
 			BeanUtils.copyProperties(entity, maatCfg);
 			maatCfg.setAction(entity.getAction());
-			maatCfg.setAuditTime(entity.getAuditTime());
+			maatCfg.setAuditTime(auditTime);
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);
@@ -687,7 +687,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(entity.getIsValid());
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.INSERT_ACTION);
@@ -704,7 +704,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(0);//无效
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.UPDATE_ACTION);
@@ -962,7 +962,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.initDefaultValue();
 			BeanUtils.copyProperties(entity, maatCfg);
 			maatCfg.setAction(entity.getAction());
-			maatCfg.setAuditTime(entity.getAuditTime());
+			maatCfg.setAuditTime(auditTime);
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);
@@ -975,7 +975,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(entity.getIsValid());
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.INSERT_ACTION);
@@ -992,7 +992,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(0);//无效
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.UPDATE_ACTION);
@@ -1215,7 +1215,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.initDefaultValue();
 			BeanUtils.copyProperties(entity, maatCfg);
 			maatCfg.setAction(entity.getAction());
-			maatCfg.setAuditTime(entity.getAuditTime());
+			maatCfg.setAuditTime(auditTime);
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);
@@ -1228,7 +1228,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(entity.getIsValid());
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.INSERT_ACTION);
@@ -1245,7 +1245,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(0);//无效
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.UPDATE_ACTION);
@@ -1467,7 +1467,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.initDefaultValue();
 			BeanUtils.copyProperties(entity, maatCfg);
 			maatCfg.setAction(entity.getAction());
-			maatCfg.setAuditTime(entity.getAuditTime());
+			maatCfg.setAuditTime(auditTime);
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);
@@ -1480,7 +1480,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(entity.getIsValid());
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.INSERT_ACTION);
@@ -1497,7 +1497,7 @@ public class AvContentCfgService extends BaseService{
 			maatCfg.setIsValid(0);//无效
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setAuditTime(auditTime);
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.UPDATE_ACTION);

src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java

@@ -18,6 +18,7 @@ import com.nis.domain.Page;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.FileDigestCfg;
 import com.nis.domain.configuration.IpPortCfg;
@@ -35,8 +36,10 @@ import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AreaIpCfgDao;
 import com.nis.web.dao.configuration.FileTransferCfgDao;
+import com.nis.web.dao.configuration.MailCfgDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.CrudService;
 
@@ -51,6 +54,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 	protected FileTransferCfgDao fileTransferCfgDao;
 	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
+	@Autowired
+	protected MailCfgDao mailCfgDao;
 	public Page<CfgIndexInfo> getFtpList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
@@ -298,4 +303,157 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			logger.info("ftp配置取消配置响应信息："+result.getMsg());
 		}
 	}
+	
+	public Page<FileDigestCfg> getFileDigestList(Page<FileDigestCfg> page, FileDigestCfg entity){
+		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.setPage(page);
+		List<FileDigestCfg> list = fileTransferCfgDao.getFileDigestList(entity);
+		page.setList(list);
+		return page;
+	}
+	
+	public FileDigestCfg getFileDigestCfg(Long cfgId){
+		FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId);
+		return entity;
+	}
+	
+	public void saveOrUpdateFileDigestCfg(FileDigestCfg entity,ToMaatResult result){
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
+		
+		entity.setIsValid(0);
+		entity.setIsAudit(0);
+		
+		if(entity.getCfgId()==null){
+			Integer compileId = 0;
+			try {
+				List<Integer> idList = ConfigServiceUtil.getId(1, 1);
+				if(idList!=null && idList.size()>0){
+					compileId = idList.get(0);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
+			}
+			entity.setCompileId(compileId);
+			entity.setCreatorId(entity.getCurrentUser().getId());
+			
+			if(result!=null && result.getData()!=null){
+				entity.setRawLen(result.getData().getRawLen());
+				entity.setDigest(result.getData().getDigest());
+			}				
+			mailCfgDao.saveMailFileDigestCfg(entity);
+			
+		}else{
+			entity.setEditorId(entity.getCurrentUser().getId());
+			entity.setEditTime(new Date());
+			if(result!=null && result.getData()!=null){
+				entity.setRawLen(result.getData().getRawLen());
+				entity.setDigest(result.getData().getDigest());
+			}
+			fileTransferCfgDao.updateFileDigestCfg(entity);
+		}
+	}
+	
+	public void updateFileDigestCfgValid(Integer isValid,String ids,Integer functionId){
+		FileDigestCfg entity = new FileDigestCfg();
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity.setCfgId(Long.parseLong(id));
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			entity.setFunctionId(functionId);
+			fileTransferCfgDao.updateFileDigestCfg(entity);
+		}
+		
+	}
+	
+	public void auditFileDigestCfg(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime) throws MaatConvertException{
+		FileDigestCfg entity = new FileDigestCfg();
+		entity.setCfgId(Long.parseLong(id));
+		entity.setIsAudit(isAudit);
+		entity.setIsValid(isValid);
+		entity.setAuditorId(UserUtils.getUser().getId());
+		entity.setAuditTime(auditTime);
+		fileTransferCfgDao.updateFileDigestCfg(entity);
+		
+		entity = fileTransferCfgDao.getFileDigest(Long.parseLong(id));
+		
+		List list=new ArrayList();
+		list.add(entity);
+		
+		ToMaatBean maatBean = new ToMaatBean();		
+		MaatCfg maatCfg = new MaatCfg();
+		List<MaatCfg> configCompileList = new ArrayList();
+		List<GroupCfg> groupRelationList = new ArrayList();
+		List<IpCfg> ipRegionList = new ArrayList();
+		List<StringCfg> strRegionList = new ArrayList();
+		List<NumBoundaryCfg> numRegionList = new ArrayList();
+		List<DigestCfg> digestRegionList = new ArrayList();
+		List<IpCfg> areaIpRegionList = new ArrayList();
+		
+		if(isAudit==1){
+				//TODO DELETE后期删除
+				entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
+				entity.setCfgType("NTC_FILE_DIGEST");
+				
+				Map<String,List> map = cfgConvert(digestRegionList,list,5,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				digestRegionList=map.get("dstList");
+				if(map.get("numRegionList")!=null){
+					numRegionList.addAll(map.get("numRegionList"));
+				}
+		}
+		
+		//构造提交综合服务参数格式，一条配置提交一次综合服务
+		if(isAudit==1){
+			maatCfg.initDefaultValue();
+			BeanUtils.copyProperties(entity, maatCfg);
+			maatCfg.setAction(entity.getAction());
+			maatCfg.setAuditTime(auditTime);
+			maatCfg.setIpRegionList(ipRegionList);
+			maatCfg.setStrRegionList(strRegionList);
+			maatCfg.setNumRegionList(numRegionList);
+			maatCfg.setDigestRegionList(digestRegionList);
+			maatCfg.setGroupRelationList(groupRelationList);
+			maatCfg.setGroupNum(groupRelationList.size());
+			//TODO 后期修改
+			maatCfg.setUserRegion(entity.getCompileId()+"");
+			maatCfg.setAreaIpRegionList(areaIpRegionList);
+			maatCfg.setIsValid(entity.getIsValid());
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(auditTime);
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			//调用服务接口下发配置数据
+			String json=gsonToJson(maatBean);
+			logger.info("File Digest配置下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+			logger.info("File Digest配置下发响应信息："+result.getMsg());
+			
+		}else if(isAudit==3){
+			maatCfg.setCompileId(entity.getCompileId());
+			maatCfg.setServiceId(entity.getServiceId());
+			maatCfg.setIsValid(0);//无效
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(auditTime);
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
+			//调用服务接口取消配置
+			String json=gsonToJson(maatBean);
+			logger.info("File Digest配置下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.put(json,1);
+			logger.info("File Digest配置取消配置响应信息："+result.getMsg());
+		}
+	}
+	
 }