From 0c88fcad74ac287f48d9b60ba882622ae0c4d469 Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Sun, 14 Jul 2024 15:24:47 +0800 Subject: [PATCH] =?UTF-8?q?0715=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hiatmp/base/model/AreaContent.class | Bin 3649 -> 0 bytes .../hisense/hiatmp/base/model/AreaQuery.class | Bin 2991 -> 0 bytes .../server_api/controller/AuthController.java | 10 ++-- .../controller/HighDangerController.java | 43 ++++++++++++------ .../server_api/mapper/HighDangerMapper.java | 5 +- .../server_api/mapper/OperatorMapper.java | 4 +- .../resources/sql-mapper/HighDangerMapper.xml | 1 + .../resources/sql-mapper/OperatorMapper.xml | 6 ++- .../hisense/hiatmp/model/common/Describe.java | 26 +++++++++++ .../model/common/ManualInvestigation.java | 15 ++---- 10 files changed, 73 insertions(+), 37 deletions(-) delete mode 100644 hiatmp-base/target/classes/com/hisense/hiatmp/base/model/AreaContent.class delete mode 100644 hiatmp-base/target/classes/com/hisense/hiatmp/base/model/AreaQuery.class create mode 100644 hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Describe.java diff --git a/hiatmp-base/target/classes/com/hisense/hiatmp/base/model/AreaContent.class b/hiatmp-base/target/classes/com/hisense/hiatmp/base/model/AreaContent.class deleted file mode 100644 index 5643b7d7060fc189b6ef182599537e5961ad4eb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3649 zcma)8ZF3V<6n-|{&2E!zo2Il7tqM}4uS68zQYw@RingT|tb#AFZPzxCCMDSx@f+%> zBQk?CiZeO_pX?WKVAP_(0Qv!E`~&;|Ddk6q_}sml=51%_OndgZ=RD`!dtUBt{{HXs zH2|CNVF(Xle>HR*5W*5-RERMl#&y^sKHnE&LQp3KN(ymMh(ki8gkefYI)n)J8_0;~ zw1LA0vIcSn90M~#H>=}_0>jGMR$pe^RuJt!Xw6#jl$D-{?{>1u^hCFU*zio+Nlw`# z$y{@jcqL2IgDSvYxOaqfa=*>iNdU|GC)W#RO31>vzwCOe)?TaL{` z1Q&iddFSkB3L*t{pPhE>tb#geyZzhwh3g+Le)K!po0I9J^P+;P*0vD^s?5BuKbf`% zXQoE&>>i6*idtmGtkj5=O^UUrRGrBrckJjN%S^=y?R3uO({iS!>sFK} zNIOhCJYhRhBWk>&wau@}d6KL|ekHT7Wq`ioj2lW6`CP-f;(Z!hE4L8|M+R(XGBZA8 zWm$99i0R}Vy}i9K-rii5?p>nD?;W%c&sZtOD%p0|=s|nT>2BMnK*^MjmuKQwWSmLS zsTxt*mclI7y80qTfgsOWM39OC!8>{(f>cD@Eeb=z~^fN zLj%^dJ0-lM@?MQu>FuH_oa9L>Hz@~=Q@4{z4-M}e*v_gD2eWo=CgmuoE=pEnnU};e z1+%5(sP#q5{Amm)Bk!()(C*AkcFf+96ayV8n#v90o-0`MpzF)&jo!Wf^}_e3?_N8_ zdwb`b3wKWZWTFl2CLTt!i8Vs36=Izb>(R`&!m@9NiCuWn#FN-)qDP>o1bSMCO+q{) z#1LLru(JHkv~4Dt8W)4pSd>?5etvpPe1M}I?atLgB?{TIv=XJ{sLJ99Uyrt=*QXb6ZhLct?kh53Ax|BvOc zng*7(((pJ9EO(`$g$A~u((nWgY)hq~6?Igym6RRaKF+5i4%L1M%0+?zIw^y$Qb!lD zDGAs>GKkqY%2MZF5V%n0Z2CI0*FMfw<<51!&YTe+XSLip>g&we@^RM6og00fIg>ul z!E)zSzRu6$IhIuvEWu}h&tQAUuL$^;yGb&+FrYGPU}SVS@tI!R{2i0Oi4cqBb$6p?BY)g;v~%+lUnQz|la<>HVKC6~NcU#7#~p~~NcSYi!H9IsLGPMJ-2tHwCsbjG zsh-6ULn2LPLUT==57)_vX?askBIufeOD0Z@^r}thu89NVdFigH*}uKR@|a#;Rrnmk z*v%v~e2P6p0XF0q-e9g({KiaTgh*xK2Jj}4hQ0hezeN;;gOyx~_KIfxgV22{R5nXd z*dQp%eTFEk147XVEl!Cf_Y&%((Rnn8#`6(fA#qsXMu~av8lp`S*9g2);#z@MQOqM&{{1Na;P!hh V3*c>cVBcB#x$rK}!JiB7{SV5?tpfl6 diff --git a/hiatmp-base/target/classes/com/hisense/hiatmp/base/model/AreaQuery.class b/hiatmp-base/target/classes/com/hisense/hiatmp/base/model/AreaQuery.class deleted file mode 100644 index fa31ac7da076b80d2820f08637e6033d0f01f462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2991 zcma)7ZF3V<6n-|@O*ZNFg+L3@DnTo>O-lp{V)~-xO{*=G7OEg3+jMOg(j;y+AYXMH zKM4B85l5Y=b;R<4L7agy;tc2)obh)UX#azV&)wa$X&OeR?cQ_GIrrS>Jm=igzy7^_ z2S69jgwcp2At*R1K4aqZRuFH8xgHarq`vzwgc#zqqw< zZT7*nOZPv!T>SoK@xtxm%uH;1Z1K~J4?gS1_y9;-|q9WE+{Bdsa>zN1F zW~o@X@Nx0m8?l|mPp%YaK9B7x4#?f^DV~gJ#|)j?kz%nbGZnMJz29 z=AP9A^ob)bAX7vPOc*(PV1mNp$5$3FU7^rpW=y+Jg1@zGOoF_ZWJ;(XG&9D*!t}Ud z9nr~~U^ko6(_^}2ioK_l?J3hCGL@Z9P&6`mgR5>&=Mv*O=2gnarO#0NysWkSipv{YSKlp2Xc#i=sqDnCZt2s8 zZCFe(?45J~t@X|=;}NHtRx)%xS7K>PrF&JRB1DL{l&}Vj4+?skSFb>MX#BL1vb)=k zOOUcFd)_m#SF`q%VM(YH)oCevA@z=-T%#?yIEmFRJ2?9q$6V?e&9#=cwWGG4Iy0o_ zoMzyYc3z~K(lh%7atZ2`o}Y62iOn@YV8bH=L;H!Ga=&*kk=k zlEN7c_~8@OLBa;^YPd%E_f#HF(?B};eU=6vHdZ>ss3g^^Pd?{_VNqy$foBt3C9X>Q zEl9sO!8Y?7aFiizp{%(MXhj=$k|+niD-Yj*?|Q}I`l^RnK|-rM?5{i=sdCs&bt~^? z2UI~IR|aXU5=6p_*ybTfa`lO1+v7LktDbz5>)|CYh;a+Do#zyeBs37o4*nbVJ4p?e zhxCh(epK?gI;1G2gq`$uxel#UwY33zv^1G;fsXBi7N%6aF;f3Dh;OE;SZWcw_ z%{4?E7vt?eL6NV<|A6uh6#v!u?@)$1+UF5)wiJQ~JNQY;oqwVxD&NDJIcS|xc^+!X zBa~F=5=sW5itq{CLu3xMQ6(BEa|$PebP6ZcXizw*o>MTYmYn3PRcSoo0$r-iMI_Np zej4#1df2Ky_PB{&>ilfk6#6L1oEr!53MBL(9wqO9=X>kL~}#;6w9DC#ODy~oJY+mp${cxVTj6}MHR(yP2r^C zm{=F*kQ!ASQ*(8y``imXgno=*0B;bEf?>Q#$%io4L8A6^-ft(hg6clbpM#VXhs<*b zJfcD-nUX{TAxV$uzP$GdMI)4wL&-;8sq)+cWp2x!m0CIzCdawU9ZnLen08&iK|6K} zwUN4c)C&r^L>gQ login(@RequestBody OperatorDTO operator) { // 判断是否有该用户，取出该用户信息 - Operator operatorById = operatorMapper.getOperatorById(operator.getCusername()); + Operator operatorById = operatorMapper.getOperatorByName(operator.getCusername()); if(operatorById != null){ // 密码加密 String encrypt = authService.encrypt(operator.getCuserpwd()+ operator.getCusername()); @@ -50,18 +50,18 @@ public class AuthController { 密码修改接口 */ @PostMapping("/updatePwd") - public ServerResponse updatePwd(@RequestParam String cusername, @RequestParam String nuserpwd){ + public ServerResponse updatePwd(@RequestParam String nuserid, @RequestParam String nuserpwd){ // 获取要修改的用户信息 - Operator operatorById = operatorMapper.getOperatorById(cusername); + Operator operatorById = operatorMapper.getOperatorById(nuserid); if(operatorById!=null){ // 密码加密存储 - String encrypt = authService.encrypt(nuserpwd + cusername); + String encrypt = authService.encrypt(nuserpwd + operatorById.getCusername()); operatorById.setCuserpwd(encrypt); // 执行修改操作并返回结果，返回修改的，如果为null，表示修改失败 String rowsAffected = operatorMapper.updateByPrimaryKeySelective(operatorById.getCusername(), operatorById.getCuserpwd()); if(rowsAffected != null){ - return ServerResponse.ok("<" + operatorById.getCusername() + ">用户密码修改成功", cusername); + return ServerResponse.ok("<" + operatorById.getCusername() + ">用户密码修改成功"); }else{ return ServerResponse.error("修改失败"); } 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 f2e0b3d..40dc251 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 @@ -52,7 +52,9 @@ public class HighDangerController { @PostMapping("/getHigDangerDealt") public ServerResponse getHighDealt(@RequestBody HighDangerBaseVO highDangerBaseVO, @RequestParam(defaultValue = "1") Integer pageNum, - @RequestParam(defaultValue = "10") Integer pageSize){ + @RequestParam(defaultValue = "10") Integer pageSize, + @RequestParam(defaultValue = "") String search + ){ String cdepartmentid = null; // 获取当前操作的对象，用于查找对应的部门 Operator operatorById = operatorMapper.getOperatorById(highDangerBaseVO.getNuserid()); @@ -65,7 +67,13 @@ public class HighDangerController { Page page = new Page<>(pageNum, pageSize); // 将要查询的状态和部门id查询数据库，获得隐患排查表 - List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page); + List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,"%" + search + "%"); + + // 待办 + if("20".equals(highDangerBaseVO.getStatus())){ + List statusCount = highDangerMapper.getHigDangerDealt("99",cdepartmentid,page,"%" + search + "%"); + statusCounts.addAll(statusCount); + } for (HighDangerBase base : statusCounts) { Date nowDate = new Date(); @@ -214,7 +222,7 @@ public class HighDangerController { Dpoint.setY(y); // 计算两点间的距离 Double pointDistance = highDangerService.getPointDistance(Dpoint, point); - map.put(pointDistance, String.valueOf(cross.getLongitude() + cross.getLatitude())); + map.put(pointDistance, String.valueOf(cross.getLongitude() + "," + cross.getLatitude())); pointMapCrossing.put(cross.getCrossingName(), map); } @@ -471,6 +479,23 @@ public class HighDangerController { extra.setBusinessId(manualInvestigation.getBusinessId()); highDangerMapper.saveThtHiddenDataCollectConfigExtra(extra); } + + // 隐患排查表--如果存在该记录则更新 + if(highDangerMapper.isExtraExistence(manualInvestigation.getBusinessId()) != null){ + highDangerMapper.deleteRoadInfo(manualInvestigation.getBusinessId()); + }else{ + for(Describe details : manualInvestigation.getDescribe()){ + // 随机生成UUID + UUID uuid = UUID.randomUUID(); + String uuidString = uuid.toString().replace("-", ""); + details.setNid(uuidString); + + details.setBusinessId(manualInvestigation.getBusinessId()); + // 保存重点排查数据 + highDangerMapper.saveDangerExtra(details); + } + } + // 保存隐患排查二级页面数据 // for (Map> map: manualInvestigation.getKeyInvestigation()){ // keys = map.keySet(); @@ -511,20 +536,8 @@ public class HighDangerController { // return ServerResponse.ok(); // } // manualInvestigation.setKeySet(keys.toString()); - // 随机生成UUID - UUID uuid = UUID.randomUUID(); - String uuidString = uuid.toString().replace("-", ""); - manualInvestigation.setNid(uuidString); - // 隐患排查表--如果存在该记录则更新 - if(highDangerMapper.isExtraExistence(manualInvestigation.getBusinessId()) != null){ - highDangerMapper.deleteRoadInfo(manualInvestigation.getBusinessId()); - }else{ - // 保存重点排查数据 - highDangerMapper.saveDangerExtra(manualInvestigation); - } - // 暂存数据 if(manualInvestigation.getTemporary() == Boolean.FALSE){ highDangerMapper.updateTemporary(manualInvestigation.getBusinessId(), "99"); 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 c34009a..558592b 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 @@ -16,7 +16,7 @@ public interface HighDangerMapper extends BaseMapper{ List getStatusCounts(String cdepartmentid); // - List getHigDangerDealt(String status, String cdepartmentid, Page page); + List getHigDangerDealt(String status, String cdepartmentid, Page page, String search); List getHigDangerDying(String status, String cdepartmentid); @@ -62,13 +62,12 @@ public interface HighDangerMapper extends BaseMapper{ void saveHiddenDataCollectConfig(ThtHiddenDataCollectConfig config); - void saveDangerExtra(ManualInvestigation manualInvestigation); + void saveDangerExtra(Describe describe); ThtHiddenDangerExtra isExtraExistence(String bussinessId); void deleteRoadInfo(String businessId); - void deleteThtHiddenDataCollectConfigExtra(String businessId); void saveThtHiddenDataCollectConfigExtra(ThtHiddenDataCollectConfigExtra extra); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java index 04af296..4b95d8b 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java @@ -11,7 +11,9 @@ public interface OperatorMapper { List getAllOperator(); - Operator getOperatorById(@Param("nusername") String nusername); + Operator getOperatorByName(@Param("cusername") String cusername); + + Operator getOperatorById(@Param("nuserid") String nuserid); String updateByPrimaryKeySelective(@Param("cusername") String cusername,@Param("cuserpwd") String cuserpwd); } 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 a082f46..56506ba 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 @@ -125,6 +125,7 @@ AND hdb.status = #{status} + AND hdb.name like #{search} -- ORDER BY hdb.PC_END_TIME::timestamp DESC ORDER BY CASE diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml index da8b07b..00aa8ad 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml @@ -3,10 +3,14 @@ - select * from operator where cusername = #{cusername} + + diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Describe.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Describe.java new file mode 100644 index 0000000..8d9d61b --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Describe.java @@ -0,0 +1,26 @@ +package com.hisense.hiatmp.model.common; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class Describe implements Serializable { + + private static final long serialVersionUID = 1L; + + private String nid; + private String businessId; + private String pcCount; + private String bigCategory; + private String smallCategory; + private String hdTerm; + private String hdDesc; + private String zlUnit; + private String zlMeasure; + private Date wcTime; + private Date lastModDate; + private String hdPic; + private String hdInfo; +} 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 8a9bc1a..9291289 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 @@ -41,18 +41,9 @@ public class ManualInvestigation implements Serializable { // 第三页，重点排查 & 存在隐患 List extraConfigs; - private String nid; - private String pcCount; - private String bigCategory; - private String smallCategory; - private String hdTerm; - private String hdDesc; - private String zlUnit; - private String zlMeasure; - private Date wcTime; - private Date lastModDate; - private String hdPic; - private String hdInfo; + // 存在隐患集合 + String pcCount; + List describe; // 暂存标识 0暂存 1提交 Boolean temporary;