From 999ac56a03c8221a084a3afab870d258dd4d9741 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期四, 21 十一月 2024 17:09:40 +0800 Subject: [PATCH] 预览状态,开始上片,暂停接口完善,前端页面新增字段 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java new file mode 100644 index 0000000..26cd5c3 --- /dev/null +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java @@ -0,0 +1,109 @@ +package com.mes.engineering.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 wu + * @since 2024-04-22 + */ +@RestController +@Slf4j +@RequestMapping("/engineering/engineering") +public class EngineeringController { + @Autowired + private EngineeringService engineeringService; + @Autowired + private UpPattenUsageService upPattenUsageService; + @Autowired + private GlassInfoService glassInfoService; + @Autowired + private OptimizeProjectService optimizeProjectService; + @ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0") + @PostMapping("/pauseTask") //鏆傚仠涓婄墖浠诲姟 + @ResponseBody + public Result <List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) { + boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState()); + List<UpPattenUsage> glass = upPattenUsageService.prioritylist(); + if(work){ + return Result.build(200,"鎴愬姛",glass); + }else { + return Result.build(100,"澶辫触",glass); + } + } + + @ApiOperation("鏆傚仠") + @PostMapping("/pause") //鏆傚仠涓婄墖浠诲姟 + @ResponseBody + public Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) { + boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState()); +// List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message; + if(work){ + return Result.build(200, "鎴愬姛", null); + }else { + return Result.build(100, "鎴愬姛", null); + } + } + + @ApiOperation("寮�濮嬩笂鐗�") + @PostMapping("/changeTask") //璋冪敤涓婄墖浠诲姟 + @ResponseBody + public Result <Boolean> changeTask(@RequestBody Engineering engineering) { + log.info("engineeringId:{}", engineering); + UpPattenUsage upPattenUsage = upPattenUsageService.selectedTaskEngineering(engineering.getEngineerId()); + if (upPattenUsage != null) { + boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState()); + List<UpPattenUsage> glass = upPattenUsageService.prioritylist(); + optimizeProjectService.changeTask(engineering.getEngineerId(), 200); + return Result.build(200, "宸蹭繚瀛樿繃", work); + } else { + List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId()); + log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷"); + upPattenUsageService.saveUpPattenUsage(upPattenUsages); + log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�"); + List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering.getEngineerId()); + glassInfoService.saveGlassInfo(glassinfo); + log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�"); + List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId()); + engineeringService.saveEngineering(listEngineering); + log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�"); + //灏唀ngineering琛ㄧ姸鎬佷负姝e湪涓婄墖 + boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState()); + List<UpPattenUsage> glass = upPattenUsageService.prioritylist(); + optimizeProjectService.changeTask(engineering.getEngineerId(), 200); + if (work) { + return Result.build(200, "淇濆瓨鎴愬姛"+engineering.getEngineerId(), true); + }else { + return Result.build(200, "淇濆瓨澶辫触"+engineering.getEngineerId(), false); + } + } + + } + + @ApiOperation("鏌ヨ鍙互涓婄墖鐨勫伐绋嬪彿") + @GetMapping("/selectTask") //璋冪敤涓婄墖浠诲姟 + @ResponseBody + public Result <List<Engineering>> selectTask() { + List<Engineering> engineering=engineeringService.selectTask(); + log.info("鍙鍙栦换鍔¤繑鍥�:{}", engineering); + return Result.build(200, "",engineering); + } +} + -- Gitblit v1.8.0