From 36d6dcc3229fb8487df706f4dad3cb2a6d451ca5 Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期五, 04 八月 2023 15:30:22 +0800 Subject: [PATCH] 武汉军粮省平台-军粮企业信息同步 --- src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java | 3 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java | 102 +++++++++++++++++ src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1101Rep.java | 21 +++ src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDept.java | 154 +++++++++++++++++++++++++ src/main/java/com/fzzy/api/data/SyncProtocol.java | 1 src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhSyncService11.java | 44 +++++++ 6 files changed, 325 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/fzzy/api/data/SyncProtocol.java b/src/main/java/com/fzzy/api/data/SyncProtocol.java index ded06eb..984af8c 100644 --- a/src/main/java/com/fzzy/api/data/SyncProtocol.java +++ b/src/main/java/com/fzzy/api/data/SyncProtocol.java @@ -12,6 +12,7 @@ FZZY_V30_GB("FZZY_V30_GB", "椋庢鑷磋繙V3.0"), FZZY_V35_GB("FZZY_V35_GB", "椋庢鑷磋繙V3.5"), FZZY_V40_GB("FZZY_V40_GB", "椋庢鑷磋繙V4.0"), + FZZY_V40_WHJL("FZZY_V40_WHJL", "椋庢鑷磋繙V4.0-姝︽眽鍐涚伯"), FZZY_V35_SHYZ("FZZY_V35_SHYZ", "椋庢鑷磋繙2涓婃捣浣戝崜瑙勮寖"); diff --git a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhSyncService11.java b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhSyncService11.java new file mode 100644 index 0000000..560b6a0 --- /dev/null +++ b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhSyncService11.java @@ -0,0 +1,44 @@ +package com.fzzy.async.whhpjl; + +import com.fzzy.api.data.ApiParam; +import com.fzzy.api.data.SyncProtocol; +import com.fzzy.api.service.SyncService11; +import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1101; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import java.util.Date; + +/** + * @Desc: 鍩虹淇℃伅鍚屾 + * + * @author: czt + * @update-time: 2023/08/04 + * + */ +@Slf4j +@Component +public class Fzzy40ToWhSyncService11 implements SyncService11 { + + + @Autowired + private Fz40ToWhjlSync1101 fz40ToWhjlSync1101; + + @Override + public String getProtocol() { + return SyncProtocol.FZZY_V40_WHJL.getCode(); + } + + @Override + public void syncData(ApiParam param) { + log.info("--------------鍩虹鏁版嵁鎵嬪姩閰嶇疆鎺ㄩ��--------"); + String kqdm = param.getKqdm(); + String deptId = param.getDeptId(); + Date start = param.getStart(); + Date end = param.getEnd(); + + //鍚屾鍐涘伐鍗曚綅淇℃伅 + fz40ToWhjlSync1101.syncData(kqdm, deptId, start, end); + } + +} diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDept.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDept.java new file mode 100644 index 0000000..4f59381 --- /dev/null +++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDept.java @@ -0,0 +1,154 @@ +package com.fzzy.async.whhpjl.entity; + +import com.bstek.dorado.annotation.PropertyDef; +import lombok.Data; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * @Desc: 搴撳尯缁勭粐鏋舵瀯 + * + * @author: czt + * @update-time: 2023/08/04 + * + */ +@Data +@Entity +@Table(name = "BDF2_DEPT") +public class Fz40WhjlDefaultDept implements Serializable { + + private static final long serialVersionUID = -7669420244144806105L; + + // ----------涓氬姟鍏叡瀛楁-------// + @Id + @Column(name = "ID_", length = 60) + private String id; + + @Column(name = "COMPANY_ID_", length = 60) + private String companyId; + + @Column(name = "PARENT_ID_", length = 60) + private String parentId; + + @Column(name = "CREATE_DATE_") + @PropertyDef(label = "寤烘垚鏃堕棿") + private Date createDate; + + @Column(name = "NAME_", length = 60) + private String name; + + @Column(name = "DESC_", length = 1000) + private String desc; + + @Column(name = "TYPE_", length = 10) + @PropertyDef(label = "绫诲瀷", description = "缁勭粐,搴撶偣") + private String type; + + @Column(name = "CODE_", length = 60) + @PropertyDef(label = "缂栫爜", description = "鐢ㄤ簬涓婃姤鐨勭粍缁囩紪鐮�") + private String code; + + @PropertyDef(label = "鎵�鍦ㄧ渷") + @Column(name = "PROVINCE_", length = 30) + private String province; + + @PropertyDef(label = "鎵�鍦ㄥ煄甯�") + @Column(name = "CITY_", length = 30) + private String city; + + @PropertyDef(label = "鎵�鍦ㄥ尯鍘�") + @Column(name = "COUNTRY_", length = 30) + private String country; + + @Column(name = "LON_") + @PropertyDef(label = "缁忓害") + private Double lon; + + @Column(name = "LAT_") + @PropertyDef(label = "绾害") + private Double lat; + + @Column(name = "POST_CODE_", length = 10) + @PropertyDef(label = "閭紪") + private String postCode; + + @Column(name = "BUILDING_NUM_") + @PropertyDef(label = "浠撴埧鏁�") + private Integer buildingNum; + + @Column(name = "OIL_NUM_") + @PropertyDef(label = "娌圭綈鏁�") + private Integer oilNum; + + @PropertyDef(label = "鍦板潃") + @Column(name = "ADDRESS_", length = 200) + private String address; + + @PropertyDef(label = "鑱旂郴浜�") + @Column(name = "CONTACT_", length = 50) + private String contact; + + @PropertyDef(label = "鑱旂郴鐢佃瘽") + @Column(name = "PHONE_", length = 20) + private String phone; + + @Column(name = "FAX_", length = 20) + @PropertyDef(label = "浼犵湡") + private String fax; + + // ----------鍗曚綅瀛楁-------// + @Column(name = "COMPANY_TYPE_", length = 10) + @PropertyDef(label = "鍗曚綅绫诲瀷", description = "1-绮浠撳偍浼佷笟;2-绮璐攢浼佷笟;3-绮鍔犲伐浼佷笟;4-绮璁惧鍒堕�犱紒涓�;9-鍏朵粬绮浼佷笟") + private String companyType; + + @Column(name = "NATURE_", length = 10) + @PropertyDef(label = "浼佷笟鎬ц川", description = "1-鍥烘湁浼佷笟;2-姘戣惀浼佷笟;3-浜嬩笟鍗曚綅;9-鍏朵粬鍐呰祫浼佷笟;10-娓境鍙板晢鎶曡祫浼佷笟;11-澶栧晢鎶曡祫浼佷笟;") + private String nature; + + @Column(name = "LEGAL_PERSON_", length = 30) + @PropertyDef(label = "娉曚汉") + private String legalPerson; + + @Column(name = "DEPT_NUM_") + @PropertyDef(label = "搴撳尯鏁�") + private Integer deptNum; + + @Column(name = "REGISTER_CODE_", length = 30) + @PropertyDef(label = "宸ュ晢鐧昏娉ㄥ唽鍙�") + private String registerCode; + + @Column(name = "CREDIT_CODE_", length = 20) + @PropertyDef(label = "淇$敤缂栫爜") + private String creditCode; + + // ----------搴撳尯瀛楁-------// + @Column(name = "DEPOT_NUM_") + @PropertyDef(label = "寤掗棿鏁�") + private Integer depotNum; + + @Column(name = "STORAGE_") + @PropertyDef(label = "搴撶偣璁捐鍌ㄩ噺", description = "鍗曚綅锛氬惃") + private Double storage; + + @Column(name = "OIL_STORAGE_") + @PropertyDef(label = "搴撶偣璁捐缃愬", description = "鍗曚綅锛氬惃") + private Double oilStorage; + + @Column(name = "AREA_") + @PropertyDef(label = "搴撶偣璁捐闈㈢Н", description = "鍗曚綅锛氥帯") + private Double area; + + @Column(name = "ACTING_RESERVE_", length = 1) + @PropertyDef(label = "鏄惁浠e偍", description = "1-鏄�; 0-鍚�") + private String actingReserve = "0"; + + @Column(name = "PROPERTY_RIGHT_", length = 2) + @PropertyDef(label = "搴撳尯浜ф潈", description = "1-鑷湁; 2-绉熻祦锛�9-鍏朵粬") + private String propertyRight = "1"; + + @Column(name = "VAL_", length = 1) + @PropertyDef(label = "鏄惁鍚敤") + private String val; +} diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java new file mode 100644 index 0000000..ebf4954 --- /dev/null +++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java @@ -0,0 +1,102 @@ +package com.fzzy.async.whhpjl.impl; + +import com.fzzy.api.Constant; +import com.fzzy.api.entity.ApiLog; +import com.fzzy.api.utils.ContextUtil; +import com.fzzy.api.view.repository.ApiLogRep; +import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept; +import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1101Rep; +import com.fzzy.whjl.dto.WhjlApi1101; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import java.util.Date; +import java.util.List; + +/** + * 鍐涘伐鍗曚綅淇℃伅 + * + * @author: czt + * @update-time: 2023/08/04 + * + */ +@Slf4j +@Component +public class Fz40ToWhjlSync1101 { + + @Autowired + private Fz40ToWhjlSync1101Rep fz40ToWhjlSync1101Rep; + @Autowired + private ApiLogRep apiLogRep; + + /** + * 鍐涘伐鍗曚綅淇℃伅 + * + * @param deptId + * @param start + * @param end + */ + public void syncData(String kqdm, String deptId, Date start, Date end) { + + log.info("-------------1101鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------"); + + //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭� + ApiLog apiLog = new ApiLog(); + apiLog.setType(ApiLog.TYPE_SYNC); + apiLog.setKqdm(deptId); + apiLog.setUploadTime(new Date()); + apiLog.setInteId(Constant.API_CODE_1111); + apiLog.setStatus(99); + apiLog.setId(ContextUtil.getUUID()); + try { + List<Fz40WhjlDefaultDept> list = fz40ToWhjlSync1101Rep.listApi1101(deptId.substring(0, 4)); + + if (null == list || list.isEmpty()) { + log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------"); + return; + } + WhjlApi1101 apiData; + //灏佽鍐涘伐鍗曚綅淇℃伅 + for (Fz40WhjlDefaultDept sysData : list) { + + apiData = new WhjlApi1101(); + apiData.setJlqybh(sysData.getRegisterCode()); + apiData.setJlqymc(sysData.getName()); + apiData.setJlqyjc(sysData.getName()); + apiData.setJlzzjgdm(""); //鍐涚伯缁勭粐鏈烘瀯浠g爜锛�9浣� + apiData.setJlqytyshxydm(sysData.getRegisterCode()); + apiData.setJlqylx("1"); //1-淇濋殰鍩哄湴 + apiData.setQyjjlx(""); //浼佷笟缁忔祹绫诲瀷 + apiData.setQyxz(""); //浼佷笟鎬ц川 + apiData.setDjzclx(""); //鐧昏娉ㄥ唽绫诲瀷 + apiData.setGsdjzch(sysData.getRegisterCode()); //宸ュ晢鐧昏娉ㄥ唽鍙� + apiData.setSfjbjlcbzg("鏄�"); //鏄惁鍏峰鍐涚伯鍌ㄥ璧勬牸 + apiData.setFddbr(sysData.getLegalPerson()); //娉曞畾浠h〃浜� + apiData.setQydz(sysData.getAddress()); //浼佷笟鍦板潃 + apiData.setQydh(sysData.getPhone()); //浼佷笟鐢佃瘽 + apiData.setQyjd(sysData.getLon()); //浼佷笟缁忓害 + apiData.setQywd(sysData.getLat()); //浼佷笟绾害 + apiData.setQyxzqhmc(sysData.getCountry()); //浼佷笟琛屾斂鍖哄垝鍚嶇О + apiData.setQyxzqhdm(sysData.getCountry()); //浼佷笟琛屾斂鍖哄垝浠g爜 + apiData.setSfyx("鏄�"); //浼佷笟琛屾斂鍖哄垝浠g爜 + if(StringUtils.isNotEmpty(sysData.getVal()) && "0".equals(sysData.getVal())){ + apiData.setSfyx("鍚�"); + } + + apiData.setBizId(sysData.getId()); + apiData.setUpdateTime(new Date()); + + //TODO 鎸佷箙鍖栦繚瀛樺緟瀹炵幇 + + + + log.info("1101---鍐涘伐鍗曚綅-鍚屾鏁版嵁锛歿}", apiData.toString()); + } + } catch (Exception e) { + log.error("---1101鍐涘伐鍗曚綅-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage()); + apiLog.setResult("1101鍐涘伐鍗曚綅淇℃伅鍚屾澶辫触锛�" + e.getMessage()); + apiLogRep.save(apiLog); + } + } +} diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1101Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1101Rep.java new file mode 100644 index 0000000..67d9363 --- /dev/null +++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1101Rep.java @@ -0,0 +1,21 @@ +package com.fzzy.async.whhpjl.repository; + +import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import java.util.List; + +/** + * 鍩虹淇℃伅-鍗曚綅鍙婂簱鍖轰俊鎭� + */ +public interface Fz40ToWhjlSync1101Rep extends JpaRepository<Fz40WhjlDefaultDept, String> { + + /** + * 鑾峰彇鍗曚綅鎴栧簱鍖轰俊鎭� + * + * @return + */ + @Query("from Fz40WhjlDefaultDept where id=:id ") + List<Fz40WhjlDefaultDept> listApi1101(@Param("id") String id); +} diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java index cdd633b..09b0c0f 100644 --- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java +++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java @@ -3,6 +3,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** * 鍐涚伯浼佷笟-鍐涚伯浼佷笟淇℃伅 @@ -50,4 +51,6 @@ private String sfyx; //鏄惁鍚敤 private String bz; //澶囨敞 + private String bizId; //涓氬姟ID + private Date updateTime; //鏈�鍚庢洿鏂版椂闂� } -- Gitblit v1.9.3