From 5d7d19b28f24da0752a990f080de881d97fa8564 Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期五, 08 九月 2023 10:36:16 +0800 Subject: [PATCH] 优化库区图监控点位上传 --- src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java | 59 +++++++++++++++++++++++++++++ src/main/java/com/fzzy/api/view/pr/Api1112PR.java | 2 src/main/java/com/fzzy/api/entity/Api1111.java | 8 ++-- src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 4 ++ 4 files changed, 68 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/fzzy/api/entity/Api1111.java b/src/main/java/com/fzzy/api/entity/Api1111.java index c2d12f1..d2b1d97 100644 --- a/src/main/java/com/fzzy/api/entity/Api1111.java +++ b/src/main/java/com/fzzy/api/entity/Api1111.java @@ -59,6 +59,10 @@ @Column(name = "bz", length = 1024) private String bz; + @PropertyDef(label = "鎿嶄綔鏍囧織" ) + @Column(name = "czbz", length = 1) + private String czbz; + @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷" ,description = "锛�1:浠撳唴锛�2:涓氬姟锛�3:瀹夐槻锛�") @Column(name = "spjklx", length = 1) private String spjklx; @@ -66,10 +70,6 @@ @PropertyDef(label = "娴峰悍璁惧鍞竴鏍囪瘑" ) @Column(name = "hkCameraIndexCode", length = 36) private String hkCameraIndexCode; - - @PropertyDef(label = "鎿嶄綔鏍囧織" ) - @Column(name = "czbz", length = 1) - private String czbz; @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" ) @JSONField(format = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/fzzy/api/view/pr/Api1112PR.java b/src/main/java/com/fzzy/api/view/pr/Api1112PR.java index b956100..c7babfc 100644 --- a/src/main/java/com/fzzy/api/view/pr/Api1112PR.java +++ b/src/main/java/com/fzzy/api/view/pr/Api1112PR.java @@ -121,7 +121,7 @@ result += responseDto.toString(); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(d.getCzbz())) { - api1112Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U); + api1112Rep.updateStatus(data.getSfzhm(), Constant.CZBZ_U); } } } diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java index 1dc9881..71c2f85 100644 --- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java +++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java @@ -284,6 +284,10 @@ //璁剧疆涓婁紶鏂囦欢id api1109.setFileStorageId((String) responseDto.getData()); return JSON.toJSONString(api1109); + }else if (Constant.API_CODE_1111.equals(inteId)) { + Gd2022Api1111 api1111 = new Gd2022Api1111(); + BeanUtils.copyProperties(data, api1111); + return JSON.toJSONString(api1111); } else if (Constant.API_CODE_1208.equals(inteId)) { Gd2022Api1208 api1208 = new Gd2022Api1208(); BeanUtils.copyProperties(data, api1208); diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java new file mode 100644 index 0000000..4626120 --- /dev/null +++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java @@ -0,0 +1,59 @@ +package com.fzzy.push.gd2022.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.bstek.dorado.annotation.PropertyDef; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; + +/** + * 鎺ュ彛琛�-搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉� + */ +@Data +@EqualsAndHashCode(callSuper=false) +public class Gd2022Api1111 implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -2000199652473542869L; + + @PropertyDef(label = "鍗曚綅浠g爜" ) + private String dwdm; + + @PropertyDef(label = "搴撳尯浠g爜" ) + private String kqdm; + + @PropertyDef(label = "瑙嗛鐩戞帶璁惧鍚嶇О" ) + private String spjksbmc; + + @PropertyDef(label = "瑙嗛鐩戞帶璁惧id" ) + private String spjksbid; + + @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷" ,description = "锛�1:浠撳唴锛�2:涓氬姟锛�3:瀹夐槻锛�") + private String spjklx; + + @PropertyDef(label = "瑙嗛鐩戞帶璁惧鐩稿浣嶇疆" ) + private String spjksbxdwz; + + @PropertyDef(label = "瑙嗛鐩戞帶璁惧浣嶇疆鏍峰紡" ) + private String spjksbwzys; + + @PropertyDef(label = "澶囨敞" ) + private String bz; + + @PropertyDef(label = "娴峰悍璁惧鍞竴鏍囪瘑" ) + private String hkCameraIndexCode; + + @PropertyDef(label = "鎿嶄綔鏍囧織" ) + private String czbz; + + @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" ) + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date zhgxsj; + + @JSONField(serialize = false) + @PropertyDef(label = "涓氬姟id") + private String bizId; +} -- Gitblit v1.9.3