From db3d0763f1d7515de2e4041c90ee70765fa8f09d Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Thu, 8 Aug 2024 18:21:01 +0800 Subject: [PATCH] =?UTF-8?q?pc=5Foperator=E5=AD=97=E6=AE=B5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=8E=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ConfigController.java | 5 ++-- .../controller/HighDangerController.java | 3 +-- .../server_api/mapper/ConfigMapper.java | 2 +- .../server_api/mapper/HighDangerMapper.java | 2 +- .../server_api/service/IConfigService.java | 2 +- .../service/impl/ConfigServiceImpl.java | 4 +-- .../resources/sql-mapper/ConfigMapper.xml | 12 ++++++--- .../resources/sql-mapper/HighDangerMapper.xml | 27 +++++-------------- .../model/common/ManualInvestigation.java | 3 +++ .../hisense/hiatmp/model/dmr/LineInfo.java | 3 +++ 10 files changed, 31 insertions(+), 32 deletions(-) diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java index a0bedf7..c6cb43e 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java @@ -64,10 +64,11 @@ public class ConfigController extends HiatmpController { 基础信息预留展示接口 */ @GetMapping("/getDangerBaseData") - public ServerResponse getBaseData(@RequestParam String sectionCode){ + public ServerResponse getBaseData(@RequestParam String sectionCode, + @RequestParam String businessId){ log.info("/getDangerBaseData（排查第一页默认数据回显）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),sectionCode); // 查询默认数据 - LineInfo dangerBaseData = configService.getDangerBaseData(sectionCode); + LineInfo dangerBaseData = configService.getDangerBaseData(sectionCode,businessId); /*List roadTypes = highDangerMapper.getRoadTypes(); if(dangerBaseData.getSectionType() != null){ diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java index 964679c..8d0fcc1 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java @@ -1104,7 +1104,6 @@ public class HighDangerController { // } // manualInvestigation.setKeySet(keys.toString()); - // 暂存数据 if (manualInvestigation.getTemporary() == Boolean.FALSE) { // highDangerMapper.updateTemporary(manualInvestigation.getBusinessId(), "99"); @@ -1118,7 +1117,7 @@ public class HighDangerController { if (CollectionUtils.isNotEmpty(manualInvestigation.getDescribe())) { hdFlag = "1"; } - highDangerMapper.updateDangerRoad(hdFlag, manualInvestigation.getBusinessId(), pcCount); + highDangerMapper.updateDangerRoad(hdFlag, manualInvestigation.getBusinessId(), pcCount, manualInvestigation.getOperator()); ThtApprove thtAApprove = new ThtApprove(); UUID uuid = UUID.randomUUID(); String uuidString = uuid.toString().replace("-", ""); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java index 2e901e5..6d39e03 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java @@ -19,5 +19,5 @@ public interface ConfigMapper { List getStreetCommunityByXq(String xqcode); - LineInfo getDangerBaseData(String sectionCode); + LineInfo getDangerBaseData(@Param("sectionCode") String sectionCode, @Param("businessId") String businessId); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java index cfb33db..7600562 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java @@ -72,7 +72,7 @@ public interface HighDangerMapper{ void updateTemporary(String businessId); - void updateDangerRoad(String hdFlag,String businessId,String pcCount); + void updateDangerRoad(String hdFlag,String businessId,String pcCount,String operator); void saveHiddenDataCollectConfig(ThtHiddenDataCollectConfig config); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java index de4ab87..3ecd030 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java @@ -17,5 +17,5 @@ public interface IConfigService { List getStreetCommunityByXq(String xqcode); - LineInfo getDangerBaseData(String sectionCode); + LineInfo getDangerBaseData(String sectionCode, String businessId); } \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java index f1a0fbf..ab9e52e 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java @@ -37,9 +37,9 @@ public List getStreetCommunityByXq(String xqcode) { } @Override - public LineInfo getDangerBaseData(String sectionCode) { + public LineInfo getDangerBaseData(String sectionCode,String businessId) { - return configMapper.getDangerBaseData(sectionCode); + return configMapper.getDangerBaseData(sectionCode,businessId); } diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml index f25e83a..7caed7a 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml @@ -13,13 +13,17 @@ \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml index ce9856b..0f6f74c 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml @@ -95,12 +95,10 @@ ON hdb.business_id = hdr.business_id AND hdb.pc_count = hdr.pc_count LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status - LEFT JOIN tht_timeline tt ON tt.business_id = hdb.business_id WHERE 1 = 1 AND hdb.status = '10' AND hdr.nid is not null - AND tt.operator = #{nuserid} AND COALESCE(hdb.approve_status,'0') not IN('0','-1') AND hdb.approve_status is not null AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%')) @@ -152,10 +150,9 @@ ON hdb.business_id = hdr.business_id AND hdb.pc_count = hdr.pc_count LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status - LEFT JOIN tht_timeline tt ON tt.business_id = hdb.business_id WHERE - tt.operator = #{nuserid} - AND tt.title = '隐患上报' + 1 = 1 + AND hdr.pc_operator = #{nuserid} AND hdb.status = '10' AND hdr.nid is not null AND hdb.approve_status != '0' AND hdb.approve_status != '-1' @@ -245,14 +242,10 @@ WHEN now() AT TIME ZONE 'Asia/Shanghai' >= t1.planEndTime THEN 1 --超期 END AS time_status , t1.* --- , EXTRACT(EPOCH FROM NOW() - t1.planEndTime) AS timeDiffEnd --- , EXTRACT(EPOCH FROM t1.planEndTime - NOW() ) AS timeDiffStart , floor(EXTRACT(EPOCH FROM(now() AT TIME ZONE 'Asia/Shanghai' - planEndTime))/(1440*60)) delayDay , ceil(mod(ceil(EXTRACT(EPOCH FROM(now() AT TIME ZONE 'Asia/Shanghai' -planEndTime)))::INTEGER , 1440*60)::FLOAT/3600) delayHour , floor(EXTRACT(EPOCH FROM(planEndTime -now() AT TIME ZONE 'Asia/Shanghai'))/(1440*60)) nearDay , ceil(mod(ceil(EXTRACT(EPOCH FROM(planEndTime -now() AT TIME ZONE 'Asia/Shanghai')))::INTEGER , 1440*60)::FLOAT/3600) nearHour - -- , now() - t1.planEndTime as timeDiffEnd --- , now() - t1.nearEndTime as timeDiffStart ]]> FROM (SELECT hdb.nid , hdb.name @@ -285,9 +278,6 @@ AND et.enumvalue = hdb.status LEFT JOIN bis_section bs ON hdr.section_code = bs.section_code LEFT JOIN tht_param_config tpc ON tpc.param_code = 'THT_PC_ROAD_XT' - - LEFT JOIN tht_timeline tt ON tt.business_id = hdb.business_id - WHERE hdb.status = #{status} AND hdr.nid is not null @@ -303,16 +293,12 @@ AND hdb.name like concat(concat('%',#{search}),'%') - - AND tt.operator = #{nuserId} - + - AND tt.title = '隐患上报' - AND tt.operator = #{nuserId} + AND hdr.pc_operator = #{nuserId} - AND tt.title != '隐患上报' - AND tt.operator = #{nuserId} + AND hdr.pc_operator != #{nuserId} ) t1 ORDER BY time_status, planEndTime DESC @@ -574,7 +560,8 @@ update tht_hidden_danger_road set hd_flag = #{hdFlag} - , pc_end_time = CURRENT_TIMESTAMP,last_mod_date = NOW() + ,last_mod_date = NOW() + , pc_operator = #{operator} where business_id = #{businessId} and pc_count = #{pcCount} diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java index 8820ad3..3948adb 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java @@ -14,6 +14,9 @@ public class ManualInvestigation implements Serializable { private static final long serialVersionUID = 1L; + // 用户 + String operator; + // 第一页，基本信息 String businessId; diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/dmr/LineInfo.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/dmr/LineInfo.java index fb54dc6..b7db5b6 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/dmr/LineInfo.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/dmr/LineInfo.java @@ -22,6 +22,9 @@ public class LineInfo { private String lineModel; private String lineType; + private String xqcode; + private String jdcode; + private List sectionList; }