From 8d97b3e1102752d5ca023ef88817032997144b04 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 21 六月 2024 15:48:10 +0800
Subject: [PATCH] plan add note
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 8 ++++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 24 ++++++++----
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 2
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 78 +++++++++++++++++++--------------------
pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml | 3 +
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 4 ++
6 files changed, 70 insertions(+), 49 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index 8f4f11a..580f0f2 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotNull;
@@ -34,6 +35,9 @@
@NotNull(message="[鐢ㄦ埛瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long userId;
+
+ @TableField(exist = false)
+ public String userName;
/**
* 鐢熶骇绾垮疄浣撶紪鍙�
*/
@@ -46,6 +50,10 @@
@NotNull(message="[宸ョ珯瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long stationId;
+
+ @TableField(exist = false)
+ public String stationName;
+
/**
* 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
*/
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index ab18a26..0bdfc35 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -73,7 +73,7 @@
select
<include refid="Base_Column_List" />
from ba_user
- where id = #{id} and disabled!=1 and deleted!=1
+ where id = #{id}
</select>
<select id="selectSomeCount" parameterType="java.util.Map" resultType="java.lang.Long">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
index aa94d68..363c06c 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
@@ -24,6 +24,9 @@
<select id="selectLineNameById" parameterType="java.lang.Long" resultType="String">
select name from plt_production_line where id = #{lineId}
</select>
+ <select id="selectNameByStationId" parameterType="java.lang.Long" resultType="String">
+ select name from plt_station where id = #{id}
+ </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index eb7476b..03bcba8 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -17,6 +17,10 @@
<result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
<result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
<result property="assistants" column="assistants" jdbcType="VARCHAR"/>
+ <association property="userName" column="user_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
+ <association property="stationName" column="station_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltStationMapper.selectNameByStationId" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
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 d2bfa5e..867d237 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
@@ -2,6 +2,8 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pmsGlobal.pojoBa.BaUser;
+import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
@@ -23,18 +25,24 @@
this.sv = workOrderSv;
}
/**
+ * 鏌ヨ鐢ㄦ埛淇℃伅
+ * @param
+ * @return
+ */
+ @GetMapping(path="getUserInfo")
+ public BaseResponse<BaUser> getUserInfo(String userId) throws Exception {
+ BaUser userInfo = sv.getUserInfo(userId);
+ return BaseResponseUtils.buildSuccess(userInfo);
+ }
+ /**
* 鏌ヨ宸ョ珯鏄惁宸茬粡琚崰鐢�
* @param
* @return
*/
- @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.buildSuccess(true);
- }
+ @GetMapping(path="getStationInfo")
+ public BaseResponse<PltStation> getStationInfo(String stationId){
+ PltStation stationInfo = sv.getStationInfo(stationId);
+ return BaseResponseUtils.buildSuccess(stationInfo);
}
/**
* 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟
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 6b82f7a..e2b8675 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
@@ -2,6 +2,7 @@
import com.alibaba.excel.util.StringUtils;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.GlException;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoOth.OthFileMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
@@ -62,47 +63,35 @@
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 +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤鍛樺伐");
+ }else if(userInfo.getDeleted()){
+ 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());
@@ -111,19 +100,36 @@
record.setId(stationId);
List<PltStation> stationInfo = pltStationDao.selectStationList(record);
if(stationInfo.size() == 0){
- message = "FALSE^宸ョ珯缂栫爜:"+ stationId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅";
- return message;
+ throw new RuntimeException("宸ョ珯缂栫爜:"+ 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.get(0);
}
- 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];
@@ -149,14 +155,6 @@
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> selectAssyPlanList(PrAssemblyPlan params){
--
Gitblit v1.8.0