From be175fe739e687cd1d45da58f2cb7dd0c36d001f Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期五, 11 八月 2023 11:48:10 +0800 Subject: [PATCH] 调整Pressure的接口包位置到COre中,然后增加modBus-TCP协议通讯报道 --- igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java index 2871e07..7e92309 100644 --- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java +++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java @@ -7,6 +7,7 @@ import com.ld.igds.data.Page; import com.ld.igds.data.PageResponse; import com.ld.igds.file.CoreFileService; +import com.ld.igds.file.dto.FileData; import com.ld.igds.inout.InoutConstant; import com.ld.igds.inout.dto.InoutCheckData; import com.ld.igds.inout.dto.InoutCheckParam; @@ -19,7 +20,6 @@ import com.ld.igds.models.InoutSysConf; import com.ld.igds.util.ContextUtil; import com.ld.igds.util.DateUtil; -import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; @@ -36,7 +36,6 @@ * * @author */ -@Slf4j @Component public class InoutManager { @@ -50,6 +49,8 @@ private CheckStandardManager checkStandardManager; @Resource private InoutEventControlManager inoutEventControl; + @Resource + private CoreFileService coreFileService; /** * 鐩存帴浠庢暟鎹簱鏌ヨ锛屼笉鑰冭檻淇℃伅鐘舵�� @@ -213,6 +214,22 @@ return data; } + private InoutData updateFiles(InoutData data) throws Exception { + List<FileData> files = data.getFiles(); + if (null == files) { + return data; + } + + for (FileData fileData : files) { + fileData.setFileId(ContextUtil.getUUID()); + fileData.setCompanyId(data.getCompanyId()); + fileData.setBizId(data.getId()); + fileData.setCreateTime(new Date()); + coreFileService.addRecord(fileData); + } + + return data; + } /** * 浠庣紦瀛樹腑鑾峰彇涓嬩竴娴佺▼ @@ -444,6 +461,7 @@ if (InoutConstant.TYPE_IN.equals(data.getType())) { this.updateCheckItems(data, true); } + this.updateFiles(data); return null; } -- Gitblit v1.9.3