From 7f8dbce72bf2ed80d164d86944b0bbc3d3720a64 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 20 六月 2024 17:18:22 +0800
Subject: [PATCH] edit queryVo
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java | 28 ++++++++++++++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 13 +++---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 64 +++++++++++++++++---------------
3 files changed, 68 insertions(+), 37 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
new file mode 100644
index 0000000..8599ce2
--- /dev/null
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
@@ -0,0 +1,28 @@
+package com.dy.pmsStation.workOrder;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.dy.common.webUtil.QueryConditionVo;
+import lombok.*;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class QueryVo {
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long id;
+ public String userId;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long lineId;
+ public String stationId;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long planId;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long processId;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long nodeId;
+ public String assistants;
+}
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 eecee9a..c243064 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
@@ -27,13 +27,13 @@
* @param
* @return
*/
- @GetMapping(path="isStationUsed")
- public BaseResponse<Boolean> isStationUsed(StaAssemblyWorkLast last){
- String message = sv.checkStationIsUsed(last);
- if ("OK".equals(message.split("^")[0])) {
- return BaseResponseUtils.buildSuccess(true);
+ @GetMapping(path="checkStationUsed")
+ public BaseResponse<Boolean> isStationUsed(QueryVo last){
+ String message = sv.checkStationUsed(last);
+ if ("FALSE".equals(message.split("\\^")[0])) {
+ return BaseResponseUtils.buildFail(message.split("\\^")[1]);
} else {
- return BaseResponseUtils.buildFail(message);
+ return BaseResponseUtils.buildSuccess(true);
}
}
/**
@@ -48,7 +48,6 @@
List<PrAssemblyPlan> list = sv.selectList(params);
return BaseResponseUtils.buildSuccess(list);
}
-
@GetMapping(path = "test")
public BaseResponse test() {
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 1e56963..a86b7c6 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
@@ -41,58 +41,63 @@
this.assemblyWorkLastDao = assemblyWorkLastDao;
}
- public String checkUser(Long id){
- Long userId = id;
+ public String checkUser(String id){
+ Long userId = null;
String message = "USER";
- //宸ョ珯103
- if(userId != null && userId.toString().startsWith("103")){
- message = checkStation(id);
- return message;
- }
- if(userId == null){
+ if(StringUtils.isBlank(id)){
message = "FALSE^鍛樺伐缂栫爜涓嶈兘涓虹┖";
return message;
}
+ //宸ョ珯103
+ if((!StringUtils.isBlank(id)) && id.toString().startsWith("103")){
+ message = checkStation(id);
+ return message;
+ }
//鐢ㄦ埛101
- if(userId.toString().startsWith("101")){
- userId = Long.parseLong(userId.toString().substring(3));
+ if(id.toString().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^鍛樺伐缂栫爜涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅";
+ message = "FALSE^鍛樺伐缂栫爜:"+ userId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅";
+ return message;
}
message += "^"+ userId;
return message;
}
- public String checkStation(Long id){
- Long stationId = id;
+ public String checkStation(String id){
+ Long stationId = null;
String message = "STATION";
- //鐢ㄦ埛101
- if(stationId != null && stationId.toString().startsWith("101")){
- message = checkUser(id);
- return message;
- }
- if(stationId == null){
+ if(StringUtils.isBlank(id)){
message = "FALSE^宸ョ珯缂栫爜涓嶈兘涓虹┖";
return message;
}
+ //鐢ㄦ埛101
+ if((!StringUtils.isBlank(id)) && id.toString().startsWith("101")){
+ message = checkUser(id);
+ return message;
+ }
//宸ョ珯103
- if(stationId.toString().startsWith("103")){
- stationId = Long.parseLong(stationId.toString().substring(3));
+ if(id.toString().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^宸ョ珯缂栫爜涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅";
+ message = "FALSE^宸ョ珯缂栫爜:"+ stationId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅";
return message;
}
//妫�鏌ュ伐绔�
message += "^"+ stationId;
return message;
}
- public String checkStationIsUsed(StaAssemblyWorkLast last){
+ public String checkStationUsed(QueryVo last){
String message = "OK";
Long userId = null;
Long stationId = null;
@@ -100,7 +105,7 @@
String stationMsg = checkStation(last.getStationId());
if(userMsg.startsWith("FALSE") || stationMsg.startsWith("FALSE")){
if(userMsg.startsWith("FALSE") && stationMsg.startsWith("FALSE")){
- message = userMsg +","+ stationMsg.split("^")[1];
+ message = userMsg +","+ stationMsg.split("\\^")[1];
}else if(userMsg.startsWith("FALSE")){
message = userMsg;
}else if(stationMsg.startsWith("FALSE")){
@@ -109,23 +114,22 @@
return message;
}else{//鏍规嵁缁撴灉 鎵惧埌瀵瑰簲鐨処D鍊�
if(userMsg.startsWith("USER")){
- userId = Long.parseLong(userMsg.split("^")[1]);
+ userId = Long.parseLong(userMsg.split("\\^")[1]);
}else if(userMsg.startsWith("STATION")){
- stationId = Long.parseLong(userMsg.split("^")[1]);
+ stationId = Long.parseLong(userMsg.split("\\^")[1]);
}
if(stationMsg.startsWith("USER")){
- userId = Long.parseLong(stationMsg.split("^")[1]);
+ userId = Long.parseLong(stationMsg.split("\\^")[1]);
}else if(stationMsg.startsWith("STATION")){
- stationId = Long.parseLong(stationMsg.split("^")[1]);
+ stationId = Long.parseLong(stationMsg.split("\\^")[1]);
}
}
if(userId == null || stationId == null){
message = "FALSE^鍛樺伐缂栫爜:"+ last.getUserId() + "鎴栧伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�";
return message;
}
- //妫�鏌ヨ〃涓槸涓嶆槸宸茬粡瀛樺湪
+ //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
StaAssemblyWorkLast param = new StaAssemblyWorkLast();
- param.setUserId(userId);
param.setStationId(stationId);
param.setStatus(1);
List<StaAssemblyWorkLast> userStationList = assemblyWorkLastDao.selectList(param);
--
Gitblit v1.8.0