1、去掉文件策略 action

2、调整service 接口
2018-08-23 10:03:25 +08:00
parent f2e72bef46
commit 76b9a732e0
10 changed files with 57 additions and 50 deletions
--- a/src/main/java/com/nis/domain/callback/ProxyFileStrategyCfg.java
+++ b/src/main/java/com/nis/domain/callback/ProxyFileStrategyCfg.java
@@ -9,7 +9,6 @@ import com.nis.domain.configuration.BaseCfg;
 public class ProxyFileStrategyCfg extends BaseCfg<ProxyFileStrategyCfg> {
 	private static final long serialVersionUID = 4283944377949702481L;
 	public final static String TABLE_NAME = "PROXY_FILE_STRATEGY_CFG";//对应表名
-	private String fileId;//glaxy返回的文件id
 	private String fileDesc;//文件描述
 	private String url;//文件保存的url
 	private String contentType;//内容类型，如text/html，取字典表contentType
@@ -20,12 +19,6 @@ public class ProxyFileStrategyCfg extends BaseCfg<ProxyFileStrategyCfg> {
 		super();
 	}
 	
-	public String getFileId() {
-		return fileId;
-	}
-	public void setFileId(String fileId) {
-		this.fileId = fileId;
-	}
 	public String getFileDesc() {
 		return fileDesc;
 	}
--- a/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java
@@ -10,13 +10,11 @@ package com.nis.web.controller.configuration.proxy;

 import java.io.File;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -28,7 +26,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.google.common.collect.Maps;
 import com.nis.domain.Page;
 import com.nis.domain.callback.ProxyFileStrategyCfg;
-import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.domain.maat.ToMaatResult.ResponseData;
 import com.nis.util.ConfigServiceUtil;
@@ -117,8 +114,7 @@ public class FileStrategyController extends CommonController {
 				}
 				cfg.setMd5(md5);//文件md5值
 				cfg.setContentLength(file.length());//文件长度
-				cfg.setFileId(md5);
-			}
+ 			}
 			proxyFileStrategyService.saveOrUpdate(cfg);
 			addMessage(redirectAttributes,"save_success");
 		}catch(Exception e){
--- a/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml
@@ -5,7 +5,6 @@
 <resultMap id="ProxyFileStrategyCfg" type="com.nis.domain.callback.ProxyFileStrategyCfg" >
    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
    
-    <result column="file_id" property="fileId" jdbcType="VARCHAR" />
    <result column="file_desc" property="fileDesc" jdbcType="VARCHAR" />
    <result column="url" property="url" jdbcType="VARCHAR" />
    <result column="content_type" property="contentType" jdbcType="VARCHAR" />
@@ -44,7 +43,7 @@
    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,a.cfg_type,a.cfg_region_code,
-    a.FILE_ID,a.FILE_DESC,a.URL,a.CONTENT_TYPE,a.CONTENT_LENGTH,a.MD5
+    a.FILE_DESC,a.URL,a.CONTENT_TYPE,a.CONTENT_LENGTH,a.MD5
  </sql>
  
  
@@ -171,8 +170,7 @@
 		function_id,
 		cfg_type,
 		cfg_region_code,
-		
-		file_id,
+
 		file_desc,
 		url,
 		content_type,
@@ -201,7 +199,6 @@
    	#{cfgType,jdbcType=VARCHAR},
    	#{cfgRegionCode,jdbcType=INTEGER},
    	
-    	#{fileId,jdbcType=VARCHAR},
    	#{fileDesc,jdbcType=VARCHAR},
    	#{url,jdbcType=VARCHAR},
    	#{contentType,jdbcType=VARCHAR},
@@ -273,9 +270,6 @@
        cfg_type =  #{cfgType,jdbcType=VARCHAR},
      </if>

-      <if test="fileId != null" >
-        file_id =  #{fileId ,jdbcType=VARCHAR},
-      </if>
      <if test="fileDesc != null" >
        file_desc  =  #{fileDesc ,jdbcType=VARCHAR},
      </if>
--- a/src/main/java/com/nis/web/service/configuration/ProxyFileStrategyService.java
+++ b/src/main/java/com/nis/web/service/configuration/ProxyFileStrategyService.java
@@ -1,32 +1,25 @@
 package com.nis.web.service.configuration;


-import java.io.File;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;

+import com.beust.jcommander.internal.Lists;
 import com.nis.domain.Page;
-import com.nis.domain.SysUser;
 import com.nis.domain.callback.ProxyFileStrategyCfg;
-import com.nis.domain.configuration.AreaIpCfg;
-import com.nis.domain.configuration.HttpBodyCfg;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.util.ConfigServiceUtil;
-import com.nis.util.FileUtils;
-import com.nis.util.JsonMapper;
-import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.ProxyFileStrategyDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;

+import jersey.repackaged.com.google.common.collect.Maps;
+

@Service
 public class ProxyFileStrategyService extends BaseService{
@@ -58,20 +51,20 @@ public class ProxyFileStrategyService extends BaseService{
 		setAreaEffectiveIds(entity);
 		//新增
 		if(entity.getCfgId()==null){
+			Integer compileId = ConfigServiceUtil.getId(1, 1).get(0);//获取编译id
+			entity.setCompileId(compileId);
 			entity.setCreatorId(UserUtils.getUser().getId());
 			entity.setCreateTime(createTime);
 			entity.setIsValid(0);
 			entity.setIsAudit(0);
-			
-			//修改
-			proxyFileDao.insert(entity);
+			proxyFileDao.insert(entity);//新增
 		}else{
 			Date editTime=new Date();
 			entity.setIsValid(0);
 			entity.setIsAudit(0);
 			entity.setEditorId(UserUtils.getUser().getId());
 			entity.setEditTime(editTime);
-			proxyFileDao.update(entity);
+			proxyFileDao.update(entity);//更新
 		}
 	}
 	
@@ -99,6 +92,35 @@ public class ProxyFileStrategyService extends BaseService{
 		entity.setAuditorId(UserUtils.getUser().getId());
 		entity.setAuditTime(auditTime);
 		proxyFileDao.update(entity);
+		if(isAudit == 1) {//审核通过，下发配置回调配置信息
+			Map<String,Object> params = Maps.newHashMap();
+			params.put("fileId", entity.getCompileId());//文件ID
+			params.put("service", entity.getServiceId());//业务ID
+			params.put("fileDesc", entity.getFileDesc());//文件描述
+			params.put("contentType", entity.getContentType());//内容类型
+			params.put("contentLength", entity.getContentLength());//文件长度
+			params.put("filePath", entity.getUrl());//文件路径
+			params.put("isValid", 1);//有效标志，有效
+			params.put("opTime", new Date());
+			List list = Lists.newArrayList();
+			list.add(params);
+			String json = gsonToJson(list);
+			logger.debug("params:" + json);
+			ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+			logger.debug("响应："+gsonToJson(result));
+		}else if(isAudit == 3) {//取消审核通过，将回调配置信息置为无效
+			Map<String,Object> params = Maps.newHashMap();
+			params.put("fileId", entity.getCompileId());//文件ID
+			params.put("service", entity.getServiceId());//业务ID
+			params.put("isValid", 0);//有效标志，无效
+			params.put("opTime", new Date());
+			List list = Lists.newArrayList();
+			list.add(params);
+			String json = gsonToJson(list);
+			logger.debug("params:" + json);
+			ToMaatResult result = ConfigServiceUtil.put(json,2);
+			logger.debug("响应："+gsonToJson(result));
+		}
 	}
 	
 	/**
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1089,4 +1089,5 @@ file_desc=File Desc
 content_type=Content Type
 content_length=Content Length
 response_file=Response File
-APP_SUBSCRIBE_ID=Certification Mark Configuration
+APP_SUBSCRIBE_ID=Certification Mark Configuration
+reply_file=Reply File
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1088,4 +1088,5 @@ file_desc=\u6587\u4EF6\u63CF\u8FF0
 content_type=\u5185\u5BB9\u7C7B\u578B
 content_length=\u6587\u4EF6\u957F\u5EA6
 response_file=\u54CD\u5E94\u6587\u4EF6
-APP_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
+APP_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
+reply_file=\u54CD\u5E94\u6587\u4EF6
--- a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
@@ -44,8 +44,8 @@
 	               		<option value=""><spring:message code="select"/></option>
 	               		<c:forEach items="${allProxyFileStrategys}" var="file">
 	               			<c:if test="${file.isValid!=0 and file.isAudit!=3}">
-	               				<option action="${file.action }" value="${file.fileId}" 
-	               		 	<c:if test="${file.fileId==_cfg.userRegion3}">selected</c:if>>${file.fileDesc}</option>
+	               				<option action="${file.action }" value="${file.compileId}" 
+	               		 	<c:if test="${file.compileId==_cfg.userRegion3}">selected</c:if>>${file.fileDesc}</option>
 	               		</c:if>
 	               		</c:forEach>
 	               </select>
@@ -53,14 +53,14 @@
 			<div for="userRegion2"></div>
 			<script type="text/javascript">
 				$(function(){
-					//清除没用的 file 信息
+					/*//清除没用的 file 信息
 					var action = $("input[name='action']").val();
 					$("#responseFile option").each(function(i,n){
 						var oa = $(this).attr("action");
 						if(oa != action && i != 0){
 							$(this).remove();
 						}
-					});
+					}); */
 					//页面加载时触发初始化操作
 					var file = $("#responseFile").val();
 					if(file){
@@ -124,22 +124,22 @@
               		<option value=""><spring:message code="select"/></option>
               		<c:forEach items="${allProxyFileStrategys}" var="file">
               			<c:if test="${file.isValid!=0 and file.isAudit!=3}">
-               				<option action="${file.action }" value="${file.fileId}" 
-               		 			<c:if test="${file.fileId==_cfg.userRegion3}">selected</c:if>>${file.fileDesc}</option>
+               				<option action="${file.action }" value="${file.compileId}" 
+               		 			<c:if test="${file.compileId==_cfg.userRegion3}">selected</c:if>>${file.fileDesc}</option>
               			</c:if>
               		</c:forEach>
               </select>
 			</div>
 			<script type="text/javascript">
 				$(function(){
-					//清除没用的 file 信息
+					/* //清除没用的 file 信息
 					var action = $("input[name='action']").val();
 					$("#responseFile option").each(function(i,n){
 						var oa = $(this).attr("action");
 						if(oa != action && i != 0){
 							$(this).remove();
 						}
-					});
+					}); */
 					//页面加载时触发初始化操作
 					var code = $("#redirectResponseCode").val();
 					if(code == 200){//响应文件
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -563,7 +563,7 @@
 											<c:if test="${not empty indexCfg.userRegion2  }">${indexCfg.userRegion2 }</c:if>
 											<c:if test="${not empty indexCfg.userRegion3  }">
 												<c:forEach items="${allProxyFileStrategys}" var="file">
-							               			<c:if test="${file.fileId eq indexCfg.userRegion3}">
+							               			<c:if test="${file.compileId eq indexCfg.userRegion3}">
 							               				<a href="${file.url }" target="_blank">${file.fileDesc }</a>
 							               			</c:if>
 							               		</c:forEach>
@@ -583,7 +583,7 @@
 											<c:if test="${not empty indexCfg.userRegion2  }">${indexCfg.userRegion2 }</c:if>
 											<c:if test="${not empty indexCfg.userRegion3  }">
 												<c:forEach items="${allProxyFileStrategys}" var="file">
-							               			<c:if test="${file.fileId eq indexCfg.userRegion3}">
+							               			<c:if test="${file.compileId eq indexCfg.userRegion3}">
 							               				<a href="${file.url }" target="_blank">${file.fileDesc }</a>
 							               			</c:if>
 							               		</c:forEach>
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
@@ -114,7 +114,7 @@
 										</div>
 									</div>
 									
-									<div class="col-md-6">
+									<div class="col-md-6 hidden">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
 								            <div class="col-md-6">
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
@@ -271,7 +271,7 @@
 								    <th><spring:message code="file_desc"/></th>
 									<th><spring:message code="content_type"/></th>
 									<th><spring:message code="content_length"/></th>
-									<th><spring:message code="block_type"/></th>
+									<%-- <th><spring:message code="block_type"/></th> --%>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
@@ -295,13 +295,13 @@
 								    <td><a href="${indexCfg.url }" target="_blank">${indexCfg.fileDesc }</a></td>
 								    <td>${indexCfg.contentType }</td>
 								    <td>${indexCfg.contentLength }</td>
-								    <td>
+								    <%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.action }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td>
+									</td> --%>
 									<td>${indexCfg.requestName }</td>
 									<td>
 									<c:set var="classify"></c:set>