From 7a24cc710b07685363022900333ab1058256a605 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@hanbangtang.com>
Date: Thu, 23 Feb 2023 10:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=8F=B0json=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=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

---
 .../supervision/service/impl/HiddenDangerServiceImpl.java  | 7 ++++---
 .../safety/supervision/service/impl/RiskServiceImpl.java   | 7 ++++---
 .../src/main/resources/mapper/HiddenDangerMapper.xml       | 2 +-
 .../src/main/resources/mapper/RiskMapper.xml               | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java
index 8679de1..62f5fbc 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java
@@ -4,6 +4,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
 import com.hbt.safety.supervision.mapper.HiddenDangerMapper;
 import com.hbt.safety.supervision.pojo.HiddenDanger;
 import com.hbt.safety.supervision.pojo.vo.DateVo;
@@ -128,9 +129,9 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService
         if (list == null) {
             return "";
         }
-        Map<Object, List<HiddenDanger>> hiddenDangerMap = list.stream()
-                .collect(Collectors.groupingBy(HiddenDanger::getReformStatus));
-        return JSONObject.toJSONString(hiddenDangerMap);
+        Map<String, List<HiddenDanger>> hiddenDangerMap = list.stream()
+                .collect(Collectors.groupingBy( s -> s.getReformStatus() + ""));
+        return JSON.toJSONString(hiddenDangerMap);
     }
 
     /**
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/RiskServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/RiskServiceImpl.java
index 97f8ce4..4cd01b9 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/RiskServiceImpl.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/RiskServiceImpl.java
@@ -2,7 +2,8 @@ package com.hbt.safety.supervision.service.impl;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.hbt.safety.supervision.mapper.RiskMapper;
 import com.hbt.safety.supervision.pojo.Risk;
 import com.hbt.safety.supervision.pojo.vo.DateVo;
@@ -107,8 +108,8 @@ public class RiskServiceImpl implements IRiskService
         if (list == null) {
             return "";
         }
-        Map<Object, List<Risk>> map = list.stream().collect(Collectors.groupingBy(Risk::getLevel));
-        return JSONObject.toJSONString(map);
+        Map<String, List<Risk>> map = list.stream().collect(Collectors.groupingBy(s -> s.getLevel() + ""));
+        return JSON.toJSONString(map);
     }
 
     /**
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
index 8a174cc..60d3d4f 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectHiddenDangers" resultType="com.hbt.safety.supervision.pojo.HiddenDanger">
-        select name, reform_status reformStatus from hidden_danger where exceed_time_limit_status = 0
+        select id, name, reform_status reformStatus from hidden_danger where exceed_time_limit_status = 0
     </select>
 
     <select id="selectHiddenDangerSubmitDat" resultType="String">
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml
index f24bd31..5723a4e 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectRisks" resultType="com.hbt.safety.supervision.pojo.Risk">
-        select name, level from risk
+        select id, name, level from risk
     </select>
 
     <select id="selectRiskSubmitDats" resultType="String">