上报隐患添加类型字段

zh-baseversion-admin/src/main/java/com/zehong/web/controller/externaldocking/rhaj/RhajController.java

@@ -131,7 +131,8 @@ public class RhajController {
                 hidden.setSource(jsonObject.getString("source"));
                 hidden.setLongitude(new BigDecimal(jsonObject.getString("longitude")));
                 hidden.setLatitude(new BigDecimal(jsonObject.getString("latitude")));
-                hidden.setHiddenType(jsonObject.getString("hiddenType"));
+                hidden.setHiddenType(jsonObject.getString("hiddenLevel"));
+                hidden.setHiddenTroubleType(jsonObject.getString("hiddenTroubleType"));
                 hidden.setHiddenFindPeople(jsonObject.getString("hiddenFindPeople"));
                 hidden.setHiddenFindDate(dateBystr(jsonObject.getString("hiddenFindDate"),"yyyy-MM-dd HH:mm:ss"));
                 hidden.setDealPlan(jsonObject.getString("dealResult"));
@@ -384,7 +385,7 @@ public class RhajController {
         if(jsonObject.getString("source")==null||jsonObject.getString("source").length() > 5)return "隐患来源不合格！";
         if(jsonObject.getString("longitude")==""||!isValidCoordinate(jsonObject.getString("longitude")))return "经度格式不合格！";
         if(jsonObject.getString("latitude")==""||!isValidCoordinate(jsonObject.getString("latitude")))return "纬度格式不合格！";
-        if(jsonObject.getString("hiddenType")==null||jsonObject.getString("hiddenType").length()>5)return "隐患等级格式不合格！";
+        if(jsonObject.getString("hiddenLevel")==null||jsonObject.getString("hiddenLevel").length()>5)return "隐患等级格式不合格！";
         if(jsonObject.getString("remediation")==null||jsonObject.getString("remediation").length()>2)return "整治情况格式不合格！";
         if(jsonObject.getString("hiddenFindDate")==null||isValidDate(jsonObject.getString("hiddenFindDate"),"yyyy-MM-dd HH:mm:ss"))return "发现时间格式不合格！";
         return "success";

zh-baseversion-system/src/main/resources/mapper/system/THiddenDangerStandingBookMapper.xml

@@ -126,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             longitude,
             latitude,
             hidden_type,
+            hidden_trouble_type,
             hidden_find_people,
             hidden_find_date,
             deal_plan,
@@ -143,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.longitude},
             #{item.latitude},
             #{item.hiddenType},
+            #{item.hiddenTroubleType},
             #{item.hiddenFindPeople},
             #{item.hiddenFindDate},
             #{item.dealPlan},