From cc0c09e96a829613bcfb4c2cc1ee5ebf998f016c Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期三, 15 十一月 2023 18:31:29 +0800 Subject: [PATCH] 宁夏省平台接口调试1 --- src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java | 4 src/main/java/com/fzzy/api/entity/Api1212.java | 10 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java | 2 src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 30 ++ src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java | 75 +++++++ src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java | 87 ++++++++ src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java | 53 +++++ src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java | 159 +++++++++++++++ src/main/java/com/fzzy/order/OrderServer.java | 2 src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java | 150 +++++++++++++++ src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 1 11 files changed, 565 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/fzzy/api/entity/Api1212.java b/src/main/java/com/fzzy/api/entity/Api1212.java index 52e0454..09a85c1 100644 --- a/src/main/java/com/fzzy/api/entity/Api1212.java +++ b/src/main/java/com/fzzy/api/entity/Api1212.java @@ -23,7 +23,7 @@ @Entity @Table(name = "API_1212") @EqualsAndHashCode(callSuper = false) -public class Api1212 extends ApiParent implements Serializable { +public class Api1212 implements Serializable { public static String SORT_PROP = "kqmc"; @@ -112,5 +112,13 @@ @Column(name = "zhgxsj") private Date zhgxsj; + @JSONField(serialize = false) + @PropertyDef(label = "涓氬姟id") + @Column(name = "bizId", length = 40) + private String bizId; + @JSONField(serialize = false) + @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠$悊涓績鐨勬椂闂�") + @Column(name = "syncTime") + private Date syncTime; } diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java index 6870cf9..4edbfaf 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java @@ -57,7 +57,7 @@ List<Fz40InoutCustomer> list = fzzySync1212Rep.listInoutCustomer(deptId); if (null == list || list.isEmpty()) { - log.debug("-------------娌℃湁鑾峰彇鍒板悎鍚屼俊鎭�------------------"); + log.debug("-------------娌℃湁鑾峰彇鍒板鎴蜂俊鎭�------------------"); return; } diff --git a/src/main/java/com/fzzy/order/OrderServer.java b/src/main/java/com/fzzy/order/OrderServer.java index f83f2d1..a047992 100644 --- a/src/main/java/com/fzzy/order/OrderServer.java +++ b/src/main/java/com/fzzy/order/OrderServer.java @@ -40,7 +40,7 @@ //蹇冭烦鎸囦护锛岀洿鎺ヨ繑鍥� if(OrderConstant.ORDER_TYPE_0.equals(req.getType())){ - OrderResp resp = new OrderResp(OrderResult.ORDER_CODE_200.getCode(), OrderResult.ORDER_CODE_500.getResult()); + OrderResp resp = new OrderResp(OrderResult.ORDER_CODE_200.getCode(), OrderResult.ORDER_CODE_200.getResult()); log.info("蹇冭烦鎸囦护杩斿洖淇℃伅={}", resp); return resp; } diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java index 079fc42..27845ad 100644 --- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java +++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java @@ -11,8 +11,7 @@ import com.fzzy.api.utils.*; import com.fzzy.api.view.repository.*; import com.fzzy.order.data.OrderData; -import com.fzzy.push.nx2023.dto.Nx2023Api1101; -import com.fzzy.push.nx2023.dto.Nx2023Api1102; +import com.fzzy.push.nx2023.dto.*; import com.fzzy.push.sh2023.dto.*; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -195,12 +194,37 @@ api1102.setLkxz("1"); return api1102; } + if (NX2023Constant.NX_2023_API_CODE_1108.equals(inteId)) { + Nx2023Api1108 api1108 = new Nx2023Api1108(); + BeanUtils.copyProperties(data, api1108); + return api1108; + } if (NX2023Constant.NX_2023_API_CODE_1109.equals(inteId)) { - Api1109 apiData = (Api1109) data; apiData.setWjl(FileUtils.fileToByteString(apiData.getWjdz())); return apiData; } + if (NX2023Constant.NX_2023_API_CODE_1111.equals(inteId)) { + Nx2023Api1111 api1111 = new Nx2023Api1111(); + BeanUtils.copyProperties(data, api1111); + return api1111; + } + if (NX2023Constant.NX_2023_API_CODE_1112.equals(inteId)) { + Nx2023Api1112 api1112 = new Nx2023Api1112(); + BeanUtils.copyProperties(data, api1112); + return api1112; + } + if (NX2023Constant.NX_2023_API_CODE_1201.equals(inteId)) { + Nx2023Api1201 api1201 = new Nx2023Api1201(); + BeanUtils.copyProperties(data, api1201); + return api1201; + } + if (NX2023Constant.NX_2023_API_CODE_1205.equals(inteId)) { + Nx2023Api1205 api1205 = new Nx2023Api1205(); + BeanUtils.copyProperties(data, api1205); + api1205.setSzlx("09"); + return api1205; + } return data; } diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java new file mode 100644 index 0000000..6cdedb9 --- /dev/null +++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java @@ -0,0 +1,75 @@ +package com.fzzy.push.nx2023.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.bstek.dorado.annotation.PropertyDef; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * 鎺ュ彛琛�-鑽墏淇℃伅 + */ +@Data +public class Nx2023Api1108 implements Serializable { + + @PropertyDef(label = "搴撳尯浠g爜") + private String kqdm; + + @PropertyDef(label = "鍗曚綅浠g爜") + private String dwdm; + + @PropertyDef(label = "搴撳尯鍚嶇О") + private String kqmc; + + @PropertyDef(label = "鑽墏缂栧彿") + private String yjbh; + + @PropertyDef(label = "鑽墏鍚嶇О") + private String yjmc; + + @PropertyDef(label = "鍖呰鐗�") + private String bzw; + + @PropertyDef(label = "鍨嬪彿瑙勬牸") + private String ggxh; + + @PropertyDef(label = "瀹夊叏浣跨敤璇存槑涔�") + private String aqsysms; + + @PropertyDef(label = "鐢熶骇鍘傚") + private String sccj; + + @PropertyDef(label = "閲囪喘鏉ユ簮") + private String cgly; + + @PropertyDef(label = "鍌ㄥ瓨鏉′欢") + private String cctj; + + @PropertyDef(label = "鍌ㄥ瓨鍦扮偣") + private String ccdd; + + @PropertyDef(label = "鍖呰鐗╁鐞嗘柟寮�") + private String bzwclfs; + + @PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡") + private String czclfs; + + @PropertyDef(label = "淇濊川鏈�") + @JSONField(format = "yyyy-MM-dd") + private Date bzq; + + @PropertyDef(label = "閲囪喘鏃ユ湡") + @JSONField(format = "yyyy-MM-dd") + private Date cgrq; + + @PropertyDef(label = "搴撳瓨鏁伴噺") + private Double kcsl; + + @PropertyDef(label = "鎿嶄綔鏍囧織") + private String czbz; + + @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date zhgxsj; + +} diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java new file mode 100644 index 0000000..4c4bba2 --- /dev/null +++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java @@ -0,0 +1,53 @@ +package com.fzzy.push.nx2023.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.bstek.dorado.annotation.PropertyDef; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; +import java.util.Date; + +/** + * 鎺ュ彛琛�-搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉� + */ +@Data +public class Nx2023Api1111 implements Serializable { + + @PropertyDef(label = "鍗曚綅鍚嶇О" ) + private String dwmc; + + @PropertyDef(label = "鍗曚綅浠g爜" ) + private String dwdm; + + @PropertyDef(label = "搴撳尯鍚嶇О" ) + private String kqmc; + + @PropertyDef(label = "搴撳尯浠g爜" ) + private String kqdm; + + @PropertyDef(label = "瑙嗛鐩戞帶璁惧鍚嶇О" ) + private String spjksbmc; + + @PropertyDef(label = "瑙嗛鐩戞帶璁惧id" ) + private String spjksbid; + + @PropertyDef(label = "瑙嗛鐩戞帶璁惧鐩稿浣嶇疆" ) + private String spjksbxdwz; + + @PropertyDef(label = "瑙嗛鐩戞帶璁惧浣嶇疆鏍峰紡" ) + private String spjksbwzys; + + @PropertyDef(label = "澶囨敞" ) + private String bz; + + @PropertyDef(label = "鎿嶄綔鏍囧織" ) + private String czbz; + + @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" ) + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date zhgxsj; +} diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java new file mode 100644 index 0000000..109a140 --- /dev/null +++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java @@ -0,0 +1,87 @@ +package com.fzzy.push.nx2023.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.bstek.dorado.annotation.PropertyDef; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * 鎺ュ彛琛�-浜哄憳淇℃伅 + */ +@Data +public class Nx2023Api1112 implements Serializable { + + @PropertyDef(label = "鍗曚綅浠g爜" ) + private String dwdm; + + @PropertyDef(label = "鍗曚綅鍚嶇О" ) + private String dwmc; + + @PropertyDef(label = "闅跺睘閮ㄩ棬" ) + private String lsbm; + + @PropertyDef(label = "琛屾斂鍖哄垝浠g爜" ) + private String xzqhdm; + + @PropertyDef(label = "濮撳悕" ) + private String xm; + + @PropertyDef(label = "鎬у埆" ) + private String xb; + + @PropertyDef(label = "韬唤璇佸彿鐮�" ) + private String sfzhm; + + @PropertyDef(label = "鍏ヨ亴鏃ユ湡" ) + @JSONField(format = "yyyy-MM-dd") + private Date rzrq; + + @PropertyDef(label = "宀椾綅鎬ц川" ) + private String gwxz; + + @PropertyDef(label = "鍦ㄥ矖鐘舵��" ) + private String zgzt; + + @PropertyDef(label = "绂昏亴鏃ユ湡" ) + @JSONField(format = "yyyy-MM-dd") + private Date lzrq; + + @PropertyDef(label = "搴ф満鐢佃瘽" ) + private String zjdh; + + @PropertyDef(label = "绉诲姩鐢佃瘽" ) + private String yddh; + + @PropertyDef(label = "鐢靛瓙閭" ) + private String dzyx; + + @PropertyDef(label = "姘戞棌" ) + private String mz; + + @PropertyDef(label = "鏀挎不闈㈣矊" ) + private String zzmm; + + @PropertyDef(label = "浜哄憳绫诲埆" ) + private String rylb; + + @PropertyDef(label = "涓撲笟" ) + private String zy; + + @PropertyDef(label = "鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿" ) + @JSONField(format = "yyyy-MM-dd") + private Date qdzgzchzyzgsj; + + @PropertyDef(label = "瀛﹀巻" ) + private String xl; + + @PropertyDef(label = "鑱屽姟" ) + private String zw; + + @PropertyDef(label = "鎿嶄綔鏍囧織" ) + private String czbz; + + @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" ) + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date zhgxsj; +} diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java new file mode 100644 index 0000000..0d1d694 --- /dev/null +++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java @@ -0,0 +1,150 @@ +package com.fzzy.push.nx2023.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.bstek.dorado.annotation.PropertyDef; +import com.fzzy.conf.NumberSerializer; +import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 鎺ュ彛琛�-鍚堝悓淇℃伅 + */ +@Data +public class Nx2023Api1201 implements Serializable { + + @PropertyDef(label = "鍚堝悓鍙�") + private String hth; + + @PropertyDef(label = "鍚堝悓鍚嶇О") + private String htmc; + + @PropertyDef(label = "鍗曚綅浠g爜") + private String dwdm; + + @PropertyDef(label = "涓氬姟绫诲埆") + private String ywlx; + + @PropertyDef(label = "瀹㈡埛绫诲瀷") + private String khlx; + + @PropertyDef(label = "瀹㈡埛缁熶竴绀句細淇$敤浠g爜") + private String khtyshxydm; + + @PropertyDef(label = "瀹㈡埛鍚嶇О") + private String khmc; + + @PropertyDef(label = "娉曞畾浠h〃浜�") + private String fddbr; + + @PropertyDef(label = "閫氳鍦板潃") + private String txdz; + + @PropertyDef(label = "閭斂缂栫爜") + private String yzbm; + + @PropertyDef(label = "鑱旂郴浜哄鍚�") + private String lxrxm; + + @PropertyDef(label = "鑱旂郴鐢佃瘽") + private String lxrdh; + + @PropertyDef(label = "韬唤璇佸彿") + private String sfzh; + + @PropertyDef(label = "鐢靛瓙淇$") + private String dzyx; + + @JSONField(format = "yyyy-MM-dd") + @PropertyDef(label = "绛捐鏃ユ湡") + private Date qdrq; + + @JSONField(format = "yyyy-MM-dd") + @PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿") + private Date ydwcsj; + + @PropertyDef(label = "绛捐鍦扮偣") + private String qddd; + + @PropertyDef(label = "绮鍝佺浠g爜") + private String lspzdm; + + @PropertyDef(label = "绮鎬ц川浠g爜") + private String lsxzdm; + + @PropertyDef(label = "鍚堝悓鍗曚环") + private double htdj; + + @PropertyDef(label = "绾﹀畾璐攢绮鏁伴噺") + private double ydgxlssl; + + @JSONField(serializeUsing = NumberSerializer.class) + @PropertyDef(label = "鍚堝悓鎬婚噾棰�") + private BigDecimal htzje; + + @PropertyDef(label = "灞ョ害淇濊瘉閲�") + private double lybzj; + + @JSONField(format = "yyyy-MM-dd") + @PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿") + private Date sswcsj; + + @JSONField(name = "Lysl") + @PropertyDef(label = "灞ョ害鏁伴噺") + private double lysl; + + @JSONField(name = "Lyl") + @PropertyDef(label = "灞ョ害鐜�") + private double lyl; + + @JSONField(name = "Jsjg") + @PropertyDef(label = "缁撶畻浠锋牸") + private double jsjg; + + @JSONField(name = "Jszje", serializeUsing = NumberSerializer.class) + @PropertyDef(label = "缁撶畻鎬婚噾棰�") + private BigDecimal jszje; + + @PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��") + private String jsyhtyzx; + + @PropertyDef(label = "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�") + private String jsyhtbyzyy; + + @PropertyDef(label = "瀹㈡埛鏂瑰紑鎴疯") + private String khfkhh; + + @PropertyDef(label = "瀹㈡埛鏂硅处鍙�") + private String khfzh; + + @PropertyDef(label = "瀹㈡埛绛剧害浜�") + private String khqyr; + + @PropertyDef(label = "鏈柟寮�鎴疯") + private String bfkhh; + + @PropertyDef(label = "鏈柟璐﹀彿") + private String bfzh; + + @PropertyDef(label = "鏈柟绛剧害浜�") + private String bfqyr; + + @PropertyDef(label = "瀹℃壒浜�") + private String shr; + + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @PropertyDef(label = "瀹℃壒鏃堕棿") + private Date shsj; + + @JSONField(format = "yyyy-MM-dd") + @PropertyDef(label = "瀹屾垚鏃ユ湡") + private Date wcrq; + + @PropertyDef(label = "鎿嶄綔鏍囧織") + private String czbz; + + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @PropertyDef(label = "鏇存柊鏃堕棿") + private Date zhgxsj; +} diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java new file mode 100644 index 0000000..1c3d724 --- /dev/null +++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java @@ -0,0 +1,159 @@ +package com.fzzy.push.nx2023.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.bstek.dorado.annotation.PropertyDef; +import com.fzzy.api.entity.ApiParent; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Id; +import java.io.Serializable; +import java.util.Date; + +/** + * 鎺ュ彛琛�-绮鍑哄簱淇℃伅 + */ +@Data +@EqualsAndHashCode(callSuper = false) +public class Nx2023Api1205 extends ApiParent implements Serializable { + + + /** + * + */ + private static final long serialVersionUID = -6381473449862569451L; + + + //涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟缂栫爜锛�15 浠h〃绮鍑哄簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234 + @Id + @PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿") + private String ckywdh; + + @PropertyDef(label = "璐т綅浠g爜") + private String hwdm; + + @PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿") + private String cktzdh; + + @PropertyDef(label = "涓氬姟绫诲瀷", description = "1锛氬嚭搴擄紙榛樿锛�") + private String ywlx = "1"; + + @JSONField(format = "yyyy-MM-dd") + @PropertyDef(label = "涓氬姟鏃ユ湡") + private Date ywrq; + + @PropertyDef(label = "鍚堝悓鍙�") + private String hth; + + @PropertyDef(label = "鎵胯繍浜�") + private String cyr; + + @PropertyDef(label = "鑱旂郴鐢佃瘽") + private String lxdh; + + @PropertyDef(label = "韬唤璇佸彿") + private String sfzh; + + @PropertyDef(label = "杩愯緭宸ュ叿") + private String ysgj; + + @PropertyDef(label = "鍗哥伯鍦扮偣") + private String xldd; + + @PropertyDef(label = "杞﹁埞鍙�") + private String cch; + + @PropertyDef(label = "鎸傝溅鍙�") + private String gch; + + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @PropertyDef(label = "鐧昏鏃堕棿") + private Date djsj; + + @PropertyDef(label = "鐧昏闂ㄥ矖浜哄憳濮撳悕") + private String djmgryxm; + + @PropertyDef(label = "绮鍝佺浠g爜") + private String lspzdm; + + @PropertyDef(label = "绮绛夌骇浠g爜") + private String lsdjdm; + + @PropertyDef(label = "绮鎬ц川浠g爜") + private String lsxzdm; + + @PropertyDef(label = "鏀惰幏骞村害") + private String shnd; + + @PropertyDef(label = "浜у湴浠g爜") + private String cddm; + + @PropertyDef(label = "鐨噸(鍏枻)") + private double pz; + + @PropertyDef(label = "鐨噸鐩戠鍛�") + private String pzjby; + + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @PropertyDef(label = "鐨噸璁¢噺鏃堕棿") + private Date pzjlsj; + + @PropertyDef(label = "鐨噸璁¢噺鍛�") + private String pzjly; + + @PropertyDef(label = "姣涢噸(鍏枻)") + private double mz; + + @PropertyDef(label = "姣涢噸鐩戠鍛�") + private String mzjby; + + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @PropertyDef(label = "姣涢噸璁¢噺鏃堕棿") + private Date mzjlsj; + + @PropertyDef(label = "姣涢噸璁¢噺鍛�") + private String mzjly; + + @PropertyDef(label = "鍖呰鐗�") + private String bzw; + + @PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)") + private double bzbdbz; + + @PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)") + private Integer bzbjs; + + @PropertyDef(label = "鍑�閲�(鍏枻)") + private double jz; + + @PropertyDef(label = "鎵�/澧為噺(鍏枻)") + private double kzl; + + @PropertyDef(label = "鍊间粨淇濈鍛樺鍚�") + private String zcbgyxm; + + @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅") + private String zxzydw; + + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @PropertyDef(label = "鍑洪棬鏃堕棿") + private Date cmsj; + + @PropertyDef(label = "鍑洪棬纭闂ㄥ矖浜哄憳濮撳悕") + private String cmqrmgryxm; + + @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿") + private String ckjsdh; + + @PropertyDef(label = "鏀舵敮绫诲瀷") + private String szlx; + + @PropertyDef(label = "澶囨敞") + private String bz; + + @PropertyDef(label = "鎿嶄綔鏍囧織") + private String czbz; + + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�") + private Date zhgxsj; +} diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java index 52c60e7..6870ad1 100644 --- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java +++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java @@ -241,6 +241,7 @@ BeanUtils.copyProperties(apiData, api1104); api1104.setAjdm(apiData.getAjdh()); api1104.setCfdm(apiData.getCfbh()); + api1104.setLsxzdm("122"); //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1104); diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java index 2ea83ae..0a51a7e 100644 --- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java +++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java @@ -64,8 +64,8 @@ @PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡") private String czclfs; - @PropertyDef(label = "淇濊川鏈�") - private String bzq; + @JSONField(format = "yyyy-MM-dd") + private Date bzq; @PropertyDef(label = "搴撳瓨鏁伴噺") private Double kcsl; -- Gitblit v1.9.3