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 5643b7d..0000000 Binary files a/hiatmp-base/target/classes/com/hisense/hiatmp/base/model/AreaContent.class and /dev/null differ 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 fa31ac7..0000000 Binary files a/hiatmp-base/target/classes/com/hisense/hiatmp/base/model/AreaQuery.class and /dev/null differ diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java index 12ec72f..3a94853 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java @@ -32,7 +32,7 @@ public class AuthController { public ServerResponse 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;