From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 一月 2025 11:29:05 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
index 4ebdc94..e5bb2b7 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -4,18 +4,14 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1305Rep;
import com.fzzy.api.view.repository.Api1306Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy40.entity.Fz40AreationData;
import com.fzzy.async.fzzy40.entity.Fz40DrugLog;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1305Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1306Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
@@ -46,7 +42,7 @@
* @param start 璧峰鏃堕棿
* @param end 鎴鏃堕棿
*/
- public void syncData(String deptId, Date start, Date end) {
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
log.info("-------------1306鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
ApiLog apiLog = new ApiLog();
@@ -75,8 +71,8 @@
api1306 = new Api1306();
BeanUtils.copyProperties(fz40DrugLog, api1306);
- api1306.setXzzydh(fz40DrugLog.getId());
- api1306.setCfdm(fz40DrugLog.getDepotId());
+ api1306.setXzzydh(api1105.getHwdm().substring(0,25) + fz40DrugLog.getId());
+ api1306.setCfdm(api1105.getHwdm().substring(0,25));
api1306.setXzkssj(fz40DrugLog.getStart());
api1306.setXzjssj(fz40DrugLog.getEnd());
api1306.setHcjcdh(fz40DrugLog.getPestBatchId());
@@ -94,10 +90,13 @@
api1306.setXzxgpj(fz40DrugLog.getEvaluate());
api1306.setZhgxsj(fz40DrugLog.getUpdateTime());
+ api1306.setHwdm(api1105.getHwdm());
+ api1306.setKqdm(kqdm);
+ api1306.setBizId(fz40DrugLog.getId());
api1306List = api1306Rep.getDataById(api1306.getXzzydh());
- if(null == api1306List || api1306List.isEmpty()){
+ if (null == api1306List || api1306List.isEmpty()) {
api1306.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
api1306.setCzbz(api1306List.get(0).getCzbz());
}
--
Gitblit v1.9.3