From 00ad5059c67d083fddc176603b29ed8aafcf45d9 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 21 五月 2025 10:46:39 +0800
Subject: [PATCH] 设备异常反馈
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcMessageApprovalService.java | 8 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java | 27 +++++++++++++++++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java | 9 ++++++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java | 7 +++++++
4 files changed, 50 insertions(+), 1 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
index 951b653..9d74bd8 100644
--- 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
@@ -5,6 +5,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
@@ -75,7 +76,13 @@
@ApiOperation(value = "mdc娑堟伅纭琛�-娣诲姞", notes = "mdc娑堟伅纭琛�-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody MdcMessageApproval mdcMessageApproval) {
- mdcMessageApprovalService.save(mdcMessageApproval);
+ if (StringUtils.isBlank(mdcMessageApproval.getEquipmentId())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡锛�");
+ }
+ boolean result = mdcMessageApprovalService.add(mdcMessageApproval);
+ if (!result) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java
index 1ac751e..50f0c12 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java
@@ -35,6 +35,13 @@
@ApiModelProperty(value = "璁惧缂栫爜")
private String equipmentId;
/**
+ * 寮傚父绫诲瀷
+ */
+ @Excel(name = "寮傚父绫诲瀷", width = 15)
+ @ApiModelProperty(value = "寮傚父绫诲瀷")
+ @Dict(dicCode = "mdcMsgType")
+ private String msgType;
+ /**
* 鏍囬
*/
@Excel(name = "鏍囬", width = 15)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcMessageApprovalService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcMessageApprovalService.java
index aa7cb03..df665eb 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcMessageApprovalService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcMessageApprovalService.java
@@ -19,4 +19,12 @@
* 鍒楄〃鏌ヨ
*/
IPage<MdcMessageApproval> pageList(String userId, Page<MdcMessageApproval> page, MdcMessageApproval mdcMessageApproval, HttpServletRequest req);
+
+ /**
+ * 鏂板
+ * @param mdcMessageApproval
+ * @return
+ */
+ boolean add(MdcMessageApproval mdcMessageApproval);
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java
index 657f19f..d80c6a2 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java
@@ -3,14 +3,20 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
+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.mapper.MdcMessageApprovalMapper;
import org.jeecg.modules.mdc.service.IMdcMessageApprovalService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Description: mdc娑堟伅纭琛�
@@ -20,6 +26,9 @@
*/
@Service
public class MdcMessageApprovalServiceImpl extends ServiceImpl<MdcMessageApprovalMapper, MdcMessageApproval> implements IMdcMessageApprovalService {
+
+ @Resource
+ private ISysUserService sysUserService;
/**
* 鍒〃鏌ヨ
@@ -40,4 +49,22 @@
}
return pageList;
}
+
+ @Override
+ public boolean add(MdcMessageApproval mdcMessageApproval) {
+ boolean result = false;
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ mdcMessageApproval.setSenderIds(user.getId());
+ mdcMessageApproval.setSenderNames(user.getRealname());
+ // 鏌ヨ璁惧瓒呯骇绠＄悊鍛�
+ List<SysUser> superList = sysUserService.getEquipmentAdmin(MdcConstant.MDC_EQUIPMENT_SUPER_MANAGER, mdcMessageApproval.getEquipmentId());
+ if (superList != null && !superList.isEmpty()) {
+ List<String> superIdList = superList.stream().map(SysUser::getId).collect(Collectors.toList());
+ mdcMessageApproval.setApproverIds(String.join(",", superIdList));
+ List<String> superNameList = superList.stream().map(SysUser::getRealname).collect(Collectors.toList());
+ mdcMessageApproval.setApproverNames(String.join(",", superNameList));
+ }
+ mdcMessageApproval.setMsgStatus(MdcConstant.MSG_STATUS_0);
+ return result;
+ }
}
--
Gitblit v1.9.3