From d7c55e6c4d27a1640a8b8dd728aa3201be8c1e57 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 24 六月 2024 13:05:30 +0800
Subject: [PATCH] update login check API
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 10 +++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 165 ++++++++++++++++++++++++++-----------------------------
2 files changed, 88 insertions(+), 87 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
index 7fd51c1..85fdce9 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
@@ -47,6 +47,16 @@
return BaseResponseUtils.buildSuccess(stationInfo);
}
/**
+ * 鏌ヨ宸ョ珯鏄惁宸茬粡琚崰鐢�
+ * @param
+ * @return
+ */
+ @GetMapping(path="checkStationUsed")
+ public BaseResponse<StaAssemblyWorkLast> checkStationUsed(QueryVo last){
+ StaAssemblyWorkLast stationInfo = sv.checkStationUsed(last);
+ return BaseResponseUtils.buildSuccess(stationInfo);
+ }
+ /**
* 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟
* @param
* @return
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 8c285b3..8886f71 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
@@ -25,7 +25,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -100,60 +102,89 @@
}else if(stationInfo.getDisabled()){
throw new RuntimeException("宸ョ珯("+stationInfo.getName()+")缂栫爜:"+ stationId +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤宸ョ珯");
}
- //妫�鏌ヨ〃涓璼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 checkUserAndStation(QueryVo last){
- String message = "OK";
- Long userId = null;
- Long stationId = null;
- String userMsg ="";// checkUser(last.getUserId());
- String stationMsg = "";//checkStationUsed(last.getStationId());
+ public StaAssemblyWorkLast checkStationUsed(QueryVo last){
+ StaAssemblyWorkLast result = new StaAssemblyWorkLast();
+ PltStation stationInfo = null;
+ BaUser userInfo = null;
+ if(StringUtils.isBlank(last.getStationId()) || StringUtils.isBlank(last.getUserId())){
+ throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
+ }
//宸ョ珯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();
+ stationInfo = getStationInfo(last.getStationId());
}else{
- //userMsg = checkUser(last.getStationId());
+ userInfo = getUserInfo(last.getStationId());
}
-
- if(userMsg.startsWith("FALSE") || stationMsg.startsWith("FALSE")){
- if(userMsg.startsWith("FALSE") && stationMsg.startsWith("FALSE")){
- message = userMsg +","+ stationMsg.split("\\^")[1];
- }else if(userMsg.startsWith("FALSE")){
- message = userMsg;
- }else if(stationMsg.startsWith("FALSE")){
- message = stationMsg;
- }
- return message;
- }else{//鏍规嵁缁撴灉 鎵惧埌瀵瑰簲鐨処D鍊�
- if(userMsg.startsWith("USER")){
- userId = Long.parseLong(userMsg.split("\\^")[1]);
- }else if(userMsg.startsWith("STATION")){
- stationId = Long.parseLong(userMsg.split("\\^")[1]);
- }
- if(stationMsg.startsWith("USER")){
- userId = Long.parseLong(stationMsg.split("\\^")[1]);
- }else if(stationMsg.startsWith("STATION")){
- stationId = Long.parseLong(stationMsg.split("\\^")[1]);
- }
+ if(last.getUserId().startsWith("103")){
+ stationInfo = getStationInfo(last.getUserId());
+ }else{
+ userInfo = getUserInfo(last.getUserId());
}
- if(userId == null || stationId == null){
- message = "FALSE^鍛樺伐缂栫爜:"+ last.getUserId() + "鎴栧伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�";
- return message;
+ if(userInfo == null && stationInfo == null){
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "鍜屽伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
+ }else if(userInfo == null){
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "涓嶆纭�,璇锋鏌�");
+ }else if(stationInfo == null){
+ throw new RuntimeException("宸ョ珯缂栫爜:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
}
- return message;
+ //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
+ StaAssemblyWorkLast param = new StaAssemblyWorkLast();
+ param.setStationId(stationInfo.getId());
+ param.setStatus(1);
+ List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
+ long userId = userInfo.getId();
+ if(workLasts.size() > 0){
+ List<StaAssemblyWorkLast> userStationList = workLasts.stream().filter(item->userId == item.getUserId()).collect(Collectors.toList());
+ if(userStationList.size() == 0){
+ throw new RuntimeException("鍛樺伐("+workLasts.get(0).getUserName()+")缂栫爜:"+ workLasts.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔�("+workLasts.get(0).getStationName()+")缂栫爜:" + workLasts.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦");
+ }else{
+ BeanUtils.copyProperties(userStationList.get(0),result);
+ }
+ }else{
+ result.setStationId(stationInfo.getId());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
+ }
+ return result;
+ }
+ @Transactional
+ public int save(QueryVo last) {
+ //鍏坈heck
+ StaAssemblyWorkLast checkResult = checkStationUsed(last);
+ //鏍￠獙planId processId nodeId
+ PrAssemblyPlan params = new PrAssemblyPlan();
+ params.setStatus(1);
+ params.setId(last.getPlanId());
+ params.setProcessId(last.getProcessId());
+ List<PrAssemblyPlan> planList = selectAssyPlanList(params);
+ planList.stream().forEach(process -> {
+ process.nodes.stream().filter(node -> node.id == last.getNodeId());
+ });
+ last.setLineId(checkResult.getLineId());
+ StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
+ BeanUtils.copyProperties(last,staLast);
+ staLast.setUserId(checkResult.getUserId());
+ staLast.setStationId(checkResult.getStationId());
+ int count = 0;
+ if(checkResult.getId() == null){
+ BeanUtils.copyProperties(last,staLast);
+ staLast.setUserId(checkResult.getUserId());
+ staLast.setStationId(checkResult.getStationId());
+ staLast.setStatus(1);
+ staLast.setStartTime(new Date());
+ count = assemblyWorkLastDao.insertSelective(staLast);
+ }else{
+ BeanUtils.copyProperties(checkResult,staLast);
+ staLast.setPlanId(last.getPlanId());
+ staLast.setProcessId(last.getProcessId());
+ staLast.setNodeId(last.getNodeId());
+ staLast.setStatus(1);
+ staLast.setStartTime(new Date());
+ count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
+ }
+ return count;
}
public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanList(params);
@@ -179,45 +210,5 @@
ins.orgName = file.orgName;
ins.extName = file.extName;
}
- @Transactional
- public int save(QueryVo last) {
- //鍏坈heck
- PltStation stationInfo = null;
- BaUser userInfo = null;
- //宸ョ珯103
- if(last.getStationId().startsWith("103")){
- stationInfo = getStationInfo(last.getStationId());
- }else{
- userInfo = getUserInfo(last.getStationId());
- }
- if(last.getUserId().startsWith("103")){
- stationInfo = getStationInfo(last.getUserId());
- }else{
- userInfo = getUserInfo(last.getUserId());
- }
- if(userInfo == null && stationInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "鍜屽伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
- }else if(userInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "涓嶆纭�,璇锋鏌�");
- }else if(stationInfo == null){
- throw new RuntimeException("宸ョ珯缂栫爜:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
- }
- //鏍￠獙planId processId nodeId
- PrAssemblyPlan params = new PrAssemblyPlan();
- params.setStatus(1);
- params.setId(last.getPlanId());
- params.setProcessId(last.getProcessId());
- List<PrAssemblyPlan> list = selectAssyPlanList(params);
- list.stream().filter(process -> {
- process.nodes.stream().filter(node -> node.id == last.getNodeId());
- return false;
- });
- last.setLineId(stationInfo.getLineId());
- StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
- BeanUtils.copyProperties(last,staLast);
- staLast.setUserId(userInfo.getId());
- staLast.setStationId(stationInfo.getId());
- int count = assemblyWorkLastDao.insertSelective(staLast);
- return count;
- }
+
}
\ No newline at end of file
--
Gitblit v1.8.0