From 49c0d402ebd35fb6753e4fab3106d56d76bd802b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 15 九月 2023 14:35:48 +0800
Subject: [PATCH] 3.5版本中加入熏蒸备案同步
---
src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogApply.java | 171 +++++++++++++
src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java | 6
src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogWay.java | 65 +++++
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1023Rep.java | 20 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 2
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogDtlRep.java | 21 +
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1023.java | 186 ++++++++++++++
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogWayRep.java | 19 +
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java | 23
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogPeopleRep.java | 19 +
src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogDtl.java | 146 +++++++++++
src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogPeople.java | 70 +++++
12 files changed, 733 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java b/src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java
index 30d012d..565e0ff 100644
--- a/src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java
+++ b/src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java
@@ -44,11 +44,11 @@
int updateStatus(@Param("id") String id, @Param("data") String data, @Param("czbz") String czbz);
/**
- * 鏍规嵁鎺ュ彛缂栫爜鍜屾暟鎹唴瀹笽D鏌ヨ鏁版嵁
+ * 鏍规嵁搴撳尯浠ｇ爜銆佹帴鍙ｇ紪鐮併�佹暟鎹甶d鏌ヨ
*
* @param inteId
* @return
*/
- @Query("from ApiInfoData where inteId=:inteId and dataId=:dataId ")
- List<ApiInfoData> getDataByInteAndData(@Param("inteId") String inteId, @Param("dataId") String dataId);
+ @Query("from ApiInfoData where inteId=:inteId and dataId=:dataId and kqdm=:kqdm")
+ List<ApiInfoData> getDataByInteAndData(@Param("inteId") String inteId, @Param("dataId") String dataId, @Param("kqdm") String kqdm);
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
index 91c5aa1..30a75db 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService13.java
@@ -1,12 +1,11 @@
package com.fzzy.async.fzzy35;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService13;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1302;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1303;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1304;
-import com.fzzy.async.fzzy35.impl.Fzzy35Sync1310;
+import com.fzzy.async.fzzy35.impl.*;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,6 +24,8 @@
private Fzzy35Sync1304 fzzySync1304;
@Autowired
private Fzzy35Sync1310 fzzySync1310;
+ @Autowired
+ private Fzzy35Sync1023 fzzySync1023;
@Override
@@ -47,13 +48,13 @@
//璐ㄦ鍚屾
fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
-// /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
-// if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_GD_2022.getCode().equals(param.getPushProtocol())) {
-// //骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭�
-// //鐔忚捀澶囨鏁版嵁鍚屾
-// fzzySync1023.syncData(param.getDeptId(), param.getStart(), param.getEnd());
-//
-// }
+ /*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
+ if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_GD_2022.getCode().equals(param.getPushProtocol())) {
+ //骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭�
+ //鐔忚捀澶囨鏁版嵁鍚屾
+ fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+
+ }
//
// //閫氶浣滀笟淇℃伅鍚屾
// fzzySync1305.syncData(param.getDeptId(), param.getStart(), param.getEnd());
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogApply.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogApply.java
new file mode 100644
index 0000000..f9b1a4f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogApply.java
@@ -0,0 +1,171 @@
+package com.fzzy.async.fzzy35.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fzzy.async.fzzy40.entity.Fz40DrugLogDtl;
+import com.fzzy.async.fzzy40.entity.Fz40DrugLogPeople;
+import com.fzzy.async.fzzy40.entity.Fz40DrugLogWay;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨涓昏〃淇℃伅
+ *
+ * @author czt
+ */
+@Entity
+@Data
+@Table(name = "D_DRUG_LOG_APPLY")
+public class Fz35DrugLogApply implements Serializable {
+
+ @Id
+ @Column(name = "xzbm", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = " yyyyMMdd + 4浣嶉『搴忓彿")
+ private String xzbm;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @Column(name = "dwdm", length = 18)
+ @PropertyDef(label = "鍗曚綅浠ｇ爜", description = "浼佷笟淇＄敤浠ｇ爜")
+ private String dwdm;
+
+ @Column(name = "sqxzrq")
+ @PropertyDef(label = "鐢宠鐔忚捀鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date sqxzrq;
+
+ @Column(name = "fzr", length = 20)
+ @PropertyDef(label = "璐熻矗浜�")
+ private String fzr;
+
+ @Column(name = "fzrdh", length = 11)
+ @PropertyDef(label = "璐熻矗浜虹數璇�")
+ private String fzrdh;
+
+ @Column(name = "xcfzr", length = 20)
+ @PropertyDef(label = "鐜板満璐熻矗浜�")
+ private String xcfzr;
+
+ @Column(name = "fzrzw", length = 10)
+ @PropertyDef(label = "鐜板満璐熻矗浜鸿亴鍔�")
+ private String xcfzrzw;
+
+ @Column(name = "xcfzrdh", length = 11)
+ @PropertyDef(label = "鐜板満璐熻矗浜虹數璇�")
+ private String xcfzrdh;
+
+ @Column(name = "tbr", length = 20)
+ @PropertyDef(label = "濉〃浜�")
+ private String tbr;
+
+ @Column(name = "tbrdh", length = 11)
+ @PropertyDef(label = "濉〃浜虹數璇�")
+ private String tbrdh;
+
+ @Column(name = "sfszjjxd", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(涓�)", description = "鏄垨鍚�")
+ private String sfszjjxd;
+
+ @Column(name = "sfszjjxx", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(瑗�)", description = "鏄垨鍚�")
+ private String sfszjjxx;
+
+ @Column(name = "sfszjjxn", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(鍗�)", description = "鏄垨鍚�")
+ private String sfszjjxn;
+
+ @Column(name = "sfszjjxb", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(鍖�)", description = "鏄垨鍚�")
+ private String sfszjjxb;
+
+ @Column(name = "ssxzzystqybqk", length = 1024)
+ @PropertyDef(label = "瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�")
+ private String ssxzzystqybqk;
+
+ @Column(name = "xzssgcap", length = 1024)
+ @PropertyDef(label = "鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�")
+ private String xzssgcap;
+
+ @Column(name = "aqfhjyjcccs", length = 1024)
+ @PropertyDef(label = "瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�")
+ private String aqfhjyjcccs;
+
+ @Column(name = "xzzysx", length = 1024)
+ @PropertyDef(label = "鐔忚捀娉ㄦ剰浜嬮」")
+ private String xzzysx;
+
+ @Column(name = "FILE_STORAGE_ID_", length = 19)
+ @PropertyDef(label = "鏂囦欢瀛樺偍ID")
+ private String fileStorageId;
+
+ @Column(name = "DRUG_NAME_", length = 64)
+ @PropertyDef(label = "鑽墏鍚嶇О")
+ private String drugName;
+
+ @Column(name = "DRUG_TYPE_", length = 10)
+ @PropertyDef(label = "鑽墏绫诲瀷/鍨嬪彿")
+ private String drugType;
+
+ @Column(name = "yjyxqz")
+ @PropertyDef(label = "鑽墏鏈夋晥鏈熻嚦")
+ private Date yjyxqz;
+
+ @Column(name = "lqsl", precision = 20, scale = 3)
+ @PropertyDef(label = "棰嗗彇鏁伴噺", description = "鍏枻")
+ private Double lqsl;
+
+ @Column(name = "sysbjfs", length = 20)
+ @PropertyDef(label = "鏂借嵂璁惧鍙婃柟寮�")
+ private String sysbjfs;
+
+ @Column(name = "zcdd", length = 30)
+ @PropertyDef(label = "鏆傚瓨鍦扮偣")
+ private String zcdd;
+
+ @Column(name = "lqr", length = 20)
+ @PropertyDef(label = "棰嗗彇浜�")
+ private String lqr;
+
+ @Column(name = "lqsj")
+ @PropertyDef(label = "棰嗗彇鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date lqsj;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ /**
+ * 鍌ㄧ伯绮儏鏄庣粏琛�
+ */
+ @Transient
+ private List<Fz40DrugLogDtl> drugLogDtls;
+
+ /**
+ * 鐔忚捀澶囨鏂瑰紡
+ */
+ @Transient
+ private List<Fz40DrugLogWay> drugLogWays;
+
+ /**
+ * 鐔忚捀浣滀笟浜哄憳
+ */
+ @Transient
+ private List<Fz40DrugLogPeople> drugLogPeople;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogDtl.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogDtl.java
new file mode 100644
index 0000000..6287ebb
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogDtl.java
@@ -0,0 +1,146 @@
+package com.fzzy.async.fzzy35.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁嗚〃
+ *
+ * @Author:YAN
+ */
+@Entity
+@Data
+@Table(name = "D_DRUG_LOG_DTL")
+public class Fz35DrugLogDtl implements Serializable {
+
+ @Id
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
+
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "id")
+ @JSONField
+ private String id;
+
+ @Column(name = "DRUG_LOG_ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @JSONField
+ private String drugLogId;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @JSONField
+ private String deptId;
+
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
+ private String depotId;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "NUMBER_", precision = 20, scale = 3)
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬惃")
+ private Double number = 0.0;
+
+ @Column(name = "PER_WET_", precision = 20, scale = 3)
+ @PropertyDef(label = "姘村垎", description = "鍗曚綅锛�%")
+ private Double perWet;
+
+ @Column(name = "PER_IMPURITY_", precision = 20, scale = 3)
+ @PropertyDef(label = "鏉傝川", description = "鍗曚綅锛�%")
+ private Double perImpurity;
+
+ @Column(name = "lw", precision = 20, scale = 3)
+ @PropertyDef(label = "绮俯")
+ private Double lw;
+
+ @Column(name = "cw", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撴俯")
+ private Double cw;
+
+ @Column(name = "cnsd", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撳唴婀垮害")
+ private Double cnsd;
+
+ @Column(name = "clfs", length = 1)
+ @PropertyDef(label = "瀛樼伯鏂瑰紡", description = "1锛氭暎瑁呭偍绮�;2锛氬寘瑁�;3锛氬洿鍖呮暎瀛�;9锛氬叾浠�")
+ private String clfs;
+
+ @Column(name = "rkrq")
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date rkrq;
+
+ @Column(name = "hc", length = 30)
+ @PropertyDef(label = "瀹宠櫕")
+ private String hc;
+
+ @Column(name = "cldjpd", length = 3)
+ @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾")
+ private String cldjpd;
+
+ @Column(name = "ldtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢浣撶Н", description = "m鲁")
+ private Double ldtj;
+
+ @Column(name = "kjtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿浣撶Н", description = "m鲁")
+ private Double kjtj;
+
+ @Column(name = "lddwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�")
+ private Double lddwyyl;
+
+ @Column(name = "kjdwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�")
+ private Double kjdwyyl;
+
+ @Column(name = "zyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "鎬荤敤鑽噺")
+ private Double zyyl;
+ /**
+ * 浠撴埧姘斿瘑鎬т互 500 Pa 鐨勫帇鍔涘崐琛� 鏈� t 鍒嗕负鍥涗釜绛夌骇銆�
+ * 1锛� 鈪犵骇锛宼鈮�300s銆�
+ * 2锛� 鈪＄骇锛�120s鈮<300s銆�
+ * 3锛氣參绾э紝40s鈮<120s (骞虫埧浠�) 锛� 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆� 4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+ */
+ @Column(name = "qmx", length = 1)
+ @PropertyDef(label = "姘斿瘑鎬�")
+ private String qmx;
+
+ @Column(name = "jhxzksrq")
+ @PropertyDef(label = "璁″垝鐔忚捀寮�濮嬫棩鏈�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzksrq;
+
+ @Column(name = "jhxzjsrq")
+ @PropertyDef(label = "璁″垝鐔忚捀缁撴潫鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzjsrq;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogPeople.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogPeople.java
new file mode 100644
index 0000000..90f3797
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogPeople.java
@@ -0,0 +1,70 @@
+package com.fzzy.async.fzzy35.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 鐔忚捀浣滀笟浜哄憳淇℃伅琛�
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG_LOG_PEOPLE")
+public class Fz35DrugLogPeople implements Serializable {
+
+ @Id
+ @Column(name = "PEOPLE_ID_", length = 40)
+ @PropertyDef(label = "propleId")
+ private String propleId;
+
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "id")
+ private String id;
+
+ @Column(name = "DRUG_LOG_ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ private String drugLogId;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @Column(name = "mx", length = 20)
+ @PropertyDef(label = "濮撳悕")
+ private String mx;
+
+ @Column(name = "zw", length = 10)
+ @PropertyDef(label = "鑱屽姟")
+ private String zw;
+
+ @Column(name = "zyzg", length = 6)
+ @PropertyDef(label = "鑱屼笟璧勬牸", description = "鍒濈骇/涓骇/楂樼骇")
+ private String zyzg;
+
+ @Column(name = "stzk", length = 10)
+ @PropertyDef(label = "韬綋鐘跺喌")
+ private String stzk;
+
+ @Column(name = "xzrwfg", length = 30)
+ @PropertyDef(label = "鐔忚捀浠诲姟鍒嗗伐")
+ private String xzrwfg;
+
+ @Column(name = "sfwb", length = 2)
+ @PropertyDef(label = "鏄惁澶栧寘", description = "鏄�/鍚�")
+ private String sfwb;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogWay.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogWay.java
new file mode 100644
index 0000000..4ca24b0
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DrugLogWay.java
@@ -0,0 +1,65 @@
+package com.fzzy.async.fzzy35.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 鐔忚捀澶囨鏂瑰紡琛�
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG_LOG_WAY")
+public class Fz35DrugLogWay implements Serializable {
+
+ @Id
+ @Column(name = "WAY_ID_", length = 40)
+ @PropertyDef(label = "wayId")
+ private String wayId;
+
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "id")
+ @JSONField
+ private String id;
+
+ @Column(name = "DRUG_LOG_ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @JSONField
+ private String drugLogId;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @JSONField
+ private String deptId;
+
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @Column(name = "xznd", precision = 20, scale = 3)
+ @PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
+ private Double xznd;
+
+ @Column(name = "mbsj")
+ @PropertyDef(label = "瀵嗛棴鏃堕棿", description = "鍗曚綅锛氬ぉ")
+ private Integer mbsj;
+
+ @Column(name = "xzfs", length = 30)
+ @PropertyDef(label = "鐔忚捀鏂瑰紡")
+ private String xzfs;
+
+ @Column(name = "sqfs", length = 30)
+ @PropertyDef(label = "鏁ｆ皵鏂瑰紡")
+ private String sqfs;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1023.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1023.java
new file mode 100644
index 0000000..9e1e232
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1023.java
@@ -0,0 +1,186 @@
+package com.fzzy.async.fzzy35.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy35.entity.Fz35DrugLogApply;
+import com.fzzy.async.fzzy35.repository.Fzzy35Sync1023Rep;
+import com.fzzy.async.fzzy35.entity.Fz35DrugLogDtl;
+import com.fzzy.async.fzzy35.entity.Fz35DrugLogPeople;
+import com.fzzy.async.fzzy35.entity.Fz35DrugLogWay;
+import com.fzzy.async.fzzy35.repository.Fzzy35SyncDrugLogDtlRep;
+import com.fzzy.async.fzzy35.repository.Fzzy35SyncDrugLogPeopleRep;
+import com.fzzy.async.fzzy35.repository.Fzzy35SyncDrugLogWayRep;
+import com.fzzy.otherview.gd2022.dto.GdApi1023;
+import com.fzzy.otherview.gd2022.dto.GdApi1023Dtl;
+import com.fzzy.otherview.gd2022.dto.GdApi1023People;
+import com.fzzy.otherview.gd2022.dto.GdApi1023Way;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+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.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀澶囨淇℃伅
+ *
+ * @author czt
+ */
+@Slf4j
+@Component
+public class Fzzy35Sync1023 {
+ @Autowired
+ private Fzzy35Sync1023Rep fzzy35Sync1023Rep;
+ @Autowired
+ private Fzzy35SyncDrugLogPeopleRep drugLogPeopleRep;
+ @Autowired
+ private Fzzy35SyncDrugLogWayRep drugLogWayRep;
+ @Autowired
+ private Fzzy35SyncDrugLogDtlRep drugLogDtlRep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+ @Autowired
+ private ApiCommonService commonService;
+
+ /**
+ * 鍚屾鐔忚捀澶囨淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1023鎺ュ彛璁惧淇℃伅寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(ApiCodeConstant.API_1023);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz35DrugLogApply> list = fzzy35Sync1023Rep.listDrugLogApply(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
+ return;
+ }
+
+ GdApi1023 gdApi1023;
+ GdApi1023Way gdApi1023Way;
+ GdApi1023People gdApi1023People;
+ GdApi1023Dtl gdApi1023Dtl;
+
+ List<GdApi1023Dtl> dtlList;
+ List<GdApi1023Way> wayList;
+ List<GdApi1023People> peopleList;
+
+ List<ApiInfoData> apiInfoList;
+ ApiInfoData infoData;
+ Api1105 api1105;
+
+ for (Fz35DrugLogApply data : list) {
+ gdApi1023 = new GdApi1023();
+ BeanUtils.copyProperties(data, gdApi1023);
+ gdApi1023.setXzbm(data.getXzbm().substring(7));
+ gdApi1023.setKqdm(kqdm);
+ gdApi1023.setDwdm(kqdm.substring(0, 18));
+ gdApi1023.setYjmc(data.getDrugName());
+ gdApi1023.setYjlx(data.getDrugType());
+ gdApi1023.setZhgxsj(data.getUpdateTime());
+
+ //鍌ㄧ伯绮儏鏄庣粏琛�
+ List<Fz35DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
+ if (null != dtls && dtls.size() > 0) {
+ dtlList = new ArrayList<>();
+ for (Fz35DrugLogDtl dtl : dtls) {
+ gdApi1023Dtl = new GdApi1023Dtl();
+ BeanUtils.copyProperties(dtl, gdApi1023Dtl);
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(dtl.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ gdApi1023Dtl.setCfdm(api1105.getHwdm().substring(0, 25));
+ gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
+ gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
+ gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
+ gdApi1023Dtl.setLssl(dtl.getNumber());
+ gdApi1023Dtl.setSf(dtl.getPerWet());
+ gdApi1023Dtl.setZz(dtl.getPerImpurity());
+ dtlList.add(gdApi1023Dtl);
+ }
+ gdApi1023.setDtls(dtlList);
+ }
+
+ List<Fz35DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
+ if (null != ways && ways.size() > 0) {
+ wayList = new ArrayList<>();
+ for (Fz35DrugLogWay way : ways) {
+ gdApi1023Way = new GdApi1023Way();
+ BeanUtils.copyProperties(way, gdApi1023Way);
+ wayList.add(gdApi1023Way);
+ }
+
+ gdApi1023.setWays(wayList);
+ }
+
+ List<Fz35DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
+ if (null != peoples && peoples.size() > 0) {
+ peopleList = new ArrayList<>();
+ for (Fz35DrugLogPeople people : peoples) {
+ gdApi1023People = new GdApi1023People();
+ BeanUtils.copyProperties(people, gdApi1023People);
+ peopleList.add(gdApi1023People);
+
+ }
+ gdApi1023.setPeoples(peopleList);
+ }
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ infoData = new ApiInfoData();
+ infoData.setId(ContextUtil.getUUID());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(Constant.API_CATEGORY_13);
+ infoData.setInteId(ApiCodeConstant.API_1023);
+ infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getXzbm());
+
+ apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), kqdm);
+ if (null == apiInfoList || apiInfoList.isEmpty()) {
+ gdApi1023.setCzbz(Constant.CZBZ_I);
+ infoData.setCzbz(Constant.CZBZ_I);
+ } else {
+ gdApi1023.setCzbz(apiInfoList.get(0).getCzbz());
+ infoData.setCzbz(apiInfoList.get(0).getCzbz());
+ }
+
+ infoData.setData(JSON.toJSONString(gdApi1023));
+
+ //淇濆瓨鏁版嵁
+ apiInfoDataRep.save(infoData);
+ log.info("1023---鍚屾鏁版嵁锛歿}", gdApi1023.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---鐔忚捀澶囨淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鐔忚捀澶囨淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1023Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1023Rep.java
new file mode 100644
index 0000000..d065199
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1023Rep.java
@@ -0,0 +1,20 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.Fz35DrugLogApply;
+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;
+
+/**
+ * 鐔忚捀澶囨淇℃伅
+ *
+ * @author czt
+ */
+public interface Fzzy35Sync1023Rep extends JpaRepository<Fz35DrugLogApply, String> {
+
+ //鏌ヨ鐔忚捀澶囨涓昏〃
+ @Query("from Fz35DrugLogApply where deptId =:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz35DrugLogApply> listDrugLogApply(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogDtlRep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogDtlRep.java
new file mode 100644
index 0000000..2d3abae
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogDtlRep.java
@@ -0,0 +1,21 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.Fz35DrugLogDtl;
+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;
+
+/**
+ * 鐔忚捀澶囨瀛愯〃 - 绮儏淇℃伅
+ *
+ * @author czt
+ */
+public interface Fzzy35SyncDrugLogDtlRep extends JpaRepository<Fz35DrugLogDtl, String> {
+
+
+ @Query("from Fz35DrugLogDtl where id =:id")
+ List<Fz35DrugLogDtl> listDrugLogDtl(@Param("id") String id);
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogPeopleRep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogPeopleRep.java
new file mode 100644
index 0000000..14b52ec
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogPeopleRep.java
@@ -0,0 +1,19 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.Fz35DrugLogPeople;
+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;
+
+/**
+ * 璁惧淇℃伅
+ *
+ * @author czt
+ */
+public interface Fzzy35SyncDrugLogPeopleRep extends JpaRepository<Fz35DrugLogPeople, String> {
+
+ @Query("from Fz35DrugLogPeople where id =:id")
+ List<Fz35DrugLogPeople> listDrugLogPeople(@Param("id") String id);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogWayRep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogWayRep.java
new file mode 100644
index 0000000..657848a
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35SyncDrugLogWayRep.java
@@ -0,0 +1,19 @@
+package com.fzzy.async.fzzy35.repository;
+
+import com.fzzy.async.fzzy35.entity.Fz35DrugLogWay;
+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;
+
+/**
+ * 璁惧淇℃伅
+ *
+ * @author czt
+ */
+public interface Fzzy35SyncDrugLogWayRep extends JpaRepository<Fz35DrugLogWay, String> {
+
+ @Query("from Fz35DrugLogWay where id =:id")
+ List<Fz35DrugLogWay> listDrugLogWay(@Param("id") String id);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
index bf00ee8..45b2381 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -77,7 +77,7 @@
List<GdApi1023Way> wayList = new ArrayList<>();
List<GdApi1023People> peopleList = new ArrayList<>();
for (Fz40DrugLogApply data : list) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(),kqdm);
if (apiInfoList.size() != 0) {
continue;
}
--
Gitblit v1.9.3