0723 问题修改

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java

@@ -31,14 +31,19 @@ public class AuthController {
     @PostMapping("/login")
     public ServerResponse<?> login(@RequestBody OperatorDTO operator) {
 
+        HashMap<String, String> authMap = new HashMap<>();
+
         // 判断是否有该用户，取出该用户信息
         Operator operatorById = operatorMapper.getOperatorById(operator.getNuserid());
         if(operatorById != null){
             // 密码加密
             String encrypt = authService.encrypt(operator.getCuserpwd()+ operator.getNuserid());
             if (operatorById.getNuserid().equals(operator.getNuserid()) && operatorById.getCuserpwd().equals(encrypt)) {
+                authMap.put("nuserid", operator.getNuserid());
+                authMap.put("department", operatorById.getCdepartmentid());
+
 //                String token = JwtUtil.createToken(operatorById);
-                return ServerResponse.ok("登录成功",operatorById.getNuserid());
+                return ServerResponse.ok("登录成功",authMap);
             }
         }else{
             return ServerResponse.error("用户不存在");

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java

@@ -72,7 +72,6 @@ public class HighDangerController {
         if(operatorById != null){
             cdepartmentid = operatorById.getCdepartmentid();
         }else{
-            log.info("");
             return ServerResponse.error("未找到当前用户");
         }
 
@@ -215,6 +214,7 @@ public class HighDangerController {
         List<SectionVO> allRoadInfo = highDangerMapper.getAllSection(sectionVO);
 //        List<SectionVO> allRoadInfo = highDangerMapper.getAllSection(sectionVO);
         List<HashMap<String, Object>> combinedMap = new LinkedList<>();
+        HashMap<String, Object> hashMap = new HashMap<>();
 
         Point Dpoint = new Point();
         // 遍历所有路段
@@ -356,7 +356,12 @@ public class HighDangerController {
             }
         });
 
+//        hashMap.put("businessId",combinedMap);
+        hashMap.put("params",combinedMap);
+
         log.info("/getNearRoadInfo（获取最近道路）接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), combinedMap);
+
+
         return ServerResponse.ok(combinedMap);
     }
 
@@ -632,11 +637,15 @@ public class HighDangerController {
         排查第三页--存在隐患列表（用户数据回显）
      */
     @GetMapping("/getUserHiddenDangerList")
-    public ServerResponse<?> getUserHiddenDangerList(@RequestParam String businessId, HttpServletRequest request){
+    public ServerResponse<?> getUserHiddenDangerList(@RequestParam String businessId,
+                                                     @RequestParam String pcType,
+                                                     @RequestParam String hdTerm,
+                                                     HttpServletRequest request
+    ){
 
         log.info("/getUserHiddenDangerList（排查第三页--存在隐患列表（用户数据回显））接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),businessId);
 
-        List<HiddenDangerDTO> userHiddenDangerList = highDangerMapper.getUserHiddenDangerList(businessId);
+        List<HiddenDangerDTO> userHiddenDangerList = highDangerMapper.getUserHiddenDangerList(businessId,pcType,hdTerm);
         for(HiddenDangerDTO hiddenDangerDTO : userHiddenDangerList){
             String dangerItems = highDangerMapper.getDangerProblem(hiddenDangerDTO.getBigCategory()) + "/" +
                     highDangerMapper.getDangerProblem(hiddenDangerDTO.getSmallCategory()) + "/" +

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java

@@ -83,7 +83,7 @@ public interface HighDangerMapper extends BaseMapper<HighDangerBase>{
 
     List<ThtDangerItems> getImportDangerItems(String nid);
 
-    List<HiddenDangerDTO> getUserHiddenDangerList(String businessId);
+    List<HiddenDangerDTO> getUserHiddenDangerList(@Param("businessId") String businessId,@Param("pcType")String pcType,@Param("hdTerm")String hdTerm);
 
     String getDangerProblem(String id);
 

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml

@@ -426,6 +426,12 @@
             tht_hidden_danger_road_info
         where
             business_id = #{businessId}
+        and
+            pc_type = #{pcType}
+        <if test="hdTerm != null">
+            AND hd_term = #{hdTerm}
+        </if>
+
     </select>
 
     <select id="getDangerProblem" resultType="String">