From cb17ef73996730f94b4f3c8df4c1fac6b20d3979 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 04 十一月 2023 14:37:41 +0800
Subject: [PATCH] 优化上海接口-安全管理接口上报
---
src/main/java/com/fzzy/api/view/pr/Api1301PR.java | 10 +---
src/main/java/com/fzzy/api/entity/Api1301.java | 50 +++++++++++-------------
src/main/java/com/fzzy/api/view/Api1301.view.xml | 4 --
3 files changed, 26 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1301.java b/src/main/java/com/fzzy/api/entity/Api1301.java
index e797676..c0d6b79 100644
--- a/src/main/java/com/fzzy/api/entity/Api1301.java
+++ b/src/main/java/com/fzzy/api/entity/Api1301.java
@@ -25,9 +25,9 @@
private static final long serialVersionUID = 1L;
@Id
- @JSONField(serialize = false)
- @Column(name = "ID_",length = 40)
- private String id;
+ @PropertyDef(label = "椋庨櫓鐐圭紪鐮�" )
+ @Column(name = "fxdbm", length = 18)
+ private String fxdbm;
@JSONField(serialize = false)
@PropertyDef(label = "涓氬姟id", description = "鎺ュ彛杩斿洖涓嶆秹鍙婃瀛楁")
@@ -35,68 +35,64 @@
private String bizId;
@PropertyDef(label = "搴撳尯浠ｇ爜" )
- @Column(name = "kqdm", length = 21, nullable = false)
+ @Column(name = "kqdm", length = 21)
private String kqdm;
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
- @Column(name = "dwdm", length = 18, nullable = false)
+ @Column(name = "dwdm", length = 18)
private String dwdm;
@PropertyDef(label = "搴撳尯鍚嶇О" )
- @Column(name = "kqmc", length = 256, nullable = false)
+ @Column(name = "kqmc", length = 256)
private String kqmc;
@PropertyDef(label = "鍦扮偣" )
- @Column(name = "dd", length = 128, nullable = false)
+ @Column(name = "dd", length = 128)
private String dd;
- @PropertyDef(label = "椋庨櫓鐐圭紪鐮�" )
- @Column(name = "fxdbm", length = 18, nullable = false)
- private String fxdbm;
-
@PropertyDef(label = "璇嗗埆浜�" )
- @Column(name = "sbr", length = 32, nullable = false)
+ @Column(name = "sbr", length = 32)
private String sbr;
@PropertyDef(label = "鐜妭/閮ㄤ綅" )
- @Column(name = "hjbw", length = 128, nullable = false)
+ @Column(name = "hjbw", length = 128)
private String hjbw;
@PropertyDef(label = "椋庨櫓淇℃伅" )
- @Column(name = "fxxx", length = 256, nullable = false)
+ @Column(name = "fxxx", length = 256)
private String fxxx;
@PropertyDef(label = "椋庨櫓绫诲瀷" )
- @Column(name = "fxlx", length = 1, nullable = false)
+ @Column(name = "fxlx", length = 1)
private String fxlx;
@PropertyDef(label = "椋庨櫓鍒嗙骇" )
- @Column(name = "fxfj", length = 1, nullable = false)
+ @Column(name = "fxfj", length = 1)
private String fxfj;
@PropertyDef(label = "椋庨櫓绠℃帶鎺柦" )
- @Column(name = "fxglcs", length = 1000, nullable = false)
+ @Column(name = "fxglcs", length = 1000)
private String fxglcs;
@JSONField(name = "Yhxx")
@PropertyDef(label = "闅愭偅淇℃伅" )
- @Column(name = "yhxx", length = 256, nullable = false)
+ @Column(name = "yhxx", length = 256)
private String yhxx;
@PropertyDef(label = "闅愭偅鎺掓煡淇℃伅" )
- @Column(name = "yhpcxx", length = 1000, nullable = false)
+ @Column(name = "yhpcxx", length = 1000)
private String yhpcxx;
@PropertyDef(label = "闅愭偅鏁存敼淇℃伅" )
- @Column(name = "yhzgxx", length = 1000, nullable = false)
+ @Column(name = "yhzgxx", length = 1000)
private String yhzgxx;
@PropertyDef(label = "闅愭偅鏁存敼楠屾敹淇℃伅" )
- @Column(name = "yhysxx", length = 1000, nullable = false)
+ @Column(name = "yhysxx", length = 1000)
private String yhysxx;
@PropertyDef(label = "浜嬫晠鍩烘湰淇℃伅" )
- @Column(name = "sgjbxx", length = 1000, nullable = false)
+ @Column(name = "sgjbxx", length = 1000)
private String sgjbxx;
@JSONField(format = "yyyy-MM-dd")
@@ -105,11 +101,11 @@
private Date zgsx;
@PropertyDef(label = "璐ｄ换鍗曚綅" )
- @Column(name = "zrdw", length = 128, nullable = false)
+ @Column(name = "zrdw", length = 128)
private String zrdw;
@PropertyDef(label = "璐ｄ换浜�" )
- @Column(name = "zrr", length = 32, nullable = false)
+ @Column(name = "zrr", length = 32)
private String zrr;
@PropertyDef(label = "鏁存敼楠屾敹淇℃伅" )
@@ -117,16 +113,16 @@
private String zgysxx;
@PropertyDef(label = "椋庨櫓璺熻釜鐩戠璐ｄ换浜�" )
- @Column(name = "fxgzjgzrr", length = 32, nullable = false)
+ @Column(name = "fxgzjgzrr", length = 32)
private String fxgzjgzrr;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/api/view/Api1301.view.xml b/src/main/java/com/fzzy/api/view/Api1301.view.xml
index fe40b33..966b4bf 100644
--- a/src/main/java/com/fzzy/api/view/Api1301.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1301.view.xml
@@ -5,10 +5,6 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.api.entity.Api1301</Property>
- <PropertyDef name="id">
- <Property></Property>
- <Property name="label">涓婚敭id</Property>
- </PropertyDef>
<PropertyDef name="kqdm">
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1301PR.java b/src/main/java/com/fzzy/api/view/pr/Api1301PR.java
index c38d12b..6c7f55a 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1301PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1301PR.java
@@ -115,9 +115,6 @@
Api1301 data = new Api1301();
BeanUtils.copyProperties(entity, data);
- if (StringUtils.isEmpty(data.getId())) {
- data.setId(ContextUtil.getUUID());
- }
api1301Rep.save(data);
}
@@ -130,7 +127,7 @@
@Expose
public String delData(Api1301 data) {
- api1301Rep.deleteById(data.getId());
+ api1301Rep.deleteById(data.getFxdbm());
return null;
}
@@ -194,9 +191,8 @@
responseDto = apiService.pushData(param, apiConf, d);
result += responseDto.toString();
if (responseDto.getSuccess() == 0) {
- //todo 浠ｈ〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
- if ("i".equals(d.getCzbz())) {
- d.setCzbz("u");
+ if (Constant.CZBZ_I.equals(d.getCzbz())) {
+ d.setCzbz(Constant.CZBZ_U);
api1301Rep.save(d);
}
}
--
Gitblit v1.9.3