From 6e4f31f205b9de704d9bf247345addc5a23c9594 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Tue, 4 Jun 2024 10:11:02 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E5=8F=AA=E6=9C=89=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=BA=BA=E5=92=8C=E4=B8=8B=E4=B8=80=E6=AD=A5=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0?= =?UTF-8?q?=E5=8A=A8=E7=81=AB=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=85=B6=E4=BB=96=E4=BA=BA=E5=91=98=E9=83=BD=E7=9C=8B?= =?UTF-8?q?=E4=B8=8D=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/FHmainApplication.java | 1 + .../highriskwork/AppHotworkCfdController.java | 1 + .../controller/system/LoginController.java | 2 +- .../highriskwork/HotworkCfdMapper.java | 3 ++ .../impl/HotworkCfdServiceImpl.java | 23 ++++++++++-- .../resources/application-local.properties | 29 +++++++++++---- .../resources/application-master.properties | 8 ++-- src/main/resources/application.properties | 4 +- .../highriskwork/HotworkCfdMapper.xml | 37 ++++++++++++++++--- 9 files changed, 84 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zcloud/FHmainApplication.java b/src/main/java/com/zcloud/FHmainApplication.java index 1251f755..75b6e36d 100644 --- a/src/main/java/com/zcloud/FHmainApplication.java +++ b/src/main/java/com/zcloud/FHmainApplication.java @@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Conditional; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java index e7250d05..d02cbabd 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -1659,6 +1659,7 @@ public class AppHotworkCfdController extends BaseController { map.put("measuresList", hotworkCfdService.listAllMeasures(condition)); pd = hotworkCfdService.findById(pd); //根据ID读取 + // created by liu jun 添加（交底人、项目主管部门负责人、安全措施确认人） hotworkCfdService.addInfo(pd); diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index 5c93c4f0..0b3c188e 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -187,7 +187,7 @@ public class LoginController extends BaseController { PageData pathData = corpPathService.getCorpPathByCorpId(pd); map.put("baseImgPath",pathData.getString("PIC_PATH")); map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY")); - map.put("BACKENDADDR", pathData.getString("BACK_END_PATH")); + map.put("BACKENDADDR", "http://192.168.0.49:8091/"); } else { PageData pathData = corpPathService.getCorpPathByPersonInfo(pd); map.put("baseImgPath",pathData.getString("PIC_PATH")); diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java index 0536d207..2d1fdc87 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java @@ -85,5 +85,8 @@ public interface HotworkCfdMapper { PageData countCheck(PageData pd); PageData getCode(PageData pd); + + List datalistPageHistory(Page page); + } diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java index c95cdb52..d18e7c80 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -309,12 +309,29 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { * @param page * @throws Exception */ - public List list(Page page)throws Exception{ + public List list(Page page) throws Exception { List list = hotworkCfdMapper.datalistPage(page); - // created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人 - for(PageData dto: list){ + String applyStatus = page.getPd().getString("APPLY_STATUS"); + + for (PageData dto : list) { + + page.getPd().put("HOTWORK_ID", dto.getString("HOTWORK_ID")); + + if ("1".equals(applyStatus) || "1.5".equals(applyStatus) || "2".equals(applyStatus)) { + List historyList = hotworkCfdMapper.datalistPageHistory(page); + if (historyList != null && !historyList.isEmpty()) { + for (PageData historyPd : historyList) { + if (historyPd.getString("HOTWORK_ID").equals(dto.getString("HOTWORK_ID"))) { + dto.put("historyPd", historyPd); + break; + } + } + } + } + this.addInfo(dto); } + return list; } public List jhlist(Page page)throws Exception{ diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 023e9b32..e5619e2d 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -2,12 +2,12 @@ datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no1.username=root -datasource.no1.password=Mysql@zcloud88888 +datasource.no1.username=dev +datasource.no1.password=Zykj@dev123456 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no2.username=root -datasource.no2.password=Mysql@zcloud88888 +datasource.no2.username=dev +datasource.no2.password=Zykj@dev123456 #druid??? @@ -62,19 +62,30 @@ spring.main.banner-mode=off #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ + +baseimgpath =http://192.168.192.201:8991/file/ + +heBeiQinAnFile=https://file.zcloudchina.com/YTHFile + +dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/ #????? -smb.host=192.168.192.201 +#smb.host=192.168.192.201 +#smb.port=22 +#smb.user=root +#smb.password=SJSKAQHBGLXT@20220311 +#smb.basePath=/mnt/qask/file/ +smb.host=39.101.130.96 smb.port=22 smb.user=root -smb.password=SJSKAQHBGLXT@20220311 -smb.basePath=/mnt/qask/file/ +smb.password=Zcloud@zcloud88888 +smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.151.57:9876 +rocketmq.name-server=39.100.115.58:8899 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -88,6 +99,8 @@ mq.topic.info=info mq.topic.eightWork=eightWork mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork +mq.gwj.data.topic=czks_docking +mq.gwj.file.topic=czks_dockingPicture corp.default.pic-path=https://qgqy.qhdsafety.com/ diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index fb62718f..5bbf7b1f 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -1,12 +1,12 @@ # ?????? datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=gwjsjkzcloud888888 +datasource.no1.password=Mysql@zcloud88888 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=gwjsjkzcloud888888 +datasource.no2.password=Mysql@zcloud88888 #druid连接池 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd259ac5..ea7feb10 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,11 +2,11 @@ spring.application.name=qa-prevention-gwj server.port=8091 #?? -#spring.profiles.active=local +spring.profiles.active=local #����31ʱʹ�� #spring.profiles.active=dev #?? -spring.profiles.active=master +#spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index bb442595..5e2058c5 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -490,7 +490,6 @@ f.APPROVE_USER_SIGNER_PATH, f.APPROVE_USER_SIGNER_TIME, f.APPLY_STATUS, - (SELECT a.ANALYZE_TIME from bus_hotworkgas_cfd a where a.ISDELETE = '0' AND a.HOTWORK_ID = #{HOTWORK_ID} ORDER BY @@ -578,7 +577,12 @@ aacu.NAME as ACCEPT_CONFESS_USER_NAME, anad.NAME as ANALYZE_DEPARTMENT_NAME, - anau.NAME as ANALYZE_USER_NAME + anau.NAME as ANALYZE_USER_NAME, + + bhe.USER_NAME as EXAMINE_USER_NAME, + bhe.APPROVAL_OPINIONS as EXAMINE_APPROVAL_OPINIONS, + bhe.CREATE_TIME as EXAMINE_APPROVAL_CREATE_TIME + from f left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID @@ -614,8 +618,10 @@ left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID + left join bus_hotwork_cfd_examine bhe on bhe.HOTWORK_ID = f.HOTWORK_ID and bhe.TYPE = 1 + where - f.HOTWORK_ID = #{HOTWORK_ID} + f.HOTWORK_ID = #{HOTWORK_ID} @@ -780,9 +786,9 @@ and bhac.ACCEPT_USER_ID = f.ACCEPT_USER_ID and bhac.CORPINFO_ID = f.CORPINFO_ID and bhac.ISDELETE = '0' and bhac.ACCEPT_USER_ID is not null and trim(bhac.ACCEPT_USER_ID) != '' where f.ISDELETE = '0' - - and f.APPLY_STATUS = #{pd.APPLY_STATUS} - + + + and f.APPLY_STATUS in ('1','2','4','5','6','0.9','2.5','1.5') @@ -1725,4 +1731,23 @@ and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%') + + From 42dc26afd5b7eb8f4be8a2cfa7751d707e66ce7e Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Tue, 4 Jun 2024 10:58:14 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=9F=A5=E8=AF=A2=E6=97=B6=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E9=99=8D=E5=BA=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/highriskwork/impl/HotworkCfdServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java index d18e7c80..235d6541 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -332,7 +332,9 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { this.addInfo(dto); } - return list; + return list.stream() + .sorted((o1, o2) -> o2.getString("CREATTIME").compareTo(o1.getString("CREATTIME"))) + .collect(Collectors.toList()); } public List jhlist(Page page)throws Exception{ return hotworkCfdMapper.jhdatalistPage(page); From 95f225bb9f1e0b1743d2759fd65eb121f0d0687a Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Wed, 5 Jun 2024 09:46:57 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8app=E7=AB=AF?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=89=B9=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2APPROVAL=5FSIGNATU?= =?UTF-8?q?RE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/highriskwork/HotworkCfdMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index 5e2058c5..d10d0b51 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -581,6 +581,7 @@ bhe.USER_NAME as EXAMINE_USER_NAME, bhe.APPROVAL_OPINIONS as EXAMINE_APPROVAL_OPINIONS, + bhe.APPROVAL_SIGNATURE as EXAMINE_APPROVAL_SIGNATURE, bhe.CREATE_TIME as EXAMINE_APPROVAL_CREATE_TIME from From dc537a8a1542e3e8ca938a7b9fd63a84dd5a23a9 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Wed, 5 Jun 2024 15:03:47 +0800 Subject: [PATCH 04/30] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E6=AD=A5=E7=9A=84=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=AD=E5=9C=A8=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=92=8C=E9=AB=98=E5=8D=B1=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=E9=83=BD=E6=B2=A1=E6=9C=89=E7=9B=B8=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HotworkCfdServiceImpl.java | 17 +++++++++++++++ .../datasource/gf/BlindBoardMapper.xml | 21 +++++++++++++------ .../datasource/gf/ConfinedSpaceMapper.xml | 19 ++++++++++++++--- .../datasource/gf/ElectricityMapper.xml | 21 +++++++++++++------ .../mybatis/datasource/gf/HighWorkMapper.xml | 21 ++++++++++++++----- .../mybatis/datasource/gf/HoistingMapper.xml | 20 ++++++++++++++---- 6 files changed, 95 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java index 235d6541..5a5b81cf 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -450,6 +450,23 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { condition.put("TYPE", "2"); // 安全项检查人需处理数 info.put("safetyNum", busHotworkCfdExamineMapper.findByCondition(condition).size()); + int sumCount = 0; + sumCount += Integer.parseInt(info.getString("COUNTBACK", "0")); + sumCount += Integer.parseInt(info.getString("COUNTLEADER", "0")); + sumCount += Integer.parseInt(info.getString("COUNTMONITOR", "0")); + sumCount += Integer.parseInt(info.getString("COUNTACCEPT", "0")); + sumCount += Integer.parseInt(info.getString("COUNTAPPROVE", "0")); + sumCount += Integer.parseInt(info.getString("COUNTANALYZE", "0")); + sumCount += Integer.parseInt(info.getString("safetyNum", "0")); + sumCount += Integer.parseInt(info.getString("belongingNum", "0")); + sumCount += Integer.parseInt(info.getString("COUNTGUARDIAN", "0")); + sumCount += Integer.parseInt(info.getString("confessNum", "0")); + sumCount += Integer.parseInt(info.getString("COUNTACCEPTCONFESS", "0")); + sumCount += Integer.parseInt(info.getString("COUNTCONFIRM", "0")); + sumCount += Integer.parseInt(info.getString("COUNTCONFESS", "0")); + sumCount += Integer.parseInt(info.getString("COUNTAUDIT", "0")); + + info.put("SUMCOUNT", sumCount); // 气体分析人需处理数 return info; } diff --git a/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml index da5034b2..de873929 100644 --- a/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml @@ -1350,20 +1350,29 @@ - diff --git a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml index ab53bbf7..4795cc08 100644 --- a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml @@ -1517,16 +1517,25 @@ COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) COUNTAPPROVE, COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) COUNTACCEPT, COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) COUNTANALYZE, - COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTGUARDIAN, - COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTCONFESS, - COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and - not exists(select 1 from GF_ELECTRICITY_ACCEPTUSER m where m.ELECTRICITY_ID = f.ELECTRICITY_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) - THEN f.ELECTRICITY_ID END) COUNTACCEPTCONFESS + COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTGUARDIAN, + COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) COUNTCONFESS, + COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_ELECTRICITY_ACCEPTUSER m where m.ELECTRICITY_ID = f.ELECTRICITY_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.ELECTRICITY_ID END) COUNTACCEPTCONFESS, + + ( + COUNT(CASE WHEN (f.APPLY_STATUS+0) < 1 AND f.CREATOR = #{USER_ID} THEN f.ELECTRICITY_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONFIRM_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.ELECTRICITY_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS < '5' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_ELECTRICITY_ACCEPTUSER m where m.ELECTRICITY_ID = f.ELECTRICITY_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.ELECTRICITY_ID END) + ) AS SUMCOUNT FROM f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID} - SELECT - COUNT(CASE WHEN (f.APPLY_STATUS+0) < 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTBACK, + COUNT(CASE WHEN (f.APPLY_STATUS + 0) < 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTBACK, COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTCONSTRUCTION, COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTLEADER, COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAUDIT, COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAPPROVE, COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTACCEPT, - COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTGUARDIAN, - COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTCONFESS, - COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_HIGHWORK_ACCEPTUSER m where m.HIGHWORK_ID = f.HIGHWORK_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END) COUNTACCEPTCONFESS + COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) COUNTGUARDIAN, + COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) COUNTCONFESS, + COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_HIGHWORK_ACCEPTUSER m WHERE m.HIGHWORK_ID = f.HIGHWORK_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END) COUNTACCEPTCONFESS, + -- 求和所有计数项 + ( + COUNT(CASE WHEN (f.APPLY_STATUS + 0) < 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.CONFESS_USER_ID = #{USER_ID} AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN f.HIGHWORK_ID END) + + COUNT(CASE WHEN f.APPLY_STATUS < '6' AND f.APPLY_STATUS > 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} AND NOT EXISTS (SELECT 1 FROM GF_HIGHWORK_ACCEPTUSER m WHERE m.HIGHWORK_ID = f.HIGHWORK_ID AND m.CORPINFO_ID = f.CORPINFO_ID AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END) + ) AS SUMCOUNT FROM f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID} - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index c73ab389..95b4e14d 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -506,9 +506,9 @@ f.OTHER_PROTECTIVE_MEASURES, f.ACCEPT_DEPARTMENT_ID, f.ACCEPT_USER_ID, - f.ACCEPT_USER_SIGNER_PATH, - f.ACCEPT_USER_SIGNER_TIME, - IFNULL(f.ACCEPT_CONTENT,'无') as ACCEPT_CONTENT, + bhac.ACCEPT_USER_SIGNER_PATH, + bhac.ACCEPT_USER_SIGNER_TIME, + IFNULL(f.ACCEPT_CONTENT,'同意') as ACCEPT_CONTENT, f.APPLY_DEPARTMENT_ID, f.APPLY_USER_ID, f.WORK_PLACE, @@ -554,83 +554,64 @@ f.CONFIRM_OTHER_CONTENT, ad.NAME as APPLY_DEPARTMENT_NAME, au.NAME as APPLY_USER_NAME, - cd.NAME as CONFIRM_DEPARTMENT_NAME, cu.NAME as CONFIRM_USER_NAME, - gd.NAME as GUARDIAN_DEPARTMENT_NAME, gu.NAME as GUARDIAN_USER_NAME, - ld.NAME as LEADER_DEPARTMENT_NAME, lu.NAME as LEADER_USER_NAME, - aud.NAME as AUDIT_DEPARTMENT_NAME, auu.NAME as AUDIT_USER_NAME, - apd.NAME as APPROVE_DEPARTMENT_NAME, apu.NAME as APPROVE_USER_NAME, - md.NAME as MONITOR_DEPARTMENT_NAME, mu.NAME as MONITOR_USER_NAME, - acd.NAME as ACCEPT_DEPARTMENT_NAME, acu.NAME as ACCEPT_USER_NAME, - ac.NAME as CONFESS_DEPARTMENT_NAME, accu.NAME as CONFESS_USER_NAME, - aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME, aacu.NAME as ACCEPT_CONFESS_USER_NAME, - anad.NAME as ANALYZE_DEPARTMENT_NAME, anau.NAME as ANALYZE_USER_NAME, - bhe.USER_NAME as EXAMINE_USER_NAME, bhe.APPROVAL_OPINIONS as EXAMINE_APPROVAL_OPINIONS, bhe.APPROVAL_SIGNATURE as EXAMINE_APPROVAL_SIGNATURE, bhe.CREATE_TIME as EXAMINE_APPROVAL_CREATE_TIME - from f left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID left join SYS_USER au on au.USER_ID = f.APPLY_USER_ID - left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID - left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID - left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONFIRM_DEPARTMENT_ID left join SYS_USER cu on cu.USER_ID = f.CONFIRM_USER_ID - left join OA_DEPARTMENT gd on gd.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID left join SYS_USER gu on gu.USER_ID = f.GUARDIAN_USER_ID - left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID - left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID - left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID - left join OA_DEPARTMENT md on md.DEPARTMENT_ID = f.MONITOR_DEPARTMENT_ID left join SYS_USER mu on mu.USER_ID = f.MONITOR_USER_ID - left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID - left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID - - left join bus_hotwork_cfd_examine bhe on bhe.HOTWORK_ID = f.HOTWORK_ID and bhe.TYPE = 1 - + left join bus_hotwork_cfd_examine bhe on + bhe.HOTWORK_ID = f.HOTWORK_ID + and bhe.TYPE = 1 + and bhe.IS_DELETE = '0' + left join bus_hotwork_acceptuser_cfd bhac on bhac.HOTWORK_ID = f.HOTWORK_ID where f.HOTWORK_ID = #{HOTWORK_ID} + From e1033f8a413a531cc9de4afbd6a84301cd5b770b Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Thu, 20 Jun 2024 14:02:01 +0800 Subject: [PATCH 22/30] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95?= =?UTF-8?q?=E4=BA=BA=E5=92=8C=E5=AE=8C=E5=B7=A5=E9=AA=8C=E6=94=B6=E5=A4=9A?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HotworkCfdServiceImpl.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java index 6b385b51..541c0a78 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -2,6 +2,7 @@ package com.zcloud.service.highriskwork.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.flow.xgf.GuFen.GuFenCharge; import com.zcloud.mapper.datasource.highriskwork.BusHotworkCfdExamineMapper; import com.zcloud.mapper.datasource.highriskwork.HotworkAcceptUserCfdMapper; import com.zcloud.mapper.datasource.highriskwork.HotworkCfdMapper; @@ -249,18 +250,32 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { conditon.put("VALID_FLAG", "1"); conditon.put("TYPE", request.getString("TYPE")); conditon.put("USER_ID", request.get("USER_ID")); + String userId = Jurisdiction.getUSER_ID(); List approvalInfos = busHotworkCfdExamineMapper.findByCondition(conditon); if(approvalInfos.size() == 0) throw new RuntimeException("未找到审批信息,请联系管理员"); - if (approvalInfos.size() > 1) throw new RuntimeException("审批信息异常,请联系管理员"); +// if (approvalInfos.size() > 1) throw new RuntimeException("审批信息异常,请联系管理员"); PageData entity = approvalInfos.get(0); + String newFilePath = Warden.saveFile(files, request.getString("CORPINFO_ID")); + + // 判断条件 + if (entity.getString("APPROVAL_SIGNATURE") != null && !entity.getString("APPROVAL_SIGNATURE").isEmpty() + && userId.equals(entity.getString("USER_ID")) + && "3".equals(entity.getString("TYPE"))) { + + // 拼接新的文件路径 + String existingFilePaths = entity.getString("APPROVAL_SIGNATURE"); + entity.put("APPROVAL_SIGNATURE", existingFilePaths + ";" + newFilePath); + } else { + // 走原有逻辑 + entity.put("APPROVAL_SIGNATURE", newFilePath); + } entity.put("APPROVAL_STATUS", request.getString("APPROVAL_STATUS")); // entity.put("APPROVAL_SIGNATURE", Warden.saveFile(files,request.getString("CORPINFO_ID"))); - List filePaths = Warden.saveFiles(files, request.getString("CORPINFO_ID")); - entity.put("APPROVAL_SIGNATURE", String.join(";", filePaths)); +// List filePaths = Warden.saveFiles(files, request.getString("CORPINFO_ID")); +// entity.put("APPROVAL_SIGNATURE", String.join(";", filePaths)); entity.put("APPROVAL_SIGNATURE_TIME", DateUtil.getTime()); entity.put("APPROVAL_CONTENT",request.getString("APPROVAL_CONTENT")); busHotworkCfdExamineMapper.edit(entity); - } @Override From 62ece3f434496e93a141633ce840aa8c46a02093 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Fri, 21 Jun 2024 17:40:50 +0800 Subject: [PATCH 23/30] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=E6=89=80=E6=9C=89=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=89=93=E5=9B=9E=E6=97=B6=E6=B7=BB=E5=8A=A0=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E7=AD=BE=E5=AD=97=E5=9B=BE=E7=89=87=E5=92=8C=E6=89=93?= =?UTF-8?q?=E5=9B=9E=E6=84=8F=E8=A7=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highriskwork/AppHotworkCfdController.java | 446 +++++++++++------- 1 file changed, 279 insertions(+), 167 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java index 8185f65d..70e028c4 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -741,13 +741,12 @@ public class AppHotworkCfdController extends BaseController { pd2.put("OTHER_PROTECTIVE_MEASURES", ""); } + List fileList = new ArrayList(); + String signertime = ""; + String[] SIGNTIME = pd.getString("SIGNTIME").split(","); + switch (status) { - - case "8"://验收人 - List fileList = new ArrayList(); - String signertime = ""; - String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - + case "8": // 验收人 for (int i = 0; i < SIGNTIME.length; i++) { signertime = SIGNTIME[i]; fileList.add(request.getFile("file" + i)); @@ -757,63 +756,70 @@ public class AppHotworkCfdController extends BaseController { } pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("FIRE_COMPLETED", pd.get("FIRE_COMPLETED")); //动火是否完成 - pd2.put("SITE_CLEANED", pd.get("SITE_CLEANED")); //作业现场是否清理 - pd2.put("NO_REMAINING_EMBERS", pd.get("NO_REMAINING_EMBERS")); //是否存在遗留火种 + pd2.put("FIRE_COMPLETED", pd.get("FIRE_COMPLETED")); // 动火是否完成 + pd2.put("SITE_CLEANED", pd.get("SITE_CLEANED")); // 作业现场是否清理 + pd2.put("NO_REMAINING_EMBERS", pd.get("NO_REMAINING_EMBERS")); // 是否存在遗留火种 hotworkCfdService.edit(pd2); log.put("ACTION", "验收通过"); // 发短信 PageData mes = new PageData(); - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DH_Y08");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID")); // 收信人userid + mes.put("templateCode", "DH_Y08"); // 短信模板编码 + mes.put("SMSCode", "SMS_227250920"); // 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID")); // 企业id // 参数集合 List paramsList = new ArrayList(); // 第1个参数 PageData params1 = new PageData(); - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + params1.put("name", "number"); // 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO")); // 存入上面参数名称所传递的值 paramsList.add(params1); // 第2个参数 PageData params2 = new PageData(); - params2.put("name", "type");// 存入短信模板中的参数名称 - params2.put("value", "动火作业");// 存入上面参数名称所传递的值 + params2.put("name", "type"); // 存入短信模板中的参数名称 + params2.put("value", "动火作业"); // 存入上面参数名称所传递的值 paramsList.add(params2); - //sendMessageUtil.sendMessages(mes, paramsList); + // sendMessageUtil.sendMessages(mes, paramsList); break; - case "-8"://审批打回 - log.put("ACTION", "验收人打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + case "-8": // 审批打回 + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file" + i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr), signertime, pd.getString("HOTWORK_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + } pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); hotworkCfdService.edit(pd2); + log.put("ACTION", "验收人打回"); // 发短信 PageData mes6 = new PageData(); - mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes6.put("templateCode", "DH_N08");// 短信模板编码 - mes6.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID")); // 收信人userid + mes6.put("templateCode", "DH_N08"); // 短信模板编码 + mes6.put("SMSCode", "SMS_223580715"); // 短信模板编码 + mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID")); // 企业id // 参数集合 List paramsList6 = new ArrayList(); // 第1个参数 PageData params19 = new PageData(); - params19.put("name", "params1");// 存入短信模板中的参数名称 - params19.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + params19.put("name", "params1"); // 存入短信模板中的参数名称 + params19.put("value", pd2.get("CHECK_NO")); // 存入上面参数名称所传递的值 paramsList6.add(params19); // 第2个参数 PageData params20 = new PageData(); - params20.put("name", "params2");// 存入短信模板中的参数名称 - params20.put("value", "动火作业");// 存入上面参数名称所传递的值 + params20.put("name", "params2"); // 存入短信模板中的参数名称 + params20.put("value", "动火作业"); // 存入上面参数名称所传递的值 paramsList6.add(params20); // 第3个参数 PageData params21 = new PageData(); - params21.put("name", "params3");// 存入短信模板中的参数名称 - params21.put("value", "验收归档");// 存入上面参数名称所传递的值 + params21.put("name", "params3"); // 存入短信模板中的参数名称 + params21.put("value", "验收归档"); // 存入上面参数名称所传递的值 paramsList6.add(params21); - //sendMessageUtil.sendMessages(mes6, paramsList6); + // sendMessageUtil.sendMessages(mes6, paramsList6); break; default: break; @@ -926,12 +932,12 @@ public class AppHotworkCfdController extends BaseController { // 保存审批信息 PageData condition = new PageData(); condition.put("HOTWORK_ID", pd2.get("HOTWORK_ID")); - condition.put("TYPE","1"); - condition.put("APPROVAL_OPINIONS",pd.get("CONTENT")); - condition.put("APPROVAL_SIGNATURE",Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - condition.put("APPROVAL_SIGNATURE_TIME",pd.get("SIGNER_TIME")); - condition.put("APPROVAL_STATUS",pd.getString("APPROVAL_STATUS")); - condition.put("APPROVAL_CONTENT",pd.getString("APPROVAL_CONTENT")); + condition.put("TYPE", "1"); + condition.put("APPROVAL_OPINIONS", pd.get("CONTENT")); + condition.put("APPROVAL_SIGNATURE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + condition.put("APPROVAL_SIGNATURE_TIME", pd.get("SIGNER_TIME")); + condition.put("APPROVAL_STATUS", pd.getString("APPROVAL_STATUS")); + condition.put("APPROVAL_CONTENT", pd.getString("APPROVAL_CONTENT")); hotworkCfdService.approval(condition); } break; @@ -1103,7 +1109,7 @@ public class AppHotworkCfdController extends BaseController { case "7"://班长 if (files != null && files.length > 0) { PageData condition = new PageData(); - pd.put("HOTWORK_ID",pd2.getString("HOTWORK_ID")); + pd.put("HOTWORK_ID", pd2.getString("HOTWORK_ID")); // condition.put("HOTWORK_ID",pd2.getString("HOTWORK_ID")); hotworkCfdService.addInfo(pd); //List acceptUsers = hotworkAcceptUserCfdService.listAll(condition); @@ -1216,17 +1222,50 @@ public class AppHotworkCfdController extends BaseController { } break; case "-1.5": {//确认 - log.put("ACTION", "作业负责人打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); - hotworkCfdService.edit(pd2); +// log.put("ACTION", "作业负责人打回"); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); +// pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); +// hotworkCfdService.edit(pd2); +// break; + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); + pd2.put("CONFIRM_OTHER_CONTENT", pd.get("APPROVAL_CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "作业负责人打回"); + } break; } case "-2": {//确认打回 - log.put("ACTION", "作业单位打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); - hotworkCfdService.edit(pd2); +// log.put("ACTION", "作业单位打回"); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); +// pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); +// hotworkCfdService.edit(pd2); + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + // 保存审批信息 + PageData condition = new PageData(); + condition.put("HOTWORK_ID", pd2.get("HOTWORK_ID")); + condition.put("TYPE", "1"); + condition.put("APPROVAL_OPINIONS", pd.get("CONTENT")); + condition.put("APPROVAL_SIGNATURE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + condition.put("APPROVAL_SIGNATURE_TIME", pd.get("SIGNER_TIME")); + condition.put("APPROVAL_STATUS", pd.getString("APPROVAL_STATUS")); + condition.put("APPROVAL_CONTENT", pd.getString("APPROVAL_CONTENT")); + hotworkCfdService.approval(condition); + } // 发短信 PageData mes = new PageData(); @@ -1256,9 +1295,24 @@ public class AppHotworkCfdController extends BaseController { } case "-4"://单位负责人打回 log.put("ACTION", "单位负责人打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); - hotworkCfdService.edit(pd2); + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("LEADER_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "单位负责人打回"); + } +// log.put("ACTION", "单位负责人打回"); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); +// pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); +// hotworkCfdService.edit(pd2); // 发短信 PageData mes2 = new PageData(); @@ -1286,126 +1340,184 @@ public class AppHotworkCfdController extends BaseController { //sendMessageUtil.sendMessages(mes2, paramsList2); break; case "-5"://审批部门打回 - log.put("ACTION", "安全部门打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); - hotworkCfdService.edit(pd2); + if (files != null && files.length > 0) { + MultipartFile file = files[0]; - // 发短信 - PageData mes3 = new PageData(); - mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes3.put("templateCode", "DH_N05");// 短信模板编码 - mes3.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 参数集合 - List paramsList3 = new ArrayList(); - // 第1个参数 - PageData params10 = new PageData(); - params10.put("name", "params1");// 存入短信模板中的参数名称 - params10.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList3.add(params10); - // 第2个参数 - PageData params11 = new PageData(); - params11.put("name", "params2");// 存入短信模板中的参数名称 - params11.put("value", "动火作业");// 存入上面参数名称所传递的值 - paramsList3.add(params11); - // 第3个参数 - PageData params12 = new PageData(); - params12.put("name", "params3");// 存入短信模板中的参数名称 - params12.put("value", "安全部门");// 存入上面参数名称所传递的值 - paramsList3.add(params12); - //sendMessageUtil.sendMessages(mes3, paramsList3); - break; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "安全部门打回"); + +// log.put("ACTION", "安全部门打回"); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); +// pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); +// hotworkCfdService.edit(pd2); + + // 发短信 + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes3.put("templateCode", "DH_N05");// 短信模板编码 + mes3.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList3 = new ArrayList(); + // 第1个参数 + PageData params10 = new PageData(); + params10.put("name", "params1");// 存入短信模板中的参数名称 + params10.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList3.add(params10); + // 第2个参数 + PageData params11 = new PageData(); + params11.put("name", "params2");// 存入短信模板中的参数名称 + params11.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList3.add(params11); + // 第3个参数 + PageData params12 = new PageData(); + params12.put("name", "params3");// 存入短信模板中的参数名称 + params12.put("value", "安全部门");// 存入上面参数名称所传递的值 + paramsList3.add(params12); + //sendMessageUtil.sendMessages(mes3, paramsList3); + break; + } case "-6"://审批打回 - log.put("ACTION", "审批部门打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); - hotworkCfdService.edit(pd2); - // 发短信 - PageData mes4 = new PageData(); - mes4.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes4.put("templateCode", "DH_N06");// 短信模板编码 - mes4.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes4.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 参数集合 - List paramsList4 = new ArrayList(); - // 第1个参数 - PageData params13 = new PageData(); - params13.put("name", "params1");// 存入短信模板中的参数名称 - params13.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList4.add(params13); - // 第2个参数 - PageData params14 = new PageData(); - params14.put("name", "params2");// 存入短信模板中的参数名称 - params14.put("value", "动火作业");// 存入上面参数名称所传递的值 - paramsList4.add(params14); - // 第3个参数 - PageData params15 = new PageData(); - params15.put("name", "params3");// 存入短信模板中的参数名称 - params15.put("value", "审批人审核");// 存入上面参数名称所传递的值 - paramsList4.add(params15); - //sendMessageUtil.sendMessages(mes4, paramsList4); - break; - case "-7"://审批打回 - log.put("ACTION", "动火前验票打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); - hotworkCfdService.edit(pd2); - // 发短信 - PageData mes5 = new PageData(); - mes5.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes5.put("templateCode", "DH_N07");// 短信模板编码 - mes5.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes5.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 参数集合 - List paramsList5 = new ArrayList(); - // 第1个参数 - PageData params16 = new PageData(); - params16.put("name", "params1");// 存入短信模板中的参数名称 - params16.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList5.add(params16); - // 第2个参数 - PageData params17 = new PageData(); - params17.put("name", "params2");// 存入短信模板中的参数名称 - params17.put("value", "动火作业");// 存入上面参数名称所传递的值 - paramsList5.add(params17); - // 第3个参数 - PageData params18 = new PageData(); - params18.put("name", "params3");// 存入短信模板中的参数名称 - params18.put("value", "动火前验票");// 存入上面参数名称所传递的值 - paramsList5.add(params18); - //sendMessageUtil.sendMessages(mes5, paramsList5); - break; - case "-8"://审批打回 - log.put("ACTION", "验收人打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); - hotworkCfdService.edit(pd2); + if (files != null && files.length > 0) { + MultipartFile file = files[0]; - // 发短信 - PageData mes6 = new PageData(); - mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes6.put("templateCode", "DH_N08");// 短信模板编码 - mes6.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 参数集合 - List paramsList6 = new ArrayList(); - // 第1个参数 - PageData params19 = new PageData(); - params19.put("name", "params1");// 存入短信模板中的参数名称 - params19.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList6.add(params19); - // 第2个参数 - PageData params20 = new PageData(); - params20.put("name", "params2");// 存入短信模板中的参数名称 - params20.put("value", "动火作业");// 存入上面参数名称所传递的值 - paramsList6.add(params20); - // 第3个参数 - PageData params21 = new PageData(); - params21.put("name", "params3");// 存入短信模板中的参数名称 - params21.put("value", "验收归档");// 存入上面参数名称所传递的值 - paramsList6.add(params21); - //sendMessageUtil.sendMessages(mes6, paramsList6); + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "审批部门打回"); +// log.put("ACTION", "审批部门打回"); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); +// pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); +// hotworkCfdService.edit(pd2); + // 发短信 + PageData mes4 = new PageData(); + mes4.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes4.put("templateCode", "DH_N06");// 短信模板编码 + mes4.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes4.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList4 = new ArrayList(); + // 第1个参数 + PageData params13 = new PageData(); + params13.put("name", "params1");// 存入短信模板中的参数名称 + params13.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList4.add(params13); + // 第2个参数 + PageData params14 = new PageData(); + params14.put("name", "params2");// 存入短信模板中的参数名称 + params14.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList4.add(params14); + // 第3个参数 + PageData params15 = new PageData(); + params15.put("name", "params3");// 存入短信模板中的参数名称 + params15.put("value", "审批人审核");// 存入上面参数名称所传递的值 + paramsList4.add(params15); + //sendMessageUtil.sendMessages(mes4, paramsList4); + break; + } + case "-7"://审批打回 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("MONITOR_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("MONITOR_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("MONITOR_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("WORK_START_DATE", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))); + hotworkCfdService.edit(pd2); + log.put("ACTION", "动火前验票打回"); +// log.put("ACTION", "动火前验票打回"); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); +// pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); +// hotworkCfdService.edit(pd2); + // 发短信 + PageData mes5 = new PageData(); + mes5.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes5.put("templateCode", "DH_N07");// 短信模板编码 + mes5.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes5.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList5 = new ArrayList(); + // 第1个参数 + PageData params16 = new PageData(); + params16.put("name", "params1");// 存入短信模板中的参数名称 + params16.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList5.add(params16); + // 第2个参数 + PageData params17 = new PageData(); + params17.put("name", "params2");// 存入短信模板中的参数名称 + params17.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList5.add(params17); + // 第3个参数 + PageData params18 = new PageData(); + params18.put("name", "params3");// 存入短信模板中的参数名称 + params18.put("value", "动火前验票");// 存入上面参数名称所传递的值 + paramsList5.add(params18); + //sendMessageUtil.sendMessages(mes5, paramsList5); + break; + } + case "-8"://审批打回 + if (files != null && files.length > 0) { + MultipartFile file = files[0]; + + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + + pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + hotworkCfdService.edit(pd2); + log.put("ACTION", "验收人打回"); +// log.put("ACTION", "验收人打回"); +// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); +// pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); +// hotworkCfdService.edit(pd2); + + // 发短信 + PageData mes6 = new PageData(); + mes6.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes6.put("templateCode", "DH_N08");// 短信模板编码 + mes6.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes6.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList6 = new ArrayList(); + // 第1个参数 + PageData params19 = new PageData(); + params19.put("name", "params1");// 存入短信模板中的参数名称 + params19.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList6.add(params19); + // 第2个参数 + PageData params20 = new PageData(); + params20.put("name", "params2");// 存入短信模板中的参数名称 + params20.put("value", "动火作业");// 存入上面参数名称所传递的值 + paramsList6.add(params20); + // 第3个参数 + PageData params21 = new PageData(); + params21.put("name", "params3");// 存入短信模板中的参数名称 + params21.put("value", "验收归档");// 存入上面参数名称所传递的值 + paramsList6.add(params21); + //sendMessageUtil.sendMessages(mes6, paramsList6); + } break; default: break; From 8e387202629cac05ee488e3cd637e9dab5b311db Mon Sep 17 00:00:00 2001 From: water_xu Date: Tue, 25 Jun 2024 17:18:16 +0800 Subject: [PATCH 24/30] =?UTF-8?q?bug-15522=20=E9=9A=90=E6=82=A3=E5=A4=84?= =?UTF-8?q?=E7=BD=9A=E7=AE=A1=E7=90=86=20=E4=B8=8D=E6=98=BE=E7=A4=BAai?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E7=9A=84=E9=9A=90=E6=82=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dsno2/keyProjects/OutSourcedMapper.xml | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 5e2d3e6d..7a9f668a 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -304,7 +304,7 @@ vua.NAME OUTSOURCED_CREATOR_NAME, ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, p.`NAME` as UNITS_PIC_NAME, - ifnull(h.HIDDEN_COUNT,0) HIDDEN_COUNT + ifnull(h.HIDDEN_COUNT,0) + ifnull(hai.AI_COUNT ,0) HIDDEN_COUNT from f left join bus_units b using (UNITS_ID) @@ -335,9 +335,24 @@ ) t group by t.OUTSOURCED_ID,t.CREATOR ) uncheck on uncheck.OUTSOURCED_ID = f.OUTSOURCED_ID and uncheck.CREATOR = #{pd.UserId} - left join ( SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT, t.SOURCE SOURCE, t.CREATOR CREATOR - FROM - ( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-gwj-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID and h.ISDELETE = '0') t GROUP BY t.OUTSOURCED_ID,t.CREATOR ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID + left join ( + SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT, t.SOURCE SOURCE, t.CREATOR CREATOR + FROM + ( + SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* + FROM `qa-gwj-prevention`.bus_keyproject_hidden h + LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID and h.ISDELETE = '0' + ) t + GROUP BY t.OUTSOURCED_ID,t.CREATOR + ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID + left join ( + select vm.OUTSOURCED_ID ,COUNT(1) AI_COUNT + from `qa-gwj-regulatory`.bus_videomanager vm + left join `qa-gwj-regulatory`.bus_aiwarning ai on ai.VIDEOMANAGER_ID = vm.VIDEOMANAGER_ID and vm.ISDELETE = '0' + left join `qa-gwj-regulatory`.bus_aiwarning_hiddens ah on ai.AIWARNING_ID = ah.AIWARNING_ID + left join `qa-gwj-prevention`.bus_keyproject_hidden h on ah.HIDDEN_ID = h.HIDDEN_ID + where h.ISDELETE = '0' and h.SOURCE = '1' + ) hai on hai.OUTSOURCED_ID = f.OUTSOURCED_ID where f.ISDELETE = '0' and From 6b90c0f662cff9ae91ff14d43d1b46a28984f494 Mon Sep 17 00:00:00 2001 From: songwenxuan <1924103812@qq.com> Date: Wed, 26 Jun 2024 14:00:18 +0800 Subject: [PATCH 25/30] =?UTF-8?q?626=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/aspect/DockingAspect.java | 29 +++++++++++++- src/main/java/com/zcloud/dto/TenCorpDto.java | 8 ++++ .../mq/impl/DockSendMessageServiceImpl.java | 29 +++++++++++++- .../resources/application-local.properties | 38 +++++++++++++++---- src/main/resources/application.properties | 4 +- 5 files changed, 94 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zcloud/aspect/DockingAspect.java b/src/main/java/com/zcloud/aspect/DockingAspect.java index 171a8ee9..5c520a6e 100644 --- a/src/main/java/com/zcloud/aspect/DockingAspect.java +++ b/src/main/java/com/zcloud/aspect/DockingAspect.java @@ -32,6 +32,13 @@ import java.util.Map; public class DockingAspect { @Autowired private DockSendMessageService sendMessageService; + @Value("${mq.csy.data.topic}") + private String csyDataDocking; + + @Value("${mq.cmt.data.topic}") + private String cmtDataDocking; + @Value("${mq.czks.data.topic}") + private String czksDataDocking; @Value("${baseimgpath}") public String baseimgpath; @Pointcut("@annotation(com.zcloud.aspect.DockAnnotation)") @@ -104,9 +111,27 @@ public class DockingAspect { tenCorpDto.setProducer_name("qa-prevention-czks"); // 有dockData if (Tools.notEmpty(proceed.get("dockData"))) { - sendData.put("dockData", proceed.get("dockData")); + String dockData = proceed.get("dockData"); + PageData dockDataMap = JSON.parseObject(dockData, PageData.class); + sendData.put("dockData",dockData); + // 操作企业 + if ("f8da1790b1034058ae2efefd69af3284".contains(dockDataMap.getString("operatingCorpId")) + || "016d19225e9d4ece863cce8a256a3e72".contains(dockDataMap.getString("operatingCorpId")) + || "1".equals(dockDataMap.getString("sendAllCorp")) + ){ + tenCorpDto.setTopic(czksDataDocking); + sendMessageService.sendMessage(tenCorpDto); + } + // todo先不给其他两家发送消息，上线前打开 + if ("8854edee3aa94be496cee676b6d4845a".equals(dockDataMap.getString("operatingCorpId")) || "1".equals(dockDataMap.getString("sendAllCorp"))){ + tenCorpDto.setTopic(csyDataDocking); + sendMessageService.sendMessage(tenCorpDto); + } + if ("6aa255d41602497fa0f934a822820df4".equals(dockDataMap.getString("operatingCorpId")) || "1".equals(dockDataMap.getString("sendAllCorp"))){ + tenCorpDto.setTopic(cmtDataDocking); + sendMessageService.sendMessage(tenCorpDto); + } proceed.remove("dockData"); - sendMessageService.sendMessage(tenCorpDto); } else { System.out.println("------------------------无dockData不发消息------------------------"); } diff --git a/src/main/java/com/zcloud/dto/TenCorpDto.java b/src/main/java/com/zcloud/dto/TenCorpDto.java index 011721d9..f9398c74 100644 --- a/src/main/java/com/zcloud/dto/TenCorpDto.java +++ b/src/main/java/com/zcloud/dto/TenCorpDto.java @@ -2,6 +2,7 @@ package com.zcloud.dto; import com.alibaba.fastjson.JSON; import com.zcloud.entity.PageData; +import com.zcloud.util.Warden; import lombok.Data; @Data @@ -23,6 +24,10 @@ public class TenCorpDto { // 消息体 private PageData data; + private String messageLogId; + + private String CREATE_TIME; + public TenCorpDto() { this.id = Warden.get32UUID(); } @@ -40,6 +45,9 @@ public class TenCorpDto { info.put("MARK_NAME", this.mark_name); info.put("MESSAGE", this.message); info.put("TOPIC",this.topic); + info.put("DATA", JSON.toJSONString(this.data)); + info.put("CREATE_TIME", this.CREATE_TIME); + info.put("MESSAGE_LOG_ID", this.messageLogId); return info; } } diff --git a/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java index ca474cd1..d4c56f41 100644 --- a/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java +++ b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java @@ -26,6 +26,13 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { private String gwjDataTopic; @Value("${mq.gwj.file.topic}") private String gwjFileTopic; + @Value("${mq.csy.data.topic}") + private String csyDataDocking; + + @Value("${mq.cmt.data.topic}") + private String cmtDataDocking; + @Value("${mq.czks.data.topic}") + private String czksDataDocking; @Resource private RocketMQTemplate rocketMQTemplate; @@ -40,14 +47,32 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { @Override public void sendMessage(TenCorpDto tenCorpDto) throws Exception { + PageData productionPD = new PageData(); + productionPD.put("PRODUCTION_ID", Warden.get32UUID()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId()); + productionPD.put("PRODUCTION_TYPE", "gwj-DockSendMessageServiceImpl.sendMessage(TenCorpDto tenCorpDto)"); + productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); try { PageData log = tenCorpDto.getPd(); log.put("MESSAGE_LOG_ID", Warden.get32UUID()); log.put("CREATE_TIME", DateUtil.getTime()); mqMessageLogMapper.save(log); System.out.println("生产者:" + tenCorpDto.toString()); - SendResult sendResult = rocketMQTemplate.syncSend(this.gwjDataTopic, tenCorpDto.toString()); - if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { + SendResult sendResult = null; + // 曹煤炭 后期是 三家 + if (tenCorpDto.getTopic().equals(czksDataDocking)) { + sendResult = rocketMQTemplate.syncSend(this.czksDataDocking, tenCorpDto.toString()); + } + if (tenCorpDto.getTopic().equals(cmtDataDocking)) { + sendResult = rocketMQTemplate.syncSend(this.cmtDataDocking, tenCorpDto.toString()); + } + if (tenCorpDto.getTopic().equals(csyDataDocking)) { + sendResult = rocketMQTemplate.syncSend(this.csyDataDocking, tenCorpDto.toString()); + } + if (sendResult != null && !sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { throw new RuntimeException("产品入栈失败"); } } catch (Exception e) { diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 023e9b32..04090df3 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -2,12 +2,12 @@ datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no1.username=root -datasource.no1.password=Mysql@zcloud88888 +datasource.no1.username=dev +datasource.no1.password=Zykj@dev123456 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no2.username=root -datasource.no2.password=Mysql@zcloud88888 +datasource.no2.username=dev +datasource.no2.password=Zykj@dev123456 #druid??? @@ -63,18 +63,18 @@ spring.main.banner-mode=off preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ #????? -smb.host=192.168.192.201 +smb.host=39.101.130.96 smb.port=22 smb.user=root -smb.password=SJSKAQHBGLXT@20220311 -smb.basePath=/mnt/qask/file/ +smb.password=Zcloud@zcloud88888 +smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.151.57:9876 +rocketmq.name-server=192.168.0.2:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -95,6 +95,28 @@ corp.default.pic-path=https://qgqy.qhdsafety.com/ corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ http.file.url=https://qgqy.qhdsafety.com/file/ +mq.csy.data.topic=csy_docking +mq.csy.data.group=scheduled_tasks_csy_docking +mq.csy.file.topic=csy_dockingPicture +mq.csy.file.group=scheduled_tasks_csy_dockingPicture + +mq.cmt.data.topic=cmt_docking +mq.cmt.data.group=scheduled_tasks_cmt_docking +mq.cmt.file.topic=cmt_dockingPicture +mq.cmt.file.group=scheduled_tasks_cmt_dockingPicture + +mq.czks.data.topic=czks_docking +mq.czks.data.group=scheduled_tasks_czks_docking +mq.czks.file.topic=czks_dockingPicture +mq.czks.file.group=scheduled_tasks_czks_dockingPicture + +mq.gwj.data.topic=czks_docking +mq.gwj.file.topic=czks_dockingPicture +baseimgpath =http://192.168.192.201:8991/file/ + +heBeiQinAnFile=https://file.zcloudchina.com/YTHFile +biaoZhunShuJuKu=https://file.zcloudchina.com/ +dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/ #�û���ʶ # ���ݿ�ʯ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd259ac5..ea7feb10 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,11 +2,11 @@ spring.application.name=qa-prevention-gwj server.port=8091 #?? -#spring.profiles.active=local +spring.profiles.active=local #����31ʱʹ�� #spring.profiles.active=dev #?? -spring.profiles.active=master +#spring.profiles.active=master From 9a1ea011e3cb7579058c27eb3e827f24c477fd94 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 27 Jun 2024 13:18:49 +0800 Subject: [PATCH 26/30] =?UTF-8?q?=E8=BE=B9=E7=95=8C=E5=85=A5=E4=BE=B5?= =?UTF-8?q?=EF=BC=8C=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/map/MapController.java | 2 +- .../map/MapPlatFormElectronicController.java | 37 ++++++++++++++++++- .../datasource/system/DictionariesMapper.java | 2 + .../service/system/DictionariesService.java | 1 + .../system/impl/DictionariesServiceImpl.java | 5 +++ .../datasource/system/DictionariesMapper.xml | 19 ++++++++++ 6 files changed, 64 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index d676c8fe..29985779 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -939,7 +939,7 @@ public class MapController extends BaseController { AlarmGet alarmGet = new AlarmGet(); alarmGet.setPage(new com.zcloud.service.dw.dto.Page()); alarmGet.getPage().setCurrent("1"); - alarmGet.getPage().setSize("12"); + alarmGet.getPage().setSize("5"); alarmGet.setCorpId(pd.getString("corpId")); map.put("result", "success"); map.put("alarmList", dwService.getAlarmList(alarmGet)); diff --git a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java index 050c6ff0..be50910a 100644 --- a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java +++ b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java @@ -4,12 +4,15 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; import com.zcloud.service.keyProjects.PlatformvideomanagementService; import com.zcloud.service.map.util.HKPostUtil; +import com.zcloud.service.system.DictionariesService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import com.zcloud.service.map.PlatformelectronicService; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -55,6 +58,8 @@ public class MapPlatFormElectronicController extends BaseController { return map; } + @Resource + private DictionariesService dictionariesService; /**地图插点 * @throws Exception @@ -66,10 +71,40 @@ public class MapPlatFormElectronicController extends BaseController { String errInfo = "success"; PageData pd = this.getPageData(); if ("bianjieruqin".equals(pd.getString("TYPE"))){ - List varList = platformvideomanagementService.listAll(pd); //列出Platformvideomanagement列表 + if (StringUtils.isEmpty(pd.getString("CORPINFO_ID"))){ + pd.put("CORPINFO_ID",pd.get("corpId")); + } + //列出Platformvideomanagement列表 + PageData condition = new PageData(); + List varList = platformvideomanagementService.listAll(pd); for (PageData data : varList) { data.put("MAP_POINT_NAME", data.getString("NAME")); + condition.clear(); + condition.put("INDEXCODE",data.getString("INDEXCODE")); + //增加容错 + List list = platformelectronicService.listAll(condition); + if (list.size() > 0){ + data.put("FANGQU_IDS",list.get(0).getString("FANGQU_IDS")); + } } + condition.clear(); + condition.put("PARENT_ID","f0bae7becdee4d779a2cb82037948ab4"); + Map> tongJi = new HashMap<>(); + List dic = dictionariesService.findByCondition(condition); + // 找出要统计的图标信息 + for (PageData _dic : dic){ + condition.clear(); + condition.put("PARENT_ID",_dic.getString("DICTIONARIES_ID")); + List dic2 = dictionariesService.findByCondition(condition); + for (PageData _dic2 : dic2){ + _dic2.put("NAME",_dic.getString("NAME") + _dic2.getString("NAME")); + // 统计不同防区中的不同的 + _dic2.put("num",varList.stream().filter(n -> n.getString("FANGQU_IDS").contains(_dic2.getString("DICTIONARIES_ID"))).count()); + } + tongJi.put(_dic.getString("NAME"),dic2); + } + map.put("iconData",tongJi); + // 根据统计的数据 map.put("varList", varList); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java index b7c8ad88..fa470a66 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java @@ -106,4 +106,6 @@ public interface DictionariesMapper { */ List getIdsByRecuByParentId(String parentId); List getIdsByParentIds(List parentIds); + + List findByCondition(PageData condition); } diff --git a/src/main/java/com/zcloud/service/system/DictionariesService.java b/src/main/java/com/zcloud/service/system/DictionariesService.java index 8712c5f3..f7a058aa 100644 --- a/src/main/java/com/zcloud/service/system/DictionariesService.java +++ b/src/main/java/com/zcloud/service/system/DictionariesService.java @@ -151,4 +151,5 @@ public interface DictionariesService { */ public List getIdsByParentIds(List parentIds) throws Exception; + List findByCondition(PageData condition) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java index 367da87b..3638c3f6 100644 --- a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java @@ -256,4 +256,9 @@ public class DictionariesServiceImpl implements DictionariesService { return dictionariesMapper.getIdsByParentIds(parentIds); } + @Override + public List findByCondition(PageData condition) throws Exception { + return dictionariesMapper.findByCondition(condition); + } + } diff --git a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml index 9f5c464d..cc960f73 100644 --- a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml @@ -266,4 +266,23 @@ #{PARENT_ID} + From 9d52c53c8dc1837dd8efa85353ed22d926acd604 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 27 Jun 2024 15:15:14 +0800 Subject: [PATCH 27/30] =?UTF-8?q?=E8=BE=B9=E7=95=8C=E5=85=A5=E4=BE=B5?= =?UTF-8?q?=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/controller/map/MapController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 29985779..645365d4 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -952,7 +952,7 @@ public class MapController extends BaseController { AlarmGet alarmGet = new AlarmGet(); alarmGet.setPage(new com.zcloud.service.dw.dto.Page()); alarmGet.getPage().setCurrent("1"); - alarmGet.getPage().setSize("12"); + alarmGet.getPage().setSize("9"); alarmGet.setCorpId(pd.getString("corpId")); map.put("result", "success"); map.put("alarmList", new ArrayList<>()); From d358ab3508c5f4f45bb9bc0bdc1e51b322dfcad6 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 28 Jun 2024 19:03:46 +0800 Subject: [PATCH 28/30] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E7=B3=BB=E7=BB=9Furl?= =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-master.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index 2eacb8de..c42d42de 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -57,7 +57,7 @@ spring.main.banner-mode=off preventionxgf.api.url=http://192.168.192.201:8993/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/ -dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/ +dw.url=http://192.168.192.201:8887/qa-dingWei-gwj/ #????? smb.host=192.168.192.201 From 3dbcce216ddcccb20745f47509ccb51f97c20a60 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 28 Jun 2024 21:56:47 +0800 Subject: [PATCH 29/30] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E8=BE=B9?= =?UTF-8?q?=E7=95=8C=E5=85=A5=E4=BE=B5=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=B8=8E?= =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=BB=A3=E7=A0=81=E6=9C=AA=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/map/MapController.java | 1 + .../map/MapPlatFormElectronicController.java | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 645365d4..4bfea969 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -941,6 +941,7 @@ public class MapController extends BaseController { alarmGet.getPage().setCurrent("1"); alarmGet.getPage().setSize("5"); alarmGet.setCorpId(pd.getString("corpId")); + alarmGet.setSourceNum(pd.getString("source")); map.put("result", "success"); map.put("alarmList", dwService.getAlarmList(alarmGet)); TraceGet get = new TraceGet(); diff --git a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java index be50910a..da0cdd79 100644 --- a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java +++ b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java @@ -71,12 +71,14 @@ public class MapPlatFormElectronicController extends BaseController { String errInfo = "success"; PageData pd = this.getPageData(); if ("bianjieruqin".equals(pd.getString("TYPE"))){ - if (StringUtils.isEmpty(pd.getString("CORPINFO_ID"))){ - pd.put("CORPINFO_ID",pd.get("corpId")); - } + // 注意：这里不加企业id +// if (StringUtils.isEmpty(pd.getString("CORPINFO_ID"))){ +// pd.put("CORPINFO_ID",pd.get("corpId")); +// } + pd.put("forMap","1"); //列出Platformvideomanagement列表 PageData condition = new PageData(); - List varList = platformvideomanagementService.listAll(pd); + List varList = platformelectronicService.listAll(pd); for (PageData data : varList) { data.put("MAP_POINT_NAME", data.getString("NAME")); condition.clear(); From c8a22f818948bb3f9e233757129421599510af72 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 28 Jun 2024 22:21:30 +0800 Subject: [PATCH 30/30] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E8=BE=B9?= =?UTF-8?q?=E7=95=8C=E5=85=A5=E4=BE=B5=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9C=AA=E4=B8=8E=E7=9B=91=E7=AE=A1=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=9F=E4=B8=80=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/dsno2/map/PlatformelectronicMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml b/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml index 7ae920a0..3929c33a 100644 --- a/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml +++ b/src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml @@ -191,6 +191,9 @@ -- and f.REGIONINDEXCODE in ('3152c0150e93491fb37f5c015fbb943e','1b0f290142534d62957bf0b6f852c589') + + and f.INDEXCODE = #{INDEXCODE} +