From 4f52dfe47a6e5f825f98e537b5cd90b006bde4bb Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 24 十月 2023 10:52:30 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java | 288 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 288 insertions(+), 0 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
new file mode 100644
index 0000000..ab98aef
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
@@ -0,0 +1,288 @@
+package org.jeecg.modules.mdc.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.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;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.service.IMdcWorkshopEquipmentService;
+import org.jeecg.modules.mdc.service.IMdcWorkshopInfoService;
+import org.jeecg.modules.mdc.vo.MdcWorkshopEquipmentVo;
+import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description: 澶у睆杞﹂棿淇℃伅
+ * @Author: Lius
+ * @Date: 2023-10-11
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "澶у睆杞﹂棿淇℃伅")
+@RestController
+@RequestMapping("/mdc/mdcWorkshopInfo")
+public class MdcWorkshopInfoController extends JeecgController<MdcWorkshopInfo, IMdcWorkshopInfoService> {
+ @Resource
+ private IMdcWorkshopInfoService mdcWorkshopInfoService;
+
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
+
+ @Resource
+ private IMdcWorkshopEquipmentService mdcWorkshopEquipmentService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mdcWorkshopInfo
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶у睆杞﹂棿淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(MdcWorkshopInfo mdcWorkshopInfo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<MdcWorkshopInfo> queryWrapper = QueryGenerator.initQueryWrapper(mdcWorkshopInfo, req.getParameterMap());
+ Page<MdcWorkshopInfo> page = new Page<MdcWorkshopInfo>(pageNo, pageSize);
+ IPage<MdcWorkshopInfo> pageList = mdcWorkshopInfoService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcWorkshopInfo
+ * @return
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-娣诲姞")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-娣诲姞", notes = "澶у睆杞﹂棿淇℃伅-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody MdcWorkshopInfo mdcWorkshopInfo) {
+ mdcWorkshopInfoService.save(mdcWorkshopInfo);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param mdcWorkshopInfo
+ * @return
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-缂栬緫")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-缂栬緫", notes = "澶у睆杞﹂棿淇℃伅-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody MdcWorkshopInfo mdcWorkshopInfo) {
+ mdcWorkshopInfoService.updateById(mdcWorkshopInfo);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-閫氳繃id鍒犻櫎", notes = "澶у睆杞﹂棿淇℃伅-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ mdcWorkshopInfoService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鎵归噺鍒犻櫎", notes = "澶у睆杞﹂棿淇℃伅-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.mdcWorkshopInfoService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-閫氳繃id鏌ヨ", notes = "澶у睆杞﹂棿淇℃伅-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ MdcWorkshopInfo mdcWorkshopInfo = mdcWorkshopInfoService.getById(id);
+ return Result.OK(mdcWorkshopInfo);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param mdcWorkshopInfo
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, MdcWorkshopInfo mdcWorkshopInfo) {
+ return super.exportXls(request, mdcWorkshopInfo, MdcWorkshopInfo.class, "澶у睆杞﹂棿淇℃伅");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, MdcWorkshopInfo.class);
+ }
+
+ /**
+ * 鑾峰彇璁惧鍒楄〃
+ *
+ * @return
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃", notes = "澶у睆杞﹂棿淇℃伅-鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃")
+ @GetMapping(value = "/workshopEquipmentList")
+ public Result<IPage<MdcEquipment>> workshopEquipmentList(WorkshopEquipmentVo workshopEquipmentVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Page<MdcEquipment> page = new Page<>(pageNo, pageSize);
+ IPage<MdcEquipment> pageList = mdcEquipmentService.getEquipmentByWorkshopId(page, workshopEquipmentVo);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�", notes = "澶у睆杞﹂棿淇℃伅-鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�")
+ @DeleteMapping(value = "/deleteWorkshopEquipment")
+ public Result deleteWorkshopEquipment(@RequestParam(name = "workshopId") String workshopId,
+ @RequestParam(name = "equipmentId", required = true) String equipmentId) {
+ try {
+ LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).eq(MdcWorkshopEquipment::getEquipmentId, equipmentId);
+ mdcWorkshopEquipmentService.remove(queryWrapper);
+ return Result.OK("鍒犻櫎鎴愬姛锛�");
+ } catch (Exception e) {
+ return Result.error("鍒犻櫎澶辫触锛�");
+ }
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-鎵归噺鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鎵归噺鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�", notes = "澶у睆杞﹂棿淇℃伅-鎵归噺鍒犻櫎鎸囧畾澶у睆杞﹂棿鍜岃澶囧叧绯�")
+ @DeleteMapping(value = "/deleteWorkshopEquipmentBatch")
+ public Result deleteWorkshopEquipmentBatch(@RequestParam(name = "workshopId") String workshopId,
+ @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(",")));
+ mdcWorkshopEquipmentService.remove(queryWrapper);
+ return Result.OK("鍒犻櫎鎴愬姛锛�");
+ } catch (Exception e) {
+ return Result.error("鍒犻櫎澶辫触锛�");
+ }
+ }
+
+ /**
+ * 鏂板澶у睆杞﹂棿涓庤澶囧叧绯�
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-鏂板澶у睆杞﹂棿涓庤澶囧叧绯�")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鏂板澶у睆杞﹂棿涓庤澶囧叧绯�", notes = "澶у睆杞﹂棿淇℃伅-鏂板澶у睆杞﹂棿涓庤澶囧叧绯�")
+ @PostMapping(value = "/addWorkshopEquipment")
+ 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);
+ }
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ } catch (Exception e) {
+ return Result.error("鏂板澶辫触锛�");
+ }
+ }
+
+ /**
+ * 鏂板澶у睆杞﹂棿涓庤澶囧叧绯�
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃", notes = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃")
+ @GetMapping(value = "/getWorkshopList")
+ public Result<List<MdcWorkshopInfo>> getWorkshopList() {
+ List<MdcWorkshopInfo> list = mdcWorkshopInfoService.list();
+ 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