diff --git a/src/main/java/com/nis/domain/callback/ProxyFileStrategyCfg.java b/src/main/java/com/nis/domain/callback/ProxyFileStrategyCfg.java index f2373a6f3..06c6d0ad6 100644 --- 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 { 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 { super(); } - public String getFileId() { - return fileId; - } - public void setFileId(String fileId) { - this.fileId = fileId; - } public String getFileDesc() { return fileDesc; } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java index 83553f4a5..4c0937e5d 100644 --- 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){ diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml index 9b8720e68..51f832b34 100644 --- 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 @@ - @@ -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 @@ -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}, - - file_id = #{fileId ,jdbcType=VARCHAR}, - file_desc = #{fileDesc ,jdbcType=VARCHAR}, diff --git a/src/main/java/com/nis/web/service/configuration/ProxyFileStrategyService.java b/src/main/java/com/nis/web/service/configuration/ProxyFileStrategyService.java index 6f8b1341e..6cd2e7d8c 100644 --- 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 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 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)); + } } /** diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 75e1cef6b..2fdfb983c 100644 --- 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 \ No newline at end of file +APP_SUBSCRIBE_ID=Certification Mark Configuration +reply_file=Reply File \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 293ff77a2..ce2df4ee5 100644 --- 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 \ No newline at end of file +APP_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E +reply_file=\u54CD\u5E94\u6587\u4EF6 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp index 0672b45b7..e978f9a82 100644 --- a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp @@ -44,8 +44,8 @@ - >${file.fileDesc} + @@ -53,14 +53,14 @@