From 8f432dc748b977cbf7f0f80a8da4ff83569df363 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期二, 09 五月 2023 20:57:15 +0800
Subject: [PATCH] 提交上海嘉定纪委-单位接口信息
---
src/main/java/com/fzzy/api/view/repository/Api1103Rep.java | 9
src/main/java/com/fzzy/api/view/repository/Api1102Rep.java | 10
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1101.java | 72 +++++
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java | 30 +-
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1101.java | 43 +++
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java | 40 --
src/main/java/com/fzzy/push/gd2022/dto/Api1101.java | 4
src/main/java/com/fzzy/push/impl/ComPushService11.java | 32 ++
src/main/java/com/fzzy/async/fzzy35/entity/Building.java | 106 +++++++
src/main/java/com/fzzy/async/fzzy35/entity/DefaultDept.java | 150 ++++++++++
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1102.java | 72 +++++
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1103Rep.java | 22 +
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1103.java | 69 ++++
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1102Rep.java | 25 +
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1101Rep.java | 22 +
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwRespDto.java | 41 ++
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 64 +++-
17 files changed, 737 insertions(+), 74 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java
index 0319801..5e43963 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java
@@ -7,6 +7,8 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
public interface Api1102Rep extends JpaRepository<Api1102, String> {
@@ -16,4 +18,12 @@
@Query("update Api1102 set czbz=:czbz where kqdm=:id ")
int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ /**
+ * 鏌ヨ鎵�鏈夌殑鐩戞帶鐐逛綅淇℃伅
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1102 where kqdm=:kqdm ")
+ List<Api1102> findPushData(@Param("kqdm") String kqdm);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1103Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1103Rep.java
index eaa2a1f..d483643 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1103Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1103Rep.java
@@ -6,6 +6,7 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
public interface Api1103Rep extends JpaRepository<Api1103, String> {
@@ -13,4 +14,12 @@
@Modifying
@Query("update Api1103 set czbz=:czbz where cfdm =:id ")
int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ /**
+ * 鏌ヨ鎵�鏈夌殑鐩戞帶鐐逛綅淇℃伅
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1103 where kqdm=:kqdm ")
+ List<Api1103> findPushData(@Param("kqdm") String kqdm);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Building.java b/src/main/java/com/fzzy/async/fzzy35/entity/Building.java
new file mode 100644
index 0000000..ee0b5bb
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Building.java
@@ -0,0 +1,106 @@
+package com.fzzy.async.fzzy35.entity;
+
+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;
+
+/**
+ * 寤虹瓚鐗╋紝鍖呮嫭浠撴埧鍜屽叾浠栨埧瀛�
+ * <p>
+ * 浠撳簱鐨勬晼闂翠娇鐢ㄧ殑鏄細Depot绫伙紝涓�涓粨鎴垮缓绛戝彲鑳藉寘鍚涓晼闂淬��
+ * <p>
+ * 褰撳墠瀹氫箟瀵硅薄浠呬粎鐢ㄤ簬寤虹瓚鐗╃殑鏁版嵁閰嶇疆
+ */
+@Data
+@Entity
+@Table(name = "D_BUILDING")
+public class Building implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_", length = 50)
+ @PropertyDef(label = "浠撴埧缂栫爜")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲簱鐐�")
+ private String deptId;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "寤虹瓚鍚嶇О")
+ private String name;
+
+ @Column(name = "STORAGE_")
+ @PropertyDef(label = "璁捐鍌ㄩ噺", description = "鍗曚綅锛欿G")
+ private Double storage;
+
+ @Column(name = "USER_DATE_")
+ @PropertyDef(label = "浣跨敤鏃ユ湡")
+ private Date userDate;
+
+ @Column(name = "HEIGHT_", precision = 16, scale = 2)
+ @PropertyDef(label = "浠撴埧楂樺害", description = "鍗曚綅锛氱背")
+ private Double height;
+
+ @Column(name = "LENGTH_", precision = 16, scale = 2)
+ @PropertyDef(label = "浠撴埧闀垮害", description = "鍗曚綅锛氱背")
+ private Double length;
+
+ @Column(name = "WIDTH_", precision = 16, scale = 2)
+ @PropertyDef(label = "浠撴埧瀹藉害", description = "鍗曚綅锛氱背")
+ private Double width;
+
+ @Column(name = "DIAMETER_", precision = 16, scale = 2)
+ @PropertyDef(label = "绛掍粨鐩村緞", description = "鍗曚綅锛氱背")
+ private Double diameter;
+
+ @Column(name = "VOLUME_", precision = 16, scale = 2)
+ @PropertyDef(label = "绛掍粨浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
+ private Double volume;
+
+ @Column(name = "DOOR_NUM_")
+ @PropertyDef(label = "浠撻棬鏁�")
+ private Integer doorNum;
+
+ @Column(name = "GROUND_", length = 20)
+ @PropertyDef(label = "鍦伴潰缁撴瀯")
+ private String ground;
+
+ @Column(name = "WALL_", length = 20)
+ @PropertyDef(label = "澧欎綋缁撴瀯")
+ private String wall;
+
+ @Column(name = "ROOF_", length = 20)
+ @PropertyDef(label = "灞嬮《缁撴瀯")
+ private String roof;
+
+ @Column(name = "ROOF_TRUSS_", length = 20)
+ @PropertyDef(label = "灞嬫灦缁撴瀯")
+ private String roofTruss;
+
+ @Column(name = "CREATE_DATE_")
+ @PropertyDef(label = "寤洪�犳棩鏈�")
+ private Date createDate;
+
+ @Column(name = "LON_", precision = 16, scale = 4)
+ @PropertyDef(label = "缁忓害")
+ private Double lon;
+
+ @Column(name = "LAT_", precision = 16, scale = 4)
+ @PropertyDef(label = "绾害")
+ private Double lat;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/DefaultDept.java b/src/main/java/com/fzzy/async/fzzy35/entity/DefaultDept.java
new file mode 100644
index 0000000..187eab6
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/DefaultDept.java
@@ -0,0 +1,150 @@
+package com.fzzy.async.fzzy35.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @since 2013-1-22
+ * @author Jacky.gao
+ */
+@Data
+@Entity
+@Table(name = "BDF2_DEPT")
+public class DefaultDept 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 = "鏄惁浠ｅ偍", 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/fzzy35/impl/Fzzy35Sync1101.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1101.java
new file mode 100644
index 0000000..b8d718f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1101.java
@@ -0,0 +1,72 @@
+package com.fzzy.async.fzzy35.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1101;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy35.entity.DefaultDept;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1101Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍗曚綅淇℃伅
+ */
+@Slf4j
+@Component
+public class Fzzy35Sync1101 {
+
+ @Autowired
+ private Fzzy35Sync1101Rep fzzy35Sync1101Rep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾鍗曚綅淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1111鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ 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<DefaultDept> list = fzzy35Sync1101Rep.listDept(deptId.substring(0, 4));
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
+ return;
+ }
+ Api1101 apiData;
+ for (DefaultDept sysData : list) {
+
+ //TODO
+// apiData = new Api1101();
+//
+// api1101Rep.save(apiData);
+// log.info("1111---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+ } catch (Exception e) {
+ log.error("---鏂囦欢鍚屾鎵ц澶辫触----{}", e);
+ apiLog.setResult("鍚屾鏂囦欢淇℃伅澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1102.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1102.java
new file mode 100644
index 0000000..b5921aa
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1102.java
@@ -0,0 +1,72 @@
+package com.fzzy.async.fzzy35.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy35.entity.DefaultDept;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1101Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 搴撳尯淇℃伅
+ */
+@Slf4j
+@Component
+public class Fzzy35Sync1102 {
+
+ @Autowired
+ private Fzzy35Sync1101Rep fzzy35Sync1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾鍗曚綅淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1102鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ 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<DefaultDept> list = fzzy35Sync1101Rep.listDept(deptId);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�------------------");
+ return;
+ }
+ Api1102 apiData;
+ for (DefaultDept sysData : list) {
+
+ //TODO
+// apiData = new Api1101();
+//
+// api1102Rep.save(apiData);
+// log.info("1111---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+ } catch (Exception e) {
+ log.error("---搴撳尯鍚屾鎵ц澶辫触----{}", e);
+ apiLog.setResult("鍚屾搴撳尯淇℃伅澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1103.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1103.java
new file mode 100644
index 0000000..f318d14
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1103.java
@@ -0,0 +1,69 @@
+package com.fzzy.async.fzzy35.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1101;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy35.entity.Building;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1103Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 浠撴埧淇℃伅
+ */
+@Slf4j
+@Component
+public class Fzzy35Sync1103 {
+
+ @Autowired
+ private Fzzy35Sync1103Rep fzzy35Sync1103Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾鍗曚綅淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1103鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ 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<Building> list = fzzy35Sync1103Rep.listBuilding(deptId);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
+ return;
+ }
+ Api1101 apiData;
+ for (Building sysData : list) {
+
+ //TODO
+// apiData = new Api1101();
+//
+// api1103Rep.save(apiData);
+// log.info("1111---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+ } catch (Exception e) {
+ log.error("---浠撴埧鍚屾鎵ц澶辫触----{}", e);
+ apiLog.setResult("鍚屾浠撴埧淇℃伅澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1101Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1101Rep.java
new file mode 100644
index 0000000..e679e32
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1101Rep.java
@@ -0,0 +1,22 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.DefaultDept;
+import com.fzzy.async.fzzy35.entity.MContract;
+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 Fzzy35Sync1101Rep extends JpaRepository<MContract, String> {
+
+ /**
+ * 鑾峰彇鍗曚綅鎴栧簱鍖轰俊鎭�
+ *
+ * @return
+ */
+ @Query("from DefaultDept where id=:id ")
+ List<DefaultDept> listDept(@Param("id") String id);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1102Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1102Rep.java
new file mode 100644
index 0000000..6e33c0f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1102Rep.java
@@ -0,0 +1,25 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.MContract;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮璐攢-鍚堝悓淇℃伅鏁版嵁鎺ュ彛鏁版嵁鑾峰彇
+ */
+public interface Fzzy35Sync1102Rep extends JpaRepository<MContract, String> {
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇鍚堝悓淇℃伅
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from MContract where deptId=:deptId and createTime >=:start and createTime <:end order by createTime ")
+ List<MContract> listContract(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1103Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1103Rep.java
new file mode 100644
index 0000000..2d7229f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1103Rep.java
@@ -0,0 +1,22 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.Building;
+import com.fzzy.async.fzzy35.entity.MContract;
+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 Fzzy35Sync1103Rep extends JpaRepository<MContract, String> {
+
+ /**
+ * 鑾峰彇浠撴埧淇℃伅
+ *
+ * @return
+ */
+ @Query("from Building where deptId=:deptId ")
+ List<Building> listBuilding(@Param("deptId") String deptId);
+}
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Api1101.java b/src/main/java/com/fzzy/push/gd2022/dto/Api1101.java
index 6a82195..4e9f193 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Api1101.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Api1101.java
@@ -7,11 +7,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService11.java b/src/main/java/com/fzzy/push/impl/ComPushService11.java
index 403e048..6cc557a 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService11.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService11.java
@@ -4,9 +4,11 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1101;
+import com.fzzy.api.entity.Api1102;
import com.fzzy.api.entity.Api1111;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1111Rep;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,6 +26,8 @@
@Autowired
private Api1101Rep api1101Rep;
@Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
private Api1111Rep api1111Rep;
/**
@@ -37,7 +41,7 @@
}
param.setInteCategory(Constant.API_CATEGORY_11);
- param.setInteId(Constant.API_CODE_1111);
+ param.setInteId(Constant.API_CODE_1101);
ResponseDto responseDto;
for (Api1101 data : items) {
@@ -53,6 +57,32 @@
}
/**
+ * 1101 搴撳尯淇℃伅
+ */
+ public void pushData1102(ApiRemoteService apiRemoteService, ApiParam param) {
+
+ List<Api1102> items = api1102Rep.findPushData(param.getKqdm());
+ if (null == items || items.isEmpty()) {
+ return;
+ }
+
+ param.setInteCategory(Constant.API_CATEGORY_11);
+ param.setInteId(Constant.API_CODE_1102);
+
+ ResponseDto responseDto;
+ for (Api1102 data : items) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ api1102Rep.updateStatus(data.getDwdm(), Constant.CZBZ_U);
+ }
+ }
+ }
+ }
+
+ /**
* 1111 搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
*/
public void pushData1111(ApiRemoteService apiRemoteService, ApiParam param) {
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java
index bb7f07f..49eff43 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java
@@ -1,21 +1,15 @@
package com.fzzy.push.shjdjw2023;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.utils.AESUtils;
-import com.fzzy.api.utils.MyMD5Util;
-import com.fzzy.api.utils.SnowflakeIdWorker;
-import com.fzzy.push.gd2022.dto.GD2022AuthToken;
import com.fzzy.push.gd2022.dto.GD2022ResponseDto;
+import com.fzzy.push.shjdjw2023.dto.ShjdjwRespDto;
import lombok.extern.slf4j.Slf4j;
-
+import org.apache.commons.lang.StringUtils;
import java.io.*;
-import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.util.Map;
-import java.util.UUID;
/**
* 涓婃捣鍢夊畾绾鐩戠骞冲彴-涓婁紶鏁版嵁鏈嶅姟绫�
@@ -32,16 +26,16 @@
* @throws Exception
*/
@SuppressWarnings("resource")
- public static GD2022ResponseDto postPushData(String url, String data , ApiConfs apiConfs) throws Exception {
+ public static ShjdjwRespDto postPushData(String url, String data , ApiConfs apiConfs) throws Exception {
log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------鍙傛暟锛�" + data +"---------");
BufferedReader in = null;
URL urls = new URL(url);
HttpURLConnection connection = null;
OutputStream outputStream = null;
String rs = "";
- GD2022ResponseDto responseDto;
+ ShjdjwRespDto responseDto = null;
try {
- String md = AESUtils.encryptByEcb(data, apiConfs.getPublicKey());
+ String md = AESUtils.encrypt(data, apiConfs.getPublicKey());
log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------瀵嗘枃鍙傛暟锛�" + md +"---------");
connection = (HttpURLConnection) urls.openConnection();
connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
@@ -75,11 +69,17 @@
System.out.println("鍙戠敓寮傚父");
log.error(e.getMessage(),e);
rs = null;
- return new GD2022ResponseDto(99,e.getMessage());
+ return new ShjdjwRespDto(99,e.getMessage());
}
- log.info("---------鎺ュ彛杩斿洖锛�" + rs +"---------");
- responseDto = JSON.parseObject(rs,GD2022ResponseDto.class);
- if(responseDto == null ) return new GD2022ResponseDto(99,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
+ if(StringUtils.isNotEmpty(rs)){
+ rs = rs.replaceAll("\"", "");
+ log.info("---------鎺ュ彛杩斿洖锛岀鏂囷細" + rs +"---------");
+ rs = AESUtils.decrypt(rs, apiConfs.getPublicKey());
+ log.info("---------鎺ュ彛杩斿洖锛岃В鏋愬悗锛�" + rs +"---------");
+ responseDto = JSON.parseObject(rs, ShjdjwRespDto.class);
+ }
+
+ if(responseDto == null ) return new ShjdjwRespDto(99,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
return responseDto;
} finally {
try {
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java
index 6612f42..f116696 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService11.java
@@ -1,21 +1,12 @@
package com.fzzy.push.shjdjw2023;
-import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
-import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.Api1101;
-import com.fzzy.api.entity.Api1109;
-import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
-import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.push.impl.ComPushService11;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.List;
/**
* 涓婃捣鍢夊畾绾鐩戠骞冲彴-鍩虹鏁版嵁涓婁紶
@@ -31,8 +22,6 @@
@Autowired
private ComPushService11 pushService;
- @Autowired
- private Api1101Rep api1101Rep;
@Override
public String getProtocol() {
@@ -43,34 +32,9 @@
public void pushData(ApiParam param) {
log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
- //鍗曚綅淇℃伅
- this.pushData(param);
+ //鑾峰彇搴撳尯淇℃伅锛屾帹閫佷负鍗曚綅淇℃伅
+ pushService.pushData1102(apiRemoteService, param);
log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
-
}
-
- /**
- * 1101 鍗曚綅淇℃伅
- */
- private void pushData1101(ApiParam param) {
- List<Api1101> items = api1101Rep.findPushData(param.getKqdm());
- if (null == items || items.isEmpty()) {
- return;
- }
-
- param.setInteCategory(Constant.API_CATEGORY_11);
- param.setInteId(Constant.API_CODE_1111);
-
- ResponseDto responseDto = apiRemoteService.pushData(param, items);
- if (responseDto.getSuccess() == 0) {
- for (Api1101 data : items) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
- api1101Rep.updateStatus(data.getDwdm(), Constant.CZBZ_U);
- }
-
- }
- }
- }
-
}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index 7fe842e..e6e638a 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -5,18 +5,24 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.Api1101;
+import com.fzzy.api.entity.Api1103;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.RedisUtil;
+import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.Api1103Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.push.gd2022.dto.*;
+import com.fzzy.push.shjdjw2023.dto.ShjdjwApi1101;
import com.fzzy.push.shjdjw2023.dto.ShjdjwReqDto;
+import com.fzzy.push.shjdjw2023.dto.ShjdjwRespDto;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,12 +41,14 @@
@Autowired
private RedisUtil redisUtil;
-
@Autowired
private ApiCommonService apiCommonService;
-
@Autowired
private ApiLogRep apiLogRep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1103Rep api1103Rep;
@Override
@@ -94,14 +102,14 @@
}
Map<String, Object> map = new HashMap<>();
- GD2022ResponseDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, jsonData, conf);
+ ShjdjwRespDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl(), jsonData, conf);
responseDto.setBizId(bizId);
- apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
- apiLog.setResult(responseDto.getMsg());
+ apiLog.setStatus(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
+ apiLog.setResult(responseDto.getDescription());
apiLogRep.save(apiLog);
ResponseDto resd = new ResponseDto();
- resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
- resd.setMsg(responseDto.getMsg());
+ resd.setSuccess(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
+ resd.setMsg(responseDto.getDescription());
//updateGD2022AuthToken(responseDto,conf, token);
return resd;
} catch (Exception e) {
@@ -121,17 +129,40 @@
private String getJsonData(String inteId, Object data, String interfaceId) {
ShjdjwReqDto<Object> dto = new ShjdjwReqDto<>();
dto.setId(getDataId(interfaceId));
+ List<Object> list = new ArrayList<>();
//杞崲灏佽
- if (Constant.API_CODE_1101.equals(inteId)) {
- dto.setData(data);
+ if (Constant.API_CODE_1102.equals(inteId)) {
+ ShjdjwApi1101 shjdjwApi1101 = new ShjdjwApi1101();
+ BeanUtils.copyProperties(data, shjdjwApi1101);
+ //鏌ヨ鍗曚綅淇℃伅
+ List<Api1101> listApi1101 = api1101Rep.findPushData(shjdjwApi1101.getKqdm());
+ Api1101 api1101 = null;
+ if(null != listApi1101 && listApi1101.size() > 0){
+ api1101 = listApi1101.get(0);
+ }
+ if(null != api1101){
+ shjdjwApi1101.setDwmc(api1101.getDwmc());
+ shjdjwApi1101.setKqs(api1101.getKqs());
+ }
+ //鏌ヨ浠撴埧淇℃伅
+ List<Api1103> listApi1103 = api1103Rep.findPushData(shjdjwApi1101.getKqdm());
+ if(null != listApi1103 && listApi1103.size() > 0){
+ for(int i = 0; i < listApi1103.size(); i++){
+ if(i == 0){
+ shjdjwApi1101.setCfmc(listApi1103.get(i).getCfmc());
+ }else {
+ shjdjwApi1101.setCfmc(shjdjwApi1101.getCfmc() + "#" + listApi1103.get(i).getCfmc());
+ }
+ }
+ }
+ //鍗曚綅淇℃伅灏佽
+ list.add(shjdjwApi1101);
} else if (Constant.API_CODE_1202.equals(inteId)) {
-
-
- dto.setData(data);
+ list.add(data);
} else {
- dto.setData(data);
+ list.add(data);
}
-
+ dto.setData(list);
return JSON.toJSONString(dto);
}
@@ -143,7 +174,8 @@
*/
private String getDataId(String inteId) {
switch (inteId) {
- case "1101":
+ case "1102":
+ //鍗曚綅鎺ュ彛缂栫爜
return ShjdjwApiCodeConstant.API_CODE_LS1101;
case "1202":
return ShjdjwApiCodeConstant.API_CODE_LS1302;
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1101.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1101.java
new file mode 100644
index 0000000..921fff9
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1101.java
@@ -0,0 +1,43 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bstek.dorado.annotation.PropertyDef;
+import java.io.Serializable;
+
+/**
+ * @author czt
+ * @date 2023/5/9 19:27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ShjdjwApi1101 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ private String dwmc;
+
+ @PropertyDef(label = "搴撳尯鏁�")
+ private Integer kqs;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜" )
+ private String kqdm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О" )
+ private String kqmc;
+
+ @PropertyDef(label = "浠撴埧鏁�" )
+ private Integer cfs;
+
+ @PropertyDef(label = "浠撴埧鍚嶇О", description = "澶氫釜鐢�#闅斿紑")
+ private String cfmc;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwRespDto.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwRespDto.java
new file mode 100644
index 0000000..fb58f6d
--- /dev/null
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwRespDto.java
@@ -0,0 +1,41 @@
+package com.fzzy.push.shjdjw2023.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 鎺ュ彛杩斿洖
+ * @author czt
+ * @date 2023/5/9 19:27
+ */
+@Data
+public class ShjdjwRespDto<T> implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6714158228489303453L;
+
+
+
+ private int code ;
+
+ private String description;
+
+ private String bizId;
+
+ private T data;
+
+ public ShjdjwRespDto() {
+ }
+
+ public ShjdjwRespDto(int code, String description) {
+ this.code = code;
+ this.description = description;
+ }
+ public ShjdjwRespDto(int code, String description, String bizId) {
+ this.code = code;
+ this.description = description;
+ this.bizId = bizId;
+ }
+}
--
Gitblit v1.9.3