From f71f31780ed55200f3e370e61c81cfd05feb34bd Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 10 四月 2026 14:25:01 +0800
Subject: [PATCH] 对接网关的地磅抓拍，生成批复告警内容
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java
index ed11698..4615130 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.InoutData;
@@ -16,14 +17,18 @@
import com.fzzy.igds.service.InoutNoticeService;
import com.fzzy.igds.service.InoutRecordService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
/**
* @Description 鍑哄叆搴撹鍗曢〉闈㈢鐞�
@@ -73,7 +78,8 @@
if (!Constant.PROGRESS_RECORD.equals(data.getProgress())) {
return "绯荤粺锛氭湭缁撴潫娴佺▼鐨勬暟鎹笉鏀寔淇敼锛�";
}
- int i = inoutRecordService.updateInoutRecord(data);
+
+ int i = inoutRecordService.checkAndUpdate(data);
if (i > 0) {
return null;
} else {
@@ -90,6 +96,7 @@
*/
@DataResolver
@Transactional
+ @Log(title = "鍑哄叆搴撴暟鎹墽琛屽紓甯哥粓姝�", businessType = BusinessType.UPDATE,bizType = BizTypeEnum.INOUT)
public String errorInoutData(InoutRecord data) {
return inoutRecordService.errorInoutData(data);
}
@@ -279,7 +286,7 @@
}
//鏂板鏁版嵁
- String msg = inoutRecordService.addInoutRecordList(inoutRecords);
+ String msg = inoutRecordService.addInoutRecordList(inoutRecords,false);
if(null == msg){
return BaseResp.success("瀵煎叆鎴愬姛锛屽叡璁″鍏�" + inoutRecords.size() + "鏉℃暟鎹紒" );
--
Gitblit v1.9.3