hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
@@ -4,6 +4,8 @@ import com.github.yulichang.base.MPJBaseMapper; import com.mes.temperingglass.entity.TemperingGlassInfo; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.List; @@ -19,5 +21,13 @@ public interface TemperingGlassInfoMapper extends MPJBaseMapper<TemperingGlassInfo> { boolean saveBatch(@Param(value = "list") List<TemperingGlassInfo> list); //绕过全局逻辑进行查询 @Select("SELECT * FROM tempering_glass_info " + "WHERE tempering_layout_id = #{temperingLayoutId} " + "AND engineer_id = #{engineerId} " + "ORDER BY tempering_layout_id DESC, tempering_feed_sequence ASC") List<TemperingGlassInfo> selectByEngineerIdAndLayoutId(String engineerId, Integer temperingLayoutId); //绕过全局逻辑进行修改 @Update("UPDATE tempering_glass_info " + "SET state = #{state}, " + "deleted = CASE WHEN #{state} < 8 THEN 0 ELSE deleted END " + "WHERE glass_id = #{glassId}") Integer updateTemperingGlassInfo(TemperingGlassInfo temperingGlassInfo); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -36,7 +36,8 @@ QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>(); glassinfo.eq("engineer_id", glass.getEngineerId()) .eq("tempering_layout_id", glass.getTemperingLayoutId()); return temperingMapper.selectList(glassinfo); //return temperingMapper.selectList(glassinfo); return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId()); }else { return null; } @@ -45,11 +46,13 @@ @Override public List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo) { //获取进炉中的玻璃信息 QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId()) .eq("engineer_id", temperingGlassInfo.getEngineerId()) .orderByAsc("tempering_layout_id","tempering_feed_sequence"); return temperingMapper.selectList(wrapper); // QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); // wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId()) // .eq("engineer_id", temperingGlassInfo.getEngineerId()) // .orderByAsc("tempering_layout_id","tempering_feed_sequence"); // return temperingMapper.selectList(wrapper); return temperingMapper.selectByEngineerIdAndLayoutId(temperingGlassInfo.getEngineerId(),temperingGlassInfo.getTemperingLayoutId()); } @Override @@ -60,11 +63,7 @@ TemperingGlassInfo glass=temperingMapper.selectOne(wrap); //根据工程号和版图获取数据 if(glass != null) { QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>(); wapper.eq("engineer_id", glass.getEngineerId()) .eq("tempering_layout_id", glass.getTemperingLayoutId()) .orderByAsc("tempering_layout_id", "tempering_feed_sequence"); return temperingMapper.selectList(wapper); return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId()); } return null; } @@ -80,11 +79,8 @@ if (glassinfo == null) { return null; // 直接返回null，表示没有找到符合条件的记录 } QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId()) .eq("engineer_id",glassinfo.getEngineerId()); return temperingMapper.selectByEngineerIdAndLayoutId(glassinfo.getEngineerId(),glassinfo.getTemperingLayoutId()); return temperingMapper.selectList(wrapper); } @Override @@ -106,11 +102,7 @@ @Override public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) { UpdateWrapper<TemperingGlassInfo> wrapper = new UpdateWrapper<>(); wrapper.eq("glass_id",temperingGlassInfo.getGlassId()) .lt("state",6) .set("state", temperingGlassInfo.getState());; if (temperingMapper.update(null,wrapper) > 0) { if (temperingMapper.updateTemperingGlassInfo(temperingGlassInfo) > 0) { return 200; }else { return 100; hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -764,7 +764,7 @@ @Scheduled(fixedDelay = 1000) public void cacheGlassIsRun() { JSONObject jsonObject = new JSONObject(); //正在进行的任务 //正在进行的磨边任务 List<EdgGlassTaskInfo> taskCaches = edgGlassTaskInfoService.selectTaskCacheIsRun(); jsonObject.append("taskCaches", taskCaches); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlassIsRun"); hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -36,7 +36,7 @@ * fixedDelay : 上一个调用结束后再次调用的延时 */ @Scheduled(fixedDelay = 10000) @Scheduled(fixedDelay = 5000) public void screenHome() { JSONObject jsonObject = new JSONObject(); Reportingdamage reportingdamage = new Reportingdamage(); hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -66,27 +66,7 @@ if (outGlass != null) { jsonObject.append("overGlass", overGlass); } //当前钢化工程的拿走数据 LambdaQueryWrapper<TemperingGlassInfo> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.select(TemperingGlassInfo::getEngineerId) .lt(TemperingGlassInfo::getState, Const.TEMPERING_END) .groupBy(TemperingGlassInfo::getEngineerId); List<String> engineerIds = temperingAgoService.list(queryWrapper) .stream() .map(TemperingGlassInfo::getEngineerId) .distinct() .collect(Collectors.toList()); List<Damage> temperingTakeGlassInfos = damageService.list( new LambdaQueryWrapper<Damage>() .in(Damage::getEngineerId, engineerIds) .eq(Damage::getType, Const.GLASS_STATE_TAKE) .orderByAsc(Damage::getId) ); jsonObject.append("temperingTakeGlassInfos", temperingTakeGlassInfos); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass"); if (sendwServer != null) { @@ -106,8 +86,6 @@ //正在进行的任务 List<TemperingGlassInfo> temperingTaskType = temperingAgoService.selectTaskType(); jsonObject.append("temperingTaskType", temperingTaskType); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingIsRun"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -48,10 +48,12 @@ return Result.build(200, "", glass); } @ApiOperation("//钢化破损") @ApiOperation("//钢化破损拿走放回") @PostMapping("/updateTemperingState") //钢化后显示出炉的版图信息 public Result <Integer> updateTemperingState(@RequestBody Damage damage) { damageService.insertDamage(damage); if(damage.getStatus()>5) { damageService.insertDamage(damage); } TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo(); temperingGlassInfo.setState(damage.getStatus()); temperingGlassInfo.setGlassId(damage.getGlassId());
