Lius
2025-05-21 00ad5059c67d083fddc176603b29ed8aafcf45d9
设备异常反馈
已修改4个文件
51 ■■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcMessageApprovalService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcMessageApprovalServiceImpl.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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("添加成功!");
    }
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)
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);
}
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;
    }
}