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 | 134 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 126 insertions(+), 8 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 4041b1e..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,17 +1,26 @@
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 io.swagger.annotations.ApiModel;
+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;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
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;
/**
* <p>
@@ -21,19 +30,128 @@
* @author zhoush
* @since 2024-03-27
*/
-@ApiModel(description = "鐞嗙墖绗艰鎯�")
+@Api(description = "鐞嗙墖绗艰鎯�")
@RestController
@RequestMapping("/bigStorageCageDetails")
public class BigStorageCageDetailsController {
@Autowired
private BigStorageCageDetailsService bigStorageCageDetailsService;
+ @Autowired
+ private BigStorageCageService bigStorageCageService;
+ @Resource
+ private RedisUtil redisUtil;
- @ApiOperation("鐞嗙墖绗艰鎯�")
- @PostMapping("/bigStorageCageDetails")
- public List<BigStorageCageDetails> bigStorageCageDetails() {
- return bigStorageCageDetailsService.list();
+ @ApiOperation("鐜荤拑璇︽儏鏌ヨ")
+ @PostMapping("/selectBigStorageCageDetails")
+ public Result selectBigStorageCageDetails(@RequestBody Map map) {
+ List<BigStorageCageDetails> bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(map.get("glassId").toString());
+ if (bigStorageCageDetails.size()>0){
+ return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetails);
+ }else{
+ return Result.build(200,"鏌ヨ澶辫触锛屾棤姝ょ幓鐠僫d",bigStorageCageDetails);
+ }
+ }
+
+ @ApiOperation("鐞嗙墖绗艰鎯呮坊鍔�")
+ @PostMapping("/insertBigStorageCageDetails")
+ public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails);
+ return Result.build(200,"娣诲姞鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
+ }
+
+ @ApiOperation("鐞嗙墖绗艰鎯呭垹闄�")
+ @PostMapping("/deleteBigStorageCageDetails")
+ public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails);
+ return Result.build(200,"鍒犻櫎鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
+ }
+
+ @ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�0/鎷胯蛋1")
+ @PostMapping("/damageBigStorageCageDetails")
+ public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails,int status) {
+ bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(),status);
+ return Result.build(200,"鐮存崯/鎷胯蛋鎴愬姛",1);
+ }
+
+ @ApiOperation("鐞嗙墖绗间换鍔″畬鎴�")
+ @PostMapping("/finishBigStorageCageDetails")
+ public Result finishBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.finishBigStorageCageDetails(bigStorageCageDetails);
+ return Result.build(200,"浠诲姟瀹屾垚鎴愬姛",1);
+ }
+
+ @ApiOperation("鐞嗙墖绗间换鍔″嚭鐗�")
+ @PostMapping("/outBigStorageCageDetails")
+ public Result outBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.outBigStorageCageDetails(bigStorageCageDetails);
+ return Result.build(200,"鍑虹墖娣诲姞鎴愬姛",1);
+ }
+
+ @ApiOperation("鎸囧畾閽㈠寲")
+ @PostMapping("/TemperingGlass")
+ public Result temperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ boolean result = bigStorageCageDetailsService.temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId());
+ if (result == true) {
+ return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
+ } else {
+ return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔★紝璇风瓑寰呴挗鍖栧畬鎴愬啀鎸囧畾閽㈠寲", 1);
+ }
+ }
+
+ @ApiOperation("閽㈠寲鏌ヨ")
+ @PostMapping("/selectTemperingGlass")
+ public Result selectTemperingGlass() {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass());
+ }
+
+ @ApiOperation("鏄惁閽㈠寲寮�鍏�")
+ @PostMapping("/temperingSwitch")
+ public Result temperingSwitch(Boolean 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