diff --git a/hiatmp-base/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-base/src/main/resources/sql-mapper/HighDangerMapper.xml index 942746c..c18f475 100644 --- a/hiatmp-base/src/main/resources/sql-mapper/HighDangerMapper.xml +++ b/hiatmp-base/src/main/resources/sql-mapper/HighDangerMapper.xml @@ -304,7 +304,7 @@ - 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}) 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 651f8aa..e21a805 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 @@ -341,6 +341,10 @@ public class HighDangerController { highDangerMapper.insertSectionTraffic(manualInvestigation); } Set keys = Collections.emptySet(); + + // 先删除二级页面数据 + highDangerMapper.deleteHiddenDataCollectConfigByBusinessId(manualInvestigation.getBusinessId()); + // 保存隐患排查二级页面数据 for (Map> 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); } // 图片上传接口 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 405a2ad..0a7cb10 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 @@ -52,12 +52,17 @@ public interface HighDangerMapper extends BaseMapper{ List 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); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java index 754217c..3e297c8 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java +++ b/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; // } } + } 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 07edc12..6f0aebe 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 @@ -3,6 +3,9 @@ + + delete from tht_hidden_data_collect_config_extra where business_id = #{businessId} + + + insert into tht_section_info values (nextval('test_id_seq'), @@ -299,12 +306,12 @@ update tht_hidden_danger_base - set status = '99' + set status = #{temporary} where business_id = #{businessId} - 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}) @@ -315,4 +322,15 @@ #{information}, #{businessId}) + + update tht_hidden_danger_extra + set + key_investigation = #{keySet}, + danger_item = #{dangerItem}, + danger_desc = #{dangerDesc}, + image_list = #{imageList}, + information = #{information} + where business_id = #{businessId} + + \ No newline at end of file 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 64ecd9f..6aa28ad 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 @@ -43,7 +43,7 @@ public class ManualInvestigation implements Serializable { String keySet; String dangerItem; String dangerDesc; - List imageList; + String imageList; String information; // 暂存标识 0暂存 1提交 diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ServerResponse.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ServerResponse.java index c494e97..306da6f 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ServerResponse.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ServerResponse.java @@ -34,9 +34,9 @@ public class ServerResponse 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 code(int code) { this.setCode(code); return this; @@ -46,18 +46,18 @@ public class ServerResponse implements Serializable { this.setMessage(message); return this; } - private ServerResponse total(int total) { - this.setTotal(total); - return this; - } +// private ServerResponse total(int total) { +// this.setTotal(total); +// return this; +// } public ServerResponse result(T result) { this.setResult(result); return this; } - public static ServerResponse response(int code, String message, T result,int total) { - return new ServerResponse(code, message, result,total); - } +// public static ServerResponse response(int code, String message, T result,int total) { +// return new ServerResponse(code, message, result,total); +// } public static ServerResponse response(int code, String message, T result) { return new ServerResponse(code, message, result); @@ -99,6 +99,10 @@ public class ServerResponse implements Serializable { return new ServerResponse(200, I18nUtils.getMessage("common.message.success"), result); } + public static ServerResponse ok(String massage,T result) { + return new ServerResponse(200, massage, result); + } + public int getCode() { return this.code; } @@ -123,13 +127,13 @@ public class ServerResponse 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) { diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDangerExtra.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDangerExtra.java new file mode 100644 index 0000000..7784b97 --- /dev/null +++ b/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; + + +} diff --git a/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/ServerResponse.class b/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/ServerResponse.class index bc70c1b..5ebb41e 100644 Binary files a/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/ServerResponse.class and b/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/ServerResponse.class differ