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/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index 7bf0afc..3b73c7e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -1,8 +1,14 @@
package com.mes.bigstorage.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.common.config.Const;
+import com.mes.common.utils.RedisUtil;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -12,6 +18,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@@ -32,6 +39,8 @@
private BigStorageCageDetailsService bigStorageCageDetailsService;
@Autowired
private BigStorageCageService bigStorageCageService;
+ @Resource
+ private RedisUtil redisUtil;
@ApiOperation("鐜荤拑璇︽儏鏌ヨ")
@@ -100,7 +109,50 @@
@ApiOperation("鏄惁閽㈠寲寮�鍏�")
@PostMapping("/temperingSwitch")
public Result temperingSwitch(Boolean flag) {
- return Result.build(200, "淇敼鎴愬姛", bigStorageCageDetailsService.temperingSwitch(flag));
+ bigStorageCageDetailsService.temperingSwitch(flag);
+ return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("temperingSwitch"));
}
+
+ @ApiOperation("娴佺▼鍗℃煡璇�")
+ @PostMapping("/selectFlowCardByCache")
+ public Result selectFlowCardByCache() {
+ List<Map<String, Object>> flowCardIdCount=bigStorageCageDetailsService.listMaps(
+ new QueryWrapper<BigStorageCageDetails>()
+ .select("flow_card_id,layer,count(*) as count")
+ .eq("state", Const.GLASS_STATE_IN)
+ .eq("tempering_layout_id",0)
+ .groupBy("flow_card_id,layer")
+ );
+ return Result.build(200, "鏌ヨ鎴愬姛", flowCardIdCount);
+ }
+
+ @ApiOperation("鎸囧畾娴佺▼鍗�")
+ @PostMapping("/appointFlowCard")
+ public Result appointFlowCard(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ List<BigStorageCageDetails> bigStorageCageDetailsList=bigStorageCageDetailsService.list(
+ new LambdaQueryWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL)
+ );
+ if(bigStorageCageDetailsList.size()==0){
+ bigStorageCageDetailsService.update(
+ new LambdaUpdateWrapper<BigStorageCageDetails>()
+ .set(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL)
+ .eq(BigStorageCageDetails::getFlowCardId,bigStorageCageDetails.getFlowCardId())
+ .eq(BigStorageCageDetails::getLayer,bigStorageCageDetails.getLayer())
+ .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_IN)
+ );
+ return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1);
+ }else{
+ return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1);
+ }
+ }
+
+ @ApiOperation("鎸囧畾宸ョ▼")
+ @PostMapping("/appointEngineerId")
+ public Result appointEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.appointEngineerId(bigStorageCageDetails.getEngineerId());
+ return Result.build(200, "淇敼鎴愬姛", 1);
+ }
+
}
--
Gitblit v1.8.0