From d3df1630ad3e1c71b61d177ee818d5c5c94e97c0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期六, 11 十月 2025 18:45:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 147 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 124 insertions(+), 23 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 77c81be..4c11c1d 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,24 @@
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.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.dto.GlassInfoLackDTO;
+import com.mes.bigstorage.entity.dto.TemperingGlassCountDTO;
+import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.common.config.Const;
+import com.mes.pp.entity.OptimizeProject;
+import com.mes.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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@@ -23,7 +30,7 @@
* @author zhoush
* @since 2024-03-27
*/
-@Api(description = "鐞嗙墖绗艰鎯�")
+@Api(tags = "鐞嗙墖绗艰鎯�")
@RestController
@RequestMapping("/bigStorageCageDetails")
public class BigStorageCageDetailsController {
@@ -32,16 +39,18 @@
private BigStorageCageDetailsService bigStorageCageDetailsService;
@Autowired
private BigStorageCageService bigStorageCageService;
+ @Resource
+ private RedisUtil redisUtil;
@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);
+ 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);
}
}
@@ -49,41 +58,42 @@
@PostMapping("/insertBigStorageCageDetails")
public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"娣诲姞鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
+ return Result.build(200, "娣诲姞鎴愬姛", bigStorageCageService.querybigStorageCageDetail());
}
@ApiOperation("鐞嗙墖绗艰鎯呭垹闄�")
@PostMapping("/deleteBigStorageCageDetails")
public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"鍒犻櫎鎴愬姛",bigStorageCageService.querybigStorageCageDetail());
+ return Result.build(200, "鍒犻櫎鎴愬姛", bigStorageCageService.querybigStorageCageDetail());
}
- @ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�0/鎷胯蛋1")
+ @ApiOperation("鐞嗙墖绗肩鍐呯幓鐠冪牬鎹�0/鎷胯蛋1")
@PostMapping("/damageBigStorageCageDetails")
- public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails,int status) {
- bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(),status);
- return Result.build(200,"鐮存崯/鎷胯蛋鎴愬姛",1);
+ 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);
+ return Result.build(200, "浠诲姟瀹屾垚鎴愬姛", 1);
}
@ApiOperation("鐞嗙墖绗间换鍔″嚭鐗�")
@PostMapping("/outBigStorageCageDetails")
public Result outBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
bigStorageCageDetailsService.outBigStorageCageDetails(bigStorageCageDetails);
- return Result.build(200,"鍑虹墖娣诲姞鎴愬姛",1);
+ return Result.build(200, "鍑虹墖娣诲姞鎴愬姛", 1);
}
@ApiOperation("鎸囧畾閽㈠寲")
@PostMapping("/TemperingGlass")
public Result temperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
- boolean result = bigStorageCageDetailsService.temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId());
+ boolean result = bigStorageCageDetailsService
+ .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(), bigStorageCageDetails.getTemperingFeedSequence().toString());
if (result == true) {
return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
} else {
@@ -91,16 +101,107 @@
}
}
- @ApiOperation("閽㈠寲鏌ヨ")
+ @ApiOperation("鎸囧畾閽㈠寲宸ョ▼")
+ @PostMapping("/appointTemperingEngineerId")
+ public Result appointTemperingEngineerId(String engineerId) {
+ boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(engineerId);
+ if (result == true) {
+ return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
+ } else {
+ return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔★紝璇风瓑寰呴挗鍖栧畬鎴愬啀鎸囧畾閽㈠寲", 1);
+ }
+ }
+
+ @ApiOperation("鍙栨秷褰撳墠閽㈠寲")
+ @PostMapping("/cancelTemperingTask")
+ public Result<Boolean> cancelTemperingTask() {
+ boolean result = bigStorageCageDetailsService.cancelTemperingTask();
+ if (result == true) {
+ return Result.build(200, "鍙栨秷褰撳墠閽㈠寲鎴愬姛", result);
+ } else {
+ return Result.build(200, "鍙栨秷褰撳墠閽㈠寲澶辫触", result);
+ }
+ }
+
+ @ApiOperation("閽㈠寲/闈為挗鍖栨煡璇細0 闈為挗鍖� 1锛氶挗鍖�")
@PostMapping("/selectTemperingGlass")
- public Result selectTemperingGlass() {
- return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass());
+ public Result<List<TemperingGlassCountDTO>> selectTemperingGlass(int isTempering) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass(isTempering));
+ }
+
+ @ApiOperation("绗煎唴瀹為檯鏁伴噺鏌ヨ")
+ @PostMapping("/queryRealGlassInfo")
+ public Result<List<BigStorageCageDetails>> queryRealGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.queryRealGlassInfo(bigStorageQueryVO));
+ }
+
+ @ApiOperation("缂虹墖鏁伴噺鏌ヨ")
+ @PostMapping("/queryLackGlassInfo")
+ public Result<List<GlassInfoLackDTO>> queryLackGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.queryLackGlassInfo(bigStorageQueryVO));
+ }
+
+ @ApiOperation("鏄惁璋冨害寮�鍏�")
+ @PostMapping("/dispatchSwitch")
+ public Result dispatchSwitch(Boolean flag) {
+ bigStorageCageDetailsService.dispatchSwitch(flag);
+ return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("dispatchSwitch"));
}
@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("/bigStorageGlassDamageByGlassId")
+ public Result<String> bigStorageGlassDamageByGlassId(@RequestBody Map<String, String> map) {
+ String glassId = map.get("glassId");
+ return Result.build(200, "鎶ョ牬鎹熸垚鍔�", bigStorageCageDetailsService.bigStorageGlassDamageByGlassId(glassId));
+ }
+
+ @ApiOperation("鏌ヨ宸ョ▼寰呮帓浜т俊鎭�")
+ @PostMapping("/queryEngineer") //鏄剧ず宸ョ▼鎺掍骇淇℃伅
+ @ResponseBody
+ public Result<List<BigStorageCageDetails>> queryEngineer() {
+ List<BigStorageCageDetails> result = bigStorageCageDetailsService.queryEngineer();
+ return Result.build(200, "", result);
}
}
--
Gitblit v1.8.0