From f26131172d91045a502cb5f42c9da4dac6ffaf65 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 21 六月 2024 16:26:01 +0800
Subject: [PATCH] check user and station
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 131 +++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 48 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index a86b7c6..1cc15ce 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -1,17 +1,25 @@
package com.dy.pmsStation.workOrder;
import com.alibaba.excel.util.StringUtils;
-import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
+import com.dy.pmsGlobal.daoOth.OthFileMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
+import com.dy.pmsGlobal.daoPr.PrProductionNodeMapper;
+import com.dy.pmsGlobal.daoPr.PrProductionProcessMapper;
+import com.dy.pmsGlobal.daoPr.PrWorkingInstructionMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
+import com.dy.pmsGlobal.dyFile.FileOperate;
+import com.dy.pmsGlobal.dyFile.FileRestVo;
import com.dy.pmsGlobal.pojoBa.BaUser;
+import com.dy.pmsGlobal.pojoOth.OthFile;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
+import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -23,7 +31,10 @@
private BaUserMapper baUserDao;
private PltStationMapper pltStationDao;
private StaAssemblyWorkLastMapper assemblyWorkLastDao;
-
+ private FileOperate fileOperate;
+ private OthFileMapper othFileMapper;
+ @Value("${dy.webFile.fmUrl}")
+ private String fmUrl ;
@Autowired
public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
this.assemblyDao = assemblyDao;
@@ -40,69 +51,80 @@
private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao){
this.assemblyWorkLastDao = assemblyWorkLastDao;
}
+ @Autowired
+ public void setFileOperate(FileOperate fileOperate){
+ this.fileOperate = fileOperate;
+ }
+ @Autowired
+ public void setOthFileMapper(OthFileMapper othFileMapper){
+ this.othFileMapper = othFileMapper;
+ }
- public String checkUser(String id){
+ public BaUser getUserInfo(String id){
Long userId = null;
- String message = "USER";
if(StringUtils.isBlank(id)){
- message = "FALSE^鍛樺伐缂栫爜涓嶈兘涓虹┖";
- return message;
- }
- //宸ョ珯103
- if((!StringUtils.isBlank(id)) && id.toString().startsWith("103")){
- message = checkStation(id);
- return message;
+ throw new RuntimeException("鍛樺伐缂栫爜涓嶈兘涓虹┖");
}
//鐢ㄦ埛101
- if(id.toString().startsWith("101")){
+ if(id.startsWith("101")){
userId = Long.parseLong(id.toString().substring(3));
}else{
userId = Long.parseLong(id.toString());
}
BaUser userInfo = baUserDao.selectByPrimaryKey(userId);
if(userInfo == null){
- message = "FALSE^鍛樺伐缂栫爜:"+ userId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅";
- return message;
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ userId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅");
+ }else if(userInfo.getDisabled()){
+ throw new RuntimeException("鍛樺伐("+userInfo.getName()+")缂栫爜:"+ userId +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤鍛樺伐");
}
- message += "^"+ userId;
- return message;
+ return userInfo;
}
- public String checkStation(String id){
+ public PltStation getStationInfo(String id){
Long stationId = null;
- String message = "STATION";
if(StringUtils.isBlank(id)){
- message = "FALSE^宸ョ珯缂栫爜涓嶈兘涓虹┖";
- return message;
- }
- //鐢ㄦ埛101
- if((!StringUtils.isBlank(id)) && id.toString().startsWith("101")){
- message = checkUser(id);
- return message;
+ throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
}
//宸ョ珯103
- if(id.toString().startsWith("103")){
+ if(id.startsWith("103")){
stationId = Long.parseLong(id.toString().substring(3));
}else{
stationId = Long.parseLong(id.toString());
}
- PltStation record = new PltStation();
- record.setId(stationId);
- List<PltStation> stationInfo = pltStationDao.selectStationList(record);
- if(stationInfo.size() == 0){
- message = "FALSE^宸ョ珯缂栫爜:"+ stationId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅";
- return message;
+ PltStation stationInfo = pltStationDao.selectByPrimaryKey(stationId);
+ if(stationInfo == null){
+ throw new RuntimeException("宸ョ珯缂栫爜:"+ stationId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅");
+ }else if(stationInfo.getDisabled()){
+ throw new RuntimeException("宸ョ珯("+stationInfo.getName()+")缂栫爜:"+ stationId +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤宸ョ珯");
}
- //妫�鏌ュ伐绔�
- message += "^"+ stationId;
- return message;
+ //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
+ StaAssemblyWorkLast param = new StaAssemblyWorkLast();
+ param.setStationId(stationId);
+ param.setStatus(1);
+ List<StaAssemblyWorkLast> userStationList = assemblyWorkLastDao.selectList(param);
+ if(userStationList.size() > 0){
+ throw new RuntimeException("鍛樺伐("+userStationList.get(0).getUserName()+")缂栫爜:"+ userStationList.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔�("+userStationList.get(0).getStationName()+")缂栫爜:" + userStationList.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦");
+ }
+ return stationInfo;
}
- public String checkStationUsed(QueryVo last){
+ public String checkUserAndStation(QueryVo last){
String message = "OK";
Long userId = null;
Long stationId = null;
- String userMsg = checkUser(last.getUserId());
- String stationMsg = checkStation(last.getStationId());
+ String userMsg ="";// checkUser(last.getUserId());
+ String stationMsg = "";//checkStationUsed(last.getStationId());
+ //宸ョ珯103
+ if(last.getUserId().startsWith("103")){
+ stationId = getStationInfo(last.getUserId()).getId();
+ }else{
+ userId = getUserInfo(last.getUserId()).getId();
+ }
+ if(last.getStationId().startsWith("103")){
+ stationId = getStationInfo(last.getStationId()).getId();
+ }else{
+ //userMsg = checkUser(last.getStationId());
+ }
+
if(userMsg.startsWith("FALSE") || stationMsg.startsWith("FALSE")){
if(userMsg.startsWith("FALSE") && stationMsg.startsWith("FALSE")){
message = userMsg +","+ stationMsg.split("\\^")[1];
@@ -128,18 +150,31 @@
message = "FALSE^鍛樺伐缂栫爜:"+ last.getUserId() + "鎴栧伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�";
return message;
}
- //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
- StaAssemblyWorkLast param = new StaAssemblyWorkLast();
- param.setStationId(stationId);
- param.setStatus(1);
- List<StaAssemblyWorkLast> userStationList = assemblyWorkLastDao.selectList(param);
- if(userStationList.size() > 0){
- message = "FALSE^鍛樺伐缂栫爜:"+ userStationList.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔欑紪鐮�:" + userStationList.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦";
- }//message = "OK^鍛樺伐缂栫爜:"+ userId+ "宸茬粡缁戝畾璇ュ伐绔欑紪鐮�:" + stationId + ".楠岃瘉閫氳繃";
return message;
}
- public List<PrAssemblyPlan> selectList(PrAssemblyPlan params){
- List<PrAssemblyPlan> planList = assemblyDao.selectList(params);
+ public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
+ List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanList(params);
+ planList.stream().forEach(process -> {
+ process.nodes.forEach(node -> {
+ if(node.instruction != null){
+ addUrl(node.instruction);
+ }
+ });
+ });
return planList;
}
+ private void addUrl(PrWorkingInstruction ins){
+ if (ins == null || ins.fileId == null) {
+ return;
+ }
+ OthFile file = othFileMapper.selectByPrimaryKey(ins.fileId);
+ if (file == null) {
+ return;
+ }
+ FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
+ ins.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + ins.fileId;
+ ins.orgName = file.orgName;
+ ins.extName = file.extName;
+ }
+
}
--
Gitblit v1.8.0