From 92be463c5a038062c42d758a6e18be62955007a7 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 02 十一月 2023 20:35:17 +0800
Subject: [PATCH] 优化上海接口-调整视频信息等
---
src/main/java/com/fzzy/api/entity/Api1308.java | 66 ++++--
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java | 2
src/main/java/com/fzzy/api/entity/Api1108.java | 9
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java | 54 +++--
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1108Rep.java | 5
src/main/java/com/fzzy/api/view/pr/Api1108PR.java | 1
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java | 20 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java | 22 +-
src/main/java/com/fzzy/api/entity/Api1307.java | 55 +++--
src/main/java/com/fzzy/api/view/Api1308.view.xml | 27 +++
src/main/java/com/fzzy/api/entity/Api1112.java | 4
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 58 +++---
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1107Rep.java | 4
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DeptDevice.java | 26 --
src/main/java/com/fzzy/api/entity/Api1107.java | 6
src/main/java/com/fzzy/api/view/repository/Api1112Rep.java | 4
src/main/java/com/fzzy/api/view/Api1307.view.xml | 27 +++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java | 10
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 21 +-
/dev/null | 19 --
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java | 6
src/main/java/com/fzzy/async/fzzy40/entity/Fz40OAStaff.java | 26 +-
src/main/java/com/fzzy/api/view/repository/Api1108Rep.java | 3
src/main/java/com/fzzy/api/entity/Api1309.java | 20 +-
src/main/java/com/fzzy/api/view/repository/Api1107Rep.java | 4
25 files changed, 280 insertions(+), 219 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1107.java b/src/main/java/com/fzzy/api/entity/Api1107.java
index 37a2c0f..60d171c 100644
--- a/src/main/java/com/fzzy/api/entity/Api1107.java
+++ b/src/main/java/com/fzzy/api/entity/Api1107.java
@@ -68,7 +68,7 @@
@PropertyDef(label = "鐢熶骇鏃ユ湡" )
@JSONField(format = "yyyy-MM-dd")
- @Column(name = "scrq", nullable = false)
+ @Column(name = "scrq")
private Date scrq;
@PropertyDef(label = "璁惧鎻忚堪" )
@@ -81,7 +81,7 @@
@PropertyDef(label = "妫�瀹氭椂闂�" )
@JSONField(format = "yyyy-MM-dd")
- @Column(name = "jdsj", nullable = false)
+ @Column(name = "jdsj")
private Date jdsj;
@PropertyDef(label = "妫�瀹氬崟浣�" )
@@ -94,7 +94,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
diff --git a/src/main/java/com/fzzy/api/entity/Api1108.java b/src/main/java/com/fzzy/api/entity/Api1108.java
index a49e5d8..5f1b3cd 100644
--- a/src/main/java/com/fzzy/api/entity/Api1108.java
+++ b/src/main/java/com/fzzy/api/entity/Api1108.java
@@ -92,12 +92,13 @@
private String czclfs;
@PropertyDef(label = "淇濊川鏈�")
- @Column(name = "bzq", length = 40)
- private String bzq;
+ @Column(name = "bzq")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date bzq;
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
- @Column(name = "cgrq", nullable = false)
+ @Column(name = "cgrq")
private Date cgrq;
@PropertyDef(label = "搴撳瓨鏁伴噺")
@@ -114,7 +115,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1112.java b/src/main/java/com/fzzy/api/entity/Api1112.java
index 97d7f3f..d79288f 100644
--- a/src/main/java/com/fzzy/api/entity/Api1112.java
+++ b/src/main/java/com/fzzy/api/entity/Api1112.java
@@ -109,7 +109,7 @@
@PropertyDef(label = "鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿" )
@JSONField(format = "yyyy-MM-dd")
- @Column(name = "qdzgzchzyzgsj", nullable = false)
+ @Column(name = "qdzgzchzyzgsj")
private Date qdzgzchzyzgsj;
@PropertyDef(label = "瀛﹀巻" )
@@ -126,7 +126,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
diff --git a/src/main/java/com/fzzy/api/entity/Api1307.java b/src/main/java/com/fzzy/api/entity/Api1307.java
index b4712db..4222665 100644
--- a/src/main/java/com/fzzy/api/entity/Api1307.java
+++ b/src/main/java/com/fzzy/api/entity/Api1307.java
@@ -30,6 +30,8 @@
*/
private static final long serialVersionUID = 1L;
+
+ /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
@Id
@JSONField(serialize = false)
@Column(name = "ID_", length = 40)
@@ -40,56 +42,69 @@
@Column(name = "bizId", length = 40)
private String bizId;
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鏂囦欢鍦板潃")
+ @Column(name = "wjdz")
+ private String wjdz;
+
+ /*----------鍥芥爣瀛楁----------*/
@PropertyDef(label = "搴撳尯浠ｇ爜")
@Column(name = "kqdm", length = 21)
private String kqdm;
@PropertyDef(label = "瑙嗛鐩戞帶璁惧id" )
- @Column(name = "spjksbid", length = 20, nullable = false)
+ @Column(name = "spjksbid", length = 20)
private String spjksbid;
@PropertyDef(label = "浠撴埧浠ｇ爜" )
- @Column(name = "cfdm", length = 25, nullable = false)
+ @Column(name = "cfdm", length = 25)
private String cfdm;
@PropertyDef(label = "璐т綅浠ｇ爜" )
- @Column(name = "hwdm", length = 30, nullable = false)
+ @Column(name = "hwdm", length = 30)
private String hwdm;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鎶撴媿鏃堕棿" )
- @Column(name = "zpsj", nullable = false)
+ @Column(name = "zpsj")
private Date zpsj;
-
- @PropertyDef(label = "鏂囦欢id")
- @Column(name = "fileStorageId", length = 20)
- private String fileStorageId;
-
- @PropertyDef(label = "鍥惧儚鏂囦欢鍚庣紑鍚�")
- @Column(name = "txwjhzm", length = 5)
- private String txwjhzm;
@PropertyDef(label = "浠撳唴鍥惧儚鏂囦欢娴�" )
@Column(name = "cntxwjl", length = 512)
private String cntxwjl;
+ @PropertyDef(label = "鍥惧儚鏂囦欢鍚庣紑鍚�")
+ @Column(name = "txwjhzm", length = 5)
+ private String txwjhzm;
+
@JSONField(name="Yzwbh")
@PropertyDef(label = "棰勭疆浣嶇紪鍙�" )
- @Column(name = "yzwbh", length = 32, nullable = false)
+ @Column(name = "yzwbh", length = 32)
private String yzwbh;
- @PropertyDef(label = "鏂囦欢鍦板潃")
- @Column(name = "wjdz")
- @JSONField(serialize = false)
- private String wjdz;
-
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
+
+ /*----------骞夸笢鐪佸钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "鏂囦欢id")
+ @Column(name = "fileStorageId", length = 20)
+ private String fileStorageId;
+
+
+ /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ @Column(name = "ajdh", length = 28)
+ private String ajdh;
+
+ @PropertyDef(label = "鍥惧儚缂栧彿", description = "鏂囦欢淇℃伅鎺ュ彛涓殑鏂囦欢鍚嶇О")
+ @Column(name = "txbh", length = 100)
+ private String txbh;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/api/entity/Api1308.java b/src/main/java/com/fzzy/api/entity/Api1308.java
index e43284f..3f45422 100644
--- a/src/main/java/com/fzzy/api/entity/Api1308.java
+++ b/src/main/java/com/fzzy/api/entity/Api1308.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -24,22 +23,34 @@
*/
private static final long serialVersionUID = 1L;
+ /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
@Id
@JSONField(serialize = false)
@Column(name = "ID_", length = 40)
private String id;
+ @PropertyDef(label = "鏂囦欢鍦板潃")
+ @Column(name = "wjdz")
+ @JSONField(serialize = false)
+ private String wjdz;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+ /*----------鍥芥爣瀛楁----------*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍛婅鏃堕棿" )
- @Column(name = "gjsj", nullable = false)
+ @Column(name = "gjsj")
private Date gjsj;
@PropertyDef(label = "搴撳尯鍚嶇О" )
- @Column(name = "kqmc", length = 64, nullable = false)
+ @Column(name = "kqmc", length = 64)
private String kqmc;
@PropertyDef(label = "搴撳尯浠ｇ爜" )
- @Column(name = "kqdm", length = 21, nullable = false)
+ @Column(name = "kqdm", length = 21)
private String kqdm;
@PropertyDef(label = "搴撳尯鍦板潃" )
@@ -47,11 +58,11 @@
private String kqdz;
@PropertyDef(label = "瑙嗛鐩戞帶璁惧id" )
- @Column(name = "spjksbid", length = 20, nullable = false)
+ @Column(name = "spjksbid", length = 20)
private String spjksbid;
@PropertyDef(label = "瀹夎浣嶇疆绫诲瀷" )
- @Column(name = "azwzlx", length = 2, nullable = false)
+ @Column(name = "azwzlx", length = 2)
private String azwzlx;
@PropertyDef(label = "鐩戣鍖哄煙璇存槑" )
@@ -59,38 +70,41 @@
private String jsqysm;
@PropertyDef(label = "寮傚父鍛婅璇存槑" )
- @Column(name = "ycgjsm", length = 1024, nullable = false)
+ @Column(name = "ycgjsm", length = 1024)
private String ycgjsm;
- @PropertyDef(label = "鏂囦欢id")
- @Column(name = "fileStorageId", length = 20)
- private String fileStorageId;
+ @PropertyDef(label = "瑙嗛鏂囦欢娴�" )
+ @Column(name = "spwjl", length = 1024)
+ private String spwjl;
@PropertyDef(label = "瑙嗛鏂囦欢鍚庣紑鍚�")
@Column(name = "spwjhzm", length = 5)
private String spwjhzm;
- @PropertyDef(label = "瑙嗛鏂囦欢娴�" )
- @Column(name = "spwjl", length = 1024, nullable = false)
- private String spwjl;
-
- @PropertyDef(label = "鏂囦欢鍦板潃")
- @Column(name = "wjdz")
- @JSONField(serialize = false)
- private String wjdz;
-
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "涓氬姟id")
- @Column(name = "bizId", length = 40)
- private String bizId;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
+ /*----------骞夸笢鐪佸钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "鏂囦欢id")
+ @Column(name = "fileStorageId", length = 20)
+ private String fileStorageId;
+
+ /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ @Column(name = "hwdm", length = 30)
+ private String hwdm;
+
+ @PropertyDef(label = "鍥惧儚缂栧彿", description = "鏂囦欢淇℃伅鎺ュ彛涓殑鏂囦欢鍚嶇О")
+ @Column(name = "txbh", length = 100)
+ private String txbh;
+
+ @PropertyDef(label = "瑙嗛缂栧彿", description = "鏂囦欢淇℃伅鎺ュ彛涓殑鏂囦欢鍚嶇О")
+ @Column(name = "spbh", length = 100)
+ private String spbh;
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1309.java b/src/main/java/com/fzzy/api/entity/Api1309.java
index bc37c37..34b904e 100644
--- a/src/main/java/com/fzzy/api/entity/Api1309.java
+++ b/src/main/java/com/fzzy/api/entity/Api1309.java
@@ -30,20 +30,20 @@
@Id
@PropertyDef(label = "棰勮淇℃伅浠ｇ爜" )
- @Column(name = "yjxxdm", length = 32, nullable = false)
+ @Column(name = "yjxxdm", length = 32)
private String yjxxdm;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "棰勮鍙戝竷鏃堕棿" )
- @Column(name = "fbsj", nullable = false)
+ @Column(name = "fbsj")
private Date fbsj;
@PropertyDef(label = "杩濊涓讳綋绫诲瀷" )
- @Column(name = "wgztlx", length = 2, nullable = false)
+ @Column(name = "wgztlx", length = 2)
private String wgztlx;
@PropertyDef(label = "杩濊鍗曚綅浠ｇ爜" )
- @Column(name = "qydm", length = 21, nullable = false)
+ @Column(name = "qydm", length = 21)
private String qydm;
@PropertyDef(label = "杩濊琛屼负浜�" )
@@ -51,19 +51,19 @@
private String wgxwr;
@PropertyDef(label = "娑夊強搴撶偣" )
- @Column(name = "sjkd", length = 128, nullable = false)
+ @Column(name = "sjkd", length = 128)
private String sjkd;
@PropertyDef(label = "杩濊绫诲瀷" )
- @Column(name = "wglx", length = 2, nullable = false)
+ @Column(name = "wglx", length = 2)
private String wglx;
@PropertyDef(label = "杩濊璇︽儏" )
- @Column(name = "wgqk", length = 512, nullable = false)
+ @Column(name = "wgqk", length = 512)
private String wgqk;
@PropertyDef(label = "褰撳墠澶勭疆鐘舵��" )
- @Column(name = "czzt", length = 2, nullable = false)
+ @Column(name = "czzt", length = 2)
private String czzt;
@PropertyDef(label = "澶勭疆鍐呭" )
@@ -80,12 +80,12 @@
private Date hxczsj;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/api/view/Api1307.view.xml b/src/main/java/com/fzzy/api/view/Api1307.view.xml
index 37d0920..dd538c3 100644
--- a/src/main/java/com/fzzy/api/view/Api1307.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1307.view.xml
@@ -61,6 +61,18 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
+ <PropertyDef name="fileStorageId">
+ <Property></Property>
+ <Property name="label">鏂囦欢id</Property>
+ </PropertyDef>
+ <PropertyDef name="ajdh">
+ <Property></Property>
+ <Property name="label">寤掗棿浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="txbh">
+ <Property></Property>
+ <Property name="label">鍥惧儚缂栧彿</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtParam">
<Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -365,6 +377,21 @@
<Property name="property">kqdm</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fileStorageId</Property>
+ <Property name="property">fileStorageId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajdh</Property>
+ <Property name="property">ajdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">txbh</Property>
+ <Property name="property">txbh</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
diff --git a/src/main/java/com/fzzy/api/view/Api1308.view.xml b/src/main/java/com/fzzy/api/view/Api1308.view.xml
index 34b007d..11d28c5 100644
--- a/src/main/java/com/fzzy/api/view/Api1308.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1308.view.xml
@@ -71,6 +71,18 @@
<Property></Property>
<Property name="label">涓氬姟缂栫爜</Property>
</PropertyDef>
+ <PropertyDef name="hwdm">
+ <Property></Property>
+ <Property name="label">璐т綅浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="txbh">
+ <Property></Property>
+ <Property name="label">鍥惧儚缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="spbh">
+ <Property></Property>
+ <Property name="label">瑙嗛缂栧彿</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtParam">
<Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -385,6 +397,21 @@
<Property name="property">bizId</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">txbh</Property>
+ <Property name="property">txbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spbh</Property>
+ <Property name="property">spbh</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1108PR.java b/src/main/java/com/fzzy/api/view/pr/Api1108PR.java
index e60f022..2dbef74 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1108PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1108PR.java
@@ -56,7 +56,6 @@
Api1108 data = new Api1108();
BeanUtils.copyProperties(entity, data);
- data.setId(data.getBizId().trim());
api1108Rep.save(data);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
index 647ff6a..fe7181f 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
@@ -35,4 +35,8 @@
*/
@Query("from Api1107 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
List<Api1107> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+
+ @Query("from Api1107 where bizId=:bizId ")
+ List<Api1107> getDataByBizId(@Param("bizId") String bizId);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java
index b40f1d1..9f0cca5 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java
@@ -36,4 +36,7 @@
*/
@Query("from Api1108 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
List<Api1108> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+ @Query("from Api1108 where bizId=:bizId ")
+ List<Api1108> getDataByBizId(@Param("bizId") String bizId);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java
index 79e0c65..babc0cd 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java
@@ -30,6 +30,10 @@
@Query("from Api1112 where kqdm=:kqdm")
List<Api1112> findPushData(@Param("kqdm") String kqdm);
+
+ @Query("from Api1112 where bizId=:bizId ")
+ List<Api1112> getDataByBizId(@Param("bizId") String bizId);
+
/**
*
* @param kqdm
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 126b510..54e99b0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -60,35 +60,35 @@
Date start = param.getStart();
Date end = param.getEnd();
- //瀹㈡埛鍚屾
- fzzySync1212.syncData(kqdm, deptId, start, end);
-
- //鍚堝悓鍚屾
- fzzySync1201.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱鍚屾
- fzzySync1202.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱璐ㄦ
- fzzySync1203.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱缁撶畻
- fzzySync1204.syncData(kqdm, deptId, start, end);
- //绮鍑哄簱鍚屾
- fzzySync1205.syncData(kqdm, deptId, start, end);
-
- //绮鍑哄簱缁撶畻
- fzzySync1206.syncData(kqdm, deptId, start, end);
- //绮鎹熺泭
- fzzySync1209.syncData(kqdm, deptId, start, end);
- //鍊掍粨淇℃伅鍚屾
- fzzySync1207.syncData(kqdm, deptId, start, end);
-
- //鍑哄叆搴撴枃浠朵俊鎭悓姝�
- fzzySync1109.syncData(kqdm, deptId, start, end);
-
- //绮搴撳瓨鍚屾
- fzzySync1208.syncData(kqdm, deptId, start, end);
+// //瀹㈡埛鍚屾
+// fzzySync1212.syncData(kqdm, deptId, start, end);
+//
+// //鍚堝悓鍚屾
+// fzzySync1201.syncData(kqdm, deptId, start, end);
+//
+// //绮鍏ュ簱鍚屾
+// fzzySync1202.syncData(kqdm, deptId, start, end);
+//
+// //绮鍏ュ簱璐ㄦ
+// fzzySync1203.syncData(kqdm, deptId, start, end);
+//
+// //绮鍏ュ簱缁撶畻
+// fzzySync1204.syncData(kqdm, deptId, start, end);
+// //绮鍑哄簱鍚屾
+// fzzySync1205.syncData(kqdm, deptId, start, end);
+//
+// //绮鍑哄簱缁撶畻
+// fzzySync1206.syncData(kqdm, deptId, start, end);
+// //绮鎹熺泭
+// fzzySync1209.syncData(kqdm, deptId, start, end);
+// //鍊掍粨淇℃伅鍚屾
+// fzzySync1207.syncData(kqdm, deptId, start, end);
+//
+// //鍑哄叆搴撴枃浠朵俊鎭悓姝�
+// fzzySync1109.syncData(kqdm, deptId, start, end);
+//
+// //绮搴撳瓨鍚屾
+// fzzySync1208.syncData(kqdm, deptId, start, end);
//绮鎬ц川杞彉淇℃伅鍚屾
fzzySync1210.syncData(kqdm, deptId, start, end);
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DeptDevice.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DeptDevice.java
index e8e02f5..5904005 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DeptDevice.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DeptDevice.java
@@ -23,29 +23,17 @@
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID")
- private String id;
-
- @Column(name = "kqdm", length = 40)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String kqdm;
+ @Column(name = "sbbh", length = 20)
+ @PropertyDef(label = "璁惧缂栧彿")
+ private String sbbh;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜", description = "")
private String companyId;
- @Column(name = "dwdm", length = 18)
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String dwdm;
-
- @Column(name = "kqmc", length = 256)
- @PropertyDef(label = "搴撳尯鍚嶇О")
- private String kqmc;
-
- @Column(name = "sbbh", length = 20)
- @PropertyDef(label = "璁惧缂栧彿")
- private String sbbh;
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲簱鍖�")
+ private String deptId;
@Column(name = "sbyqmc", length = 50)
@PropertyDef(label = "璁惧浠櫒鍚嶇О")
@@ -78,7 +66,6 @@
@Column(name = "jdsj")
@PropertyDef(label = "妫�瀹氭椂闂�")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date jdsj;
@Column(name = "jddw", length = 256)
@@ -87,7 +74,6 @@
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏇存柊鏃堕棿")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
index 94ea5ff..0887bf8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Drug.java
@@ -17,20 +17,17 @@
@Data
@Entity
@Table(name = "D_DRUG")
-@IdClass(Fz40DrugKey.class)
public class Fz40Drug implements Serializable {
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鑽墏缂栧彿", description = "搴撳尯浠ｇ爜+涓変綅椤哄簭鍙�")
+ @PropertyDef(label = "鑽墏缂栧彿", description = "閲囪喘鏃ユ湡(yyyyMMdd)+涓変綅椤哄簭鍙�")
private String id;
- @Id
@Column(name = "DEPT_ID_", length = 50)
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String deptId;
- @Id
@Column(name = "cgrq")
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -89,9 +86,10 @@
@PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡")
private String czclfs;
- @Column(name = "bzq", length = 40)
+ @Column(name = "bzq", length = 20)
@PropertyDef(label = "淇濊川鏈�")
- private String bzq;
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date bzq;
// @Column(name = "SPEC_", length = 50)
// @PropertyDef(label = "瑙勬牸璇存槑")
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugKey.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugKey.java
deleted file mode 100644
index cc5cac1..0000000
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugKey.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.fzzy.async.fzzy40.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-public class Fz40DrugKey implements Serializable {
- private String id;
- private String deptId;
- private Date cgrq;
-
- public Fz40DrugKey() {
- super();
- }
-}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40OAStaff.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40OAStaff.java
index f676635..c342266 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40OAStaff.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40OAStaff.java
@@ -25,29 +25,29 @@
public class Fz40OAStaff implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID")
- private String id;
+ @Column(name = "sfzhm", length = 18)
+ @PropertyDef(label = "韬唤璇佸彿鐮�")
+ private String sfzhm;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜", description = "")
private String companyId;
- @Column(name = "dwdm", length = 18)
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String dwdm;
-
- @Column(name = "dwmc", length = 256)
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
+ @Column(name = "DEPT_ID_", length = 20)
+ @PropertyDef(label = "搴撳尯缂栫爜", description = "")
+ private String deptId;
@Column(name = "lsbm", length = 256)
@PropertyDef(label = "闅跺睘閮ㄩ棬", description = "闅跺睘閮ㄩ棬鍚嶇О")
private String lsbm;
@Column(name = "xzqhdm", length = 6)
- @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
private String xzqhdm;
+
+ @Column(name = "xzqhmc", length = 6)
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
+ private String xzqhmc;
@Column(name = "xm", length = 32)
@PropertyDef(label = "濮撳悕")
@@ -56,10 +56,6 @@
@Column(name = "xb", length = 1)
@PropertyDef(label = "鎬у埆")
private String xb;
-
- @Column(name = "sfzhm", length = 18)
- @PropertyDef(label = "韬唤璇佸彿鐮�")
- private String sfzhm;
@Column(name = "rzrq")
@PropertyDef(label = "鍏ヨ亴鏃ユ湡")
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
index 3fb99a6..6b21b93 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
@@ -3,7 +3,6 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1107Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -29,8 +28,6 @@
@Autowired
private ApiLogRep apiLogRep;
@Autowired
- private Api1101Rep api1101Rep;
- @Autowired
private Api1102Rep api1102Rep;
@Autowired
private Api1107Rep api1107Rep;
@@ -55,22 +52,20 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40DeptDevice> list = fzzy40Sync1107Rep.listDecixe(deptId);
+ List<Fz40DeptDevice> list = fzzy40Sync1107Rep.listDevice(deptId);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒拌澶囦俊鎭�------------------");
return;
}
Api1102 api1102 = api1102Rep.findById(kqdm).get();
- Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
Api1107 apiData;
-
+ List<Api1107> api1107List;
for (Fz40DeptDevice sysData : list) {
apiData = new Api1107();
- apiData.setBizId(sysData.getId());
apiData.setSbbh(sysData.getSbbh());
- apiData.setDwdm(api1101.getDwdm());//鍗曚綅浠ｇ爜
+ apiData.setDwdm(api1102.getDwdm());//鍗曚綅浠ｇ爜
apiData.setKqdm(api1102.getKqdm());//搴撳尯浠ｇ爜
apiData.setKqmc(api1102.getKqmc());//搴撳尯鍚嶇О
apiData.setSbyqmc(sysData.getSbyqmc());
@@ -82,8 +77,15 @@
apiData.setSbzt(sysData.getSbzt());
apiData.setJdsj(sysData.getJdsj());
apiData.setJddw(sysData.getJddw());
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setBizId(sysData.getSbbh());
+
+ api1107List = api1107Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1107List || api1107List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1107List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1107Rep.save(apiData);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
index 7101e67..1b2885d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1108.java
@@ -1,21 +1,17 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1101;
-import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1108;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1108Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40Drug;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1108Rep;
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;
@@ -32,8 +28,6 @@
private Fzzy40Sync1108Rep fzzy40Sync1108Rep;
@Autowired
private ApiLogRep apiLogRep;
- @Autowired
- private Api1101Rep api1101Rep;
@Autowired
private Api1102Rep api1102Rep;
@Autowired
@@ -61,40 +55,48 @@
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40Drug> list = fzzy40Sync1108Rep.listDrug(deptId);
+ List<Fz40Drug> list = fzzy40Sync1108Rep.listDrug(deptId, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒拌嵂鍓備俊鎭�------------------");
return;
}
Api1102 api1102 = api1102Rep.findById(kqdm).get();
- Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
Api1108 apiData;
+ List<Api1108> api1108List;
for (Fz40Drug sysData : list) {
apiData = new Api1108();
- apiData.setId(ContextUtil.getUUID());//ID
+ apiData.setId(kqdm + sysData.getId());//ID
apiData.setBizId(sysData.getId());//涓氬姟id
- apiData.setDwdm(api1101.getDwdm());//鍗曚綅浠ｇ爜
+ apiData.setDwdm(api1102.getDwdm());//鍗曚綅浠ｇ爜
apiData.setKqdm(api1102.getKqdm());//搴撳尯浠ｇ爜
apiData.setKqmc(api1102.getKqmc());//搴撳尯鍚嶇О
- apiData.setYjbh(sysData.getId());//鑽墏缂栧彿
+ apiData.setYjbh(kqdm + sysData.getId().substring(8));//鑽墏缂栧彿
apiData.setYjmc(sysData.getName());//鑽墏鍚嶇О
- apiData.setBzw(sysData.getBzw());//鍖呰鐗�
- apiData.setGgxh(sysData.getGgxh());//鍨嬪彿瑙勬牸
- apiData.setAqsysms(sysData.getAqsysms());//瀹夊叏浣跨敤璇存槑涔�
- apiData.setSccj(sysData.getSccj());//鐢熶骇鍘傚
- apiData.setCgly(sysData.getCgly());//閲囪喘鏉ユ簮
- apiData.setCctj(sysData.getCctj());//瀛樺偍鏉′欢
- apiData.setCcdd(sysData.getCcdd());//鍌ㄥ瓨鍦扮偣
- apiData.setBzwclfs(sysData.getBzwclfs());//鍖呰鐗╁鐞嗘柟寮�
- apiData.setCzclfs(sysData.getCzclfs());//娈嬫福澶勭悊鏂瑰紡
- apiData.setBzq(sysData.getBzq());//淇濊川鏈�
- apiData.setCgrq(sysData.getCgrq());//閲囪喘鏃ユ湡
+ apiData.setBzw(StringUtils.isEmpty(sysData.getBzw())?"":sysData.getBzw());//鍖呰鐗�
+ apiData.setGgxh(StringUtils.isEmpty(sysData.getGgxh())?"":sysData.getGgxh());//鍨嬪彿瑙勬牸
+ apiData.setAqsysms(StringUtils.isEmpty(sysData.getAqsysms())?"":sysData.getAqsysms());//瀹夊叏浣跨敤璇存槑涔�
+ apiData.setSccj(StringUtils.isEmpty(sysData.getSccj())?"":sysData.getSccj());//鐢熶骇鍘傚
+ apiData.setCgly(StringUtils.isEmpty(sysData.getCgly())?"":sysData.getCgly());//閲囪喘鏉ユ簮
+ apiData.setCctj(StringUtils.isEmpty(sysData.getCctj())?"":sysData.getCctj());//瀛樺偍鏉′欢
+ apiData.setCcdd(StringUtils.isEmpty(sysData.getCcdd())?"":sysData.getCcdd());//鍌ㄥ瓨鍦扮偣
+ apiData.setBzwclfs(StringUtils.isEmpty(sysData.getBzwclfs())?"":sysData.getBzwclfs());//鍖呰鐗╁鐞嗘柟寮�
+ apiData.setCzclfs(StringUtils.isEmpty(sysData.getCzclfs())?"":sysData.getCzclfs());//娈嬫福澶勭悊鏂瑰紡
+ apiData.setBzq(null == sysData.getBzw()?new Date():sysData.getBzq());//淇濊川鏈�
+ apiData.setCgrq(null == sysData.getBzw()?new Date():sysData.getCgrq());//閲囪喘鏃ユ湡
apiData.setKcsl(sysData.getCount());//搴撳瓨鏁伴噺
- apiData.setKcsldw(sysData.getKcsldw());//搴撳瓨鏁伴噺鍗曚綅
- apiData.setCzbz(Constant.CZBZ_I);//鎿嶄綔鏍囧織
+ apiData.setKcsldw(StringUtils.isEmpty(sysData.getKcsldw())?"":sysData.getKcsldw());//搴撳瓨鏁伴噺鍗曚綅
+
apiData.setZhgxsj(sysData.getUpdateTime());//鏈�鍚庢洿鏂版椂闂�
+ apiData.setBizId(sysData.getId());//涓氬姟id
+
+ api1108List = api1108Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1108List || api1108List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1108List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1108Rep.save(apiData);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
index 908d35d..81f8f2c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
@@ -1,10 +1,7 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1101;
-import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1112;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.Fz40OAStaff;
@@ -12,7 +9,6 @@
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;
@@ -68,13 +64,13 @@
Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
Api1112 apiData;
-
+ List<Api1112> api1112List;
for (Fz40OAStaff sysData : list) {
apiData = new Api1112();
apiData.setDwmc(api1101.getDwmc());
apiData.setDwdm(api1101.getDwdm());
- apiData.setKqdm(api1102.getKqdm());
- apiData.setBizId(sysData.getId());
+ apiData.setKqdm(api1101.getKqdm());
+
apiData.setSfzhm(sysData.getSfzhm());
apiData.setLsbm(sysData.getLsbm());
apiData.setXzqhdm(sysData.getXzqhdm());
@@ -93,8 +89,16 @@
apiData.setQdzgzchzyzgsj(sysData.getQdzgzchzyzgsj());
apiData.setXl(sysData.getXl());
apiData.setZw(sysData.getZw());
- apiData.setCzbz(Constant.CZBZ_I);
+
apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setBizId(sysData.getSfzhm());
+
+ api1112List = api1112Rep.getDataByBizId(apiData.getBizId());
+ if (null == api1112List || api1112List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1112List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1112Rep.save(apiData);
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1107Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1107Rep.java
index efdc3fa..d0e7c34 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1107Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1107Rep.java
@@ -13,6 +13,6 @@
* @Author:YAN
*/
public interface Fzzy40Sync1107Rep extends JpaRepository<Fz40DeptDevice, String> {
- @Query("from Fz40DeptDevice where kqdm=:deptId order by sbbh")
- List<Fz40DeptDevice> listDecixe(@Param("deptId") String deptId);
+ @Query("from Fz40DeptDevice where deptId =:deptId order by sbbh")
+ List<Fz40DeptDevice> listDevice(@Param("deptId") String deptId);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1108Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1108Rep.java
index 0bff8b7..d48f734 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1108Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1108Rep.java
@@ -5,6 +5,7 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
+import java.util.Date;
import java.util.List;
/**
@@ -14,6 +15,6 @@
*/
public interface Fzzy40Sync1108Rep extends JpaRepository<Fz40Drug, String> {
- @Query("from Fz40Drug where deptId=:deptId order by id")
- List<Fz40Drug> listDrug(@Param("deptId") String deptId);
+ @Query("from Fz40Drug where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz40Drug> listDrug(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 90f4825..7d2b360 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -272,7 +272,7 @@
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
api1109.setWjl(JSON.toJSONString(map));
//涓婃捣甯傚钩鍙版枃浠跺悕绉拌鍒欙細搴撳尯缂栫爜_涓氬姟娴佹按鍙穇鍒嗙被鐮乢椤哄簭鐮�.jpg锛屼緥濡傦細91310114703439394M001_142211080101_GL_00.jpg
- api1109.setWjmc(getWjmc(api1109.getWjmc()));
+ api1109.setWjmc(getWjmc(api1109.getWjlx(), api1109.getWjmc()));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1109);
return api1109;
@@ -606,8 +606,6 @@
BeanUtils.copyProperties(apiData, api1307);
api1307.setBjw(ShAreaBjw.getBjw(code));
api1307.setAjdm(apiData.getHwdm().substring(0, 28));
- List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
- api1307.setTxbh(api1109List.get(0).getWjmc());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1307);
@@ -619,9 +617,6 @@
BeanUtils.copyProperties(apiData, api1308);
api1308.setBjw(ShAreaBjw.getBjw(code));
- List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
- api1308.setTxbh(api1109List.get(0).getWjmc());
- api1308.setSpbh(api1109List.get(0).getWjmc());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1308);
@@ -766,12 +761,14 @@
return data;
}
- private String getWjmc(String wjmc){
- if(wjmc.endsWith(".jpg")) {
- wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
- }
- if(wjmc.endsWith(".png")) {
- wjmc = wjmc.replaceAll(".png", "_00.png");
+ private String getWjmc(String wjlx, String wjmc){
+ if("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)){
+ if(wjmc.endsWith(".jpg")) {
+ wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
+ }
+ if(wjmc.endsWith(".png")) {
+ wjmc = wjmc.replaceAll(".png", "_00.png");
+ }
}
return wjmc;
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
index 1651745..df3557b 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
@@ -73,7 +73,7 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
- @PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:鍖虹骇鐩村睘锛�3:绀句細浠撳锛�4:鍏朵粬")
+ @PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:甯傜骇浠ｅ偍锛�3:鍖虹骇鐩村偍锛�4:鍖虹骇浠ｅ偍锛�9锛氬叾浠�")
private String kqsx;
@PropertyDef(label = "搴撳尯鐘舵��")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
index d20b3e8..6fc9366 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
@@ -33,6 +33,9 @@
@PropertyDef(label = "瑙嗛鐩戞帶璁惧id")
private String spjksbid;
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
+
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
@@ -55,9 +58,6 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
-
- @PropertyDef(label = "寤掗棿浠ｇ爜")
- private String ajdm;
@PropertyDef(label = "鏍囪浣�")
private String bjw;
--
Gitblit v1.9.3