hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -86,7 +86,7 @@ public void saveGlassInfo(List<GlassInfo> glassinfo) { this.saveBatch(glassinfo); } /* @Override public int getGlassInfoCountByFlowCardId(String flowCardId) { @@ -125,7 +125,7 @@ .collect(Collectors.toList()); log.info("result: {}", result); return result; } }*/ } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java
New file @@ -0,0 +1,20 @@ package com.mes.pp.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.github.yulichang.base.MPJBaseMapper; import com.mes.pp.entity.OptimizeLayout; import org.apache.ibatis.annotations.Mapper; /** * <p> * Mapper 接口 * </p> * * @author zhoush * @since 2024-04-16 */ @DS("pp") @Mapper public interface OptimizeLayoutMapper extends MPJBaseMapper<OptimizeLayout> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java
New file @@ -0,0 +1,16 @@ package com.mes.pp.service; import com.github.yulichang.base.MPJBaseService; import com.mes.pp.entity.OptimizeLayout; /** * <p> * 服务类 * </p> * * @author zhoush * @since 2024-04-16 */ public interface OptimizeLayoutService extends MPJBaseService<OptimizeLayout> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java
New file @@ -0,0 +1,22 @@ package com.mes.pp.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.github.yulichang.base.MPJBaseServiceImpl; import com.mes.pp.entity.OptimizeLayout; import com.mes.pp.mapper.OptimizeLayoutMapper; import com.mes.pp.service.OptimizeLayoutService; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author zhoush * @since 2024-04-16 */ @Service @DS("pp") public class OptimizeLayoutServiceImpl extends MPJBaseServiceImpl<OptimizeLayoutMapper, OptimizeLayout> implements OptimizeLayoutService { } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
@@ -55,16 +55,16 @@ @PostMapping("/updateEdgStorageCage") @ResponseBody public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); return Result.build(200,"【启用/禁用】成功",1); String isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage)?"成功":"失败"; return Result.build(200,"【启用/禁用】"+isSucess,1); } @ApiOperation("磨边缓存理片笼信息 功能：对笼内栅格玻璃进行【清除/更换/绑定】 EdgStorageCage格子信息,EdgStorageCageDetails 玻璃信息 ") @PostMapping("/edgStorageCageGlass") @ResponseBody public Result edgStorageCageGlass(@RequestBody EdgStorageCageDetails edgStorageCageDetails,int edgStorageCageId) { boolean isSucess=edgStorageCageService.updateEdgStorageCageDetails(edgStorageCageId,edgStorageCageDetails); return Result.build(200,"【清除/更换/绑定】成功",1); String isSucess=edgStorageCageService.updateEdgStorageCageDetails(edgStorageCageId,edgStorageCageDetails)?"成功":"失败"; return Result.build(200,"【清除/更换/绑定】"+isSucess,1); } @ApiOperation("磨边模块汇报玻璃状态 功能：对笼内栅格玻璃进行【破损/拿走】 ") @@ -73,8 +73,8 @@ public Result edgReportStatus(@RequestBody Map<String, String> arguments) { String edgStorageCageDetailsId=arguments.get("glassId"); int controlsId=Integer.valueOf(arguments.get("controlsId")); boolean isSucess=edgStorageCageDetailsService.identWorn(edgStorageCageDetailsId,controlsId); return Result.build(200,"【破损/拿走】成功",1); String isSucess=edgStorageCageDetailsService.identWorn(edgStorageCageDetailsId,controlsId)?"成功":"失败"; return Result.build(200,"【破损/拿走】"+isSucess,1); } } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCage.java
@@ -1,6 +1,7 @@ package com.mes.edgstoragecage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -122,9 +122,14 @@ @Override public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage) { EdgStorageCage edgItem = baseMapper.selectById(edgStorageCage.getId()); edgItem.setEnableState(edgStorageCage.getEnableState()); baseMapper.updateById(edgItem); return true; if(edgItem!=null){ edgItem.setEnableState(edgStorageCage.getEnableState()); baseMapper.updateById(edgItem); log.info("卧室缓存：【启用/禁用】 参数:{} 结果:成功",edgStorageCage); return true; } log.info("卧室缓存：【启用/禁用】 参数:{} 结果:失败",edgStorageCage); return false; } /** hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -72,7 +72,7 @@ @Value("${mes.secondLength}") private String secondLength; @Scheduled(fixedDelay = 1000) public void plcHomeEdgTask() { PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject; String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue(); @@ -641,8 +641,8 @@ List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory(); jsonObject.append("currentCutTerritory", currentCutTerritorys); //磨边信息 List<Map<String, Object>> EdgTasks1 = taskCacheService.selectEdgInfo("2001"); List<Map<String, Object>> EdgTasks2 = taskCacheService.selectEdgInfo("2002"); List<Map<String, Object>> EdgTasks1 = taskCacheService.selectEdgInfo(Const.A09_OUT_TARGET_POSITION.toString()); List<Map<String, Object>> EdgTasks2 = taskCacheService.selectEdgInfo(Const.A10_OUT_TARGET_POSITION.toString()); jsonObject.append("EdgTasks1", EdgTasks1); jsonObject.append("EdgTasks2", EdgTasks2); @@ -650,6 +650,7 @@ List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages(); jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos); log.info("推送数据：{}",jsonObject); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -105,6 +105,7 @@ } return emptyList.get(0); } /* @Override public List<DownStorageCageDetails> selectCacheMax() { @@ -124,6 +125,7 @@ ); } */ @Override hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
@@ -52,7 +52,7 @@ private int threshold; // @Scheduled(fixedDelay = 1000) public void autoBindRack() { /* public void autoBindRack() { log.info("根据缓存中已经进片的玻璃种数量最多的流程卡号自动绑定一个启用状态的空架子"); List<DownStorageCageDetails> Details = downStorageCageService.selectCacheMax(); @@ -70,7 +70,7 @@ } } }*/ // @Scheduled(fixedDelay = 1000) hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -189,7 +189,7 @@ //downGlassTaskService.getUnloadingTaskState(); } @Test /* @Test public void updateDownStorageCage() { @@ -198,7 +198,7 @@ downStorageCage.setId(1); downStorageCageService.updateDownStorageCage(downStorageCage); } }*/ }
