From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 157 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 144 insertions(+), 13 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 5d3bc0b..6011bcc 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,29 @@
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.glassinfo.entity.GlassInfo;
+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 javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -21,34 +33,153 @@
* @author zhoush
* @since 2024-03-27
*/
-@Api(description = "鐞嗙墖绗艰鎯�")
+@Api(tags = "鐞嗙墖绗艰鎯�")
@RestController
@RequestMapping("/bigStorageCageDetails")
public class BigStorageCageDetailsController {
@Autowired
private BigStorageCageDetailsService bigStorageCageDetailsService;
+ @Autowired
+ private BigStorageCageService bigStorageCageService;
+ @Resource
+ private RedisUtil redisUtil;
- @ApiOperation("鐞嗙墖绗艰鎯�")
- @PostMapping("/queryBigStorageCageDetails")
- public Result queryBigStorageCageDetails() {
- return Result.build(200,"鏌ヨ鎴愬姛",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(BigStorageCageDetails bigStorageCageDetails) {
- bigStorageCageDetailsService.save(bigStorageCageDetails);
- return Result.build(200,"娣诲姞鎴愬姛",1);
-
+ public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails);
+ return Result.build(200, "娣诲姞鎴愬姛", bigStorageCageService.querybigStorageCageDetail());
}
@ApiOperation("鐞嗙墖绗艰鎯呭垹闄�")
@PostMapping("/deleteBigStorageCageDetails")
- public Result deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
- bigStorageCageDetailsService.removeById(bigStorageCageDetails.getId());
- return Result.build(200,"鍒犻櫎鎴愬姛",1);
+ 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(), bigStorageCageDetails.getTemperingFeedSequence().toString());
+ if (result == true) {
+ return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
+ } else {
+ return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔★紝璇风瓑寰呴挗鍖栧畬鎴愬啀鎸囧畾閽㈠寲", 1);
+ }
+ }
+
+ @ApiOperation("鎸囧畾閽㈠寲宸ョ▼")
+ @PostMapping("/appointTemperingEngineerId")
+ public Result appointTemperingEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
+ boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(bigStorageCageDetails.getEngineerId());
+ if (result == true) {
+ return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
+ } else {
+ return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔★紝璇风瓑寰呴挗鍖栧畬鎴愬啀鎸囧畾閽㈠寲", 1);
+ }
+ }
+
+ @ApiOperation("閽㈠寲/闈為挗鍖栨煡璇細0 闈為挗鍖� 1锛氶挗鍖�")
+ @PostMapping("/selectTemperingGlass")
+ public Result<List<TemperingGlassCountDTO>> selectTemperingGlass(int isTempering) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass(isTempering));
+ }
+
+ @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) {
+ 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));
}
}
--
Gitblit v1.8.0