hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/mapper/DamageMapper.java
@@ -1,5 +1,6 @@ package com.mes.damage.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.mes.damage.entity.Damage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ * @author wu * @since 2024-06-13 */ @DS("hangzhoumes") public interface DamageMapper extends BaseMapper<Damage> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java
@@ -1,5 +1,6 @@ package com.mes.glassinfo.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.github.yulichang.base.MPJBaseMapper; import com.mes.glassinfo.entity.GlassInfo; @@ -11,6 +12,7 @@ * @author wu * @since 2024-04-29 */ @DS("hangzhoumes") public interface GlassInfoMapper extends MPJBaseMapper<GlassInfo> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
@@ -24,4 +24,7 @@ List<TemperingGlassInfo> selectLayoutId(); List<TemperingGlassInfo> selectTaskType(); Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -86,4 +86,16 @@ .groupBy("state"); return temperingMapper.selectList(wrapper); } @Override public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) { QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.eq("glass_id",temperingGlassInfo.getGlassId()) .lt("state",5); if (temperingMapper.update(temperingGlassInfo,wrapper) > 0) { return 200; }else { return 100; } } } hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/mapper/WorkAssignmentMapper.java
@@ -1,5 +1,6 @@ package com.mes.work_assignment.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.mes.work_assignment.entity.WorkAssignment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ * @author wu * @since 2024-07-01 */ @DS("hangzhoumes") public interface WorkAssignmentMapper extends BaseMapper<WorkAssignment> { } hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -121,8 +121,8 @@ @Test public void testSelectCacheEmpty() { List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty(); log.info("笼内空格：{}", Arrays.asList(map)); // List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty(); // log.info("笼内空格：{}", Arrays.asList(map)); } @Test hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -25,7 +25,7 @@ @Autowired private ReportingWorkService reportingWorkService; @Autowired private OptimizeProjectService optimizeProjectService; private OptimizeProjectService optimizeProjectService; @Autowired private OrdersService ordersService; /** @@ -34,45 +34,26 @@ */ @Scheduled(fixedDelay = 2000) public void screenHome(){ public void screenHome() { JSONObject jsonObject = new JSONObject(); //正在等待进片的玻璃 Reportingdamage reportingdamage = new Reportingdamage(); reportingdamage.setReportingWorkTime("2024-05-11"); //获取切割信息 reportingdamage.setThisProcess("切割"); List<Reportingdamage> cutting = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("cutting", cutting); //获取磨边信息 reportingdamage.setThisProcess("磨边"); List<Reportingdamage> edging = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("edging", edging); //获取钢化信息 reportingdamage.setThisProcess("钢化"); List<Reportingdamage> tempering = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("tempering", tempering); //获取夹胶信息 reportingdamage.setThisProcess("夹胶"); List<Reportingdamage> doubling = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("doubling", doubling); //获取中空信息 reportingdamage.setThisProcess("中空"); List<Reportingdamage> hollow = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("hollow", hollow); //获取包装信息 reportingdamage.setThisProcess("包装"); List<Reportingdamage> packaging = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("packaging", packaging); //扇形图各设备的加工破损数量 List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("device", device); //获取次破未补信息 List<AwaitingRepair>awaitingRepairs = reportingWorkService.selectAwaitingRepair(); List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair(); jsonObject.append("awaitingRepairs", awaitingRepairs); //获取正在进行的工程 List<OptimizeProject>optimizeProjects= optimizeProjectService.getDoingTask(); List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask(); jsonObject.append("DoingTask", optimizeProjects); //获取当前订单 List<Orders>orders=ordersService.selectOrders(); List<Orders> orders = ordersService.selectOrders(); jsonObject.append("orders", orders); /*现场规划图显示*/ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("screen"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,13 +1,13 @@ package com.mes.temperingglass.controller; import com.mes.damage.entity.Damage; import com.mes.damage.service.DamageService; import com.mes.temperingglass.service.TemperingGlassInfoService; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -22,12 +22,14 @@ public class TemperingGlassInfoController { @Autowired private TemperingGlassInfoService temperingAgoService; private TemperingGlassInfoService temperingGlassInfoService; @Autowired private DamageService damageService; @ApiOperation("查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中") @GetMapping("/selectWaitingGlass") // 查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中 public Result <List<TemperingGlassInfo>> selectWaitingGlass() { List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass(); List<TemperingGlassInfo> glass = temperingGlassInfoService.selectWaitingGlass(); log.info("等待中的玻璃信息{}",glass); return Result.build(200, "", glass); } @@ -41,10 +43,24 @@ @ApiOperation("//钢化后显示出炉的版图信息。") @GetMapping("/selectOutGlass") //钢化后显示出炉的版图信息 public Result <List<TemperingGlassInfo>> selectOutGlass() { List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass(); List<TemperingGlassInfo> glass = temperingGlassInfoService.selectOutGlass(); log.info("钢化出炉后的玻璃信息{}",glass); return Result.build(200, "", glass); } @ApiOperation("//钢化破损") @PostMapping("/updateTemperingState") //钢化后显示出炉的版图信息 public Result <Integer> updateTemperingState(@RequestBody Damage damage) { damageService.insertDamage(damage); TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo(); if(damage.getStatus()==2){ temperingGlassInfo.setState(5); } temperingGlassInfo.setGlassId(damage.getGlassId()); int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo); return Result.build(200, "破损成功", result); } }
