From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java | 45 ++++++++++++++++++---------------------------
1 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java
index b53fc4a..768e547 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocRelativeServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.dnc.entity.DocInfo;
import org.jeecg.modules.dnc.entity.DocRelative;
import org.jeecg.modules.dnc.exception.ExceptionCast;
@@ -10,18 +11,14 @@
import org.jeecg.modules.dnc.mapper.DocInfoMapper;
import org.jeecg.modules.dnc.mapper.DocRelativeMapper;
import org.jeecg.modules.dnc.response.CommonCode;
-
-import org.jeecg.modules.dnc.service.*;
+import org.jeecg.modules.dnc.service.IDocRelativeService;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dnc.utils.date.DateUtil;
-
import org.jeecg.modules.dnc.utils.file.FileUtilS;
-import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -32,12 +29,6 @@
@Autowired
private DocInfoMapper docInfoMapper;
- @Autowired
- private IDeviceInfoService deviceInfoService;
- @Autowired
- private IDeviceGroupService deviceGroupService;
- @Value("${securedoc.localFilePath}")
- private String localFilePath;
@Autowired
private IMdcEquipmentService iMdcEquipmentService;
@Autowired
@@ -102,22 +93,22 @@
ncTxt.setOrigFileName(info.getDocName());
ncTxt.setOrigFileSuffix(info.getDocSuffix());
ncTxt.setFileAddOrDelete(2);
- String loFilePath = localFilePath + "\\" + ncTxt.getFileTxtName() + ".nc";
- try {
- /* ObjectMapper mapper = new ObjectMapper();
- String json = mapper.writeValueAsString(ncTxt);*/
- String allList = new String();
- allList=(ncTxt.getFileTxtName()+"\n");
- allList+=(ncTxt.getFileNcName()+"\n");
- allList+=(ncTxt.getOrigFileName()+"\n");
- allList+=(ncTxt.getOrigFileSuffix()+"\n");
- allList+=(ncTxt.getFilePath()+"\n");
- allList+=(ncTxt.getEquipmentId()+"\n");
- allList+=(ncTxt.getFileAddOrDelete().toString());
- FileUtilS.fileWriterSql(loFilePath,allList);
- }catch (Exception e) {
- return true;
- }
+// String loFilePath = localFilePath + "\\" + ncTxt.getFileTxtName() + ".nc";
+// try {
+// /* ObjectMapper mapper = new ObjectMapper();
+// String json = mapper.writeValueAsString(ncTxt);*/
+// String allList = new String();
+// allList=(ncTxt.getFileTxtName()+"\n");
+// allList+=(ncTxt.getFileNcName()+"\n");
+// allList+=(ncTxt.getOrigFileName()+"\n");
+// allList+=(ncTxt.getOrigFileSuffix()+"\n");
+// allList+=(ncTxt.getFilePath()+"\n");
+// allList+=(ncTxt.getEquipmentId()+"\n");
+// allList+=(ncTxt.getFileAddOrDelete().toString());
+// FileUtilS.fileWriterSql(loFilePath,allList);
+// }catch (Exception e) {
+// return true;
+// }
}
}
return b;
--
Gitblit v1.9.3