From 60311724f9afc274f15cd07320947aca8adf27e4 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 01 八月 2025 16:53:08 +0800
Subject: [PATCH] 班次利用率算法调整
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 197 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 159 insertions(+), 38 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index 3b4b965..a6f9814 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -16,6 +16,8 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.exception.ExceptionCast;
+import org.jeecg.modules.dnc.ext.NcTxtFilePathInfo;
+import org.jeecg.modules.dnc.listener.FileMonitorConfig;
import org.jeecg.modules.dnc.mapper.DocInfoMapper;
import org.jeecg.modules.dnc.request.DocInfoQueryRequest;
import org.jeecg.modules.dnc.request.DocInfoUploadRequest;
@@ -26,8 +28,13 @@
import org.jeecg.modules.dnc.utils.file.FileUtilS;
import org.jeecg.modules.dncFlow.entity.DispatchFile;
import org.jeecg.modules.dncFlow.service.IDispatchFileService;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.system.entity.SysParams;
+import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysParamsService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,13 +46,22 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Scanner;
import java.util.stream.Collectors;
@Service
public class DocInfoServiceImpl extends ServiceImpl<DocInfoMapper, DocInfo> implements IDocInfoService {
+ @Autowired
+ private FileMonitorConfig config;
+ @Autowired
+ private IMdcEquipmentService iMdcEquipmentService;
+ @Autowired
+ private IMdcProductionService iMdcProductionService;
@Autowired
private IDocClassificationService docClassificationService;
@Autowired
@@ -56,17 +72,19 @@
@Lazy
private IDocRelativeService docRelativeService;
@Autowired
- @Lazy
- private IDeviceInfoService deviceInfoService;
- @Autowired
- private IDeviceGroupService deviceGroupService;
- @Autowired
private IDispatchFileService dispatchFileService;
@Autowired
private ISysParamsService sysParamsService;
@Autowired
@Lazy
private IComponentInfoService componentInfoService;
+ @Autowired
+ @Lazy
+ private IGuideCardBatchService guideCardBatchService;
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
/*澶囦唤澶勭悊*/
@Override
@@ -131,47 +149,55 @@
docInfo.setPublishVersion(docFile.getDocVersion());
docInfo.setPublishFileId(docFile.getFileId());
//COPY
- DeviceInfo deviceInfo= deviceInfoService.getById(uploadRequest.getAttributionId());
- if (deviceInfo != null) {
- List<String> strings = deviceGroupService.findListParentTreeAll(deviceInfo.getGroupId());
+ MdcEquipment mdcEquipment= iMdcEquipmentService.getById(uploadRequest.getAttributionId());
+ if (mdcEquipment != null) {
+ List<String> strings = iMdcProductionService.findListParentTreeAll(mdcEquipment.getId());
boolean copyFileNc = false;
if (strings != null && !strings.isEmpty()) {
String path = org.apache.commons.lang3.StringUtils.join(strings.toArray(), "/");
copyFileNc = FileUtilS.copyFile(fileUploadResult.getFilePath()+"/" + fileUploadResult.getFileEncodeName(),
- path+ "/" + deviceInfo.getDeviceNo() ,fileNameAll);
+ path+ "/" + mdcEquipment.getEquipmentId() ,fileNameAll);
if (!copyFileNc) {
ExceptionCast.cast(ActivitiCode.ACT_FILE_ERROR);
} else {
- FileUtilS.deleteZipFromToSend(path + "/"+ deviceInfo.getDeviceNo(),
+ FileUtilS.deleteZipFromToSend(path + "/"+ mdcEquipment.getEquipmentId(),
docFile.getFileName(),docFile.getFileSuffix());
}
} else {
copyFileNc =FileUtilS.copyFile(fileUploadResult.getFilePath()+"/" + fileUploadResult.getFileEncodeName(),
- deviceInfo.getDeviceNo() ,fileNameAll);
+ mdcEquipment.getEquipmentId() ,fileNameAll);
if (!copyFileNc) {
ExceptionCast.cast(ActivitiCode.ACT_FILE_ERROR);
} else {
- FileUtilS.deleteZipFromToSend(fileUploadResult.getFilePath()+"/" + fileUploadResult.getFileEncodeName() + "/"+ deviceInfo.getDeviceNo(),
+ FileUtilS.deleteZipFromToSend(fileUploadResult.getFilePath()+"/" + fileUploadResult.getFileEncodeName() + "/"+ mdcEquipment.getEquipmentId(),
docFile.getFileName(),docFile.getFileSuffix());
}
}
}
boolean saveBool = super.save(docInfo);
- SysParams sysParams=sysParamsService.getSysPramBySettingKey("nc_dispatch_file");
- if (sysParams ==null){
- throw new JeecgBootException("鏈厤缃鍏C涓庣數瀛愬浘鐗堟槸鍚﹁Е鍙戝绛炬祦绋嬶紝璇疯仈绯荤鐞嗗憳");
- }else {
- if (saveBool&&sysParams.getSettingValue().equals("1")){
- //瑙﹀彂瀹＄
- DispatchFile dispatchFile = new DispatchFile();
- dispatchFile.setDocId(docInfo.getDocId());
- dispatchFile.setFileId(docFile.getFileId());
- dispatchFile.setAttributionId(uploadRequest.getAttributionId());
- dispatchFile.setAttributionType(String.valueOf(uploadRequest.getAttributionType()));
- dispatchFile.setDocClassCode(uploadRequest.getDocClassCode());
- dispatchFileService.saveDispatchFile(dispatchFile);
+ if (uploadRequest.getDocClassCode().equals("NC")||uploadRequest.getDocClassCode().equals("other")){
+ SysParams sysParams=sysParamsService.getSysPramBySettingKey("nc_dispatch_file");
+ if (sysParams ==null){
+ throw new JeecgBootException("鏈厤缃鍏C涓庣數瀛愬浘鐗堟槸鍚﹁Е鍙戝绛炬祦绋嬶紝璇疯仈绯荤鐞嗗憳");
+ }else {
+ if (saveBool&&sysParams.getSettingValue().equals("1")){
+ //瑙﹀彂瀹＄
+ DispatchFile dispatchFile = new DispatchFile();
+ dispatchFile.setDocId(docInfo.getDocId());
+ dispatchFile.setFileId(docFile.getFileId());
+ dispatchFile.setAttributionId(uploadRequest.getAttributionId());
+ dispatchFile.setAttributionType(String.valueOf(uploadRequest.getAttributionType()));
+ dispatchFile.setDocClassCode(uploadRequest.getDocClassCode());
+ dispatchFileService.saveDispatchFile(dispatchFile);
+ }
+ }
+ }
+ if (uploadRequest.getDocClassCode().equals("NC")){
+ boolean savaGuideCardBatch=guideCardBatchService.importGuideCardBatch(docInfo.getDocId(),uploadRequest.getAttributionId(),uploadRequest.getAttributionType());
+ if (!savaGuideCardBatch) {
+ ExceptionCast.cast(DocumentCode.DOC_BATCH_ERROR);
}
}
return saveBool;
@@ -201,8 +227,8 @@
if (StringUtils.isEmpty(deviceNo)) {
return false;
}
- DeviceInfo deviceInfo = deviceInfoService.getByDeviceNo(deviceNo);
- if (deviceInfo == null) {
+ MdcEquipment mdcEquipment = iMdcEquipmentService.findEquipmentNameByEquipmentId(deviceNo);
+ if (mdcEquipment == null) {
return false;
}
String fileName = FileUtilS.getFilenameNonSuffix(file.getOriginalFilename());
@@ -211,7 +237,7 @@
if(fileUploadResult == null) {
return false;
}
- DocInfo en = findByAttrAndDocName(fileName, 4, deviceInfo.getDeviceId());
+ DocInfo en = findByAttrAndDocName(fileName, 7, mdcEquipment.getId());
if(en != null) {
return false;
}
@@ -224,9 +250,9 @@
docInfo.setDocStatus(1);
docInfo.setSyncStatus(2);
DocRelative docRelative = new DocRelative();
- docRelative.setAttributionId(deviceInfo.getDeviceId());
+ docRelative.setAttributionId(mdcEquipment.getId());
docRelative.setDocId(docInfo.getDocId());
- docRelative.setAttributionType(4);
+ docRelative.setAttributionType(7);
docRelative.setClassificationId(docClass.getClassificationId());
boolean b = docRelativeService.save(docRelative);
if(!b) {
@@ -249,6 +275,94 @@
return saveBool;
}
+ /**
+ * 瑙ｆ瀽NC鏂囨。閫氱敤鏂规硶
+ * @param pathFile,fileRec
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public boolean addDocInfoAnalysisGwNcService(String pathFile,File file) throws FileNotFoundException {
+ String line;
+ int count = 0;
+ String loFilePath = config.getPaths().get(0)+"/" + file.getName();
+ FileInputStream fis = new FileInputStream(loFilePath);
+ NcTxtFilePathInfo result = new NcTxtFilePathInfo();
+ Scanner sc = new Scanner(fis, "UTF-8");
+ while (count < 8 && sc.hasNext()) {
+ line = sc.nextLine();
+ if (count ==0) {
+ result.setFileTxtName(line.trim());
+ } else if (count ==1) {
+ result.setFileNcName(line.trim());
+ }else if (count ==2) {
+ result.setOrigFileName(line.trim());
+ }else if (count ==3) {
+ result.setOrigFileSuffix(line.trim());
+ }else if (count ==4) {
+ result.setFilePath(line.trim());
+ }else if (count ==5) {
+ result.setEquipmentId(line.trim());
+ }else if (count ==6) {
+ result.setFileAddOrDelete(Integer.valueOf(line.trim()));
+ }else if (count == 7) {
+ result.setFileSize(line.trim());
+ }
+ count++;
+ }
+ sc.close();
+ if (result.getFileAddOrDelete() != null ) {
+ if ( result.getFileAddOrDelete()==1) {
+ String path = config.getPaths().get(0) +"/" + result.getFileNcName()+ ".NC";
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(result.getFileNcName()) &&
+ result.getFileNcName().equals("null")) {
+ //鏂囦欢寰呭鐞�
+ //澶囦唤鏁版嵁
+ FileUtilS.deleteFileNewRec(loFilePath);
+ }
+ File ncFile = new File(path);
+ //宸茬粡瀛樺湪鏂囦欢闇�瑕佸浠�
+ String size = String.valueOf(ncFile.length());
+ if (!size.equals(result.getFileSize())) {
+ return false;
+ }
+ boolean bool = this.addDocInfoRecService(result.getEquipmentId(),
+ ncFile,result.getOrigFileSuffix(),
+ FileUtilS.getFilenameNonSuffix(result.getOrigFileName())
+ ,result.getFilePath());
+ if (bool) {
+ FileUtilS.deleteFileNewRec(path);
+ FileUtilS.deleteFileNewRec(loFilePath);
+ }else {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+
+ /**
+ * 绋嬪簭鍥炰紶锛堟秹瀵嗚В鏋愬伐鎺э級
+ * @param pathFile
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public boolean addDocInfoAnalysisSmwNcService(String pathFile,File fileRec){
+ //纭瑙ｆ瀽鐩綍
+ return true;
+ }
+
+ /**
+ * 鏂囨。瑙ｆ瀽
+ * todo 淇敼鍒涘缓鏂囦欢鍏宠仈鍏崇郴锛屾敼鎴愬浐瀹歞ocId锛屽幓闄ゅ垱寤篋ocInfo
+ * @param equipmentId
+ * @param fileRec
+ * @param fileNameSuffix
+ * @param fileNameNew
+ * @param filePath
+ * @return
+ */
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addDocInfoRecService(String equipmentId,File fileRec,String fileNameSuffix,String fileNameNew,String filePath ) {
@@ -261,12 +375,11 @@
ExceptionCast.cast(DocumentCode.DOC_CLASS_ERROR);
}
//鏍规嵁璁惧缂栧彿鏌ヨ鏁版嵁
- String deviceNo = equipmentId;
- if (StringUtils.isEmpty(deviceNo)) {
+ if (StringUtils.isEmpty(equipmentId)) {
return false;
}
- DeviceInfo deviceInfo = deviceInfoService.getByDeviceNo(deviceNo);
- if (deviceInfo == null) {
+ MdcEquipment mdcEquipment = iMdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
+ if (mdcEquipment == null) {
return false;
}
String fileName = FileUtilS.getFilenameNonSuffix(file.getOriginalFilename());
@@ -275,7 +388,7 @@
if(fileUploadResult == null) {
return false;
}
- DocInfo en = findByAttrAndDocName(fileName, 4, deviceInfo.getDeviceId());
+ DocInfo en = findByAttrAndDocName(fileName, 7, mdcEquipment.getId());
if(en != null) {
return false;
}
@@ -288,9 +401,9 @@
docInfo.setDocStatus(1);
docInfo.setSyncStatus(2);
DocRelative docRelative = new DocRelative();
- docRelative.setAttributionId(deviceInfo.getDeviceId());
+ docRelative.setAttributionId(mdcEquipment.getId());
docRelative.setDocId(docInfo.getDocId());
- docRelative.setAttributionType(4);
+ docRelative.setAttributionType(7);
docRelative.setClassificationId(docClass.getClassificationId());
boolean b = docRelativeService.save(docRelative);
if(!b) {
@@ -366,6 +479,14 @@
b = docRelativeService.deleteByDocId(id);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
+ //寮哄埗缁撴潫娴佺▼ 鍒犻櫎鐢ㄦ埛鐨勬寰呭姙浠诲姟
+ List<DispatchFile> dispatchFiles=dispatchFileService.list(new QueryWrapper<DispatchFile>().eq("doc_id",id));
+ if (dispatchFiles != null && !dispatchFiles.isEmpty()) {
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.selectByDataId(dispatchFiles.get(0).getId());
+ if (flowMyBusiness != null) {
+ flowTaskService.end(flowMyBusiness.getProcessInstanceId(), "鍒犻櫎鏂囨。");
+ }
+ }
return super.removeById(id);
}
@@ -667,7 +788,7 @@
public boolean deleteByDeviceId(String deviceId) {
if(!ValidateUtil.validateString(deviceId))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
- Integer attrType = 4;
+ Integer attrType = 7;
/*boolean b = docFileService.deleteByDocAttr(attrType, deviceId);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
--
Gitblit v1.9.3