排查提交修改

hiatmp-base/src/main/resources/sql-mapper/HighDangerMapper.xml

@@ -304,7 +304,7 @@
     </update>
 
     <insert id="saveHiddenDataCollectConfig">
-        INSERT INTO tht_hidden_data_collect_config_copy2 (nid, itemid, order, type, name, standar, unit, pic1_address,
+        INSERT INTO tht_hidden_data_collect_config_extra (nid, itemid, order, type, name, standar, unit, pic1_address,
                                                           pic2_address)
         VALUES (nextval('test_id_seq2'), , #{itemid}, #{order}, #{type}, #{name}, #{standar}, #{unit}, #{pic1Address},
                 #{pic2Address})

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

@@ -341,6 +341,10 @@ public class HighDangerController {
             highDangerMapper.insertSectionTraffic(manualInvestigation);
         }
         Set<String> keys = Collections.emptySet();
+
+        // 先删除二级页面数据
+        highDangerMapper.deleteHiddenDataCollectConfigByBusinessId(manualInvestigation.getBusinessId());
+
         // 保存隐患排查二级页面数据
         for (Map<String,List<ThtHiddenDataCollectConfig>> map: manualInvestigation.getKeyInvestigation()){
             keys = map.keySet();
@@ -382,16 +386,24 @@ public class HighDangerController {
 //        }
         manualInvestigation.setKeySet(keys.toString());
 
-        // 保存重点排查数据
-        highDangerMapper.saveDangerExtra(manualInvestigation);
+        // 隐患排查表--如果存在该记录则更新
+        if(highDangerMapper.isExtraExistence(manualInvestigation.getBusinessId()) != null){
+            highDangerMapper.updateDangerExtra(manualInvestigation);
+        }else{
+            // 保存重点排查数据
+            highDangerMapper.saveDangerExtra(manualInvestigation);
+        }
 
         // 暂存数据
         if(manualInvestigation.getTemporary() == Boolean.FALSE){
-            highDangerMapper.updateTemporary(manualInvestigation.getBusinessId());
-            return ServerResponse.ok("数据已暂存");
+            highDangerMapper.updateTemporary(manualInvestigation.getBusinessId(), "99");
+            return ServerResponse.ok("数据已暂存",manualInvestigation);
+        }else{
+            highDangerMapper.updateTemporary(manualInvestigation.getBusinessId(), "30");
+            return ServerResponse.ok("数据已保存",manualInvestigation);
         }
 
-        return ServerResponse.ok(manualInvestigation);
+//        return ServerResponse.ok(manualInvestigation);
     }
 
     // 图片上传接口

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

@@ -52,12 +52,17 @@ public interface HighDangerMapper extends BaseMapper<HighDangerBase>{
 
     List<ThtDangerItems> getDangerItems();
 
-    void updateTemporary(String temporary);
+    void updateTemporary(String businessId, String temporary);
 
     void saveHiddenDataCollectConfig(ThtHiddenDataCollectConfig config);
 
     void saveDangerExtra(ManualInvestigation manualInvestigation);
 
+    ThtHiddenDangerExtra isExtraExistence(String bussinessId);
 
+    void updateDangerExtra(ManualInvestigation manualInvestigation);
+
+
+    void deleteHiddenDataCollectConfigByBusinessId(String businessId);
 
 }

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java

@@ -190,4 +190,5 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
 //        return null;
 //    }
     }
+
 }

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

@@ -3,6 +3,9 @@
 
 
 <mapper namespace="com.hisense.hiatmp.server_api.mapper.HighDangerMapper">
+    <delete id="deleteHiddenDataCollectConfigByBusinessId">
+        delete from tht_hidden_data_collect_config_extra where business_id = #{businessId}
+    </delete>
 
     <select id="getStatusCounts" resultType="com.hisense.hiatmp.model.common.HighDangerBaseNum">
         SELECT 'Unconfirmed' AS status, SUM(CASE WHEN hdb.status = '0' THEN 1 ELSE 0 END) AS count
@@ -239,6 +242,10 @@
         FROM tht_danger_items
     </select>
 
+    <select id="isExtraExistence" resultType="com.hisense.hiatmp.model.common.ThtHiddenDangerExtra">
+        SELECT * FROM tht_hidden_danger_extra where business_id = #{businessId}
+    </select>
+
     <insert id="insertSectionInfo">
         insert into tht_section_info
         values (nextval('test_id_seq'),
@@ -299,12 +306,12 @@
 
     <update id="updateTemporary">
         update tht_hidden_danger_base
-        set status = '99'
+        set status = #{temporary}
         where business_id = #{businessId}
     </update>
 
     <insert id="saveHiddenDataCollectConfig">
-        INSERT INTO tht_hidden_data_collect_config_copy2 (nid, itemid, "order", type, name, standar, unit, business_id)
+        INSERT INTO tht_hidden_data_collect_config_extra (nid, itemid, "order", type, name, standar, unit, business_id)
         VALUES (nextval('test_id_seq2'), #{itemid}, #{order}, #{type}, #{name}, #{standar}, #{unit},#{businessId})
     </insert>
 
@@ -315,4 +322,15 @@
                 #{information}, #{businessId})
     </insert>
 
+    <update id="updateDangerExtra">
+        update tht_hidden_danger_extra
+        set
+            key_investigation = #{keySet},
+            danger_item = #{dangerItem},
+            danger_desc = #{dangerDesc},
+            image_list = #{imageList},
+            information = #{information}
+        where business_id = #{businessId}
+    </update>
+
 </mapper>

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java

@@ -43,7 +43,7 @@ public class ManualInvestigation implements Serializable {
     String keySet;
     String dangerItem;
     String dangerDesc;
-    List<MultipartFile> imageList;
+    String imageList;
     String information;
 
     // 暂存标识 0暂存 1提交

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ServerResponse.java

@@ -34,9 +34,9 @@ public class ServerResponse<T> implements Serializable {
         this.code(code).message(message).result(result);
     }
 
-    ServerResponse(int code, String message, T result,int total) {
-        this.code(code).message(message).result(result).total(total);
-    }
+//    ServerResponse(int code, String message, T result) {
+//        this.code(code).message(message).result(result);
+//    }
     private ServerResponse<T> code(int code) {
         this.setCode(code);
         return this;
@@ -46,18 +46,18 @@ public class ServerResponse<T> implements Serializable {
         this.setMessage(message);
         return this;
     }
-    private ServerResponse<T> total(int total) {
-        this.setTotal(total);
-        return this;
-    }
+//    private ServerResponse<T> total(int total) {
+//        this.setTotal(total);
+//        return this;
+//    }
     public ServerResponse<T> result(T result) {
         this.setResult(result);
         return this;
     }
 
-    public static <T> ServerResponse<T> response(int code, String message, T result,int total) {
-        return new ServerResponse(code, message, result,total);
-    }
+//    public static <T> ServerResponse<T> response(int code, String message, T result,int total) {
+//        return new ServerResponse(code, message, result,total);
+//    }
 
     public static <T> ServerResponse<T> response(int code, String message, T result) {
         return new ServerResponse(code, message, result);
@@ -99,6 +99,10 @@ public class ServerResponse<T> implements Serializable {
         return new ServerResponse(200, I18nUtils.getMessage("common.message.success"), result);
     }
 
+    public static <T> ServerResponse<T> ok(String massage,T result) {
+        return new ServerResponse(200, massage, result);
+    }
+
     public int getCode() {
         return this.code;
     }
@@ -123,13 +127,13 @@ public class ServerResponse<T> implements Serializable {
         this.result = result;
     }
 
-    public int getTotal() {
-        return total;
-    }
+//    public int getTotal() {
+//        return total;
+//    }
 
-    public void setTotal(int total) {
-        this.total = total;
-    }
+//    public void setTotal(int total) {
+//        this.total = total;
+//    }
 
     public boolean equals(final Object o) {
         if (o == this) {

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDangerExtra.java

@@ -0,0 +1,27 @@
+package com.hisense.hiatmp.model.common;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 排查保存 & 暂存数据
+ */
+@Data
+public class ThtHiddenDangerExtra implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    String nid;
+    String keyInvestigation;
+    String dangerItem;
+    String dangerDesc;
+    String imageList;
+    String information;
+    String businessId;
+
+
+}