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/whhpjl/impl/Fz40ToWhjlSync1101.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java
index ebf4954..08cf93b 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java
@@ -1,16 +1,21 @@
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.Fz40WhjlDefaultDept;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1101Rep;
-import com.fzzy.whjl.dto.WhjlApi1101;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.Date;
import java.util.List;
@@ -19,7 +24,6 @@
*
* @author: czt
* @update-time: 2023/08/04
- *
*/
@Slf4j
@Component
@@ -29,6 +33,8 @@
private Fz40ToWhjlSync1101Rep fz40ToWhjlSync1101Rep;
@Autowired
private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
/**
* 鍐涘伐鍗曚綅淇℃伅
@@ -46,7 +52,7 @@
apiLog.setType(ApiLog.TYPE_SYNC);
apiLog.setKqdm(deptId);
apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1111);
+ apiLog.setInteId(Constant.API_CODE_1101);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
@@ -56,6 +62,7 @@
log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
return;
}
+ List<ApiInfoData> apiInfoDataList;
WhjlApi1101 apiData;
//灏佽鍐涘伐鍗曚綅淇℃伅
for (Fz40WhjlDefaultDept sysData : list) {
@@ -79,17 +86,36 @@
apiData.setQywd(sysData.getLat()); //浼佷笟绾害
apiData.setQyxzqhmc(sysData.getCountry()); //浼佷笟琛屾斂鍖哄垝鍚嶇О
apiData.setQyxzqhdm(sysData.getCountry()); //浼佷笟琛屾斂鍖哄垝浠ｇ爜
- apiData.setSfyx("鏄�"); //浼佷笟琛屾斂鍖哄垝浠ｇ爜
- if(StringUtils.isNotEmpty(sysData.getVal()) && "0".equals(sysData.getVal())){
+ apiData.setSfyx("鏄�"); //鏄惁鍚敤
+ if (StringUtils.isNotEmpty(sysData.getVal()) && "0".equals(sysData.getVal())) {
apiData.setSfyx("鍚�");
}
apiData.setBizId(sysData.getId());
apiData.setUpdateTime(new Date());
- //TODO 鎸佷箙鍖栦繚瀛樺緟瀹炵幇
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(sysData.getId());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_11);
+ infoData.setInteId(WhjlConstant.API_CODE_1101);
+ 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("1101---鍐涘伐鍗曚綅-鍚屾鏁版嵁锛歿}", apiData.toString());
}
--
Gitblit v1.9.3