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 | 79 ++++++++++++---------------------------
1 files changed, 24 insertions(+), 55 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 2463c9b..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,8 +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.jeecg.modules.dnc.entity.DeviceInfo;
-import org.jeecg.modules.dnc.entity.DncPassLog;
+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;
@@ -12,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;
@@ -34,14 +29,6 @@
@Autowired
private DocInfoMapper docInfoMapper;
- @Autowired
- private IDeviceInfoService deviceInfoService;
- @Autowired
- private IDeviceGroupService deviceGroupService;
- @Value("${securedoc.localFilePath}")
- private String localFilePath;
- @Autowired
- private IDncPassLogService dncPassLogService;
@Autowired
private IMdcEquipmentService iMdcEquipmentService;
@Autowired
@@ -88,58 +75,40 @@
if (b && docRel) {
DocInfo info = docInfoMapper.selectById(docId);
//todo 淇敼涓簃dc璁惧
- DeviceInfo deviceInfo = deviceInfoService.getById(attrId);
- List<String> strings = deviceGroupService.findListParentTreeAll(deviceInfo.getGroupId());
+ MdcEquipment mdcEquipment=iMdcEquipmentService.getById(attrId);
+ List<String> strings = iMdcProductionService.findListParentTreeAll(mdcEquipment.getId());
if (strings != null && !strings.isEmpty()) {
String path = StringUtils.join(strings.toArray(), "/");
- boolean deleteFile = FileUtilS.deleteFilePathZip(path + "/"+ deviceInfo.getDeviceNo(),
+ boolean deleteFile = FileUtilS.deleteFilePathZip(path + "/"+ mdcEquipment.getEquipmentId(),
info.getDocName(), info.getDocSuffix());
if (!deleteFile) {
return false;
}
- DncPassLog dncPassLog = dncPassLogService.findDayTime(DateUtil.format(DateUtil.getNow(),DateUtil.STR_YEARMONTHDAY));
- Integer fileTxt = 0, fileNc =0;
- if (dncPassLog !=null) {
- fileTxt = dncPassLog.getSequenceNumber() + 1;
- fileNc = fileTxt + 1;
- } else {
- fileTxt = 1;
- fileNc = fileTxt + 1;
- }
- String sequence = String.format("%06d",fileTxt);
- DncPassLog passInfoNc = new DncPassLog();
- passInfoNc.setSequenceNumber(fileNc);
- passInfoNc.setSequenceOrder(sequence);
- passInfoNc.setDayTime(DateUtil.format(DateUtil.getNow(),DateUtil.STR_YEARMONTHDAY));
- passInfoNc.setPassType("02");
- passInfoNc.setPassName(info.getDocName()+"."+info.getDocSuffix());
- passInfoNc.setCreateTime(DateUtil.getNow());
- dncPassLogService.save(passInfoNc);
//澶勭悊鏂囦欢鍚嶇О 鏂囦欢璺緞
NcTxtFilePathInfo ncTxt = new NcTxtFilePathInfo();
- ncTxt.setEquipmentId(deviceInfo.getDeviceNo());
- ncTxt.setFilePath(path + "/"+ deviceInfo.getDeviceNo() + "/" );
- ncTxt.setFileTxtName("02A"+DateUtil.format(DateUtil.getNow(),DateUtil.STR_YEARMONTHDAY)+sequence);
+ ncTxt.setEquipmentId(mdcEquipment.getEquipmentId());
+ ncTxt.setFilePath(path + "/"+ mdcEquipment.getEquipmentId() + "/" );
+ ncTxt.setFileTxtName("02A"+DateUtil.format(DateUtil.getNow(),DateUtil.STR_YEARMONTHDAY));
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