From d28b028b4643289b348df70053b81cb876ffa910 Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Sat, 13 Jul 2024 10:37:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=8F=90=E4=BA=A4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql-mapper/HighDangerMapper.xml | 2 +- .../controller/HighDangerController.java | 22 ++++++++--- .../server_api/mapper/HighDangerMapper.java | 7 +++- .../impl/HighDangerBaseServiceImpl.java | 1 + .../resources/sql-mapper/HighDangerMapper.xml | 22 ++++++++++- .../model/common/ManualInvestigation.java | 2 +- .../hiatmp/model/common/ServerResponse.java | 36 ++++++++++-------- .../model/common/ThtHiddenDangerExtra.java | 27 +++++++++++++ .../hiatmp/model/common/ServerResponse.class | Bin 7872 -> 7231 bytes 9 files changed, 93 insertions(+), 26 deletions(-) create mode 100644 hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDangerExtra.java 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 bc70c1b5e16d18917f6e1b4622503a6422a42528..5ebb41ef8bd5dd8876146c01cc23e40954626648 100644 GIT binary patch literal 7231 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 M+>r=X}p{&p8)9`}ceA z1K5Ut2JvDDCvhr-Rrs+qFNM&H)6#ocnlsY8BF#^vc~zR%r1_~dKMUY>`Mx2|&ja{{ ze193judpP&UkCAiH6noe3XmBySdajac}HI ztUnn`&Gt{_GKtjeb`7Di$;thb>M###pOce0;~Z-lpO_fiJv?!Acyjl_=-9q#doyM< zv=%Ko=k$1b#?TO$H?rB-EPK9OIu}c7@MnzdVlr0O`1*{&%h_uzs}@|p^14N{6B zA=ouuYypv|K5FFV(lZBQnb^FMqv17lmD=k%ZK+F6x0TvTma^7eYOR>exa@5&wU>0% z;?}P5?h3`G#Mf7T%2w8BmkXxltrvk{{Qp3vBqZAal`CbSON>+DIU7TecSkv>hFeS7 z%cV36;l<0HN<)0Ba%OdzH7FExT%Jl zYz75;?Bv8fewA(52@=h;S%3w3&g%M&`xawK791td-^TJ%>ZeUk4Of@W%^8{exK=IG z)0LEAbJZUD)Q~qktzm10cWN*)w4G%+t71Zr$5La0lij&kcFr_}@4)1Ebd1!AGMGmc z*krR0=F+CJGz^t?JeSohm6Jx0DKwi3YsEgXJ>A z_f`Ku9`!7cKK zF@j`-@uNJT^V<|zfiKdr0)Ouc0$Y|5JeEyCHNub`#~>}JBd9BXlf z0=vyT>ws-_z_vPITP?8UArXe>^RQbT*s{xp-Jlo1-swP}B3K4r3;Hb_iDv{N9m@zs z-elM9Fx|u!Q7BCn1ss$C3uWG*vSu69$E4$MJV*|V^hF$dmQh>8v5y@4%WxDI(p)a& z;VAB7n&&V%GNTl6q>SMrj#rc8)-oJL*Z+m%PKV<`Zet>|INt7Pl`_^9alDosuPejR zyyJQ6+A`8a%DS3zO6oW7j7Lzz#CE&I`yTj}_lM78)sgm|-b+@nI&W4#ae@IzZmW4q zR0iWnVuGn)=?M(+3zg7FId5iJ8|9kZjj~R5hk|scqYfW?K&=IdF~p1LMuo_XAGON0 zxSzq-MpSDd%Hxn38%N1IdY8g*)WWcxU*+iSJq(WZ!oNyIMpGjr1?DgVu&CVR?}<^S zlijW8+fKHXzl)v^bDj(#Gp=hs=Ws}n z!@W38JxJ`nOlg}Yte3TI$S4m<3|K&%wOj z!WX!7V3-5hSl!!76h!Gl;d9AF?6jF3K;x42O>LR#Pw#NSUDM#ng{%CKH1{`2o2RsZN4_Yy+;=<=_=$MW90^Xn^HYNFi-M*@f}+BDYW2e zT*3!qCtryXJj++d5BSD-j`hLwOw%v0jQJr`@rw+?C+UALVG5^l1TW(*oMEVc1qNPa zlzNT9=yj#7n@RmDp7NvbT@K+^D=t8;rYCh+Qh!il3JW6KO@pqSuy1WI<$;_^dH3zSjzwa