From 8e095a4a2e882e31836e98742bf4f408233bd351 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 九月 2025 10:06:05 +0800
Subject: [PATCH] 上海对农数据接口调整
---
src/main/java/com/fzzy/api/view/repository/Api9112Rep.java | 6
src/main/java/com/fzzy/api/view/Api9111.view.xml | 16 ---
src/main/java/com/fzzy/api/view/pr/Api9110PR.java | 2
src/main/java/com/fzzy/api/view/pr/Api9111PR.java | 2
src/main/java/com/fzzy/api/view/repository/Api9113Rep.java | 6
src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java | 14 ++-
src/main/java/com/fzzy/api/view/repository/Api9111Rep.java | 6
src/main/resources/application-pro.yml | 10 +-
src/main/java/com/fzzy/api/view/Api9116.view.xml | 2
src/main/java/com/fzzy/api/view/repository/Api9116Rep.java | 6
src/main/java/com/fzzy/api/view/repository/Api9115Rep.java | 6
src/main/resources/application-dev.yml | 8 +
src/main/java/com/fzzy/api/view/Api9114.view.xml | 2
src/main/java/com/fzzy/api/view/repository/Api9114Rep.java | 6
src/main/java/com/fzzy/api/view/Api9112.view.xml | 18 ----
src/main/java/com/fzzy/api/view/repository/Api9109Rep.java | 6
src/main/java/com/fzzy/api/view/Api9113.view.xml | 15 ---
src/main/java/com/fzzy/api/view/Api9110.view.xml | 13 --
src/main/java/com/fzzy/api/view/pr/Api9113PR.java | 2
src/main/java/com/fzzy/api/view/pr/Api9114PR.java | 2
src/main/java/com/fzzy/api/view/pr/Api9115PR.java | 2
src/main/java/com/fzzy/api/view/pr/Api9116PR.java | 3
src/main/java/com/fzzy/api/view/repository/Api9110Rep.java | 6
src/main/java/com/fzzy/api/view/pr/Api9112PR.java | 2
src/main/java/com/fzzy/api/view/Api9115.view.xml | 2
src/main/java/com/fzzy/api/view/pr/Api9109PR.java | 2
src/main/java/com/fzzy/api/view/Api9109.view.xml | 22 -----
27 files changed, 63 insertions(+), 124 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/Api9109.view.xml b/src/main/java/com/fzzy/api/view/Api9109.view.xml
index 25358bd..d8e4a5f 100644
--- a/src/main/java/com/fzzy/api/view/Api9109.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api9109.view.xml
@@ -78,20 +78,12 @@
<Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="bizId">
<Property/>
- <Property name="label">涓氬姟id</Property>
- </PropertyDef>
- <PropertyDef name="kqdm">
- <Property/>
- <Property name="label">搴撳尯浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="syncTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍚屾鏃堕棿</Property>
+ <Property name="label">閰嶇疆ID</Property>
</PropertyDef>
</DataType>
<DataType name="dtGBArea">
@@ -442,16 +434,6 @@
<AutoFormElement>
<Property name="name">bizId</Property>
<Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">syncTime</Property>
- <Property name="property">syncTime</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/src/main/java/com/fzzy/api/view/Api9110.view.xml b/src/main/java/com/fzzy/api/view/Api9110.view.xml
index ba32723..15566e2 100644
--- a/src/main/java/com/fzzy/api/view/Api9110.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api9110.view.xml
@@ -58,7 +58,7 @@
<Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="bjw">
@@ -67,11 +67,7 @@
</PropertyDef>
<PropertyDef name="bizId">
<Property/>
- <Property name="label">涓氬姟id</Property>
- </PropertyDef>
- <PropertyDef name="syncTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍚屾鏃堕棿</Property>
+ <Property name="label">閰嶇疆id</Property>
</PropertyDef>
</DataType>
<DataType name="dtGBArea">
@@ -366,11 +362,6 @@
<AutoFormElement>
<Property name="name">bizId</Property>
<Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">syncTime</Property>
- <Property name="property">syncTime</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/src/main/java/com/fzzy/api/view/Api9111.view.xml b/src/main/java/com/fzzy/api/view/Api9111.view.xml
index ce5161d..b8b28c8 100644
--- a/src/main/java/com/fzzy/api/view/Api9111.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api9111.view.xml
@@ -30,7 +30,7 @@
<Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="bjw">
@@ -39,11 +39,7 @@
</PropertyDef>
<PropertyDef name="bizId">
<Property/>
- <Property name="label">涓氬姟id</Property>
- </PropertyDef>
- <PropertyDef name="syncTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍚屾鏃堕棿</Property>
+ <Property name="label">閰嶇疆id</Property>
</PropertyDef>
</DataType>
</Model>
@@ -186,9 +182,6 @@
<DataColumn name="bizId">
<Property name="property">bizId</Property>
</DataColumn>
- <DataColumn name="syncTime">
- <Property name="property">syncTime</Property>
- </DataColumn>
</DataGrid>
<Dialog id="dialogMain">
<Property name="width">1000</Property>
@@ -271,11 +264,6 @@
<AutoFormElement>
<Property name="name">bizId</Property>
<Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">syncTime</Property>
- <Property name="property">syncTime</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/src/main/java/com/fzzy/api/view/Api9112.view.xml b/src/main/java/com/fzzy/api/view/Api9112.view.xml
index da63587..3e991d4 100644
--- a/src/main/java/com/fzzy/api/view/Api9112.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api9112.view.xml
@@ -34,7 +34,7 @@
<Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="bjw">
@@ -43,15 +43,7 @@
</PropertyDef>
<PropertyDef name="bizId">
<Property/>
- <Property name="label">涓氬姟id</Property>
- </PropertyDef>
- <PropertyDef name="kqdm">
- <Property/>
- <Property name="label">搴撳尯浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="syncTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍚屾鏃堕棿</Property>
+ <Property name="label">閰嶇疆id</Property>
</PropertyDef>
</DataType>
</Model>
@@ -195,12 +187,6 @@
</DataColumn>
<DataColumn name="bizId">
<Property name="property">bizId</Property>
- </DataColumn>
- <DataColumn name="kqdm">
- <Property name="property">kqdm</Property>
- </DataColumn>
- <DataColumn name="syncTime">
- <Property name="property">syncTime</Property>
</DataColumn>
</DataGrid>
<Dialog id="dialogMain">
diff --git a/src/main/java/com/fzzy/api/view/Api9113.view.xml b/src/main/java/com/fzzy/api/view/Api9113.view.xml
index 2467a4e..1bcee91 100644
--- a/src/main/java/com/fzzy/api/view/Api9113.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api9113.view.xml
@@ -26,7 +26,7 @@
<Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="bjw">
@@ -35,15 +35,7 @@
</PropertyDef>
<PropertyDef name="bizId">
<Property/>
- <Property name="label">涓氬姟id</Property>
- </PropertyDef>
- <PropertyDef name="kqdm">
- <Property/>
- <Property name="label">搴撳尯浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="syncTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍚屾鏃堕棿</Property>
+ <Property name="label">閰嶇疆id</Property>
</PropertyDef>
</DataType>
</Model>
@@ -175,9 +167,6 @@
</DataColumn>
<DataColumn name="zhgxsj">
<Property name="property">zhgxsj</Property>
- </DataColumn>
- <DataColumn name="syncTime">
- <Property name="property">syncTime</Property>
</DataColumn>
</DataGrid>
<Dialog id="dialogMain">
diff --git a/src/main/java/com/fzzy/api/view/Api9114.view.xml b/src/main/java/com/fzzy/api/view/Api9114.view.xml
index 9fe1c75..92c0fbd 100644
--- a/src/main/java/com/fzzy/api/view/Api9114.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api9114.view.xml
@@ -226,7 +226,7 @@
<Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="bjw">
diff --git a/src/main/java/com/fzzy/api/view/Api9115.view.xml b/src/main/java/com/fzzy/api/view/Api9115.view.xml
index f3e1bc8..c2d0e62 100644
--- a/src/main/java/com/fzzy/api/view/Api9115.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api9115.view.xml
@@ -66,7 +66,7 @@
<Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="bjw">
diff --git a/src/main/java/com/fzzy/api/view/Api9116.view.xml b/src/main/java/com/fzzy/api/view/Api9116.view.xml
index a78fd0b..a3bb665 100644
--- a/src/main/java/com/fzzy/api/view/Api9116.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api9116.view.xml
@@ -94,7 +94,7 @@
<Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="bjw">
diff --git a/src/main/java/com/fzzy/api/view/pr/Api9109PR.java b/src/main/java/com/fzzy/api/view/pr/Api9109PR.java
index f699ff0..a2d9e5a 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api9109PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api9109PR.java
@@ -102,7 +102,7 @@
public String pushData(List<Api9109> items) {
//鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
+ String kqdm = items.get(0).getBizId();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) {
diff --git a/src/main/java/com/fzzy/api/view/pr/Api9110PR.java b/src/main/java/com/fzzy/api/view/pr/Api9110PR.java
index 8b41cdf..b1b45bc 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api9110PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api9110PR.java
@@ -101,7 +101,7 @@
public String pushData(List<Api9110> items) {
//鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
+ String kqdm = items.get(0).getBizId();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) {
diff --git a/src/main/java/com/fzzy/api/view/pr/Api9111PR.java b/src/main/java/com/fzzy/api/view/pr/Api9111PR.java
index c09bcb8..fcb8711 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api9111PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api9111PR.java
@@ -101,7 +101,7 @@
public String pushData(List<Api9111> items) {
//鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
+ String kqdm = items.get(0).getBizId();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) {
diff --git a/src/main/java/com/fzzy/api/view/pr/Api9112PR.java b/src/main/java/com/fzzy/api/view/pr/Api9112PR.java
index 07039e7..9d4d842 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api9112PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api9112PR.java
@@ -101,7 +101,7 @@
public String pushData(List<Api9112> items) {
//鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
+ String kqdm = items.get(0).getBizId();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) {
diff --git a/src/main/java/com/fzzy/api/view/pr/Api9113PR.java b/src/main/java/com/fzzy/api/view/pr/Api9113PR.java
index e34ee47..7d147c0 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api9113PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api9113PR.java
@@ -101,7 +101,7 @@
public String pushData(List<Api9113> items) {
//鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
+ String kqdm = items.get(0).getBizId();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) {
diff --git a/src/main/java/com/fzzy/api/view/pr/Api9114PR.java b/src/main/java/com/fzzy/api/view/pr/Api9114PR.java
index af32400..8555d4a 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api9114PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api9114PR.java
@@ -167,7 +167,7 @@
public String pushData(List<Api9114> items) {
//鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
+ String kqdm = items.get(0).getBizId();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) {
diff --git a/src/main/java/com/fzzy/api/view/pr/Api9115PR.java b/src/main/java/com/fzzy/api/view/pr/Api9115PR.java
index 3bc473c..01c599c 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api9115PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api9115PR.java
@@ -170,7 +170,7 @@
public String pushData(List<Api9115> items) {
//鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
+ String kqdm = items.get(0).getBizId();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) {
diff --git a/src/main/java/com/fzzy/api/view/pr/Api9116PR.java b/src/main/java/com/fzzy/api/view/pr/Api9116PR.java
index c1d205f..44aeb04 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api9116PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api9116PR.java
@@ -8,7 +8,6 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api9116;
-import com.fzzy.api.entity.Api9116;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -169,7 +168,7 @@
public String pushData(List<Api9116> items) {
//鑾峰彇閰嶇疆
- String kqdm = items.get(0).getKqdm();
+ String kqdm = items.get(0).getBizId();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) {
diff --git a/src/main/java/com/fzzy/api/view/repository/Api9109Rep.java b/src/main/java/com/fzzy/api/view/repository/Api9109Rep.java
index dda78f3..d5453f9 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api9109Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api9109Rep.java
@@ -35,11 +35,11 @@
/**
* 鍗曚綅淇℃伅
- * @param kqdm
+ * @param bizId
* @return
*/
- @Query("from Api9109 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
- List<Api9109> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Api9109 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api9109> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end);
/**
* 鍗曚綅淇℃伅
diff --git a/src/main/java/com/fzzy/api/view/repository/Api9110Rep.java b/src/main/java/com/fzzy/api/view/repository/Api9110Rep.java
index 27ca50f..9dcabc0 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api9110Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api9110Rep.java
@@ -35,11 +35,11 @@
/**
* 鍗曚綅淇℃伅
- * @param kqdm
+ * @param bizId
* @return
*/
- @Query("from Api9110 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
- List<Api9110> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Api9110 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api9110> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end);
/**
* 鍗曚綅淇℃伅
diff --git a/src/main/java/com/fzzy/api/view/repository/Api9111Rep.java b/src/main/java/com/fzzy/api/view/repository/Api9111Rep.java
index c55bf3a..8e4459a 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api9111Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api9111Rep.java
@@ -35,11 +35,11 @@
/**
* 鏍规嵁浠撴埧浠ｇ爜鏌ヨ
- * @param kqdm
+ * @param bizId
* @return
*/
- @Query("from Api9111 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
- List<Api9111> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Api9111 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api9111> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end);
/**
* 鏍规嵁浠撴埧浠ｇ爜鏌ヨ
diff --git a/src/main/java/com/fzzy/api/view/repository/Api9112Rep.java b/src/main/java/com/fzzy/api/view/repository/Api9112Rep.java
index 4e7e59e..f86d6e5 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api9112Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api9112Rep.java
@@ -35,11 +35,11 @@
/**
* 鍗曚綅淇℃伅
- * @param kqdm
+ * @param bizId
* @return
*/
- @Query("from Api9112 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
- List<Api9112> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Api9112 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api9112> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end);
/**
* 鍗曚綅淇℃伅
diff --git a/src/main/java/com/fzzy/api/view/repository/Api9113Rep.java b/src/main/java/com/fzzy/api/view/repository/Api9113Rep.java
index 3ab6153..e67b522 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api9113Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api9113Rep.java
@@ -35,11 +35,11 @@
/**
* 鍗曚綅淇℃伅
- * @param kqdm
+ * @param bizId
* @return
*/
- @Query("from Api9113 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
- List<Api9113> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Api9113 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api9113> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end);
@Query("from Api9113 where hwdm =:hwdm ")
diff --git a/src/main/java/com/fzzy/api/view/repository/Api9114Rep.java b/src/main/java/com/fzzy/api/view/repository/Api9114Rep.java
index 8a36b62..1aeba1f 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api9114Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api9114Rep.java
@@ -40,11 +40,11 @@
/**
* 鍗曚綅淇℃伅
- * @param kqdm
+ * @param bizId
* @return
*/
- @Query("from Api9114 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
- List<Api9114> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Api9114 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api9114> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end);
@Query("from Api9114 where rkywdh =:rkywdh ")
Api9114 findData(@Param("rkywdh") String rkywdh);
diff --git a/src/main/java/com/fzzy/api/view/repository/Api9115Rep.java b/src/main/java/com/fzzy/api/view/repository/Api9115Rep.java
index c6768e9..e881dd5 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api9115Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api9115Rep.java
@@ -31,10 +31,10 @@
/**
* 鍗曚綅淇℃伅
- * @param kqdm
+ * @param bizId
* @return
*/
- @Query("from Api9115 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
- List<Api9115> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Api9115 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api9115> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api9116Rep.java b/src/main/java/com/fzzy/api/view/repository/Api9116Rep.java
index 9945fe0..5015a01 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api9116Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api9116Rep.java
@@ -37,11 +37,11 @@
/**
* 鍗曚綅淇℃伅
- * @param kqdm
+ * @param bizId
* @return
*/
- @Query("from Api9116 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
- List<Api9116> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+ @Query("from Api9116 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api9116> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end);
/**
* 鍗曚綅淇℃伅
diff --git a/src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java b/src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java
index 3b476f3..198737c 100644
--- a/src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java
+++ b/src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java
@@ -60,7 +60,7 @@
return;
}
for (Api9109 apiData : list) {
- apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setBizId(apiConfs.getKqdm());
apiData.setZhgxsj(new Date());
api9109Rep.save(apiData);
}
@@ -78,6 +78,7 @@
return;
}
for (Api9110 apiData : list) {
+ apiData.setBizId(apiConfs.getKqdm());
apiData.setZhgxsj(new Date());
api9110Rep.save(apiData);
}
@@ -95,6 +96,7 @@
return;
}
for (Api9111 apiData : list) {
+ apiData.setBizId(apiConfs.getKqdm());
apiData.setZhgxsj(new Date());
api9111Rep.save(apiData);
}
@@ -112,7 +114,7 @@
return;
}
for (Api9112 apiData : list) {
- apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setBizId(apiConfs.getKqdm());
apiData.setZhgxsj(new Date());
api9112Rep.save(apiData);
}
@@ -130,7 +132,7 @@
return;
}
for (Api9113 apiData : list) {
- apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setBizId(apiConfs.getKqdm());
apiData.setZhgxsj(new Date());
api9113Rep.save(apiData);
}
@@ -148,7 +150,7 @@
return;
}
for (Api9114 apiData : list) {
- apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setBizId(apiConfs.getKqdm());
apiData.setZhgxsj(new Date());
api9114Rep.save(apiData);
}
@@ -166,7 +168,7 @@
return;
}
for (Api9115 apiData : list) {
- apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setBizId(apiConfs.getKqdm());
apiData.setZhgxsj(new Date());
api9115Rep.save(apiData);
}
@@ -184,7 +186,7 @@
return;
}
for (Api9116 apiData : list) {
- apiData.setKqdm(apiConfs.getKqdm());
+ apiData.setBizId(apiConfs.getKqdm());
apiData.setZhgxsj(new Date());
api9116Rep.save(apiData);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 52331f3..ac3ea88 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,7 +6,7 @@
#涓绘暟鎹簮
primary:
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
- url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瀹佸鐭冲槾灞�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞挎境
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
@@ -32,14 +32,15 @@
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5348?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢姹曞ご娼崡
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5349_sx?useUnicode=true&useSSL=false&characterEncoding=utf-8 #闄曡タ鏌炴按鍘�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5352?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄鍐烽摼-澶╂鼎澧炲煄搴�
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄鍐烽摼-澶╂鼎澧炲煄搴�
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢涓滈儴绮补
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5362?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢娴蜂赴
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
- url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瀹佸鐭冲槾灞�
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞挎境
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
@@ -52,6 +53,7 @@
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5349?useUnicode=true&useSSL=false&characterEncoding=utf-8 #闄曡タ鏌炴按鍘�
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5352?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄鍐烽摼-澶╂鼎澧炲煄搴�
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄-涓滈儴绮补涓績搴�
+ url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5362?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢娴蜂赴
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index fcd2e16..eb88f33 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 骞夸笢娴蜂赴鍘� C-鐩� pro ##########################
+########################## 涓婃捣鍢夊畾 -C鐩� pro ##########################
server:
port: 8090
jetty:
@@ -9,13 +9,13 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://192.168.200.3:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
@@ -39,7 +39,7 @@
# Redis鐩稿叧閰嶇疆
redis:
database: 1
- host: 127.0.0.1
+ host: 192.168.200.3
port: 6379
password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -51,7 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5362
+ companyId: 5303
file-path: C:/IGDS-API/FILE/
img-path: C:/IGDS/FILE/
# 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
--
Gitblit v1.9.3