From be3aa0812cb43be7484e162b4fece5344e9eb5c8 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:12:43 +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/MdcMessageApprovalController.java | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 212 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
new file mode 100644
index 0000000..951b653
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
@@ -0,0 +1,212 @@
+package org.jeecg.modules.mdc.controller;
+
+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.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.dto.message.MessageDTO;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.constant.MdcConstant;
+import org.jeecg.modules.mdc.entity.MdcMessageApproval;
+import org.jeecg.modules.mdc.service.IMdcMessageApprovalService;
+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: mdc娑堟伅纭琛�
+ * @Author: Lius
+ * @Date: 2024-03-06
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "mdc娑堟伅纭琛�")
+@RestController
+@RequestMapping("/mdc/mdcMessageApproval")
+public class MdcMessageApprovalController extends JeecgController<MdcMessageApproval, IMdcMessageApprovalService> {
+
+ @Resource
+ private IMdcMessageApprovalService mdcMessageApprovalService;
+
+ @Resource
+ private ISysBaseAPI sysBaseApi;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mdcMessageApproval
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "mdc娑堟伅纭琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "mdc娑堟伅纭琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "mdc娑堟伅纭琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(MdcMessageApproval mdcMessageApproval,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<MdcMessageApproval> page = new Page<MdcMessageApproval>(pageNo, pageSize);
+ IPage<MdcMessageApproval> pageList = mdcMessageApprovalService.pageList(userId, page, mdcMessageApproval, req);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcMessageApproval
+ * @return
+ */
+ @AutoLog(value = "mdc娑堟伅纭琛�-娣诲姞")
+ @ApiOperation(value = "mdc娑堟伅纭琛�-娣诲姞", notes = "mdc娑堟伅纭琛�-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody MdcMessageApproval mdcMessageApproval) {
+ mdcMessageApprovalService.save(mdcMessageApproval);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param mdcMessageApproval
+ * @return
+ */
+ @AutoLog(value = "mdc娑堟伅纭琛�-缂栬緫")
+ @ApiOperation(value = "mdc娑堟伅纭琛�-缂栬緫", notes = "mdc娑堟伅纭琛�-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody MdcMessageApproval mdcMessageApproval) {
+ mdcMessageApprovalService.updateById(mdcMessageApproval);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "mdc娑堟伅纭琛�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "mdc娑堟伅纭琛�-閫氳繃id鍒犻櫎", notes = "mdc娑堟伅纭琛�-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ mdcMessageApprovalService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "mdc娑堟伅纭琛�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "mdc娑堟伅纭琛�-鎵归噺鍒犻櫎", notes = "mdc娑堟伅纭琛�-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.mdcMessageApprovalService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "mdc娑堟伅纭琛�-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "mdc娑堟伅纭琛�-閫氳繃id鏌ヨ", notes = "mdc娑堟伅纭琛�-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ MdcMessageApproval mdcMessageApproval = mdcMessageApprovalService.getById(id);
+ return Result.OK(mdcMessageApproval);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param mdcMessageApproval
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, MdcMessageApproval mdcMessageApproval) {
+ return super.exportXls(request, mdcMessageApproval, MdcMessageApproval.class, "mdc娑堟伅纭琛�");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, MdcMessageApproval.class);
+ }
+
+ /**
+ * 涓婃姤鍘熷洜
+ */
+ @AutoLog(value = "mdc娑堟伅纭琛�-涓婃姤鍘熷洜")
+ @ApiOperation(value = "mdc娑堟伅纭琛�-涓婃姤鍘熷洜", notes = "mdc娑堟伅纭琛�-涓婃姤鍘熷洜")
+ @RequestMapping(value = "/reportReason", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> reportReason(@RequestBody MdcMessageApproval mdcMessageApproval) {
+ mdcMessageApproval.setMsgStatus(MdcConstant.MSG_STATUS_1);
+ mdcMessageApprovalService.updateById(mdcMessageApproval);
+ List<String> approverIdList = Arrays.asList(mdcMessageApproval.getApproverIds().split(","));
+ for (String approverId : approverIdList) {
+ //涓婃姤鍘熷洜鍙戦�佹秷鎭粰纭浜�
+ MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("璁惧鐘舵�侀暱鏃堕棿鏈彉鍖栧師鍥犱笂鎶ョ‘璁わ紒");
+ messageDTO.setCategory("娑堟伅");
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ messageDTO.setFromUser(user.getUsername());
+ LoginUser userById = sysBaseApi.getUserById(approverId);
+ messageDTO.setToUser(userById.getUsername());
+ messageDTO.setContent("璁惧缂栧彿涓� [" + mdcMessageApproval.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏃堕棿鏈彉鍖栧師鍥犱笂鎶ュ緟纭锛�");
+ sysBaseApi.sendSysAnnouncement(messageDTO);
+ }
+
+ return Result.OK("涓婃姤鎴愬姛锛�");
+ }
+
+ /**
+ * 澶勭悊纭
+ */
+ @AutoLog(value = "mdc娑堟伅纭琛�-澶勭悊纭")
+ @ApiOperation(value = "mdc娑堟伅纭琛�-澶勭悊纭", notes = "mdc娑堟伅纭琛�-澶勭悊纭")
+ @RequestMapping(value = "/handleConfirm", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> handleConfirm(@RequestBody MdcMessageApproval mdcMessageApproval) {
+ if (mdcMessageApproval.getMsgStatus().equals(MdcConstant.MSG_STATUS_3)) {
+ //澶勭悊琚嫆缁濓紝闇�閲嶆柊涓婃姤鍘熷洜
+ //涓婃姤鍘熷洜鍙戦�佹秷鎭粰纭浜�
+ MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("璁惧鐘舵�佹秷鎭紒");
+ messageDTO.setCategory("娑堟伅");
+ messageDTO.setFromUser("admin");
+ messageDTO.setToUser(mdcMessageApproval.getUpdateBy());
+ messageDTO.setContent("鎮ㄧ殑璁惧缂栧彿涓� [" + mdcMessageApproval.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏃堕棿鏈彉鍖栦笂鎶ュ凡琚澶囪秴绾х鐞嗗憳鎷掔粷锛岃閲嶆柊濉啓涓婃姤鍘熷洜锛�");
+ sysBaseApi.sendSysAnnouncement(messageDTO);
+ }
+ mdcMessageApprovalService.updateById(mdcMessageApproval);
+
+ return Result.OK("鎴愬姛锛�");
+ }
+
+
+
+}
--
Gitblit v1.9.3