From c98f22a26ee5d931faa840f547cf9b2c684afc4e Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 25 七月 2024 17:14:01 +0800
Subject: [PATCH] 武汉军粮-出入库信息同步
---
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2004PR.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2005PR.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2006PR.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2007PR.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2008PR.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2009PR.java | 4
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1212Rep.java | 23 ++
src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java | 18 +
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java | 239 +++++++++++++++++++++
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlInoutRecord.java | 289 ++++++++++++++++++++++++++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2010PR.java | 4
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java | 2
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2002PR.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2001PR.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2003PR.java | 5
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml | 27 +
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2011PR.java | 4
17 files changed, 627 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java
index 55e4399..748d776 100644
--- a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java
+++ b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java
@@ -6,6 +6,7 @@
import com.fzzy.api.service.SyncService12;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1204;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1207;
+import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1212;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1214;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,8 @@
private Fz40ToWhjlSync1207 fz40ToWhjlSync1207;
@Autowired
private Fz40ToWhjlSync1214 fz40ToWhjlSync1214;
+ @Autowired
+ private Fz40ToWhjlSync1212 fz40ToWhjlSync1212;
@Override
@@ -43,18 +46,19 @@
Date start = param.getStart();
Date end = param.getEnd();
- // 鍚屾瀹㈡埛淇℃伅
- fz40ToWhjlSync1204.syncData(kqdm, deptId, start, end);
- // 鍚屾鍚堝悓淇℃伅
- fz40ToWhjlSync1207.syncData(kqdm, deptId, start, end);
+// // 鍚屾瀹㈡埛淇℃伅
+// fz40ToWhjlSync1204.syncData(kqdm, deptId, start, end);
+// // 鍚屾鍚堝悓淇℃伅
+// fz40ToWhjlSync1207.syncData(kqdm, deptId, start, end);
//TODO 鍚屾搴撳瓨鍙拌处淇℃伅
//TODO 鍚屾搴撳瓨鍙拌处浜у搧鎵规淇℃伅
- //TODO 鍚屾搴撳瓨鍙拌处鍑哄叆淇℃伅
+ //鍚屾鍑哄叆搴撹褰�
+ fz40ToWhjlSync1212.syncData(kqdm, deptId, start, end);
- // 鍚屾鍑哄叆搴撹褰�
- fz40ToWhjlSync1214.syncData(kqdm, deptId, start, end);
+// // 鍚屾鍑哄叆搴撹褰�
+// fz40ToWhjlSync1214.syncData(kqdm, deptId, start, end);
}
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlInoutRecord.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlInoutRecord.java
new file mode 100644
index 0000000..d1fd932
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlInoutRecord.java
@@ -0,0 +1,289 @@
+package com.fzzy.async.whhpjl.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍑哄叆搴撶鐞�
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_RECORD")
+public class Fz40WhjlInoutRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "娴佹按鍙�", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 50)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
+
+ @Column(name = "NOTICE_ID_", length = 40)
+ @PropertyDef(label = "閫氱煡鍗曠紪鐮�")
+ private String noticeId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "瑁呭嵏浠撳簱")
+ private String depotId;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "鍑哄叆搴撶被鍨�", description = "IN=鍏ュ簱锛孫UT=鍑哄簱")
+ private String type;
+
+ @Column(name = "PROGRESS_", length = 20)
+ @PropertyDef(label = "娴佺▼杩涘害")
+ private String progress;
+
+ @Column(name = "RECORD_STATUS_", length = 10)
+ @PropertyDef(label = "鏁版嵁鐘舵��", description = "鏁版嵁鐘舵�侊紝姝ｅ父锛屽紓甯革紙2灏忔椂鍐呴噸澶嶅嚭鍏ュ簱绛夛級锛岃ˉ褰�")
+ private String recordStatus;
+
+ @Column(name = "CUSTOMER_NAME_", length = 50)
+ @PropertyDef(label = "寰�鏉ュ崟浣�", description = "鍏宠仈閫氱煡鍗曡幏鍙�")
+ private String customerName;
+
+ @Column(name = "INTEL_CARD_", length = 20)
+ @PropertyDef(label = "鏅烘収鍗″彿")
+ private String intelCard;
+
+ /*** ------------------------鐧昏-------------------------------------**/
+ @Column(name = "REGISTER_TIME_")
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private Date registerTime;
+
+ @Column(name = "REGISTER_USER_", length = 50)
+ @PropertyDef(label = "鐧昏浜�")
+ private String registerUser;
+
+ @Column(name = "USER_NAME_", length = 40)
+ @PropertyDef(label = "鎵胯繍浜�")
+ private String userName;
+
+ @Column(name = "USER_CONTACT_", length = 20)
+ @PropertyDef(label = "鑱旂郴鏂瑰紡")
+ private String userContact;
+
+ @Column(name = "USER_ID_", length = 20)
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String userId;
+
+ @Column(name = "USER_ADDRESS_", length = 100)
+ @PropertyDef(label = "鎵胯繍浜哄湴鍧�")
+ private String userAddress;
+
+ @Column(name = "USER_BIRTHDAY_")
+ @PropertyDef(label = "鍑虹敓鏃ユ湡")
+ private Date userBirthday;
+
+ @Column(name = "USER_SEX_", length = 10)
+ @PropertyDef(label = "鎬у埆")
+ private String userSex;
+
+ @Column(name = "USER_NATION_", length = 10)
+ @PropertyDef(label = "姘戞棌")
+ private String userNation;
+
+ @Column(name = "PLATE_NUM_", length = 20)
+ @PropertyDef(label = "杞﹁埞鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
+ private String plateNum;
+
+ @Column(name = "TRANS_TYPE_", length = 6)
+ @PropertyDef(label = "杩愯緭宸ュ叿")
+ private String transType;
+
+
+ /*** ------------------------绮鍩虹淇℃伅-------------------------------------**/
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LOCATION_ID_", length = 20)
+ @PropertyDef(label = "浜у湴鍚嶇О浠ｇ爜")
+ private String foodLocationId;
+
+ @Column(name = "FOOD_LOCATION_", length = 40)
+ @PropertyDef(label = "浜у湴鍚嶇О")
+ private String foodLocation;
+
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "鏀惰揣骞村害")
+ private String foodYear;
+
+ /*** ------------------------鎵︽牱璐ㄦ淇℃伅-------------------------------------**/
+ @Column(name = "FOOD_LEVEL_", length = 20)
+ @PropertyDef(label = "绮瀹氱瓑")
+ private String foodLevel;
+
+ @Column(name = "CHECK_STATUS_", length = 10)
+ @PropertyDef(label = "璐ㄦ缁撴灉")
+ private String checkStatus;
+
+ @Column(name = "CHECK_USER_", length = 50)
+ @PropertyDef(label = "璐ㄦ浜�")
+ private String checkUser;
+
+ @Column(name = "CHECK_TIME_")
+ @PropertyDef(label = "璐ㄦ鏃堕棿")
+ private Date checkTime;
+
+ @Column(name = "SAMPLE_USER_", length = 50)
+ @PropertyDef(label = "鎵︽牱浜�")
+ private String sampleUser;
+
+ @Column(name = "SAMPLE_TIME_")
+ @PropertyDef(label = "鎵︽牱鏃堕棿")
+ private Date sampleTime;
+
+ @Column(name = "SAMPLE_TYPE_", length = 1)
+ @PropertyDef(label = "鎵︽牱鏂瑰紡", description = "0-浜哄伐锛�1=鑷姩锛�2=鏅鸿兘闅忔満")
+ private String sampleType;
+
+ @Column(name = "CHECK_ID_", length = 12)
+ @PropertyDef(label = "璐ㄦ鍗曞彿")
+ private String checkId;
+
+ @Column(name = "DE_CHECK_")
+ @PropertyDef(label = "璐ㄦ鎵ｉ噸", description = "鍗曚綅KG")
+ private double deCheck = 0.0;
+
+ @Column(name = "ADD_CHECK_")
+ @PropertyDef(label = "璐ㄦ澧為噸", description = "鍗曚綅KG")
+ private double addCheck = 0.0;
+
+ /*** ------------------------绉伴噸鐜妭-------------------------------------**/
+
+ @Column(name = "jjlx", length = 2)
+ @PropertyDef(label = "妫�鏂ょ被鍨�", description = "0锛氱О閲嶅叆搴� 1锛氭爣鍑嗗寘鍏ュ簱 榛樿涓虹О閲嶅叆搴擄紝鏍囧噯鍖呭叆搴撶浉鍏冲瓧娈靛彲涓虹┖")
+ private String jjlx = "1";
+
+ @Column(name = "FULL_WEIGHT_")
+ @PropertyDef(label = "婊¤溅绉伴噸", description = "鍏ュ簱鏃跺�欒〃绀虹涓�娆＄О閲嶏紝鍑哄簱鏃跺�欒〃绀虹浜屾绉伴噸锛屽崟浣岾G")
+ private Double fullWeight = 0.0;
+
+ @Column(name = "FULL_WEIGHT_TIME_")
+ @PropertyDef(label = "婊¤溅绉伴噸鏃堕棿")
+ private Date fullWeightTime;
+
+ @Column(name = "FULL_WEIGHT_USER_", length = 40)
+ @PropertyDef(label = "婊¤溅绉伴噸浜�")
+ private String fullWeightUser;
+
+ @Column(name = "EMPTY_WEIGHT_")
+ @PropertyDef(label = "绌鸿溅绉伴噸", description = "鍏ュ簱鏃惰〃绀虹浜屾绉伴噸锛屽嚭搴撴椂鍊欒〃绀虹涓�娆＄О閲嶏紝鍗曚綅KG")
+ private Double emptyWeight = 0.0;
+
+ @Column(name = "EMPTY_WEIGHT_TIME_")
+ @PropertyDef(label = "绌鸿溅绉伴噸鏃堕棿")
+ private Date emptyWeightTime;
+
+ @Column(name = "EMPTY_WEIGHT_USER_", length = 50)
+ @PropertyDef(label = "绌鸿溅绉伴噸浜�")
+ private String emptyWeightUser;
+
+ @Column(name = "NET_WEIGHT_")
+ @PropertyDef(label = "鍑�姣涢噸", description = "鍗曚綅KG锛岀瓑浜庢弧杞� - 绌鸿溅")
+ private double netWeight = 0.0;
+
+ @Column(name = "DE_HANDLE_")
+ @PropertyDef(label = "鐜板満鎵ｉ噸", description = "鍗曚綅KG")
+ private double deHandle = 0.0;
+
+ @Column(name = "DE_PACKAGE_")
+ @PropertyDef(label = "鍖呰鎵ｉ噸", description = "鍗曚綅KG")
+ private double dePackage = 0.0;
+
+ @Column(name = "DE_OTHER_")
+ @PropertyDef(label = "鍏朵粬鎵ｉ噸", description = "鍗曚綅KG")
+ private double deOther = 0.0;
+
+ @Column(name = "DE_OTHER_INTO_", length = 200)
+ @PropertyDef(label = "鍏朵粬鎵ｉ噸鍘熷洜")
+ private String deOtherInfo;
+
+ @Column(name = "SETTLE_WEIGHT_")
+ @PropertyDef(label = "缁撶畻閲嶉噺", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝鍗曚綅KG")
+ private Double settleWeight = 0.0;
+
+ @Column(name = "RECORD_WEIGHT_")
+ @PropertyDef(label = "鍏ュ簱閲嶉噺", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝琛ュ寘鎷閲嶏紝鍗曚綅KG")
+ private Double recordWeight = 0.0;
+
+
+ /**
+ * -----------缁撶畻淇℃伅-----------------------
+ **/
+ @Column(name = "PRICE_")
+ @PropertyDef(label = "鍗曚环", description = "鍗曚綅锛氬厓/鍏枻锛屽疄闄呯粨绠椾环鏍间互缁撶畻鍗曚腑鍗曚环涓哄噯")
+ private Double price = 0.0;
+
+ @Column(name = "SETTLE_MONEY_")
+ @PropertyDef(label = "缁撶畻閲戦", description = "鍗曚綅锛氬厓锛屽疄闄呯粨绠椾互璁＄畻鍗曚负鍑�")
+ private Double settleMoney = 0.00;
+
+ @Column(name = "SETTLE_ID_", length = 50)
+ @PropertyDef(label = "缁撶畻鍗曞彿", description = "濡傛灉鏄崟杞︾粨绠楀繀濉�")
+ private String settleId;
+
+ /**
+ * ----------- 鍊间粨淇℃伅-----------------------
+ **/
+ @Column(name = "HANDLE_USER_", length = 40)
+ @PropertyDef(label = "鍊间粨鎿嶄綔浜�")
+ private String handleUser;
+
+ // 鍑哄簱
+ @Column(name = "COMPLETE_TIME_")
+ @PropertyDef(label = "瀹屾垚鏃堕棿")
+ private Date completeTime;
+
+ @Column(name = "COMPLETE_USER_", length = 40)
+ @PropertyDef(label = "瀹屾垚纭浜�")
+ private String completeUser;
+
+ // 澶囨敞
+ @Column(name = "REMARKS_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remarks;
+
+
+ /**
+ * ----------- 鍏朵粬淇℃伅锛岄拡瀵规鏂ょ被鍨嬫爣鍑嗗寘鍏ュ簱濉啓-----------------------
+ **/
+ @Column(name = "bzw", length = 2)
+ @PropertyDef(label = "鍖呰鐗�", description = "1锛氬寘2锛氭《3锛氱 9锛氬叾浠�")
+ private String bzw;
+
+ @Column(name = "dbz")
+ @PropertyDef(label = "鍗曞寘閲�", description = "鍗曚綅锛氬叕鏂�")
+ private Double dbz;
+
+ @Column(name = "bzbjs")
+ @PropertyDef(label = "鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
+ private int bzbjs;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java
new file mode 100644
index 0000000..83ee497
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java
@@ -0,0 +1,239 @@
+package com.fzzy.async.whhpjl.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.ApiTrigger;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.view.repository.ApiTriggerRep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlInoutRecord;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1101Rep;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1212Rep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 鍑哄叆搴撹褰曚俊鎭�
+ *
+ */
+@Slf4j
+@Component
+public class Fz40ToWhjlSync1212 {
+
+ @Autowired
+ private Fz40ToWhjlSync1212Rep fz40ToWhjlSync1212Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiTriggerRep apiTriggerRep;
+ @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("-------------1212鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1212);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40WhjlInoutRecord> list = fz40ToWhjlSync1212Rep.listApi1212(deptId);
+ List<ApiInfoData> apiInfoDataList;
+ WhjlApi1212 apiData;
+ for (Fz40WhjlInoutRecord sysData : list) {
+ List<ApiInfoData> dept = apiInfoDataRep.getDataByDataId(sysData.getCompanyId());
+ WhjlApi1101 whjlApi1101 = JSONObject.parseObject(dept.get(0).getData(), WhjlApi1101.class);
+ List<ApiInfoData> deptArea = apiInfoDataRep.getDataByDataId(sysData.getDeptId());
+ WhjlApi1102 whjlApi1102 = JSONObject.parseObject(deptArea.get(0).getData(), WhjlApi1102.class);
+ apiData = new WhjlApi1212();
+ apiData.setCrkid(sysData.getId());
+ apiData.setJlqybh(whjlApi1101.getJlqybh());//鍐涚伯浼佷笟缂栧彿
+ apiData.setJlqymc(whjlApi1101.getJlqymc());//鍐涚伯浼佷笟鍚嶇О
+ apiData.setJgzdbh(whjlApi1102.getJgzdbh());//鍐涗緵绔欑偣缂栫爜
+ apiData.setJgzdmc(whjlApi1102.getJgzdmc());//鍐涗緵绔欑偣鍚嶇О
+ apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
+ if(sysData.getType().equals("IN")){
+ apiData.setCrklx("鍏ュ簱");
+ apiData.setYwlx("鏃ュ父鍑哄叆搴�");//鍑哄叆搴撶被鍨�: 鏃ュ父鍑哄叆搴�/鏃ュ父鍑哄簱/搴旀�ュ叆搴�/搴旀�ュ嚭搴�/鐩樼偣鍏ュ簱/鐩樼偣鍑哄簱/杞粨鍏ュ簱/杞粨鍑哄簱
+ }
+ if(sysData.getType().equals("OUT")){
+ apiData.setCrklx("鍑哄簱");
+ apiData.setYwlx("鏃ュ父鍑哄簱");//鍑哄叆搴撶被鍨�: 鏃ュ父鍑哄叆搴�/鏃ュ父鍑哄簱/搴旀�ュ叆搴�/搴旀�ュ嚭搴�/鐩樼偣鍏ュ簱/鐩樼偣鍑哄簱/杞粨鍏ュ簱/杞粨鍑哄簱
+ }
+
+// apiData.setCrkpz("");//鍑哄叆搴撳嚟璇�
+// apiData.setJljgqybh("");//鍔犲伐浼佷笟缂栫爜
+// apiData.setJljgqymc("");//鍔犲伐浼佷笟鍚嶇О
+// apiData.setKhbh("");//瀹㈡埛缂栧彿
+// apiData.setGlzxm("");//瀹㈡埛鍚嶇О
+// apiData.setShdw("");//鏀惰揣鍗曚綅
+// apiData.setShlxr("");//鏀惰揣鑱旂郴浜�
+// apiData.setRjfaid("");//搴旀�ユ柟妗坕d
+// apiData.setJhid("");//绛规帾璁″垝iD
+// apiData.setHtid("");//鍚堝悓ID
+// apiData.setPsmxid("");//閰嶉�佷换鍔d
+
+ apiData.setYscch(sysData.getPlateNum());//杩愯緭杞﹁埞鍙�
+ apiData.setCyr(sysData.getUserName());//鎵胯繍浜�
+ apiData.setCyrdh(StringUtils.isBlank(sysData.getUserContact()) ? "18336564986" : sysData.getUserContact());//鎵胯繍浜虹數璇�
+
+// apiData.setBz("");//澶囨敞
+// apiData.setCrkmxid("");//鍑哄叆搴撴槑缁唅d
+
+
+ List<ApiInfoData> dataByDataId = apiInfoDataRep.getDataByDataId(sysData.getDepotId());
+ WhjlApi1108 whjlApi1108 = new WhjlApi1108();
+ if(dataByDataId != null && dataByDataId.size()>0){
+ whjlApi1108 = JSONObject.parseObject(dataByDataId.get(0).getData(), WhjlApi1108.class);
+ }
+ apiData.setHwbh(whjlApi1108.getHwbh());//璐т綅缂栧彿
+ apiData.setHwmc(whjlApi1108.getHwmc());//璐т綅鍚嶇О
+ apiData.setAjbh(apiData.getHwbh().substring(0,28));//寤掗棿缂栧彿
+ apiData.setAjmc(apiData.getHwmc());// TODO 寤掗棿鍚嶇О
+
+ apiData.setKctzbh(sysData.getId().substring(2));//搴撳瓨鍙拌处ID
+ apiData.setKctzcppcid(sysData.getId().substring(2));//搴撳瓨鍙拌处鎵规ID
+// apiData.setPsmxid("");//閰嶉�佽溅杈嗘槑缁咺D
+
+// apiData.setYjfamxid("");//搴旀�ユ柟妗堟槑缁咺D
+ apiData.setLspzbm(sysData.getFoodVariety());//鍝佺缂栧彿
+ List<ApiTrigger> lspz = apiTriggerRep.findNameByCode(sysData.getFoodVariety(),"LSPZ");
+ if(lspz != null && lspz.size() > 0){
+ apiData.setLspzmc(lspz.get(0).getName());//鍝佺鍚嶇О
+ }
+ if (sysData.getFoodVariety().equals("2")){
+
+ //灏忛害绮�
+ apiData.setCpbh("FJL89570583ec0a2571");//浜у搧缂栧彿
+ apiData.setCpmc("灏忛害绮�");//浜у搧缂栧彿
+ }
+ if (sysData.getFoodVariety().equals("1")){
+
+ //澶х背
+ apiData.setCpbh("FJLdf09130205a43002");//浜у搧缂栧彿
+ apiData.setCpmc("澶х背");//浜у搧缂栧彿
+
+ }
+ if (sysData.getFoodVariety().equals("3")){
+
+ //椋熺敤娌�
+ apiData.setCpbh("FJL3e7ba1605ebd5dec");//浜у搧缂栧彿
+ apiData.setCpmc("椋熺敤娌�");//浜у搧缂栧彿
+ }
+ apiData.setJldwbm("12");//璁￠噺鍗曚綅缂栫爜
+ apiData.setJldwmc("鍗冨厠");//璁￠噺鍗曚綅鍚嶇О
+ apiData.setJsdwbm("21");//璁℃暟鍗曚綅缂栫爜
+ apiData.setJsdwmc("琚�");//璁℃暟鍗曚綅鍚嶇О
+
+// apiData.setCrklx("");//鍑哄叆搴撶被鍨�
+
+ apiData.setCrksl((double) sysData.getBzbjs());//鍑哄叆搴撴暟閲�
+ apiData.setCrkzl(sysData.getSettleWeight());//鍑哄叆搴撻噸閲�
+
+// apiData.setQcsl(0.00);//鏈熷垵鏁伴噺
+// apiData.setQmsl(0.00);//鏈熸湯鏁伴噺
+// apiData.setQczl(0.00);//鏈熷垵閲嶉噺
+// apiData.setQmzl(0.00);//鏈熸湯閲嶉噺
+// apiData.setShsl(0.00);//鎹熻�楁暟閲�
+// apiData.setShzl(0.00);//鎹熻�楅噸閲�
+// apiData.setYsyq("");//楠屾敹瑕佹眰
+// apiData.setSfhx("");//鏄惁鏍搁攢
+// apiData.setQkxm("");//娆犳椤圭洰
+
+ apiData.setDj(sysData.getPrice());//鍗曚环
+ apiData.setJe(apiData.getDj()*apiData.getCrkzl());//閲戦
+ apiData.setCpdj("涓�绛�");//浜у搧绛夌骇 鍏宠仈浜у搧鎺ュ彛
+
+// apiData.setCd("");//浜у湴
+// apiData.setSccj("");//鐢熶骇鍘傚
+// apiData.setGg("");//瑙勬牸鍨嬪彿
+// apiData.setCppc("");//浜у搧鎵规
+// apiData.setScrq(null);//鐢熶骇鏃ユ湡
+// apiData.setBzq(null);//淇濊川鏈�
+// apiData.setCkfs("");//鍑哄簱鏂瑰紡
+ apiData.setDjsj(sysData.getRegisterTime());//鐧昏鏃堕棿
+// apiData.setZz("");//绔欓暱
+// apiData.setJjy("");//璐ㄦ鍛�
+ apiData.setSxh(Integer.valueOf(sysData.getId().substring(6)));//椤哄簭鍙�
+// apiData.setDdid("");//璁㈠崟id
+// apiData.setCrktzdid("");//鍑哄叆搴撻�氱煡鍗昳d
+// apiData.setCrktzdmxid("");//鍑哄叆搴撻�氱煡鍗曟槑缁咺D
+// apiData.setDjr("");//鐧昏浜�
+
+
+// WhjlCheck zjbgwj = new WhjlCheck();
+// zjbgwj.setJybgwjid("");//妫�楠屾姤鍛婃枃浠禝D
+// zjbgwj.setJyrq(null);//妫�楠屾棩鏈�
+// zjbgwj.setJylx("");//妫�楠岀被鍨�
+// zjbgwj.setWjlx("");//鏂囦欢绫诲瀷
+// zjbgwj.setWjm("");//鏂囦欢鍚�
+// zjbgwj.setWjlj("");//鏂囦欢璺緞
+// zjbgwj.setWjdx("");//鏂囦欢澶у皬
+
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(sysData.getId());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1212);
+ 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("1212---鍑哄叆搴撹褰�-鍚屾鏁版嵁锛歿}", apiData.toString());
+
+ }
+ } catch (Exception e) {
+ log.error("---1212鍚堝悓-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1212鍚堝悓淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1212Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1212Rep.java
new file mode 100644
index 0000000..820056f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1212Rep.java
@@ -0,0 +1,23 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlInoutRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撲俊鎭�
+ *
+ */
+public interface Fz40ToWhjlSync1212Rep extends JpaRepository<Fz40WhjlInoutRecord, String> {
+ /**
+ * 鍑哄叆搴撲俊鎭�
+ *
+ * @return
+ */
+ @Query("from Fz40WhjlInoutRecord where deptId=:deptId ")
+ List<Fz40WhjlInoutRecord> listApi1212(@Param("deptId") String deptId);
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
index 78f77bd..b7fe814 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
@@ -319,6 +319,7 @@
<PropertyDef name="sxh">
<Property></Property>
<Property name="label">椤哄簭鍙�</Property>
+ <Property name="dataType">int</Property>
</PropertyDef>
<PropertyDef name="ddid">
<Property></Property>
@@ -337,32 +338,32 @@
<Property name="label">鐧昏浜�</Property>
</PropertyDef>
<PropertyDef name="ajmc">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="cpdj">
- <Property/>
+ <Property></Property>
<Property name="label">绛夌骇</Property>
</PropertyDef>
<PropertyDef name="jybgwjid">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="jyrq">
<Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="jylx">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="wjlx">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="wjm">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="wjlj">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="wjdx">
- <Property/>
+ <Property></Property>
</PropertyDef>
</DataType>
<DataType name="dtCrkmx">
@@ -1238,6 +1239,16 @@
<Property name="property">sxh</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dj</Property>
+ <Property name="property">dj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">scrq</Property>
+ <Property name="property">scrq</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
<Panel layout="regionPadding:5">
<Property name="caption">璐ㄦ鎶ュ憡鏂囦欢</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
index 50128f3..83e33e2 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
@@ -109,7 +109,7 @@
private Date djsj; //鐧昏鏃堕棿
private String zz; //绔欓暱
private String jjy; //璐ㄦ鍛�
- private String sxh; //椤哄簭鍙�
+ private int sxh; //椤哄簭鍙�
// private String bz; //澶囨敞
private String ddid; //璁㈠崟ID
private String crktzdid; //鍑哄叆搴撻�氱煡鍗旾D
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2001PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2001PR.java
index e945308..4d2c4b7 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2001PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2001PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -122,6 +123,9 @@
String result = "";
List<WhjlShareApi2001> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2002PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2002PR.java
index 3224efa..e34bb72 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2002PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2002PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -124,6 +125,9 @@
String result = "";
List<WhjlShareApi2002> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2003PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2003PR.java
index b1abb0c..5928a6b 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2003PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2003PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -133,10 +134,14 @@
String result = "";
List<WhjlShareApi2003> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
}
+
//灏佽鍙傛暟
param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_20, WhjlConstant.API_CODE_2003);
responseDto = apiService.pullData(param, apiConf);
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2004PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2004PR.java
index d8059a0..dccbbad 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2004PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2004PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -125,6 +126,9 @@
String result = "";
List<WhjlShareApi2004> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2005PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2005PR.java
index e6bfc06..cfe3923 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2005PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2005PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -122,6 +123,9 @@
String result = "";
List<WhjlShareApi2005> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2006PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2006PR.java
index 66e17aa..bfd17db 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2006PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2006PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -124,6 +125,9 @@
String result = "";
List<WhjlShareApi2006> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2007PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2007PR.java
index 1a37b26..6be3e4d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2007PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2007PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -123,6 +124,9 @@
String result = "";
List<WhjlShareApi2007> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2008PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2008PR.java
index 894d9bf..6095c33 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2008PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2008PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -123,6 +124,9 @@
String result = "";
List<WhjlShareApi2008> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2009PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2009PR.java
index eafcbef..ceeae1d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2009PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2009PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -123,6 +124,9 @@
String result = "";
List<WhjlShareApi2009> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2010PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2010PR.java
index 230ed04..2d75cc8 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2010PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2010PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -146,6 +147,9 @@
String result = "";
List<WhjlShareApi2010> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2011PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2011PR.java
index 5b00241..fc4b669 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2011PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2011PR.java
@@ -7,6 +7,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
@@ -136,6 +137,9 @@
String result = "";
List<WhjlShareApi2011> list;
for (ApiConfs apiConf : apiConfs) {
+ if(!apiConf.getSyncProtocol().equals(SyncProtocol.FZZY_V40_WHJL.getCode())){
+ continue;
+ }
apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) {
continue;
--
Gitblit v1.9.3