From 0477b72d30cfe7d412edeb237aa587b1c5242207 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 09 七月 2024 08:34:31 +0800 Subject: [PATCH] 1、任务新增计时功能,日志打印每次任务执行的周期 2、卧式理片笼更新出片规则:都为禁用(2),笼子不出玻璃;存在一个禁用,07片台可以存玻璃;都非禁用:两片台有玻璃笼子不出片 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java index ad8b70f..13dbcca 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java @@ -10,11 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -38,15 +34,15 @@ @ApiOperation("鍑虹墖浠诲姟鍒犻櫎") @PostMapping("/deleteTemperingGlassInfo") - public Result deleteTemperingGlassInfo(TemperingGlassInfo temperingGlassInfo) { - temperingGlassInfoService.removeById(temperingGlassInfo); + public Result deleteTemperingGlassInfo(@RequestBody TemperingGlassInfo temperingGlassInfo) { + temperingGlassInfoService.removeById(temperingGlassInfo.getId()); return Result.build(200,"鍒犻櫎鎴愬姛",1); } - @ApiOperation("鍑虹墖浠诲姟鐮存崯") + @ApiOperation("鍑虹墖浠诲姟鐮存崯0/鎷胯蛋1") @PostMapping("/damageTemperingGlassInfo") - public Result damageTemperingGlassInfo(TemperingGlassInfo temperingGlassInfo) { - bigStorageCageDetailsService.damageBigStorageCageDetails(temperingGlassInfo.getGlassId()); + public Result damageTemperingGlassInfo(@RequestBody TemperingGlassInfo temperingGlassInfo,int status) { + bigStorageCageDetailsService.damageBigStorageCageDetails(temperingGlassInfo.getGlassId(),status); return Result.build(200,"鐮存崯鎴愬姛",1); } } -- Gitblit v1.8.0