From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 142 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 138 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index d46e65e..77e07e5 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -1,21 +1,155 @@
package com.mes.downworkstation.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.mes.common.utils.RedisUtil;
+import com.mes.downworkstation.entity.DownWorkstation;
+import com.mes.downworkstation.entity.request.DownWorkRequest;
+import com.mes.downworkstation.service.DownWorkstationService;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
* @since 2024-03-27
*/
+
@RestController
-@RequestMapping("/downWorkstation")
+@Api(description = "宸ヤ綅")
+@RequestMapping("/downWorkStation")
public class DownWorkstationController {
+ @Autowired
+ private DownWorkstationService downWorkstationService;
+ @Autowired
+ private GlassInfoService glassInfoService;
+ @Resource
+ private RedisUtil redisUtil;
+
+ @ApiOperation("鑾峰彇宸ヤ綅淇℃伅")
+ @GetMapping("/getone")
+ public Result getOneDownWorkstations() {
+ try {
+ List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1, 6);
+ // 鏋勫缓绗﹀悎棰勬湡鏍煎紡鐨勫搷搴旀暟鎹�
+ return Result.build(200, "鑾峰彇宸ヤ綅淇℃伅鎴愬姛", data);
+ } catch (Exception e) {
+ e.printStackTrace();
+ // 濡傛灉鍑虹幇寮傚父锛岃繑鍥為敊璇俊鎭�
+ return Result.build(500, "鑾峰彇宸ヤ綅淇℃伅澶辫触", 1);
+ }
+ }
+
+ @ApiOperation("鑾峰彇娴佺▼鍗″彿")
+ @GetMapping("/getflowCardId")
+ public Result getflowCardId() {
+
+ try {
+ List<Map<String, Object>> data = glassInfoService.getFlowCardId();
+ return Result.build(200, "鑾峰彇娴佺▼鍗″彿鎴愬姛", data);
+ } catch (Exception e) {
+ return Result.build(500, "鑾峰彇娴佺▼鍗″彿澶辫触", 1);
+ }
+ }
+
+
+ //缁戝畾鏋跺瓙
+ @ApiOperation("缁戝畾鏋跺瓙")
+ @PostMapping("/updateFlowCardId")
+ public Result updateFlowCardId(@RequestBody DownWorkRequest request) {
+
+ // 缁戝畾鏋跺瓙
+ downWorkstationService.updateFlowCardIdAndCount(request.getFlowCardId(), request.getWorkstationId(), request.getLayer());
+
+ return Result.build(200, "缁戝畾鏋跺瓙鎴愬姛", 1);
+ }
+
+ @ApiOperation("娓呴櫎宸ヤ綅淇℃伅")
+ @PostMapping("/clear")
+ public Result clearWorkstationInfo(@RequestBody Map<String, Object> requestData) {
+ // 璋冪敤 DownWorkstationService 涓殑鏂规硶娓呴櫎鎸囧畾宸ヤ綅ID鐨勪俊鎭�
+ int workstationId = (int) requestData.get("workstationId");
+
+ downWorkstationService.clearFlowCardId(workstationId);
+ return Result.build(200, "娓呴櫎宸ヤ綅淇℃伅鎴愬姛", 1);
+
+
+ // 鏋勫缓鍝嶅簲鏁版嵁
+
+ }
+
+
+ @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�1")
+ @GetMapping("/getwo")
+ public Result getwo() {
+
+ try {
+ List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation(1, 3);
+ return Result.build(200, "鑾峰彇宸ヤ綅鏄剧ず鍥�1鎴愬姛", data);
+ } catch (Exception e) {
+ return Result.build(200, "鑾峰彇宸ヤ綅鏄剧ず鍥�1澶辫触", 1);
+ }
+ }
+
+ @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�2")
+ @GetMapping("/getwo2")
+ public Result getwo2() {
+
+ try {
+ List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation(4, 6);
+ return Result.build(200, "鑾峰彇宸ヤ綅鏄剧ず鍥�2鎴愬姛", data);
+ } catch (Exception e) {
+ return Result.build(200, "鑾峰彇宸ヤ綅鏄剧ず鍥�2澶辫触", 1);
+
+ }
+ }
+
+ @ApiOperation(" 鍔熻兘锛氬宸ヤ綅杩涜銆愬惎鐢�/绂佺敤銆�")
+ @PostMapping("/updateDownWorkstation")
+ @ResponseBody
+ public Result updateDownWorkstation(@RequestBody DownWorkstation downWorkstation) {
+ boolean isSucess = downWorkstationService.updateDownWorkstationstate(downWorkstation);
+ return Result.build(200, "鏇存崲鎴愬姛", isSucess);
+ }
+
+ @ApiOperation("鍏抽棴宸ヤ綅宸叉弧璀︽姤")
+ @PostMapping("/closeAlarmSignal")
+ @ResponseBody
+ public Result<String> closeAlarmSignal() {
+ return Result.build(200, "鏇存崲鎴愬姛", downWorkstationService.closeAlarmSignal());
+ }
+
+ @ApiOperation("鏄惁鑷姩鎵撳嵃")
+ @PostMapping("/autoPrint")
+ public Result autoPrint(Boolean flag) {
+ downWorkstationService.autoPrint(flag);
+ return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("autoPrint"));
+ }
+
+ @ApiOperation("鏂板铏氭嫙宸ヤ綅")
+ @PostMapping("/insertDownWorkstation")
+ public Result insertDownWorkstation() {
+ downWorkstationService.insertDownWorkstation();
+ return Result.build(200, "鏂板鎴愬姛", 1);
+ }
+
+ @ApiOperation("鍒犻櫎铏氭嫙宸ヤ綅")
+ @PostMapping("/deleteDownWorkstation")
+ public Result deleteDownWorkstation(DownWorkstation downWorkstation) {
+ downWorkstationService.removeById(downWorkstation.getWorkstationId());
+ return Result.build(200, "鍒犻櫎鎴愬姛", 1);
+ }
+
}
--
Gitblit v1.8.0