From 7f120fc7a05d560db1e47b3ef243fde19a0c56b4 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期二, 28 五月 2024 09:01:19 +0800 Subject: [PATCH] 更改开始上片和暂停接口,选择工程增加信息预览 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 42 insertions(+), 5 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java index 49e6d15..5851554 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java @@ -1,9 +1,19 @@ package com.mes.uppattenusage.controller; +import com.mes.engineering.entity.Engineering; +import com.mes.engineering.service.EngineeringService; +import com.mes.glassinfo.entity.GlassInfo; +import com.mes.glassinfo.service.GlassInfoService; +import com.mes.pp.service.OptimizeProjectService; +import com.mes.uppattenusage.entity.UpPattenUsage; +import com.mes.uppattenusage.service.UpPattenUsageService; +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.*; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +import java.util.List; /** * <p> @@ -11,11 +21,38 @@ * </p> * * @author zhoush - * @since 2024-04-07 + * @since 2024-04-18 */ @RestController -@RequestMapping("/upPattenUsage") +@RequestMapping("/up-patten-usage") +@Slf4j public class UpPattenUsageController { + @Autowired + private UpPattenUsageService upPattenUsageService; + @Autowired + private GlassInfoService glassInfoService; + @Autowired + private EngineeringService engineeringService; + @Autowired + private OptimizeProjectService optimizeProjectService; + @ApiOperation("鏄剧ず姝e湪鍑虹墖鐨勫伐绋嬩俊鎭�") + @GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅 + @ResponseBody + public Result<List<UpPattenUsage>> prioritylist() { + List<UpPattenUsage> glass = upPattenUsageService.prioritylist(); + log.info("鏄剧ず姝e湪鍑虹墖鐨勫伐绋嬩俊鎭�:{}", glass); + return Result.build(200, "", glass); + } + + @ApiOperation("閫夋嫨宸ョ▼鍙峰悗鏄剧ず涓婄墖椤哄簭棰勮") + @PostMapping("/selectUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅 + @ResponseBody + public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) { + List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId()); + return Result.build(200, "", upPattenUsages); + } + + } -- Gitblit v1.8.0