From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
index b85d532..7d2a24c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
@@ -8,10 +8,13 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;
@@ -27,6 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.List;
/**
* @Description: 澶у睆杞﹂棿淇℃伅
@@ -165,6 +169,7 @@
/**
* 鑾峰彇璁惧鍒楄〃
+ *
* @return
*/
@AutoLog(value = "澶у睆杞﹂棿淇℃伅-鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃")
@@ -204,7 +209,7 @@
@ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鎵归噺鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�", notes = "澶у睆杞﹂棿淇℃伅-鎵归噺鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�")
@DeleteMapping(value = "/deleteWorkshopEquipmentBatch")
public Result deleteWorkshopEquipmentBatch(@RequestParam(name = "workshopId") String workshopId,
- @RequestParam(name = "equipmentIds", required = true) String equipmentIds) {
+ @RequestParam(name = "equipmentIds", required = true) String equipmentIds) {
try {
LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).in(MdcWorkshopEquipment::getEquipmentId, Arrays.asList(equipmentIds.split(",")));
@@ -221,22 +226,25 @@
@AutoLog(value = "澶у睆杞﹂棿淇℃伅-鏂板澶у睆杞﹂棿涓庤澶囧叧绯�")
@ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鏂板澶у睆杞﹂棿涓庤澶囧叧绯�", notes = "澶у睆杞﹂棿淇℃伅-鏂板澶у睆杞﹂棿涓庤澶囧叧绯�")
@PostMapping(value = "/addWorkshopEquipment")
- public Result addWorkshopEquipment(MdcWorkshopEquipmentVo mdcWorkshopEquipmentVo) {
+ public Result addWorkshopEquipment(@RequestBody MdcWorkshopEquipmentVo mdcWorkshopEquipmentVo) {
try {
String workshopId = mdcWorkshopEquipmentVo.getWorkshopId();
for (String equipmentId : mdcWorkshopEquipmentVo.getEquipmentIdList()) {
- MdcWorkshopEquipment mdcWorkshopEquipment = new MdcWorkshopEquipment();
- mdcWorkshopEquipment.setWorkshopId(workshopId);
- mdcWorkshopEquipment.setEquipmentId(equipmentId);
- mdcWorkshopEquipment.setCoordinateLeft(0);
- mdcWorkshopEquipment.setCoordinateTop(0);
- mdcWorkshopEquipment.setVw(100);
- mdcWorkshopEquipment.setVh(100);
- LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).eq(MdcWorkshopEquipment::getEquipmentId, equipmentId);
- MdcWorkshopEquipment one = mdcWorkshopEquipmentService.getOne(queryWrapper);
- if (one == null) {
- mdcWorkshopEquipmentService.save(mdcWorkshopEquipment);
+ List<MdcEquipment> list = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
+ if (list != null && !list.isEmpty()) {
+ MdcWorkshopEquipment mdcWorkshopEquipment = new MdcWorkshopEquipment();
+ mdcWorkshopEquipment.setWorkshopId(workshopId);
+ mdcWorkshopEquipment.setEquipmentId(equipmentId);
+ mdcWorkshopEquipment.setCoordinateLeft(0);
+ mdcWorkshopEquipment.setCoordinateTop(0);
+ mdcWorkshopEquipment.setVw(100);
+ mdcWorkshopEquipment.setVh(100);
+ LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).eq(MdcWorkshopEquipment::getEquipmentId, equipmentId);
+ MdcWorkshopEquipment one = mdcWorkshopEquipmentService.getOne(queryWrapper);
+ if (one == null) {
+ mdcWorkshopEquipmentService.save(mdcWorkshopEquipment);
+ }
}
}
return Result.OK("娣诲姞鎴愬姛锛�");
@@ -245,4 +253,43 @@
}
}
+ /**
+ * 鏂板澶у睆杞﹂棿涓庤澶囧叧绯�
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃", notes = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃")
+ @GetMapping(value = "/getWorkshopList")
+ public Result<List<MdcWorkshopInfo>> getWorkshopList() {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ List<MdcWorkshopInfo> list = mdcWorkshopInfoService.listByUser(userId);
+ return Result.OK(list);
+ }
+
+ /**
+ * 澶у睆
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-澶у睆淇℃伅")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-澶у睆淇℃伅", notes = "澶у睆杞﹂棿淇℃伅-澶у睆淇℃伅")
+ @GetMapping(value = "/getBigScreenInfo")
+ public Result getBigScreenInfo(@RequestParam(name = "workshopId", required = true) String workshopId) {
+ List<MdcBigScreenEquipmentDto> result = mdcWorkshopInfoService.getBigScreenInfo(workshopId);
+ return Result.OK(result);
+ }
+
+ /**
+ * 澶у睆
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-淇濆瓨璁惧鍧愭爣澶у皬淇℃伅")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-淇濆瓨璁惧鍧愭爣澶у皬淇℃伅", notes = "澶у睆杞﹂棿淇℃伅-淇濆瓨璁惧鍧愭爣澶у皬淇℃伅")
+ @PutMapping(value = "/saveEquipmentCoordinate")
+ public Result saveEquipmentCoordinate(@RequestBody List<MdcWorkshopEquipment> workshopEquipmentList) {
+ try {
+ mdcWorkshopEquipmentService.updateBatchById(workshopEquipmentList);
+ return Result.OK("淇濆瓨鎴愬姛锛�");
+ } catch (Exception e) {
+ return Result.error("淇濆瓨澶辫触锛�");
+ }
+ }
+
}
--
Gitblit v1.9.3