From 62c74409a587d9921df1a2248ce23b3b0375fbd1 Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期三, 29 五月 2024 14:13:09 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 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 new file mode 100644 index 0000000..5851554 --- /dev/null +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java @@ -0,0 +1,58 @@ +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 java.util.List; + +/** + * <p> + * 鍓嶇鎺у埗鍣� + * </p> + * + * @author zhoush + * @since 2024-04-18 + */ +@RestController +@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