refactor(equipment):优化设备导入，根据页面编码和流程编码绑定页面id和流程id

admin/src/main/java/com/dcs/hnyz/controller/EquipmentController.java

@@ -55,8 +55,8 @@ public class EquipmentController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, Equipment equipment)
     {
-        List<Equipment> list = equipmentService.selectEquipmentExportList(equipment);
-        ExcelUtil<Equipment> util = new ExcelUtil<Equipment>(Equipment.class);
+        List<EquipmentFormVO> list = equipmentService.selectEquipmentExportList(equipment);
+        ExcelUtil<EquipmentFormVO> util = new ExcelUtil<>(EquipmentFormVO.class);
         util.exportExcel(response, list, "设备管理数据");
     }
 
@@ -185,8 +185,8 @@ public class EquipmentController extends BaseController
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
     {
-        ExcelUtil<Equipment> util = new ExcelUtil<Equipment>(Equipment.class);
-        List<Equipment> equipmentList = util.importExcel(file.getInputStream());
+        ExcelUtil<EquipmentFormVO> util = new ExcelUtil<>(EquipmentFormVO.class);
+        List<EquipmentFormVO> equipmentList = util.importExcel(file.getInputStream());
         String operName = getUsername();
         String message = equipmentService.importEquipment(equipmentList, updateSupport, operName);
         return success(message);

admin/src/main/java/com/dcs/hnyz/controller/FlowController.java

@@ -38,7 +38,7 @@ public class FlowController extends BaseController
     @GetMapping("/getFlowList")
     @ApiOperation(value = "获取设备对应流程列表（用于下拉框）")
     public AjaxResult getFlowList(@ApiParam(name = "equipmentId" ,value="设备id") Long equipmentId){
-        return success(flowService.getFlowList(equipmentId));
+        return success(flowService.getFlowListByEquipmentId(equipmentId));
     }
 
     /**

admin/src/main/java/com/dcs/hnyz/controller/PageController.java

@@ -1,29 +1,22 @@
 package com.dcs.hnyz.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.dcs.common.annotation.Log;
 import com.dcs.common.core.controller.BaseController;
 import com.dcs.common.core.domain.AjaxResult;
+import com.dcs.common.core.page.TableDataInfo;
 import com.dcs.common.enums.BusinessType;
+import com.dcs.common.utils.poi.ExcelUtil;
 import com.dcs.hnyz.domain.PageControl;
 import com.dcs.hnyz.service.IPageControlService;
-import com.dcs.common.utils.poi.ExcelUtil;
-import com.dcs.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 页面管理Controller
@@ -113,6 +106,6 @@ public class PageController extends BaseController
     @GetMapping("/getPageList")
     @ApiOperation(value = "获取设备对应页面列表（用于下拉框）")
     public AjaxResult getPageList(@ApiParam(name = "equipmentId" ,value="设备id") Long equipmentId){
-        return success(pageControlService.getPageList(equipmentId));
+        return success(pageControlService.getPageListByEquipmentId(equipmentId));
     }
 }

admin/src/main/java/com/dcs/hnyz/domain/Equipment.java

@@ -31,12 +31,12 @@ public class Equipment extends BaseEntity
     private String equipmentName;
 
     /** 流程id(用‘,’分隔) */
-    @Excel(name = "流程id(用‘,’分隔)")
+//    @Excel(name = "流程id(用‘,’分隔)")
     @ApiModelProperty(value = "流程id(用‘,’分隔)")
     private String flowIds;
 
     /** 页面id(用‘,’分隔) */
-    @Excel(name = "页面id(用‘,’分隔)")
+//    @Excel(name = "页面id(用‘,’分隔)")
     @ApiModelProperty(value = "页面id(用‘,’分隔)")
     private String pageIds;
 
@@ -83,12 +83,6 @@ public class Equipment extends BaseEntity
     @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Integer protocolId;
 
-    /** 通讯协议code */
-    @Excel(name = "通讯协议识别码 MODBUS/OPCUA/MQTT")
-    @ApiModelProperty(value = "通讯协议识别码")
-    @TableField(exist = false)
-    private String protocolCode;
-
     /** 状态 0-启用,1-禁用*/
 //    @Excel(name = "状态")
     @ApiModelProperty(value = "状态 0-启用,1-禁用")

admin/src/main/java/com/dcs/hnyz/domain/vo/EquipmentFormVO.java

@@ -23,30 +23,45 @@ public class EquipmentFormVO extends Equipment {
      * 流程归属
      */
     @ApiModelProperty(value = "流程归属")
-    @Excel(name = "流程归属")
+//    @Excel(name = "流程归属")
     private String flowName;
 
     /**
      * 页面
      */
     @ApiModelProperty(value = "页面名称")
-    @Excel(name = "页面名称")
+//    @Excel(name = "页面名称")
     private String pageName;
 
     /**
      * plc名称
      */
     @ApiModelProperty(value = "plc名称")
-    @Excel(name = "plc名称")
+//    @Excel(name = "plc名称")
     private String plcName;
 
     /**
      * 通讯协议
      */
     @ApiModelProperty(value = "通讯协议")
-    @Excel(name = "通讯协议")
+//    @Excel(name = "通讯协议")
     private String protocolName;
 
+    /** 通讯协议code */
+    @Excel(name = "通讯协议识别码 MODBUS/OPCUA/MQTT")
+    @ApiModelProperty(value = "通讯协议识别码")
+    private String protocolCode;
+
+    /** 流程编码(用‘,’分隔) */
+    @Excel(name = "流程编码(用‘,’分隔)")
+    @ApiModelProperty(value = "流程编码(用‘,’分隔)")
+    private String flowCodes;
+
+    /** 页面编码(用‘,’分隔) */
+    @Excel(name = "页面编码(用‘,’分隔)")
+    @ApiModelProperty(value = "页面编码(用‘,’分隔)")
+    private String pageCodes;
+
 }
 
 

admin/src/main/java/com/dcs/hnyz/service/IEquipmentService.java

@@ -115,7 +115,7 @@ public interface IEquipmentService
      */
     Map<String,List<Equipment>> getPageEquipmentGroupByFlowCode(String flowCode);
 
-    String importEquipment(List<Equipment> equipmentList, boolean updateSupport, String operName);
+    String importEquipment(List<EquipmentFormVO> equipmentList, boolean updateSupport, String operName);
 
     /**
      * 根据流程编码按罐体设备分组 获取设备组信息
@@ -136,5 +136,5 @@ public interface IEquipmentService
      */
     List<Equipment> selectBatchIds(List<Long> equipmentIds);
 
-    List<Equipment> selectEquipmentExportList(Equipment equipment);
+    List<EquipmentFormVO> selectEquipmentExportList(Equipment equipment);
 }

admin/src/main/java/com/dcs/hnyz/service/IFlowService.java

@@ -72,7 +72,9 @@ public interface IFlowService
      * @param equipmentId
      * @return
      */
-    List<Flow> getFlowList(Long equipmentId);
+    List<Flow> getFlowList();
+
+    List<Flow> getFlowListByEquipmentId(Long equipmentId);
 
     /**
      * 获取目前流程数量以及今日流程变化

admin/src/main/java/com/dcs/hnyz/service/IPageControlService.java

@@ -1,10 +1,10 @@
 package com.dcs.hnyz.service;
 
+import com.dcs.hnyz.domain.PageControl;
+
 import java.util.List;
 import java.util.Map;
 
-import com.dcs.hnyz.domain.PageControl;
-
 /**
  * 页面管理Service接口
  * 
@@ -67,11 +67,12 @@ public interface IPageControlService
     Map<Long, String> getPageNameMap();
 
     /**
-     * 根据设备id获取对应页面列表
-     * @param equipmentId
+     * 根据页面列表
      * @return
      */
-    List<PageControl> getPageList(Long equipmentId);
+    List<PageControl> getPageList();
+
+    List<PageControl> getPageListByEquipmentId(Long equipmentId);
 
     /**
      * 根据页面标识获取页面信息

admin/src/main/java/com/dcs/hnyz/service/impl/EquipmentServiceImpl.java

@@ -13,6 +13,7 @@ import com.dcs.hnyz.domain.vo.EquipmentFormVO;
 import com.dcs.hnyz.enums.DeviceTypeEnum;
 import com.dcs.hnyz.mapper.EquipmentMapper;
 import com.dcs.hnyz.service.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -38,7 +39,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
     private IFlowService flowService;
 
     @Resource
-    private CommunicationProtocolServiceImpl communicationProtocolService;
+    private ICommunicationProtocolService communicationProtocolService;
 
     @Resource
     private IPlcInfoService plcInfoService;
@@ -47,7 +48,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
     private IEquipmentParamService equipmentParamService;
 
     @Resource
-    private AlarmEventServiceImpl alarmEventService;
+    private IAlarmEventService alarmEventService;
 
     @Resource
     private IPageControlService pageControlService;
@@ -77,14 +78,50 @@ public class EquipmentServiceImpl implements IEquipmentService {
     }
 
     @Override
-    public List<Equipment> selectEquipmentExportList(Equipment equipment) {
+    public List<EquipmentFormVO> selectEquipmentExportList(Equipment equipment) {
         List<Equipment> list = equipmentMapper.selectEquipmentList(equipment);
-//        过滤掉没有protocolId的
-        List<Equipment> collect = list.stream().filter(e -> e.getProtocolId() != null).collect(Collectors.toList());
-        List<CommunicationProtocol> commProtocolList = communicationProtocolService.getCommProtocolList();
-        for (Equipment e : collect) {
-            e.setProtocolCode(commProtocolList.stream().filter(cp -> cp.getProtocolId().equals(e.getProtocolId())).findFirst().get().getCode());
-        }
+
+        // 把协议列表转成 Map<protocolId, code>
+        Map<Integer, String> protocolMap = communicationProtocolService.getCommProtocolList().stream()
+                .collect(Collectors.toMap(CommunicationProtocol::getProtocolId, CommunicationProtocol::getCode));
+
+        Map<Long, String> pageMap = pageControlService.getPageList().stream()
+                .collect(Collectors.toMap(PageControl::getPageId, PageControl::getPageCode));
+
+        List<Flow> flowList = flowService.getFlowList();
+        Map<Long, String> flowMap = flowList.stream()
+                .collect(Collectors.toMap(Flow::getFlowId, Flow::getFlowCode));
+
+        // 过滤 + 复制 + 填充 protocolCode
+        List<EquipmentFormVO> collect = list.stream()
+                .filter(e -> e.getProtocolId() != null) // 过滤掉 protocolId == null 的
+                .map(e -> {
+                    EquipmentFormVO equipmentFormVO = new EquipmentFormVO();
+                    BeanUtils.copyProperties(e, equipmentFormVO);
+                    // 安全地设置协议编码（防止 map.get 返回 null）
+                    equipmentFormVO.setProtocolCode(protocolMap.getOrDefault(e.getProtocolId(), "未配置"));
+                    // 将页面ID转换为页面编码字符串
+                    if (equipmentFormVO.getPageIds() != null) {
+                        List<String> ids = Arrays.asList(equipmentFormVO.getPageIds().split(","));
+                        equipmentFormVO.setPageCodes(ids.stream()
+                                .map(id -> pageMap.get(Long.valueOf(id)))
+                                .collect(Collectors.joining(",")));
+                    } else {
+                        equipmentFormVO.setPageCodes("未配置");
+                    }
+                    // 将流程ID转换为流程编码字符串
+                    if (equipmentFormVO.getFlowIds() != null) {
+                        List<String> ids = Arrays.asList(equipmentFormVO.getFlowIds().split(","));
+                        equipmentFormVO.setFlowCodes(ids.stream()
+                                .map(id -> flowMap.get(Long.valueOf(id)))
+                                .collect(Collectors.joining(",")));
+                    } else {
+                        equipmentFormVO.setFlowCodes("未配置");
+                    }
+                    return equipmentFormVO;
+                })
+                .collect(Collectors.toList());
+
         return collect;
     }
 
@@ -391,9 +428,9 @@ public class EquipmentServiceImpl implements IEquipmentService {
     }
 
     @Override
-    public String importEquipment(List<Equipment> equipmentList, boolean isUpdateSupport, String operName) {
+    public String importEquipment(List<EquipmentFormVO> equipmentFormVOList, boolean isUpdateSupport, String operName) {
 
-        if (StringUtils.isNull(equipmentList) || equipmentList.size() == 0)
+        if (StringUtils.isNull(equipmentFormVOList) || equipmentFormVOList.size() == 0)
         {
             throw new ServiceException("导入设备数据不能为空！");
         }
@@ -403,30 +440,78 @@ public class EquipmentServiceImpl implements IEquipmentService {
         StringBuilder failureMsg = new StringBuilder();
         List<PlcInfo> plcInfoList = plcInfoService.getPlcList();
         List<CommunicationProtocol> protocolList = communicationProtocolService.getCommProtocolList();
-        for (Equipment equipment : equipmentList)
+        Map<String, Long> plcMap = plcInfoList.stream()
+                .collect(Collectors.toMap(
+                        p -> p.getIpAddress() + ":" + p.getPort(),
+                        PlcInfo::getPlcId
+                ));
+
+        Map<String, Integer> protocolMap = protocolList.stream()
+                .collect(Collectors.toMap(CommunicationProtocol::getCode, CommunicationProtocol::getProtocolId));
+
+        Map<String, Long> pageMap = pageControlService.getPageList().stream()
+                .collect(Collectors.toMap(PageControl::getPageCode, PageControl::getPageId));
+
+        List<Flow> flowList = flowService.getFlowList();
+        Map<String, Long> flowMap = flowList.stream()
+                .collect(Collectors.toMap(Flow::getFlowCode, Flow::getFlowId));
+
+        for (EquipmentFormVO equipmentFormVO : equipmentFormVOList)
         {
             try
             {
                 // 验证是否存在这个设备
-                Equipment e = equipmentMapper.selectOne(new QueryWrapper<Equipment>().eq("code", equipment.getCode()));
+                Equipment e = equipmentMapper.selectOne(new QueryWrapper<Equipment>().eq("code", equipmentFormVO.getCode()));
+                Equipment equipment = new Equipment();
+                BeanUtils.copyProperties(equipmentFormVO, equipment);
                 if (StringUtils.isNull(e))
                 {
                     // TODO 获取设备类型字符串查询设备类型库 填充相应的设备类型 id
                     // TODO 模糊查询设备流程和页面 填充相应的流程和页面 id 没有命中需返回消息提示无页面
                     // 识别设备的PLC
-                    if (equipment.getIpAddress() != null && equipment.getPort() != null && plcInfoList.size() > 0) {
-                        PlcInfo plcInfo = plcInfoList.stream().filter(p -> p.getIpAddress().equals(equipment.getIpAddress()) && p.getPort().equals(equipment.getPort())).findFirst().orElse(null);
-                        if (plcInfo != null) {
-                            equipment.setPlcId(plcInfo.getPlcId());
+                    if (equipmentFormVO.getIpAddress() != null && equipmentFormVO.getPort() != null) {
+                        Long plcInfoId = plcMap.get(equipmentFormVO.getIpAddress() + ":" + equipmentFormVO.getPort());
+                        if (plcInfoId != null) {
+                            equipment.setPlcId(plcInfoId);
                         }
                     }
                     // 识别设备的通信协议
-                    if (equipment.getProtocolCode() != null && protocolList.size() > 0) {
-                        CommunicationProtocol protocol = protocolList.stream().filter(p -> p.getCode().equals(equipment.getProtocolCode())).findFirst().orElse(null);
-                        if (protocol != null) {
-                            equipment.setProtocolId(protocol.getProtocolId());
+                    if (equipmentFormVO.getProtocolCode() != null) {
+                        Integer protocolId = protocolMap.get(equipmentFormVO.getProtocolCode());
+                        if (protocolId != null) {
+                            equipment.setProtocolId(protocolId);
+                        } else {
+                            failureMsg.append("<br/>" + failureNum + "、设备 " + equipmentFormVO.getCode() + " 协议Code" + equipmentFormVO.getProtocolCode() + "不存在，请检查！");
+                        }
+                    }
+                    // 识别设备流程（将 flowCodes 转为 flowIds）
+                    if (equipmentFormVO.getFlowCodes() != null && !equipmentFormVO.getFlowCodes().trim().isEmpty()) {
+                        String flowIds = Arrays.stream(equipmentFormVO.getFlowCodes().split(","))
+                                .map(String::trim)
+                                .filter(s -> !s.isEmpty())
+                                .map(flowMap::get)
+                                .filter(Objects::nonNull)
+                                .map(String::valueOf)
+                                .collect(Collectors.joining(","));
+                        if (flowIds.isEmpty()) {
+                            failureMsg.append("<br/>" + failureNum + "、设备 " + equipmentFormVO.getCode() + " 未识别到任何流程编码，请检查！");
+                        } else {
+                            equipment.setFlowIds(flowIds);
+                        }
+                    }
+                    // 识别设备页面（将 pageCodes 转为 pageIds）
+                    if (equipmentFormVO.getPageCodes() != null && !equipmentFormVO.getPageCodes().trim().isEmpty()) {
+                        String pageIds = Arrays.stream(equipmentFormVO.getPageCodes().split(","))
+                                .map(String::trim)
+                                .filter(s -> !s.isEmpty())
+                                .map(pageMap::get)
+                                .filter(Objects::nonNull)
+                                .map(String::valueOf)
+                                .collect(Collectors.joining(","));
+                        if (pageIds.isEmpty()) {
+                            failureMsg.append("<br/>" + failureNum + "、设备 " + equipmentFormVO.getCode() + " 未识别到任何页面编码，请检查！");
                         } else {
-                            failureMsg.append("<br/>" + failureNum + "、设备 " + equipment.getCode() + " 协议Code" + e.getProtocolCode() + "不存在，请检查！");
+                            equipment.setPageIds(pageIds);
                         }
                     }
                     equipment.setCreateBy(operName);
@@ -437,6 +522,36 @@ public class EquipmentServiceImpl implements IEquipmentService {
                 }
                 else if (isUpdateSupport)
                 {
+                    // 识别设备流程（将 flowCodes 转为 flowIds）
+                    if (equipmentFormVO.getFlowCodes() != null && !equipmentFormVO.getFlowCodes().trim().isEmpty()) {
+                        String flowIds = Arrays.stream(equipmentFormVO.getFlowCodes().split(","))
+                                .map(String::trim)
+                                .filter(s -> !s.isEmpty())
+                                .map(flowMap::get)
+                                .filter(Objects::nonNull)
+                                .map(String::valueOf)
+                                .collect(Collectors.joining(","));
+                        if (flowIds.isEmpty()) {
+                            failureMsg.append("<br/>" + failureNum + "、设备 " + equipmentFormVO.getCode() + " 未识别到任何流程编码，请检查！");
+                        } else {
+                            equipment.setFlowIds(flowIds);
+                        }
+                    }
+                    // 识别设备页面（将 pageCodes 转为 pageIds）
+                    if (equipmentFormVO.getPageCodes() != null && !equipmentFormVO.getPageCodes().trim().isEmpty()) {
+                        String pageIds = Arrays.stream(equipmentFormVO.getPageCodes().split(","))
+                                .map(String::trim)
+                                .filter(s -> !s.isEmpty())
+                                .map(pageMap::get)
+                                .filter(Objects::nonNull)
+                                .map(String::valueOf)
+                                .collect(Collectors.joining(","));
+                        if (pageIds.isEmpty()) {
+                            failureMsg.append("<br/>" + failureNum + "、设备 " + equipmentFormVO.getCode() + " 未识别到任何页面编码，请检查！");
+                        } else {
+                            equipment.setPageIds(pageIds);
+                        }
+                    }
                     equipment.setCreateBy(operName);
 //                    equipment.setStatus("0");
                     equipmentMapper.insert(equipment);
@@ -452,7 +567,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
             catch (Exception e)
             {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、设备 " + equipment.getCode() + " 导入失败：";
+                String msg = "<br/>" + failureNum + "、设备 " + equipmentFormVO.getCode() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
 //                log.error(msg, e);
             }

admin/src/main/java/com/dcs/hnyz/service/impl/FlowServiceImpl.java

@@ -3,7 +3,6 @@ package com.dcs.hnyz.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dcs.common.enums.GeneralStatus;
 import com.dcs.hnyz.domain.Equipment;
-import com.dcs.hnyz.domain.EquipmentParam;
 import com.dcs.hnyz.domain.Flow;
 import com.dcs.hnyz.domain.vo.FlowNavVO;
 import com.dcs.hnyz.mapper.FlowMapper;
@@ -112,13 +111,22 @@ public class FlowServiceImpl implements IFlowService
         return flow != null ? flow.getFlowName() : null;
     }
 
+    /**
+     * 获取流程列表
+     * @return
+     */
+    @Override
+    public List<Flow> getFlowList() {
+        Flow flow = new Flow();
+        return flowMapper.selectFlowList(flow);
+    }
     /**
      * 通过设备id获取流程列表
      * @param equipmentId
      * @return
      */
     @Override
-    public List<Flow> getFlowList(Long equipmentId) {
+    public List<Flow> getFlowListByEquipmentId(Long equipmentId) {
         LambdaQueryWrapper<Flow> wrapper=new LambdaQueryWrapper<>();
         if(equipmentId==null){//不传设备id时默认查全部
             return flowMapper.selectList(wrapper);

admin/src/main/java/com/dcs/hnyz/service/impl/PageControlServiceImpl.java

@@ -1,23 +1,20 @@
 package com.dcs.hnyz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dcs.common.enums.GeneralStatus;
-import com.dcs.common.utils.DateUtils;
 import com.dcs.hnyz.domain.Equipment;
-import com.dcs.hnyz.service.IEquipmentService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.dcs.hnyz.mapper.PageControlMapper;
 import com.dcs.hnyz.domain.PageControl;
+import com.dcs.hnyz.mapper.PageControlMapper;
+import com.dcs.hnyz.service.IEquipmentService;
 import com.dcs.hnyz.service.IPageControlService;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 页面管理Service业务层处理
@@ -113,7 +110,13 @@ public class PageControlServiceImpl implements IPageControlService
     }
 
     @Override
-    public List<PageControl> getPageList(Long equipmentId) {
+    public List<PageControl> getPageList() {
+        PageControl pageControl = new PageControl();
+        return pageControlMapper.selectPageControlList(pageControl);
+    }
+
+    @Override
+    public List<PageControl> getPageListByEquipmentId(Long equipmentId) {
         LambdaQueryWrapper<PageControl> wrapper=new LambdaQueryWrapper<>();
         wrapper.eq(PageControl::getStatus, GeneralStatus.ENABLE.getCode());
         if(equipmentId==null){//不传设备id时默认查全部

admin/src/main/resources/mapper/hnyzdcs/FlowMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFlowVo">
-        select flow_id, flow_name, sort, status, del_flag, create_by, create_time, update_by, update_time, remark from flow
+        select flow_id, flow_name, flow_code, sort, status, del_flag, create_by, create_time, update_by, update_time, remark from flow
     </sql>
 
     <select id="selectFlowList" parameterType="Flow" resultMap="FlowResult">