From 4e00cdcadaba4825c224fe6c8a01d89b46e182ce Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 七月 2024 11:41:30 +0800
Subject: [PATCH] 增加破损状态推送，增加用户指定数据库
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 37 ++++++++++++++++++++++++-------------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 2 +-
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserMapper.java | 3 ++-
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 4 ++--
4 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
index 17e7aec..6abbb6a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
@@ -15,7 +15,7 @@
List<TemperingGlassInfo> selectWaitingGlass();
- List<TemperingGlassInfo> selectIntoGlass(int layoutId);
+ List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo);
List<TemperingGlassInfo> selectOutGlass();
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index 36359f6..a7da6ff 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -29,17 +30,20 @@
public List<TemperingGlassInfo> selectWaitingGlass() {
//鑾峰彇绛夊緟杩涚倝涓殑鐜荤拑淇℃伅
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- //wrapper.eq("state",1);
- wrapper.in("state",1,0,-1);
- return temperingMapper.selectList(wrapper);
+ wrapper.select("Top 1 *").eq("state",1);
+ TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
+ QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
+ glassinfo.eq("engineer_id",glass.getEngineerId())
+ .eq("tempering_layout_id", glass.getTemperingLayoutId());
+ return temperingMapper.selectList(glassinfo);
}
@Override
- public List<TemperingGlassInfo> selectIntoGlass(int layoutId) {
+ public List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo) {
//鑾峰彇杩涚倝涓殑鐜荤拑淇℃伅
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.eq("state",2)
- .eq("tempering_layout_id", layoutId)
+ wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId())
+ .eq("engineer_id", temperingGlassInfo.getEngineerId())
.orderByAsc("tempering_layout_id","tempering_feed_sequence");
return temperingMapper.selectList(wrapper);
}
@@ -47,8 +51,13 @@
@Override
public List<TemperingGlassInfo> selectOutGlass() {
//鑾峰彇鍑虹倝涓殑鐜荤拑淇℃伅
+ QueryWrapper<TemperingGlassInfo> wrap = new QueryWrapper<>();
+ wrap.select("Top 1 *").eq("state",3);
+ TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
+ //鏍规嵁宸ョ▼鍙峰拰鐗堝浘鑾峰彇鏁版嵁
QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
- wapper.eq("state", 3)
+ wapper.eq("engineer_id",glass.getEngineerId())
+ .eq("tempering_layout_id", glass.getTemperingLayoutId())
.orderByAsc("tempering_layout_id","tempering_feed_sequence");
return temperingMapper.selectList(wapper);
}
@@ -58,14 +67,15 @@
//鑾峰彇杩囨棆杞彴鏈�澶х殑閽㈠寲鐗堝浘id
QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
wapper.select("Top 1 *").eq("state", 4)
- .orderByDesc("tempering_layout_id");
+ .orderByDesc("tempering_layout_id,engineer_id");
//鏍规嵁鏈�澶х殑鐗堝浘id鏄剧ず閽㈠寲鍚庣殑鐗堝浘淇℃伅
TemperingGlassInfo glassinfo= temperingMapper.selectOne(wapper);
if (glassinfo == null) {
return null; // 鐩存帴杩斿洖null锛岃〃绀烘病鏈夋壘鍒扮鍚堟潯浠剁殑璁板綍
}
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId());
+ wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId())
+ .eq("engineer_id",glassinfo.getEngineerId());
return temperingMapper.selectList(wrapper);
}
@@ -73,7 +83,7 @@
@Override
public List<TemperingGlassInfo> selectLayoutId() {
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.select("distinct tempering_layout_id")
+ wrapper.select("distinct tempering_layout_id,engineer_id")
.eq("state",2)
.orderByAsc("tempering_layout_id");
return temperingMapper.selectList(wrapper);
@@ -89,10 +99,11 @@
@Override
public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
- QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+ UpdateWrapper<TemperingGlassInfo> wrapper = new UpdateWrapper<>();
wrapper.eq("glass_id",temperingGlassInfo.getGlassId())
- .lt("state",5);
- if (temperingMapper.update(temperingGlassInfo,wrapper) > 0) {
+ .lt("state",5)
+ .set("state", temperingGlassInfo.getState());;
+ if (temperingMapper.update(null,wrapper) > 0) {
return 200;
}else {
return 100;
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserMapper.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserMapper.java
index 68d34de..b9c491c 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserMapper.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserMapper.java
@@ -1,5 +1,6 @@
package com.mes.userinfo.mapper;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.github.yulichang.base.MPJBaseMapper;
import com.mes.userinfo.entity.SysUser;
@@ -11,7 +12,7 @@
* @author zhoush
* @since 2024-04-11
*/
-
+@DS("hangzhoumes")
public interface SysUserMapper extends MPJBaseMapper<SysUser> {
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index a58215e..f7e63e5 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -35,11 +35,11 @@
List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
//杩涚倝涓殑鐜荤拑
if(!layoutId.isEmpty()) {
- List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
+ List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0));
jsonObject.append("intoGlass", intoGlass);
//杩涚倝涓殑绗簩涓増鍥�
if (layoutId.size() > 1) {
- List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
+ List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1));
jsonObject.append("intoGlass2", intoGlass2);
}
}
--
Gitblit v1.8.0