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; } 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; } 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; } 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; } 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 = "åºåºä»£ç ") private String kqdm; @PropertyDef(label = "åä½ä»£ç ") 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; } 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 = "åä½ä»£ç " ) private String dwdm; @PropertyDef(label = "åºåºåç§°" ) private String kqmc; @PropertyDef(label = "åºåºä»£ç " ) 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; } 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 = "åä½ä»£ç " ) private String dwdm; @PropertyDef(label = "åä½åç§°" ) private String dwmc; @PropertyDef(label = "é¶å±é¨é¨" ) private String lsbm; @PropertyDef(label = "è¡æ¿åºå代ç " ) 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; } 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 = "åä½ä»£ç ") private String dwdm; @PropertyDef(label = "ä¸å¡ç±»å«") private String ywlx; @PropertyDef(label = "客æ·ç±»å") private String khlx; @PropertyDef(label = "客æ·ç»ä¸ç¤¾ä¼ä¿¡ç¨ä»£ç ") private String khtyshxydm; @PropertyDef(label = "客æ·åç§°") private String khmc; @PropertyDef(label = "æ³å®ä»£è¡¨äºº") 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 = "ç²®é£åç§ä»£ç ") private String lspzdm; @PropertyDef(label = "ç²®é£æ§è´¨ä»£ç ") 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; } 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 代表粮é£åºåºï¼ï¼ç¬¬ 3-8 ä½ä¾æ¬¡ä¸ºå¹´ä»½çå两ä½ã2 使份ã2使¥æï¼ååä½ä¸ºé¡ºåºç ãä¾å¦ï¼141605041234 @Id @PropertyDef(label = "åºåºä¸å¡åå·") private String ckywdh; @PropertyDef(label = "è´§ä½ä»£ç ") 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 = "ç²®é£åç§ä»£ç ") private String lspzdm; @PropertyDef(label = "ç²®é£ç级代ç ") private String lsdjdm; @PropertyDef(label = "ç²®é£æ§è´¨ä»£ç ") private String lsxzdm; @PropertyDef(label = "æ¶è·å¹´åº¦") private String shnd; @PropertyDef(label = "产å°ä»£ç ") 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; } 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); 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;