diff --git a/src/main/java/com/zcloud/controller/corp/CorpInfoController.java b/src/main/java/com/zcloud/controller/corp/CorpInfoController.java index 8565a82..ccc1d32 100644 --- a/src/main/java/com/zcloud/controller/corp/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/corp/CorpInfoController.java @@ -62,6 +62,9 @@ public class CorpInfoController extends BaseController { private ListManagerService listManagerService; @Autowired private HiddenService hiddenService; +// @Autowired +// private StudyTaskService studyTaskService; + @Autowired private Smb smb; @@ -631,4 +634,43 @@ public class CorpInfoController extends BaseController { map.put("result", errInfo); return map; } + + /**根据企业ID获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/getDiagnosis") + @ResponseBody + @LogAnno(menuType= "双重预控",menuServer= "持续改进",instructionsOperate = "企业报告",instructionsType = "公司详情") + + public Object getDiagnosis() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + PageData cpd = corpinfoService.findById(pd); //根据ID读取 + pd.put("CORPCREATTIME",cpd.getString("CREATTIME").substring(0,7)); + PageData riskpd = riskPointService.getDiagnosis(pd); + List lists = listManagerService.listAllForDiagnosis(pd); + List thismonth = listManagerService.thisMonthListmanager(pd); + List hdlist = hiddenService.listAllForDiagnosis(pd); +// PageData studypd = studyTaskService.getDiagnosis(pd); + List riskLog = riskPointService.getLogDiagnosis(pd); + + map.put("cpd", cpd); + map.put("monthlist",thismonth); + map.put("riskpd", riskpd); + map.put("lists", lists); + map.put("hdlist", hdlist); +// map.put("studypd", studypd); + map.put("riskLog",riskLog); + if(pd!=null) { + errInfo = "success"; + }else { + errInfo = "faild"; + } + map.put("result", errInfo); + return map; + } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8462dad..e0f195f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,20 +1,20 @@ spring.application.name=integrated_traffic -server.port=8093 +server.port=7082 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://192.168.0.26:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=root +datasource.no1.password=1234 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://192.168.0.26:3306/qa-traffic-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=root +datasource.no2.password=1234 datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no3.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no3.url=jdbc:mysql://192.168.0.26:3306/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no3.username=root -datasource.no3.password=root +datasource.no3.password=1234 #druid\u8FDE\u63A5\u6C60 @@ -46,7 +46,7 @@ spring.cache.ehcache.cofnig=ehcache.xml #\u914D\u7F6E\u8FD9\u53E5\u8BDD,\u63A7\u5236\u53F0\u8F93\u51FAsql\u8BED\u53E5 logging.level.com.zcloud.mapper=debug -#上传文件大小限制 +#\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236 spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-request-size=500MB @@ -91,14 +91,14 @@ customer.url=http://192.168.0.18:8997/sync/ customer.domain=yth.qhdsafety.com -#自定义线程池配置 -# 核心线程池数 +#\u81EA\u5B9A\u4E49\u7EBF\u7A0B\u6C60\u914D\u7F6E +# \u6838\u5FC3\u7EBF\u7A0B\u6C60\u6570 spring.task.execution.pool.core-size= 1 -# 最大线程池数 +# \u6700\u5927\u7EBF\u7A0B\u6C60\u6570 spring.task.execution.pool.max-size= 1 -# 任务队列的容量 +# \u4EFB\u52A1\u961F\u5217\u7684\u5BB9\u91CF spring.task.execution.pool.queue-capacity= 60 -# 非核心线程的存活时间 +# \u975E\u6838\u5FC3\u7EBF\u7A0B\u7684\u5B58\u6D3B\u65F6\u95F4 spring.task.execution.pool.keep-alive= 60 -# 线程池的前缀名称 +# \u7EBF\u7A0B\u6C60\u7684\u524D\u7F00\u540D\u79F0 spring.task.execution.thread-name-prefix= upload-archives-file-task- diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml index 012be6e..4e9039c 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml @@ -133,7 +133,7 @@ and f.PRACTITIONERTYPE = #{pd.PRACTITIONERTYPE} - and f.REPLYSTATUS = #{pd.REPLYSTATUS} + and f.REPLY = #{pd.REPLYSTATUS} and f.SIGNEDSTATUS = #{pd.SIGNEDSTATUS}