From c06fab29ca7826a6dc9736c1ba8ce1e26a11c829 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 06 三月 2025 15:57:08 +0800
Subject: [PATCH] 新增层级结构工艺规程版本、结构树表、新权限表 修改原有权限验证 删除原有代码
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/service/impl/AssignFileStreamServiceImpl.java | 57 ++++++++++-----------------------------------------------
1 files changed, 10 insertions(+), 47 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/service/impl/AssignFileStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/service/impl/AssignFileStreamServiceImpl.java
index b4b380b..ae4f369 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/service/impl/AssignFileStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/service/impl/AssignFileStreamServiceImpl.java
@@ -75,7 +75,7 @@
@Autowired
private IWorkStepService workStepService;
@Autowired
- private IPermissionStreamService permissionStreamService;
+ private IPermissionStreamNewService permissionStreamNewService;
@Autowired
private IDocClassificationService classificationService;
@Autowired
@@ -92,8 +92,6 @@
private ISynchronizedFlagService synchronizedFlagService;
@Autowired
private IDeviceGroupService deviceGroupService;
- @Autowired
- private IDncPassLogService dncPassLogService;
@Autowired
private IDeviceCharactersService iDeviceCharactersService;
@Autowired
@@ -206,7 +204,7 @@
if (deviceDoc != null) {
handleExistingDeviceDoc(docFile, mdcEquipment, stream.getDeviceId());
}
- List<PermissionStream> permissionStreams = getPermissionStreams(stream);
+ PermissionStreamNew permissionStreams = getPermissionStreams(stream);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
saveBusinessObject(stream, userId);
@@ -575,8 +573,9 @@
}
//鏉冮檺鏍￠獙
- private List<PermissionStream> getPermissionStreams(AssignFileStream stream) {
- List<PermissionStream> permissionStreams = new ArrayList<>();
+ private PermissionStreamNew getPermissionStreams(AssignFileStream stream) {
+ PermissionStreamNew permissionStreams;
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (stream.getAttributionType().equals("5")) {
// 宸ュ簭
ProcessStream processStream = processStreamService.getById(stream.getAttributionId());
@@ -587,8 +586,7 @@
stream.setComponentId(processStream.getComponentId());
stream.setPartsId(processStream.getPartsId());
stream.setProcessId(processStream.getProcessId());
- permissionStreams = permissionStreamService
- .getByProcessId(processStream.getProductId(), processStream.getComponentId(), processStream.getPartsId(), processStream.getProcessId());
+ permissionStreams = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(),user.getId(),"5");
} else {
// 宸ユ
WorkStep workStep = workStepService.getById(stream.getAttributionId());
@@ -600,10 +598,9 @@
stream.setPartsId(workStep.getPartsId());
stream.setProcessId(workStep.getProcessId());
stream.setStepId(workStep.getId());
- permissionStreams = permissionStreamService
- .getByStepId(workStep.getProductId(), workStep.getComponentId(), workStep.getPartsId(), workStep.getProcessId(), workStep.getId());
+ permissionStreams = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(workStep.getId(),user.getId(),"6");
}
- if (permissionStreams == null || permissionStreams.isEmpty()) {
+ if (permissionStreams == null ) {
ExceptionCast.cast(ActivitiCode.ACT_NODE_DEPART_NONE);
}
return permissionStreams;
@@ -713,44 +710,10 @@
if (strings != null && !strings.isEmpty()) {
String path = StringUtils.join(strings.toArray(), "/");
Date dateFirst = DateUtil.getNow();
- DncPassLog passInfoTxt = new DncPassLog();
- passInfoTxt.setDayTime(DateUtil.format(dateFirst, DateUtil.STR_YEARMONTHDAY));
- DncPassLog dncPassLog = dncPassLogService.findDayTime(DateUtil.format(dateFirst, 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);
- String sequenceNc = String.format("%06d", fileNc);
- passInfoTxt.setSequenceNumber(fileTxt);
- passInfoTxt.setSequenceOrder(sequence);
- passInfoTxt.setCreateTime(dateFirst);
- passInfoTxt.setPassType("02");
- dncPassLogService.save(passInfoTxt);
-
- DncPassLog passInfoNc = new DncPassLog();
- passInfoNc.setSequenceNumber(fileNc);
- passInfoNc.setSequenceOrder(sequenceNc);
- passInfoNc.setDayTime(DateUtil.format(dateFirst, DateUtil.STR_YEARMONTHDAY));
- passInfoNc.setPassType("02");
- passInfoNc.setPassName(docFile.getFileName());
- try {
- Thread.sleep(1000);
- Date date = new Date();
- passInfoNc.setCreateTime(date);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- dncPassLogService.save(passInfoNc);
-
NcTxtFilePathInfo ncTxt = new NcTxtFilePathInfo();
ncTxt.setEquipmentId(mdcEquipment.getEquipmentId());
- ncTxt.setFileNcName("02A" + DateUtil.format(dateFirst, DateUtil.STR_YEARMONTHDAY) + sequenceNc);
- ncTxt.setFileTxtName("02A" + DateUtil.format(dateFirst, DateUtil.STR_YEARMONTHDAY) + sequence);
+ ncTxt.setFileNcName("02A" + DateUtil.format(dateFirst, DateUtil.STR_YEARMONTHDAY));
+ ncTxt.setFileTxtName("02A" + DateUtil.format(dateFirst, DateUtil.STR_YEARMONTHDAY));
ncTxt.setFilePath(path + "/" + mdcEquipment.getEquipmentId() + "/");
ncTxt.setOrigFileName(docFile.getFileName());
ncTxt.setOrigFileSuffix(docFile.getFileSuffix());
--
Gitblit v1.9.3