From 1d9f9bd9afb6e18aa73b456555256564e34b2acc Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 28 五月 2024 13:20:06 +0800 Subject: [PATCH] 卧式理片笼线程改造:1、优化任务查询,每次只获取第一条数据,避免任务表数据过多 2、玻璃尺寸限制改为配置 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 8 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java index 020a22d..785dd88 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java @@ -1,9 +1,21 @@ package com.mes.edgstoragecage.controller; +import com.mes.edgstoragecage.entity.EdgStorageCage; +import com.mes.edgstoragecage.entity.EdgStorageCageDetails; +import com.mes.edgstoragecage.service.EdgStorageCageService; +import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl; +import com.mes.taskcache.entity.TaskCache; +import com.mes.taskcache.service.impl.TaskCacheServiceImpl; +import com.mes.utils.Result; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.awt.image.ImageProducer; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * <p> @@ -13,15 +25,41 @@ * @author zhoush * @since 2024-04-07 */ +@Api(tags = "鐞嗙墖绗肩紦瀛�") @RestController @RequestMapping("/edgStorageCage") public class EdgStorageCageController { - //todo: 瀹炰緥浠g爜 寰呭垹闄� - @ApiOperation("娴嬭瘯") - @GetMapping("/index") - public String index() { - return "hello world"; + @Autowired + private EdgStorageCageService edgStorageCageService; + + @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 鍙傛暟()") + @PostMapping("/selectEdgStorageCage") + @ResponseBody + public Result selectEdgStorageCage () { + List<Map<String, Object>> list=edgStorageCageService.selectEdgStorageCages(); + return Result.build(200,"鎴愬姛",list); + } +// @ApiOperation("娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(EdgStorageCage edgStorageCage)") +// @PostMapping("/insertEdgStorageCage") +// @ResponseBody +// public Result insertEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { +// boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); +// return Result.build(200,"娣诲姞鎴愬姛",1); +// } + @ApiOperation("淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�") + @PostMapping("/updateEdgStorageCage") + @ResponseBody + public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { + boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); + return Result.build(200,"鏇存崲鎴愬姛",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); } } -- Gitblit v1.8.0