From 84e6dc37bf0079f14fa4f69e892ece977d8b785f Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 25 十月 2023 12:13:05 +0800
Subject: [PATCH] 类名修改
---
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java | 37 -
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml | 203 ++++------
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java | 23
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml | 10
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java | 56 +-
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java | 42 ++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java | 20
src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java | 18
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml | 203 ++++++----
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java | 23
src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java | 12
/dev/null | 57 ---
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java | 25
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java | 55 +-
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java | 119 ++++++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1112.java | 8
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java | 39 -
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java | 63 ++-
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java | 33 +
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java | 51 --
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java | 38 +
21 files changed, 629 insertions(+), 506 deletions(-)
diff --git a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java
index f645daf..0cf13c4 100644
--- a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java
+++ b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java
@@ -29,11 +29,11 @@
@Autowired
private Fz40ToWhjlSync1105 fz40ToWhjlSync1105;
@Autowired
- private Fz40ToWhjlSync1106 fz40ToWhjlSync1106;
- @Autowired
private Fz40ToWhjlSync1107 fz40ToWhjlSync1107;
@Autowired
- private Fz40ToWhjlSync1111 fz40ToWhjlSync1111;
+ private Fz40ToWhjlSync1108 fz40ToWhjlSync1108;
+ @Autowired
+ private Fz40ToWhjlSync1112 fz40ToWhjlSync1112;
@Override
public String getProtocol() {
@@ -59,11 +59,11 @@
//鍚屾浠撴埧淇℃伅
fz40ToWhjlSync1105.syncData(kqdm, deptId, start, end);
// 鍚屾寤掗棿淇℃伅
- fz40ToWhjlSync1106.syncData(kqdm, deptId, start, end);
- // 鍚屾璐т綅淇℃伅
fz40ToWhjlSync1107.syncData(kqdm, deptId, start, end);
+ // 鍚屾璐т綅淇℃伅
+ fz40ToWhjlSync1108.syncData(kqdm, deptId, start, end);
// 鍚屾浠撳偍璁惧淇℃伅
- fz40ToWhjlSync1111.syncData(kqdm, deptId, start, end);
+ fz40ToWhjlSync1112.syncData(kqdm, deptId, start, end);
}
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java
deleted file mode 100644
index 8f796e0..0000000
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.fzzy.async.whhpjl.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.fzzy.api.Constant;
-import com.fzzy.api.entity.ApiInfoData;
-import com.fzzy.api.entity.ApiLog;
-import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
-import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
-import com.fzzy.otherview.whhpjl.WhjlConstant;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1106;
-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;
-
-/**
- * 寤掗棿淇℃伅
- *
- * @Author:YAN
- */
-@Slf4j
-@Component
-public class Fz40ToWhjlSync1106 {
- @Autowired
- private Fz40ToWhjlSync1106Rep fz40ToWhjlSync1106Rep;
- @Autowired
- private ApiLogRep apiLogRep;
- @Autowired
- private ApiInfoDataRep apiInfoDataRep;
-
- /**
- * 寤掗棿淇℃伅
- *
- * @param kqdm
- * @param deptId
- * @param start
- * @param end
- */
- public void syncData(String kqdm, String deptId, Date start, Date end) {
- log.info("-------------1106鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
-
- //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
- ApiLog apiLog = new ApiLog();
- apiLog.setType(ApiLog.TYPE_SYNC);
- apiLog.setKqdm(deptId);
- apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1106);
- apiLog.setStatus(99);
- apiLog.setId(ContextUtil.getUUID());
-
- try {
- List<Fz40WhjlDefaultGranary> list = fz40ToWhjlSync1106Rep.listApi1106(deptId.substring(0, 4));
- if (null == list || list.isEmpty()) {
- log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
- return;
- }
- List<ApiInfoData> apiInfoDataList;
- WhjlApi1106 apiData;
- for (Fz40WhjlDefaultGranary sysData : list) {
- apiData = new WhjlApi1106();
- apiData.setAjbh(sysData.getAjdh()); //寤掗棿缂栧彿
- apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
- apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
- apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
- apiData.setJlqymc(""); //鍐涗緵绔欑偣鍚嶇О
- apiData.setSscfbh(sysData.getCfbh()); //浠撴埧缂栧彿
- apiData.setSscfmc(""); //浠撴埧鍚嶇О
- apiData.setAjmc(sysData.getAjmc()); //寤掗棿鍚嶇О
- apiData.setAjcd(sysData.getAjcd()); //寤掗棿闀垮害
- apiData.setAjkd(sysData.getAjkd()); //寤掗棿瀹藉害
- apiData.setAjgd(sysData.getAjgd()); //寤掗棿楂樺害
- apiData.setAjsjcr(sysData.getAjsjcr()); //寤掗棿璁捐浠撳
- apiData.setAjsjcr01(null); //寤掗棿瀹為檯浠撳
- apiData.setAjlxdh(sysData.getAjlxdh()); //寤掗棿鑱旂郴鐢佃瘽
- apiData.setAjjd(null); //寤掗棿缁忓害
- apiData.setAjwd(null); //寤掗棿绾害
- apiData.setAjqyrq(sysData.getAjqyrq()); //寤掗棿鍚敤鏃ユ湡
- apiData.setAjzt(sysData.getAjzt()); //寤掗棿鐘舵��
- apiData.setAjsyzt(""); //寤掗棿浣跨敤鐘舵��
- apiData.setSfyx(""); //鏄惁鏈夋晥
-
- apiData.setBizId(sysData.getAjdh());
- apiData.setUpdateTime(new Date());
-
- //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
- ApiInfoData infoData = new ApiInfoData();
- infoData.setId(sysData.getAjdh());
- infoData.setKqdm(kqdm);
- infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1106);
- infoData.setUpdateTime(new Date());
- infoData.setDataId(sysData.getAjdh());
- infoData.setRemarks("澶囨敞淇℃伅");
-
- //璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
- if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
- apiData.setCzbz(Constant.CZBZ_I);
- infoData.setCzbz(Constant.CZBZ_I);
- } else {
- apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
- infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
- }
-
- infoData.setData(JSON.toJSONString(apiData));
- apiInfoDataRep.save(infoData);
-
-
- log.info("1106---寤掗棿-鍚屾鏁版嵁锛歿}", apiData.toString());
- }
-
- } catch (Exception e) {
- log.error("---1106寤掗棿-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
- apiLog.setResult("1106寤掗棿淇℃伅鍚屾澶辫触锛�" + e.getMessage());
- apiLogRep.save(apiLog);
- }
- }
-}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
index 75422ff..a47009a 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
@@ -7,8 +7,8 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
-import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1107;
import lombok.extern.slf4j.Slf4j;
@@ -19,23 +19,22 @@
import java.util.List;
/**
- * 璐т綅淇℃伅
+ * 寤掗棿淇℃伅
*
* @Author:YAN
*/
@Slf4j
@Component
public class Fz40ToWhjlSync1107 {
-
@Autowired
- private Fz40ToWhjlSync1107Rep fz40ToWhjlSync1107Rep;
+ private Fz40ToWhjlSync1106Rep fz40ToWhjlSync1106Rep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
private ApiInfoDataRep apiInfoDataRep;
/**
- * 璐т綅淇℃伅
+ * 寤掗棿淇℃伅
*
* @param kqdm
* @param deptId
@@ -43,54 +42,59 @@
* @param end
*/
public void syncData(String kqdm, String deptId, Date start, Date end) {
- log.info("-------------1107鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ log.info("-------------1106鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
ApiLog apiLog = new ApiLog();
apiLog.setType(ApiLog.TYPE_SYNC);
apiLog.setKqdm(deptId);
apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1107);
+ apiLog.setInteId(Constant.API_CODE_1106);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40WhjlDefaultDepot> list = fz40ToWhjlSync1107Rep.listApi1107(deptId.substring(0, 4));
+ List<Fz40WhjlDefaultGranary> list = fz40ToWhjlSync1106Rep.listApi1106(deptId.substring(0, 4));
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
return;
}
List<ApiInfoData> apiInfoDataList;
WhjlApi1107 apiData;
- for (Fz40WhjlDefaultDepot sysData : list) {
+ for (Fz40WhjlDefaultGranary sysData : list) {
apiData = new WhjlApi1107();
- apiData.setHwbh(sysData.getId()); //璐т綅缂栧彿
+ apiData.setAjbh(sysData.getAjdh()); //寤掗棿缂栧彿
apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
apiData.setJlqymc(""); //鍐涗緵绔欑偣鍚嶇О
- apiData.setSscfbh(sysData.getBuildingId()); //浠撴埧缂栧彿
+ apiData.setSscfbh(sysData.getCfbh()); //浠撴埧缂栧彿
apiData.setSscfmc(""); //浠撴埧鍚嶇О
- apiData.setSsajbh(sysData.getGranaryId()); //寤掗棿缂栧彿
- apiData.setAjmc(""); //寤掗棿鍚嶇О
- apiData.setHwmc(sysData.getName()); //璐т綅鍚嶇О
- apiData.setHwqyrq(sysData.getStoreDate()); //璐т綅鍚敤鏃ユ湡
- apiData.setHwzt(sysData.getDepotStatus()); //璐т綅鐘舵��
- apiData.setClfs(sysData.getStoreType()); //鍌ㄧ伯鏂瑰紡
- apiData.setHwrl(sysData.getStorageMax()); //璐т綅瀹归噺
+ apiData.setAjmc(sysData.getAjmc()); //寤掗棿鍚嶇О
+ apiData.setAjcd(sysData.getAjcd()); //寤掗棿闀垮害
+ apiData.setAjkd(sysData.getAjkd()); //寤掗棿瀹藉害
+ apiData.setAjgd(sysData.getAjgd()); //寤掗棿楂樺害
+ apiData.setAjsjcr(sysData.getAjsjcr()); //寤掗棿璁捐浠撳
+ apiData.setAjsjcr01(null); //寤掗棿瀹為檯浠撳
+ apiData.setAjlxdh(sysData.getAjlxdh()); //寤掗棿鑱旂郴鐢佃瘽
+ apiData.setAjjd(null); //寤掗棿缁忓害
+ apiData.setAjwd(null); //寤掗棿绾害
+ apiData.setAjqyrq(sysData.getAjqyrq()); //寤掗棿鍚敤鏃ユ湡
+ apiData.setAjzt(sysData.getAjzt()); //寤掗棿鐘舵��
+ apiData.setAjsyzt(""); //寤掗棿浣跨敤鐘舵��
apiData.setSfyx(""); //鏄惁鏈夋晥
- apiData.setBizId(sysData.getId());
+ apiData.setBizId(sysData.getAjdh());
apiData.setUpdateTime(new Date());
//鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
ApiInfoData infoData = new ApiInfoData();
- infoData.setId(sysData.getId());
+ infoData.setId(sysData.getAjdh());
infoData.setKqdm(kqdm);
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1107);
+ infoData.setInteId(WhjlConstant.API_CODE_1106);
infoData.setUpdateTime(new Date());
- infoData.setDataId(sysData.getId());
+ infoData.setDataId(sysData.getAjdh());
infoData.setRemarks("澶囨敞淇℃伅");
//璁剧疆鎿嶄綔鏍囧織
@@ -107,12 +111,12 @@
apiInfoDataRep.save(infoData);
- log.info("1107---璐т綅-鍚屾鏁版嵁锛歿}", apiData.toString());
+ log.info("1106---寤掗棿-鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
- log.error("---1107璐т綅-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
- apiLog.setResult("1107璐т綅淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ log.error("---1106寤掗棿-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1106寤掗棿淇℃伅鍚屾澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
}
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java
new file mode 100644
index 0000000..beeeded
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java
@@ -0,0 +1,119 @@
+package com.fzzy.async.whhpjl.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1108;
+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;
+
+/**
+ * 璐т綅淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fz40ToWhjlSync1108 {
+
+ @Autowired
+ private Fz40ToWhjlSync1107Rep fz40ToWhjlSync1107Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 璐т綅淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1107鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1107);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40WhjlDefaultDepot> list = fz40ToWhjlSync1107Rep.listApi1107(deptId.substring(0, 4));
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
+ return;
+ }
+ List<ApiInfoData> apiInfoDataList;
+ WhjlApi1108 apiData;
+ for (Fz40WhjlDefaultDepot sysData : list) {
+ apiData = new WhjlApi1108();
+ apiData.setHwbh(sysData.getId()); //璐т綅缂栧彿
+ apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
+ apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
+ apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
+ apiData.setJlqymc(""); //鍐涗緵绔欑偣鍚嶇О
+ apiData.setSscfbh(sysData.getBuildingId()); //浠撴埧缂栧彿
+ apiData.setSscfmc(""); //浠撴埧鍚嶇О
+ apiData.setSsajbh(sysData.getGranaryId()); //寤掗棿缂栧彿
+ apiData.setAjmc(""); //寤掗棿鍚嶇О
+ apiData.setHwmc(sysData.getName()); //璐т綅鍚嶇О
+ apiData.setHwqyrq(sysData.getStoreDate()); //璐т綅鍚敤鏃ユ湡
+ apiData.setHwzt(sysData.getDepotStatus()); //璐т綅鐘舵��
+ apiData.setClfs(sysData.getStoreType()); //鍌ㄧ伯鏂瑰紡
+ apiData.setHwrl(sysData.getStorageMax()); //璐т綅瀹归噺
+ apiData.setSfyx(""); //鏄惁鏈夋晥
+
+ apiData.setBizId(sysData.getId());
+ apiData.setUpdateTime(new Date());
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(sysData.getId());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_11);
+ infoData.setInteId(WhjlConstant.API_CODE_1107);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(sysData.getId());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ //璁剧疆鎿嶄綔鏍囧織
+ apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+ if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ infoData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ }
+
+ infoData.setData(JSON.toJSONString(apiData));
+ apiInfoDataRep.save(infoData);
+
+
+ log.info("1107---璐т綅-鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1107璐т綅-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1107璐т綅淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1112.java
similarity index 96%
rename from src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java
rename to src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1112.java
index d46ac44..56fface 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1112.java
@@ -10,7 +10,7 @@
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDevice;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1111Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1111;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1112;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,7 +25,7 @@
*/
@Slf4j
@Component
-public class Fz40ToWhjlSync1111 {
+public class Fz40ToWhjlSync1112 {
@Autowired
private Fz40ToWhjlSync1111Rep fz40ToWhjlSync1111Rep;
@@ -61,9 +61,9 @@
return;
}
List<ApiInfoData> apiInfoDataList;
- WhjlApi1111 apiData;
+ WhjlApi1112 apiData;
for (Fz40WhjlDefaultDevice sysData : list) {
- apiData = new WhjlApi1111();
+ apiData = new WhjlApi1112();
apiData.setSbbh(sysData.getSbyqdm()); //璁惧缂栧彿
apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml
index e7f933a..52ac2ef 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml
@@ -5,9 +5,9 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1107</Property>
- <PropertyDef name="hwbh">
+ <PropertyDef name="ajbh">
<Property></Property>
- <Property name="label">璐т綅缂栧彿</Property>
+ <Property name="label">寤掗棿缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jlqybh">
<Property></Property>
@@ -33,55 +33,71 @@
<Property></Property>
<Property name="label">浠撴埧鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="ssajbh">
- <Property></Property>
- <Property name="label">寤掗棿缂栧彿</Property>
- </PropertyDef>
<PropertyDef name="ajmc">
<Property></Property>
<Property name="label">寤掗棿鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="hwmc">
- <Property></Property>
- <Property name="label">璐т綅鍚嶇О</Property>
+ <PropertyDef name="ajcd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">寤掗棿闀垮害</Property>
+ <Property name="displayFormat">#0.0绫�</Property>
</PropertyDef>
- <PropertyDef name="hwqyrq">
+ <PropertyDef name="ajkd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">寤掗棿瀹藉害</Property>
+ <Property name="displayFormat">#0.0绫�</Property>
+ </PropertyDef>
+ <PropertyDef name="ajgd">
+ <Property></Property>
+ <Property name="label">寤掗棿楂樺害</Property>
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">#0.0绫�</Property>
+ </PropertyDef>
+ <PropertyDef name="ajsjcr">
+ <Property name="dataType">Double</Property>
+ <Property name="label">寤掗棿璁捐浠撳</Property>
+ <Property name="displayFormat">#0.00鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="ajsjcr01">
+ <Property name="dataType">Double</Property>
+ <Property name="label">寤掗棿瀹為檯浠撳</Property>
+ <Property name="displayFormat">#0.00鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="ajlxdh">
+ <Property></Property>
+ <Property name="label">寤掗棿鑱旂郴鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="ajjd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">寤掗棿缁忓害</Property>
+ <Property name="displayFormat">#0.000000搴�</Property>
+ </PropertyDef>
+ <PropertyDef name="ajwd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">寤掗棿绾害</Property>
+ <Property name="displayFormat">#0.000000搴�</Property>
+ </PropertyDef>
+ <PropertyDef name="ajqyrq">
<Property name="dataType">Date</Property>
- <Property name="label">璐т綅鍚敤鏃ユ湡</Property>
+ <Property name="label">寤掗棿鍚敤鏃ユ湡</Property>
</PropertyDef>
- <PropertyDef name="hwzt">
+ <PropertyDef name="ajzt">
<Property></Property>
- <Property name="label">璐т綅鐘舵��</Property>
+ <Property name="label">寤掗棿鐘舵��</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CFZT")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="clfs">
+ <PropertyDef name="ajsyzt">
<Property></Property>
- <Property name="label">鍌ㄧ伯鏂瑰紡</Property>
+ <Property name="label">寤掗棿浣跨敤鐘舵��</Property>
<Property name="mapping">
- <Property name="keyProperty">key</Property>
- <Property name="valueProperty">value</Property>
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="key">1</Property>
- <Property name="value">琚嬭</Property>
- </Entity>
- <Entity>
- <Property name="key">2</Property>
- <Property name="value">鐡惰</Property>
- </Entity>
- </Collection>
- </Property>
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("HWZT")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="hwrl">
- <Property name="dataType">Double</Property>
- <Property name="label">璐т綅瀹归噺</Property>
- <Property name="displayFormat">#0.00鍚�</Property>
</PropertyDef>
<PropertyDef name="sfyx">
<Property></Property>
@@ -118,7 +134,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1107PR#listData</Property>
+ <Property name="dataProvider">WhjlApi1107PR#listData</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -205,40 +221,44 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="hwmc">
- <Property name="property">hwmc</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="jlqymc">
- <Property name="property">jlqymc</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="jgzdmc">
- <Property name="property">jgzdmc</Property>
+ <DataColumn name="ajmc">
+ <Property name="property">ajmc</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="sscfmc">
<Property name="property">sscfmc</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajmc">
- <Property name="property">ajmc</Property>
+ <DataColumn name="ajcd">
+ <Property name="property">ajcd</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="hwqyrq">
- <Property name="property">hwqyrq</Property>
+ <DataColumn name="ajkd">
+ <Property name="property">ajkd</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="hwzt">
- <Property name="property">hwzt</Property>
+ <DataColumn name="ajgd">
+ <Property name="property">ajgd</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="clfs">
- <Property name="property">clfs</Property>
+ <DataColumn name="ajsjcr">
+ <Property name="property">ajsjcr</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="hwrl">
- <Property name="property">hwrl</Property>
+ <DataColumn name="ajsjcr01">
+ <Property name="property">ajsjcr01</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ajqyrq">
+ <Property name="property">ajqyrq</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ajzt">
+ <Property name="property">ajzt</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ajsyzt">
+ <Property name="property">ajsyzt</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="sfyx">
@@ -251,7 +271,7 @@
<Property name="width">60%</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-sliders</Property>
- <Property name="caption">璐т綅淇℃伅</Property>
+ <Property name="caption">寤掗棿淇℃伅</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
@@ -279,13 +299,8 @@
<Property name="labelWidth">120</Property>
<Property name="labelAlign">right</Property>
<AutoFormElement>
- <Property name="name">hwbh</Property>
- <Property name="property">hwbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwmc</Property>
- <Property name="property">hwmc</Property>
+ <Property name="name">ajbh</Property>
+ <Property name="property">ajbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -319,33 +334,63 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ssajbh</Property>
- <Property name="property">ssajbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">ajmc</Property>
<Property name="property">ajmc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">hwqyrq</Property>
- <Property name="property">hwqyrq</Property>
+ <Property name="name">ajcd</Property>
+ <Property name="property">ajcd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">hwzt</Property>
- <Property name="property">hwzt</Property>
+ <Property name="name">ajkd</Property>
+ <Property name="property">ajkd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">clfs</Property>
- <Property name="property">clfs</Property>
+ <Property name="name">ajgd</Property>
+ <Property name="property">ajgd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">hwrl</Property>
- <Property name="property">hwrl</Property>
+ <Property name="name">ajsjcr</Property>
+ <Property name="property">ajsjcr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajsjcr01</Property>
+ <Property name="property">ajsjcr01</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajlxdh</Property>
+ <Property name="property">ajlxdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajjd</Property>
+ <Property name="property">ajjd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajwd</Property>
+ <Property name="property">ajwd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajqyrq</Property>
+ <Property name="property">ajqyrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajzt</Property>
+ <Property name="property">ajzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajsyzt</Property>
+ <Property name="property">ajsyzt</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -384,7 +429,7 @@
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1107PR#saveData</Property>
+ <Property name="dataResolver">WhjlApi1107PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -392,10 +437,10 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1107PR#delData</Property>
+ <Property name="service">WhjlApi1107PR#delData</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1107PR#pushData</Property>
+ <Property name="service">WhjlApi1107PR#pushData</Property>
</AjaxAction>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml
similarity index 74%
rename from src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml
index 6d96f15..ca9fb89 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml
@@ -4,10 +4,10 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1106</Property>
- <PropertyDef name="ajbh">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1108</Property>
+ <PropertyDef name="hwbh">
<Property></Property>
- <Property name="label">寤掗棿缂栧彿</Property>
+ <Property name="label">璐т綅缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jlqybh">
<Property></Property>
@@ -33,71 +33,55 @@
<Property></Property>
<Property name="label">浠撴埧鍚嶇О</Property>
</PropertyDef>
+ <PropertyDef name="ssajbh">
+ <Property></Property>
+ <Property name="label">寤掗棿缂栧彿</Property>
+ </PropertyDef>
<PropertyDef name="ajmc">
<Property></Property>
<Property name="label">寤掗棿鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="ajcd">
- <Property name="dataType">Double</Property>
- <Property name="label">寤掗棿闀垮害</Property>
- <Property name="displayFormat">#0.0绫�</Property>
- </PropertyDef>
- <PropertyDef name="ajkd">
- <Property name="dataType">Double</Property>
- <Property name="label">寤掗棿瀹藉害</Property>
- <Property name="displayFormat">#0.0绫�</Property>
- </PropertyDef>
- <PropertyDef name="ajgd">
+ <PropertyDef name="hwmc">
<Property></Property>
- <Property name="label">寤掗棿楂樺害</Property>
- <Property name="dataType">Double</Property>
- <Property name="displayFormat">#0.0绫�</Property>
+ <Property name="label">璐т綅鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="ajsjcr">
- <Property name="dataType">Double</Property>
- <Property name="label">寤掗棿璁捐浠撳</Property>
- <Property name="displayFormat">#0.00鍚�</Property>
- </PropertyDef>
- <PropertyDef name="ajsjcr01">
- <Property name="dataType">Double</Property>
- <Property name="label">寤掗棿瀹為檯浠撳</Property>
- <Property name="displayFormat">#0.00鍚�</Property>
- </PropertyDef>
- <PropertyDef name="ajlxdh">
- <Property></Property>
- <Property name="label">寤掗棿鑱旂郴鐢佃瘽</Property>
- </PropertyDef>
- <PropertyDef name="ajjd">
- <Property name="dataType">Double</Property>
- <Property name="label">寤掗棿缁忓害</Property>
- <Property name="displayFormat">#0.000000搴�</Property>
- </PropertyDef>
- <PropertyDef name="ajwd">
- <Property name="dataType">Double</Property>
- <Property name="label">寤掗棿绾害</Property>
- <Property name="displayFormat">#0.000000搴�</Property>
- </PropertyDef>
- <PropertyDef name="ajqyrq">
+ <PropertyDef name="hwqyrq">
<Property name="dataType">Date</Property>
- <Property name="label">寤掗棿鍚敤鏃ユ湡</Property>
+ <Property name="label">璐т綅鍚敤鏃ユ湡</Property>
</PropertyDef>
- <PropertyDef name="ajzt">
+ <PropertyDef name="hwzt">
<Property></Property>
- <Property name="label">寤掗棿鐘舵��</Property>
+ <Property name="label">璐т綅鐘舵��</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CFZT")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="ajsyzt">
+ <PropertyDef name="clfs">
<Property></Property>
- <Property name="label">寤掗棿浣跨敤鐘舵��</Property>
+ <Property name="label">鍌ㄧ伯鏂瑰紡</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("HWZT")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">琚嬭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">鐡惰</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ </PropertyDef>
+ <PropertyDef name="hwrl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">璐т綅瀹归噺</Property>
+ <Property name="displayFormat">#0.00鍚�</Property>
</PropertyDef>
<PropertyDef name="sfyx">
<Property></Property>
@@ -134,7 +118,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1106PR#listData</Property>
+ <Property name="dataProvider">WhjlApi1108PR#listData</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -221,44 +205,40 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="ajmc">
- <Property name="property">ajmc</Property>
+ <DataColumn name="hwmc">
+ <Property name="property">hwmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jlqymc">
+ <Property name="property">jlqymc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jgzdmc">
+ <Property name="property">jgzdmc</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="sscfmc">
<Property name="property">sscfmc</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajcd">
- <Property name="property">ajcd</Property>
+ <DataColumn name="ajmc">
+ <Property name="property">ajmc</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajkd">
- <Property name="property">ajkd</Property>
+ <DataColumn name="hwqyrq">
+ <Property name="property">hwqyrq</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajgd">
- <Property name="property">ajgd</Property>
+ <DataColumn name="hwzt">
+ <Property name="property">hwzt</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajsjcr">
- <Property name="property">ajsjcr</Property>
+ <DataColumn name="clfs">
+ <Property name="property">clfs</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ajsjcr01">
- <Property name="property">ajsjcr01</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ajqyrq">
- <Property name="property">ajqyrq</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ajzt">
- <Property name="property">ajzt</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ajsyzt">
- <Property name="property">ajsyzt</Property>
+ <DataColumn name="hwrl">
+ <Property name="property">hwrl</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="sfyx">
@@ -271,7 +251,7 @@
<Property name="width">60%</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-sliders</Property>
- <Property name="caption">寤掗棿淇℃伅</Property>
+ <Property name="caption">璐т綅淇℃伅</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
@@ -299,8 +279,13 @@
<Property name="labelWidth">120</Property>
<Property name="labelAlign">right</Property>
<AutoFormElement>
- <Property name="name">ajbh</Property>
- <Property name="property">ajbh</Property>
+ <Property name="name">hwbh</Property>
+ <Property name="property">hwbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwmc</Property>
+ <Property name="property">hwmc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -334,63 +319,33 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">ssajbh</Property>
+ <Property name="property">ssajbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">ajmc</Property>
<Property name="property">ajmc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajcd</Property>
- <Property name="property">ajcd</Property>
+ <Property name="name">hwqyrq</Property>
+ <Property name="property">hwqyrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajkd</Property>
- <Property name="property">ajkd</Property>
+ <Property name="name">hwzt</Property>
+ <Property name="property">hwzt</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajgd</Property>
- <Property name="property">ajgd</Property>
+ <Property name="name">clfs</Property>
+ <Property name="property">clfs</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajsjcr</Property>
- <Property name="property">ajsjcr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajsjcr01</Property>
- <Property name="property">ajsjcr01</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajlxdh</Property>
- <Property name="property">ajlxdh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajjd</Property>
- <Property name="property">ajjd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajwd</Property>
- <Property name="property">ajwd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajqyrq</Property>
- <Property name="property">ajqyrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajzt</Property>
- <Property name="property">ajzt</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajsyzt</Property>
- <Property name="property">ajsyzt</Property>
+ <Property name="name">hwrl</Property>
+ <Property name="property">hwrl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -429,7 +384,7 @@
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1106PR#saveData</Property>
+ <Property name="dataResolver">WhjlApi1108PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -437,10 +392,10 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1106PR#delData</Property>
+ <Property name="service">WhjlApi1108PR#delData</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1106PR#pushData</Property>
+ <Property name="service">WhjlApi1108PR#pushData</Property>
</AjaxAction>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml
similarity index 98%
rename from src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml
index 395928f..46ade0c 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1111</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1112</Property>
<PropertyDef name="sbbh">
<Property></Property>
<Property name="label">璁惧缂栧彿</Property>
@@ -190,7 +190,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1111PR#listData</Property>
+ <Property name="dataProvider">whjlApi1112PR#listData</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -549,7 +549,7 @@
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1111PR#saveData</Property>
+ <Property name="dataResolver">whjlApi1112PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -557,10 +557,10 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1111PR#delData</Property>
+ <Property name="service">whjlApi1112PR#delData</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1111PR#pushData</Property>
+ <Property name="service">whjlApi1112PR#pushData</Property>
</AjaxAction>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java
deleted file mode 100644
index 58bd6fe..0000000
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.fzzy.otherview.whhpjl.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 浠撳偍璁炬柦璁惧-寤掗棿淇℃伅
- *
- * @author czt
- * @date 2023/8/2 17:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class WhjlApi1106 implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- private String ajbh; //寤掗棿缂栧彿
- private String jlqybh; //鍐涚伯浼佷笟缂栧彿
- private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
- private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
- private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String sscfbh; //浠撴埧缂栧彿
- private String sscfmc; //浠撴埧鍚嶇О
- private String ajmc; //寤掗棿鍚嶇О
- private Double ajcd; //寤掗棿闀垮害
- private Double ajkd; //寤掗棿瀹藉害
- private Double ajgd; //寤掗棿楂樺害
- private Double ajsjcr; //寤掗棿璁捐浠撳
- private Double ajsjcr01; //寤掗棿瀹為檯浠撳
- private String ajlxdh; //寤掗棿鑱旂郴鐢佃瘽
- private Double ajjd; //寤掗棿缁忓害
- private Double ajwd; //寤掗棿绾害
- @JSONField(format = "yyyy-MM-dd")
- private Date ajqyrq; //寤掗棿鍚敤鏃ユ湡
- private String ajzt; //寤掗棿鐘舵��
- private String ajsyzt; //寤掗棿浣跨敤鐘舵��
- private String sfyx; //鏄惁鏈夋晥
- private String bz; //澶囨敞
-
- //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
- @JSONField(serialize = false)
- private String bizId; //涓氬姟ID
- @JSONField(serialize = false)
- private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
- @JSONField(serialize = false)
- private String czbz; //鎿嶄綔鏍囧織
- @JSONField(serialize = false)
- private String kqdm; //搴撳尯浠ｇ爜
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java
index 304a869..8f6209f 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java
@@ -8,10 +8,10 @@
import java.util.Date;
/**
- * 浠撳偍璁炬柦璁惧-璐т綅淇℃伅
+ * 浠撳偍璁炬柦璁惧-寤掗棿淇℃伅
*
* @author czt
- * @date 2023/8/2 17:15
+ * @date 2023/8/2 17:00
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,24 +21,29 @@
*/
private static final long serialVersionUID = 1L;
- private String hwbh; //璐т綅缂栧彿
+ private String ajbh; //寤掗棿缂栧彿
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
private String sscfbh; //浠撴埧缂栧彿
private String sscfmc; //浠撴埧鍚嶇О
- private String ssajbh; //寤掗棿缂栧彿
private String ajmc; //寤掗棿鍚嶇О
- private String hwmc; //璐т綅鍚嶇О
+ private Double ajcd; //寤掗棿闀垮害
+ private Double ajkd; //寤掗棿瀹藉害
+ private Double ajgd; //寤掗棿楂樺害
+ private Double ajsjcr; //寤掗棿璁捐浠撳
+ private Double ajsjcr01; //寤掗棿瀹為檯浠撳
+ private String ajlxdh; //寤掗棿鑱旂郴鐢佃瘽
+ private Double ajjd; //寤掗棿缁忓害
+ private Double ajwd; //寤掗棿绾害
@JSONField(format = "yyyy-MM-dd")
- private Date hwqyrq; //璐т綅鍚敤鏃ユ湡
- private String hwzt; //璐т綅鐘舵��
- private String clfs; //鍌ㄧ伯鏂瑰紡
- private Double hwrl; //璐т綅瀹归噺
+ private Date ajqyrq; //寤掗棿鍚敤鏃ユ湡
+ private String ajzt; //寤掗棿鐘舵��
+ private String ajsyzt; //寤掗棿浣跨敤鐘舵��
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
-
+
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
private String bizId; //涓氬姟ID
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java
index 355cf85..92b50de 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java
@@ -1,15 +1,17 @@
package com.fzzy.otherview.whhpjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
/**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁炬柦鐢靛瓙妗ｆ
+ * 浠撳偍璁炬柦璁惧-璐т綅淇℃伅
*
* @author czt
- * @date 2023/8/2 17:25
+ * @date 2023/8/2 17:15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -19,19 +21,32 @@
*/
private static final long serialVersionUID = 1L;
- private String dadm; //妗ｆ浠ｇ爜
+ private String hwbh; //璐т綅缂栧彿
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String cfbh; //浠撴埧缂栧彿
+ private String sscfbh; //浠撴埧缂栧彿
private String sscfmc; //浠撴埧鍚嶇О
- private String dalx; //妗ｆ绫诲瀷
- private String damc; //妗ｆ鍚嶇О
- private String dawj; //妗ｆ鏂囦欢
+ private String ssajbh; //寤掗棿缂栧彿
+ private String ajmc; //寤掗棿鍚嶇О
+ private String hwmc; //璐т綅鍚嶇О
+ @JSONField(format = "yyyy-MM-dd")
+ private Date hwqyrq; //璐т綅鍚敤鏃ユ湡
+ private String hwzt; //璐т綅鐘舵��
+ private String clfs; //鍌ㄧ伯鏂瑰紡
+ private Double hwrl; //璐т綅瀹归噺
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
-
-
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
index 79d1541..4f76fc5 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
@@ -1,17 +1,15 @@
package com.fzzy.otherview.whhpjl.dto;
-import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.util.Date;
/**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁炬柦缁存姢璁板綍
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁炬柦鐢靛瓙妗ｆ
*
* @author czt
- * @date 2023/8/2 17:35
+ * @date 2023/8/2 17:25
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,24 +19,17 @@
*/
private static final long serialVersionUID = 1L;
- private String whjlhb; //缁存姢璁板綍缂栧彿
+ private String dadm; //妗ｆ浠ｇ爜
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
private String cfbh; //浠撴埧缂栧彿
private String sscfmc; //浠撴埧鍚嶇О
- @JSONField(format = "yyyy-MM-dd")
- private Date jcrq; //妫�鏌ユ棩鏈�
- private String jclx; //妫�鏌ョ被鍨�
- private String jxlr; //妫�淇唴瀹�
- private String shqk; //鎹熷鎯呭喌
- private String wxff; //缁翠慨鏂规硶
- private String wxqk; //缁翠慨鎯呭喌
- private String jxr; //妫�淇汉
- private String ysr; //楠屾敹浜�
- @JSONField(format = "yyyy-MM-dd")
- private Date wcrq; //瀹屾垚鏃ユ湡
+ private String dalx; //妗ｆ绫诲瀷
+ private String damc; //妗ｆ鍚嶇О
+ private String dawj; //妗ｆ鏂囦欢
+ private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java
index ea8ad33..2268d75 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java
@@ -8,10 +8,10 @@
import java.util.Date;
/**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁惧鎶ュ簾璁板綍
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁炬柦缁存姢璁板綍
*
* @author czt
- * @date 2023/8/2 17:45
+ * @date 2023/8/2 17:35
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,7 +21,7 @@
*/
private static final long serialVersionUID = 1L;
- private String ssbfjlbh; //璁炬柦鎶ュ簾璁板綍缂栧彿
+ private String whjlhb; //缁存姢璁板綍缂栧彿
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
@@ -29,13 +29,18 @@
private String cfbh; //浠撴埧缂栧彿
private String sscfmc; //浠撴埧鍚嶇О
@JSONField(format = "yyyy-MM-dd")
- private Date sqrq; //鐢宠鏃ユ湡
- private String bfyy; //鎶ュ簾鍘熷洜
- private String sqr; //鐢宠浜�
- private String spr; //瀹℃壒浜�
+ private Date jcrq; //妫�鏌ユ棩鏈�
+ private String jclx; //妫�鏌ョ被鍨�
+ private String jxlr; //妫�淇唴瀹�
+ private String shqk; //鎹熷鎯呭喌
+ private String wxff; //缁翠慨鏂规硶
+ private String wxqk; //缁翠慨鎯呭喌
+ private String jxr; //妫�淇汉
+ private String ysr; //楠屾敹浜�
@JSONField(format = "yyyy-MM-dd")
- private Date sprq; //瀹℃壒鏃ユ湡
- private String spyj; //瀹℃壒鎰忚
+ private Date wcrq; //瀹屾垚鏃ユ湡
private String bz; //澶囨敞
+
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java
index aef6d05..a78fa31 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java
@@ -8,10 +8,10 @@
import java.util.Date;
/**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁惧淇℃伅
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁惧鎶ュ簾璁板綍
*
* @author czt
- * @date 2023/8/2 17:55
+ * @date 2023/8/2 17:45
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,52 +21,21 @@
*/
private static final long serialVersionUID = 1L;
- private String sbbh; //璁惧缂栧彿
+ private String ssbfjlbh; //璁炬柦鎶ュ簾璁板綍缂栧彿
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
private String cfbh; //浠撴埧缂栧彿
private String sscfmc; //浠撴埧鍚嶇О
- private String sblxbh; //璁惧绫诲瀷缂栧彿
- private String sbmc; //璁惧鍚嶇О
- private String sbzt; //璁惧鐘舵��
- private String ggxh; //瑙勬牸鍨嬪彿
- private String zzdw; //鍒堕�犲崟浣�
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date cgsj; //閲囪喘鏃堕棿
- private String gl; //鍔熺巼
- private String cl; //浜ч噺
- private String wxcc; //澶栧舰灏哄
- private String zygn; //涓昏鍔熻兘
- private String bgfzrmc; //淇濈璐熻矗浜�
- private String whgzrmc; //缁存姢璐熻矗浜�
- private String czfzrmc; //鎿嶄綔璐熻矗浜�
- private String zynhyq; //涓昏淇濈瑕佹眰
@JSONField(format = "yyyy-MM-dd")
- private Date xgrq; //淇敼鏃ユ湡
- private String tbrmc; //濉〃浜哄悕绉�
- private String sfytkk; //鏄惁浜戝彴鍙帶
- private String ipdz; //IP鍦板潃
- private Integer gldk; //绠＄悊绔彛
- private String sdkdk; //Sdk绔彛
- private String zh; //甯愬彿
- private String mm; //瀵嗙爜
- private Integer rstpdz; //Rtsp鍦板潃
- private String rtspdk; //rtsp绔彛
- private String sbxlh; //璁惧搴忓垪鍙�
- private String jklx; //鐩戞帶绫诲瀷
- private String sfyx; //鏄惁鏈夋晥
+ private Date sqrq; //鐢宠鏃ユ湡
+ private String bfyy; //鎶ュ簾鍘熷洜
+ private String sqr; //鐢宠浜�
+ private String spr; //瀹℃壒浜�
+ @JSONField(format = "yyyy-MM-dd")
+ private Date sprq; //瀹℃壒鏃ユ湡
+ private String spyj; //瀹℃壒鎰忚
private String bz; //澶囨敞
-
- //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
- @JSONField(serialize = false)
- private String bizId; //涓氬姟ID
- @JSONField(serialize = false)
- private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
- @JSONField(serialize = false)
- private String czbz; //鎿嶄綔鏍囧織
- @JSONField(serialize = false)
- private String kqdm; //搴撳尯浠ｇ爜
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java
index 6e7530e..1119f2f 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java
@@ -8,10 +8,10 @@
import java.util.Date;
/**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁存姢璁板綍
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁惧淇℃伅
*
* @author czt
- * @date 2023/8/2 18:20
+ * @date 2023/8/2 17:55
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,31 +21,52 @@
*/
private static final long serialVersionUID = 1L;
- private String sbwhjlbh; //璁惧缁存姢璁板綍缂栧彿
+ private String sbbh; //璁惧缂栧彿
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String sbbh; //璁惧缂栧彿
+ private String cfbh; //浠撴埧缂栧彿
+ private String sscfmc; //浠撴埧鍚嶇О
+ private String sblxbh; //璁惧绫诲瀷缂栧彿
private String sbmc; //璁惧鍚嶇О
+ private String sbzt; //璁惧鐘舵��
+ private String ggxh; //瑙勬牸鍨嬪彿
+ private String zzdw; //鍒堕�犲崟浣�
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date cgsj; //閲囪喘鏃堕棿
+ private String gl; //鍔熺巼
+ private String cl; //浜ч噺
+ private String wxcc; //澶栧舰灏哄
+ private String zygn; //涓昏鍔熻兘
+ private String bgfzrmc; //淇濈璐熻矗浜�
+ private String whgzrmc; //缁存姢璐熻矗浜�
+ private String czfzrmc; //鎿嶄綔璐熻矗浜�
+ private String zynhyq; //涓昏淇濈瑕佹眰
@JSONField(format = "yyyy-MM-dd")
- private Date wbrq; //缁翠繚鏃ユ湡
- private String wbdw; //缁翠繚鍗曚綅
- private String wbr; //缁翠繚浜�
- private String lxdh; //鑱旂郴鐢佃瘽
- private String whlr; //缁存姢鍐呭
- private String whjl; //缁存姢璁板綍
- private String fxwt; //鍙戠幇闂
- private String jjcs; //瑙ｅ喅鎺柦
- @JSONField(format = "yyyy-MM-dd")
- private Date xcwbrq; //涓嬫缁翠繚鏃ユ湡
- private String ysr; //楠屾敹浜�
- private String whjy; //缁存姢寤鸿
- private String whjlzp; //缁存姢璁板綍鐓х墖
+ private Date xgrq; //淇敼鏃ユ湡
+ private String tbrmc; //濉〃浜哄悕绉�
+ private String sfytkk; //鏄惁浜戝彴鍙帶
+ private String ipdz; //IP鍦板潃
+ private Integer gldk; //绠＄悊绔彛
+ private String sdkdk; //Sdk绔彛
+ private String zh; //甯愬彿
+ private String mm; //瀵嗙爜
+ private Integer rstpdz; //Rtsp鍦板潃
+ private String rtspdk; //rtsp绔彛
+ private String sbxlh; //璁惧搴忓垪鍙�
+ private String jklx; //鐩戞帶绫诲瀷
+ private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
- private String zpid; //鐓х墖id
- private String zpmc; //鐓х墖鍚嶇О
- private String zplj; //鐓х墖璺緞
- private String zpdx; //鐓х墖澶у皬
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java
index d7c36be..8b3c8fe 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java
@@ -5,12 +5,13 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
/**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁翠慨璁板綍
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁存姢璁板綍
*
* @author czt
- * @date 2023/8/2 18:40
+ * @date 2023/8/2 18:20
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -20,33 +21,31 @@
*/
private static final long serialVersionUID = 1L;
- private String sbwxjlbh; //璁惧缁翠慨璁板綍缂栧彿
+ private String sbwhjlbh; //璁惧缁存姢璁板綍缂栧彿
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
private String sbbh; //璁惧缂栧彿
private String sbmc; //璁惧鍚嶇О
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private String wxkssj; //寮�濮嬬淮淇椂闂�
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private String wxjssj; //缁撴潫缁翠慨鏃堕棿
- private String wxdw; //缁翠慨鍗曚綅
- private String lxr; //鑱旂郴浜�
+ @JSONField(format = "yyyy-MM-dd")
+ private Date wbrq; //缁翠繚鏃ユ湡
+ private String wbdw; //缁翠繚鍗曚綅
+ private String wbr; //缁翠繚浜�
private String lxdh; //鑱旂郴鐢佃瘽
- private String gzxx; //鏁呴殰鐜拌薄
- private String gzyy; //鏁呴殰鍘熷洜
- private String wxff; //缁翠慨鏂规硶
- private String gxpjxx; //鏇存柊閰嶄欢淇℃伅
- private String wxhyxzt; //缁翠慨鍚庤繍琛岀姸鎬�
- private int sysj; //璇曠敤鏃堕棿
- private String wxfy; //缁翠慨璐圭敤
+ private String whlr; //缁存姢鍐呭
+ private String whjl; //缁存姢璁板綍
+ private String fxwt; //鍙戠幇闂
+ private String jjcs; //瑙ｅ喅鎺柦
+ @JSONField(format = "yyyy-MM-dd")
+ private Date xcwbrq; //涓嬫缁翠繚鏃ユ湡
private String ysr; //楠屾敹浜�
- private String jl; //缁撹
- private String wxjlzp; //缁存姢璁板綍鐓х墖
+ private String whjy; //缁存姢寤鸿
+ private String whjlzp; //缁存姢璁板綍鐓х墖
private String bz; //澶囨敞
private String zpid; //鐓х墖id
private String zpmc; //鐓х墖鍚嶇О
private String zplj; //鐓х墖璺緞
- private int zpdx; //鐓х墖澶у皬
+ private String zpdx; //鐓х墖澶у皬
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
index 83f7d87..9fbc2ac 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
@@ -5,13 +5,12 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.util.Date;
/**
- * 浠撳偍璁炬柦璁惧-浠撳偍璁惧鎶ュ簾璁板綍
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁惧缁翠慨璁板綍
*
* @author czt
- * @date 2023/8/2 18:50
+ * @date 2023/8/2 18:40
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,22 +20,33 @@
*/
private static final long serialVersionUID = 1L;
- private String sbbfjlbh; //璁惧鎶ュ簾璁板綍缂栧彿
+ private String sbwxjlbh; //璁惧缁翠慨璁板綍缂栧彿
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
private String sbbh; //璁惧缂栧彿
private String sbmc; //璁惧鍚嶇О
- @JSONField(format = "yyyy-MM-dd")
- private Date bfsqsj; //鎶ュ簾鐢宠鏃ユ湡
- private String sqr; //鐢宠浜�
- private String ysynx; //宸蹭娇鐢ㄥ勾闄�
- private String bfyy; //鎶ュ簾鍘熷洜
- private String pzr; //鎵瑰噯浜�
- @JSONField(format = "yyyy-MM-dd")
- private Date pzrq; //鎵瑰噯鏃ユ湡
- private String sm; //璇存槑
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private String wxkssj; //寮�濮嬬淮淇椂闂�
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private String wxjssj; //缁撴潫缁翠慨鏃堕棿
+ private String wxdw; //缁翠慨鍗曚綅
+ private String lxr; //鑱旂郴浜�
+ private String lxdh; //鑱旂郴鐢佃瘽
+ private String gzxx; //鏁呴殰鐜拌薄
+ private String gzyy; //鏁呴殰鍘熷洜
+ private String wxff; //缁翠慨鏂规硶
+ private String gxpjxx; //鏇存柊閰嶄欢淇℃伅
+ private String wxhyxzt; //缁翠慨鍚庤繍琛岀姸鎬�
+ private int sysj; //璇曠敤鏃堕棿
+ private String wxfy; //缁翠慨璐圭敤
+ private String ysr; //楠屾敹浜�
+ private String jl; //缁撹
+ private String wxjlzp; //缁存姢璁板綍鐓х墖
private String bz; //澶囨敞
-
+ private String zpid; //鐓х墖id
+ private String zpmc; //鐓х墖鍚嶇О
+ private String zplj; //鐓х墖璺緞
+ private int zpdx; //鐓х墖澶у皬
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java
new file mode 100644
index 0000000..d881b69
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java
@@ -0,0 +1,42 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 浠撳偍璁炬柦璁惧-浠撳偍璁惧鎶ュ簾璁板綍
+ *
+ * @author czt
+ * @date 2023/8/2 18:50
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1115 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String sbbfjlbh; //璁惧鎶ュ簾璁板綍缂栧彿
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
+ private String sbbh; //璁惧缂栧彿
+ private String sbmc; //璁惧鍚嶇О
+ @JSONField(format = "yyyy-MM-dd")
+ private Date bfsqsj; //鎶ュ簾鐢宠鏃ユ湡
+ private String sqr; //鐢宠浜�
+ private String ysynx; //宸蹭娇鐢ㄥ勾闄�
+ private String bfyy; //鎶ュ簾鍘熷洜
+ private String pzr; //鎵瑰噯浜�
+ @JSONField(format = "yyyy-MM-dd")
+ private Date pzrq; //鎵瑰噯鏃ユ湡
+ private String sm; //璇存槑
+ private String bz; //澶囨敞
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
index c7dad8f..59d6835 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
@@ -24,13 +24,12 @@
import java.util.List;
/**
- * 璐т綅淇℃伅
+ * 寤掗棿淇℃伅
*
* @Author:YAN
*/
@Component
public class WhjlApi1107PR {
-
@Autowired
private ApiCommonService apiCommonService;
@@ -41,32 +40,32 @@
/**
* 鑾峰彇鍒楄〃淇℃伅
- * whjlApi1107PR#listData
+ * whjlApi1106PR#listData
*
* @return
*/
@DataProvider
public List<WhjlApi1107> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106);
if (null == result || result.isEmpty()) {
return null;
}
List<WhjlApi1107> list = new ArrayList<>();
- WhjlApi1107 whjlApi1107;
+ WhjlApi1107 whjlApi1106;
for (ApiInfoData infoData : result) {
- whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
- whjlApi1107.setKqdm(infoData.getKqdm());
- whjlApi1107.setCzbz(infoData.getCzbz());
- whjlApi1107.setUpdateTime(infoData.getUpdateTime());
- whjlApi1107.setBizId(infoData.getDataId());
- list.add(whjlApi1107);
+ whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
+ whjlApi1106.setKqdm(infoData.getKqdm());
+ whjlApi1106.setCzbz(infoData.getCzbz());
+ whjlApi1106.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1106.setBizId(infoData.getDataId());
+ list.add(whjlApi1106);
}
return list;
}
/**
* 鏇存柊鎴栦慨鏀�
- * whjlApi1107PR#saveData
+ * whjlApi1106PR#saveData
*
* @param data
* @return
@@ -77,7 +76,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1107);
+ infoData.setInteId(WhjlConstant.API_CODE_1106);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
infoData.setData(JSON.toJSONString(data));
@@ -89,7 +88,7 @@
/**
* 鍒犻櫎
- * whjlApi1107PR#delData
+ * whjlApi1106PR#delData
*
* @param data
* @return
@@ -102,7 +101,7 @@
/**
* 涓婁紶
- * whjlApi1107PR#pushData
+ * whjlApi1106PR#pushData
*
* @param items
* @return
@@ -120,7 +119,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1107);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1106);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -128,12 +127,8 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
-
-
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
ResponseDto responseDto;
+ ApiInfoData infoData;
for (WhjlApi1107 data : items) {
responseDto = apiService.pushData(param, apiConf, data);
if (responseDto.getSuccess() == 0) {
@@ -143,7 +138,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1107);
+ infoData.setInteId(WhjlConstant.API_CODE_1106);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java
similarity index 77%
rename from src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java
index 2bc6043..172370a 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java
@@ -15,7 +15,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1106;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1108;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -24,12 +24,13 @@
import java.util.List;
/**
- * 寤掗棿淇℃伅
+ * 璐т綅淇℃伅
*
* @Author:YAN
*/
@Component
-public class WhjlApi1106PR {
+public class WhjlApi1108PR {
+
@Autowired
private ApiCommonService apiCommonService;
@@ -40,43 +41,43 @@
/**
* 鑾峰彇鍒楄〃淇℃伅
- * whjlApi1106PR#listData
+ * whjlApi1107PR#listData
*
* @return
*/
@DataProvider
- public List<WhjlApi1106> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106);
+ public List<WhjlApi1108> listData() {
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
if (null == result || result.isEmpty()) {
return null;
}
- List<WhjlApi1106> list = new ArrayList<>();
- WhjlApi1106 whjlApi1106;
+ List<WhjlApi1108> list = new ArrayList<>();
+ WhjlApi1108 whjlApi1107;
for (ApiInfoData infoData : result) {
- whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1106.class);
- whjlApi1106.setKqdm(infoData.getKqdm());
- whjlApi1106.setCzbz(infoData.getCzbz());
- whjlApi1106.setUpdateTime(infoData.getUpdateTime());
- whjlApi1106.setBizId(infoData.getDataId());
- list.add(whjlApi1106);
+ whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1108.class);
+ whjlApi1107.setKqdm(infoData.getKqdm());
+ whjlApi1107.setCzbz(infoData.getCzbz());
+ whjlApi1107.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1107.setBizId(infoData.getDataId());
+ list.add(whjlApi1107);
}
return list;
}
/**
* 鏇存柊鎴栦慨鏀�
- * whjlApi1106PR#saveData
+ * whjlApi1107PR#saveData
*
* @param data
* @return
*/
@DataResolver
- public void saveData(WhjlApi1106 data) {
+ public void saveData(WhjlApi1108 data) {
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1106);
+ infoData.setInteId(WhjlConstant.API_CODE_1107);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
infoData.setData(JSON.toJSONString(data));
@@ -88,26 +89,26 @@
/**
* 鍒犻櫎
- * whjlApi1106PR#delData
+ * whjlApi1107PR#delData
*
* @param data
* @return
*/
@Expose
- public String delData(WhjlApi1106 data) {
+ public String delData(WhjlApi1108 data) {
apiInfoDataRep.deleteById(data.getBizId());
return null;
}
/**
* 涓婁紶
- * whjlApi1106PR#pushData
+ * whjlApi1107PR#pushData
*
* @param items
* @return
*/
@Expose
- public String pushData(List<WhjlApi1106> items) {
+ public String pushData(List<WhjlApi1108> items) {
String result = "";
@@ -119,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1106);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1107);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -127,9 +128,13 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- ResponseDto responseDto;
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+
+
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
ApiInfoData infoData;
- for (WhjlApi1106 data : items) {
+ ResponseDto responseDto;
+ for (WhjlApi1108 data : items) {
responseDto = apiService.pushData(param, apiConf, data);
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
@@ -138,7 +143,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1106);
+ infoData.setInteId(WhjlConstant.API_CODE_1107);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java
similarity index 91%
rename from src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java
index e33729b..52d5571 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java
@@ -15,7 +15,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1111;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1112;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -29,7 +29,7 @@
* @Author:YAN
*/
@Component
-public class WhjlApi1111PR {
+public class WhjlApi1112PR {
@Autowired
@@ -46,15 +46,15 @@
* @return
*/
@DataProvider
- public List<WhjlApi1111> listData() {
+ public List<WhjlApi1112> listData() {
List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1111);
if (null == result || result.isEmpty()) {
return null;
}
- List<WhjlApi1111> list = new ArrayList<>();
- WhjlApi1111 whjlApi1111;
+ List<WhjlApi1112> list = new ArrayList<>();
+ WhjlApi1112 whjlApi1111;
for (ApiInfoData infoData : result) {
- whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1111.class);
+ whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1112.class);
whjlApi1111.setKqdm(infoData.getKqdm());
whjlApi1111.setCzbz(infoData.getCzbz());
whjlApi1111.setUpdateTime(infoData.getUpdateTime());
@@ -72,7 +72,7 @@
* @return
*/
@DataResolver
- public void saveData(WhjlApi1111 data) {
+ public void saveData(WhjlApi1112 data) {
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
@@ -95,7 +95,7 @@
* @return
*/
@Expose
- public String delData(WhjlApi1111 data) {
+ public String delData(WhjlApi1112 data) {
apiInfoDataRep.deleteById(data.getBizId());
return null;
}
@@ -108,7 +108,7 @@
* @return
*/
@Expose
- public String pushData(List<WhjlApi1111> items) {
+ public String pushData(List<WhjlApi1112> items) {
String result = "";
@@ -130,7 +130,7 @@
ApiInfoData infoData;
ResponseDto responseDto;
- for (WhjlApi1111 data : items) {
+ for (WhjlApi1112 data : items) {
responseDto = apiService.pushData(param, apiConf, data);
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
index 1e006da..9393d8c 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
@@ -225,10 +225,10 @@
}
param.setInteCategory(WhjlConstant.API_CATEGORY_11);
param.setInteId(WhjlConstant.API_CODE_1106);
- List<WhjlApi1106> list = new ArrayList<>();
- WhjlApi1106 whjlApi1106;
+ List<WhjlApi1107> list = new ArrayList<>();
+ WhjlApi1107 whjlApi1106;
for (ApiInfoData infoData : items) {
- whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1106.class);
+ whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
whjlApi1106.setKqdm(infoData.getKqdm());
whjlApi1106.setCzbz(infoData.getCzbz());
whjlApi1106.setUpdateTime(infoData.getUpdateTime());
@@ -263,10 +263,10 @@
}
param.setInteCategory(WhjlConstant.API_CATEGORY_11);
param.setInteId(WhjlConstant.API_CODE_1107);
- List<WhjlApi1107> list = new ArrayList<>();
- WhjlApi1107 whjlApi1107;
+ List<WhjlApi1108> list = new ArrayList<>();
+ WhjlApi1108 whjlApi1107;
for (ApiInfoData infoData : items) {
- whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
+ whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1108.class);
whjlApi1107.setKqdm(infoData.getKqdm());
whjlApi1107.setCzbz(infoData.getCzbz());
whjlApi1107.setUpdateTime(infoData.getUpdateTime());
@@ -301,10 +301,10 @@
}
param.setInteCategory(WhjlConstant.API_CATEGORY_11);
param.setInteId(WhjlConstant.API_CODE_1111);
- List<WhjlApi1111> list = new ArrayList<>();
- WhjlApi1111 whjlApi1111;
+ List<WhjlApi1112> list = new ArrayList<>();
+ WhjlApi1112 whjlApi1111;
for (ApiInfoData infoData : items) {
- whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1111.class);
+ whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1112.class);
whjlApi1111.setKqdm(infoData.getKqdm());
whjlApi1111.setCzbz(infoData.getCzbz());
whjlApi1111.setUpdateTime(infoData.getUpdateTime());
--
Gitblit v1.9.3