通道，参数

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manage/EquipmentManageController.java

@@ -11,6 +11,7 @@ import com.ruoyi.manage.service.IEquipmentManageService;
 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;
 
@@ -22,31 +23,38 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/manage/equipmentManage")
-public class EquipmentManageController extends BaseController
-{
+public class EquipmentManageController extends BaseController {
     @Autowired
     private IEquipmentManageService equipmentManageService;
 
-/**
- * 查询设备管理列表
- */
-@PreAuthorize("@ss.hasPermi('manage:equipmentManage:list')")
-@GetMapping("/list")
-    public TableDataInfo list(EquipmentManage equipmentManage)
-    {
+    /**
+     * 查询设备管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:equipmentManage:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EquipmentManage equipmentManage) {
         startPage();
         List<EquipmentManage> list = equipmentManageService.selectEquipmentManageList(equipmentManage);
         return getDataTable(list);
     }
 
+    /**
+     * 查询设备管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:equipmentManage:listNoPage')")
+    @GetMapping("/listNoPage")
+    public TableDataInfo listNoPage(EquipmentManage equipmentManage) {
+        List<EquipmentManage> list = equipmentManageService.selectEquipmentManageList(equipmentManage);
+        return getDataTable(list);
+    }
+
     /**
      * 导出设备管理列表
      */
     @PreAuthorize("@ss.hasPermi('manage:equipmentManage:export')")
     @Log(title = "设备管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, EquipmentManage equipmentManage)
-    {
+    public void export(HttpServletResponse response, EquipmentManage equipmentManage) {
         List<EquipmentManage> list = equipmentManageService.selectEquipmentManageList(equipmentManage);
         ExcelUtil<EquipmentManage> util = new ExcelUtil<EquipmentManage>(EquipmentManage.class);
         util.exportExcel(response, list, "设备管理数据");
@@ -57,8 +65,7 @@ public class EquipmentManageController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('manage:equipmentManage:query')")
     @GetMapping(value = "/{equipmentId}")
-    public AjaxResult getInfo(@PathVariable("equipmentId") Long equipmentId)
-    {
+    public AjaxResult getInfo(@PathVariable("equipmentId") Long equipmentId) {
         return success(equipmentManageService.selectEquipmentManageByEquipmentId(equipmentId));
     }
 
@@ -68,8 +75,7 @@ public class EquipmentManageController extends BaseController
     @PreAuthorize("@ss.hasPermi('manage:equipmentManage:add')")
     @Log(title = "设备管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EquipmentManage equipmentManage)
-    {
+    public AjaxResult add(@RequestBody EquipmentManage equipmentManage) {
         return toAjax(equipmentManageService.insertEquipmentManage(equipmentManage));
     }
 
@@ -79,8 +85,7 @@ public class EquipmentManageController extends BaseController
     @PreAuthorize("@ss.hasPermi('manage:equipmentManage:edit')")
     @Log(title = "设备管理", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody EquipmentManage equipmentManage)
-    {
+    public AjaxResult edit(@RequestBody EquipmentManage equipmentManage) {
         return toAjax(equipmentManageService.updateEquipmentManage(equipmentManage));
     }
 
@@ -90,8 +95,7 @@ public class EquipmentManageController extends BaseController
     @PreAuthorize("@ss.hasPermi('manage:equipmentManage:remove')")
     @Log(title = "设备管理", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{equipmentIds}")
-    public AjaxResult remove(@PathVariable Long[] equipmentIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] equipmentIds) {
         return toAjax(equipmentManageService.deleteEquipmentManageByEquipmentIds(equipmentIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manage/ParameterSetController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.manage;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.manage.domain.ParameterSet;
+import com.ruoyi.manage.service.IParameterSetService;
+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
+ *
+ * @author boman
+ * @date 2025-06-18
+ */
+@RestController
+@RequestMapping("/manage/parameterSet")
+public class ParameterSetController extends BaseController {
+    @Autowired
+    private IParameterSetService parameterSetService;
+
+    /**
+     * 查询参数设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:parameterSet:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ParameterSet parameterSet) {
+        startPage();
+        List<ParameterSet> list = parameterSetService.selectParameterSetList(parameterSet);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出参数设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:parameterSet:export')")
+    @Log(title = "参数设置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ParameterSet parameterSet) {
+        List<ParameterSet> list = parameterSetService.selectParameterSetList(parameterSet);
+        ExcelUtil<ParameterSet> util = new ExcelUtil<ParameterSet>(ParameterSet.class);
+        util.exportExcel(response, list, "参数设置数据");
+    }
+
+    /**
+     * 获取参数设置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:parameterSet:query')")
+    @GetMapping(value = "/{parameterId}")
+    public AjaxResult getInfo(@PathVariable("parameterId") Long parameterId) {
+        return success(parameterSetService.selectParameterSetByParameterId(parameterId));
+    }
+
+    /**
+     * 新增参数设置
+     */
+    @PreAuthorize("@ss.hasPermi('manage:parameterSet:add')")
+    @Log(title = "参数设置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ParameterSet parameterSet) {
+        return toAjax(parameterSetService.insertParameterSet(parameterSet));
+    }
+
+    /**
+     * 修改参数设置
+     */
+    @PreAuthorize("@ss.hasPermi('manage:parameterSet:edit')")
+    @Log(title = "参数设置", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ParameterSet parameterSet) {
+        return toAjax(parameterSetService.updateParameterSet(parameterSet));
+    }
+
+    /**
+     * 删除参数设置
+     */
+    @PreAuthorize("@ss.hasPermi('manage:parameterSet:remove')")
+    @Log(title = "参数设置", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{parameterIds}")
+    public AjaxResult remove(@PathVariable Long[] parameterIds) {
+        return toAjax(parameterSetService.deleteParameterSetByParameterIds(parameterIds));
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -1,8 +1,9 @@
 package com.ruoyi.common.constant;
 
-import java.util.Locale;
 import io.jsonwebtoken.Claims;
 
+import java.util.Locale;
+
 /**
  * 通用常量信息
  * 
@@ -170,4 +171,7 @@ public class Constants
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
             "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config", "com.ruoyi.generator" };
+
+    public static final String Y = "Y";
+    public static final String N = "N";
 }

ruoyi-system/src/main/java/com/ruoyi/manage/domain/ChannelNumber.java

@@ -1,7 +1,5 @@
 package com.ruoyi.manage.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -18,13 +16,35 @@ public class ChannelNumber extends BaseEntity
     /** 通道ID */
     private Long channelId;
 
+    /** 设备ID */
+    private Long equipmentId;
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String equipmentNum;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String equipmentName;
     /** 通道编号 */
     @Excel(name = "通道编号")
     private String channelNum;
 
+    /**
+     * 预览端口
+     */
+    private String port;
+
     /** 视频地址 */
     @Excel(name = "视频地址")
     private String videoAddress;
+    /**
+     * 账号
+     */
+    private String account;
+    /**
+     * 密码
+     */
+    private String password;
 
     /** 探测协议类型 */
     @Excel(name = "探测协议类型")
@@ -36,8 +56,81 @@ public class ChannelNumber extends BaseEntity
 
     /** 删除标志（0代表存在 1代表删除） */
     private String delFlag;
+    /**
+     * 是否设置过参数 N Y 不在数据库中
+     */
+    private String isChannel;
+
+    /**
+     * 参数设置
+     */
+    private ParameterSet parameterSet;
+
+    public ParameterSet getParameterSet() {
+        return parameterSet;
+    }
+
+    public void setParameterSet(ParameterSet parameterSet) {
+        this.parameterSet = parameterSet;
+    }
+
+    public String getPort() {
+        return port;
+    }
+
+    public void setPort(String port) {
+        this.port = port;
+    }
+
+    public String getIsChannel() {
+        return isChannel;
+    }
+
+    public void setIsChannel(String isChannel) {
+        this.isChannel = isChannel;
+    }
+
+    public String getEquipmentNum() {
+        return equipmentNum;
+    }
+
+    public void setEquipmentNum(String equipmentNum) {
+        this.equipmentNum = equipmentNum;
+    }
+
+    public String getEquipmentName() {
+        return equipmentName;
+    }
+
+    public void setEquipmentName(String equipmentName) {
+        this.equipmentName = equipmentName;
+    }
+
+    public Long getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Long equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
 
-    public void setChannelId(Long channelId) 
+    public void setChannelId(Long channelId)
     {
         this.channelId = channelId;
     }
@@ -99,18 +192,21 @@ public class ChannelNumber extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("channelId", getChannelId())
-            .append("channelNum", getChannelNum())
-            .append("videoAddress", getVideoAddress())
-            .append("protocolType", getProtocolType())
-            .append("channelDetails", getChannelDetails())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "ChannelNumber{" +
+                "channelId=" + channelId +
+                ", equipmentId=" + equipmentId +
+                ", equipmentNum='" + equipmentNum + '\'' +
+                ", equipmentName='" + equipmentName + '\'' +
+                ", channelNum='" + channelNum + '\'' +
+                ", port='" + port + '\'' +
+                ", videoAddress='" + videoAddress + '\'' +
+                ", account='" + account + '\'' +
+                ", password='" + password + '\'' +
+                ", protocolType='" + protocolType + '\'' +
+                ", channelDetails='" + channelDetails + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                ", isChannel='" + isChannel + '\'' +
+                ", parameterSet=" + parameterSet +
+                '}';
     }
 }

ruoyi-system/src/main/java/com/ruoyi/manage/domain/ParameterSet.java

@@ -0,0 +1,206 @@
+package com.ruoyi.manage.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 参数设置对象 parameter_set
+ * 
+ * @author boman
+ * @date 2025-06-18
+ */
+public class ParameterSet extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 参数ID */
+    private Long parameterId;
+
+    /** 通道ID */
+    @Excel(name = "通道ID")
+    private Long channelId;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Long equipmentId;
+
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String equipmentNum;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String equipmentName;
+
+    /** 通道编号 */
+    @Excel(name = "通道编号")
+    private String channelNum;
+
+    /** 坐标范围 */
+    @Excel(name = "坐标范围")
+    private String channelRange;
+
+    /** 离岗时间设置 默认：10 分钟 */
+    @Excel(name = "离岗时间设置 默认：10 分钟")
+    private String leaveTime;
+
+    /** 玩手机时间设置 默认：10 分钟 */
+    @Excel(name = "玩手机时间设置 默认：10 分钟")
+    private String playTime;
+
+    /** 离岗时间相似度设置 默认：0.5 */
+    @Excel(name = "离岗时间相似度设置 默认：0.5")
+    private String leaveRate;
+
+    /** 玩手机相似度设置 默认：0.5 */
+    @Excel(name = "玩手机相似度设置 默认：0.5")
+    private String playRate;
+
+    /** 删除标志（0代表存在 1代表删除） */
+    private String delFlag;
+
+    public void setParameterId(Long parameterId) 
+    {
+        this.parameterId = parameterId;
+    }
+
+    public Long getParameterId() 
+    {
+        return parameterId;
+    }
+
+    public void setChannelId(Long channelId) 
+    {
+        this.channelId = channelId;
+    }
+
+    public Long getChannelId() 
+    {
+        return channelId;
+    }
+
+    public void setEquipmentId(Long equipmentId) 
+    {
+        this.equipmentId = equipmentId;
+    }
+
+    public Long getEquipmentId() 
+    {
+        return equipmentId;
+    }
+
+    public void setEquipmentNum(String equipmentNum) 
+    {
+        this.equipmentNum = equipmentNum;
+    }
+
+    public String getEquipmentNum() 
+    {
+        return equipmentNum;
+    }
+
+    public void setEquipmentName(String equipmentName) 
+    {
+        this.equipmentName = equipmentName;
+    }
+
+    public String getEquipmentName() 
+    {
+        return equipmentName;
+    }
+
+    public void setChannelNum(String channelNum) 
+    {
+        this.channelNum = channelNum;
+    }
+
+    public String getChannelNum() 
+    {
+        return channelNum;
+    }
+
+    public void setChannelRange(String channelRange) 
+    {
+        this.channelRange = channelRange;
+    }
+
+    public String getChannelRange() 
+    {
+        return channelRange;
+    }
+
+    public void setLeaveTime(String leaveTime) 
+    {
+        this.leaveTime = leaveTime;
+    }
+
+    public String getLeaveTime() 
+    {
+        return leaveTime;
+    }
+
+    public void setPlayTime(String playTime) 
+    {
+        this.playTime = playTime;
+    }
+
+    public String getPlayTime() 
+    {
+        return playTime;
+    }
+
+    public void setLeaveRate(String leaveRate) 
+    {
+        this.leaveRate = leaveRate;
+    }
+
+    public String getLeaveRate() 
+    {
+        return leaveRate;
+    }
+
+    public void setPlayRate(String playRate) 
+    {
+        this.playRate = playRate;
+    }
+
+    public String getPlayRate() 
+    {
+        return playRate;
+    }
+
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("parameterId", getParameterId())
+            .append("channelId", getChannelId())
+            .append("equipmentId", getEquipmentId())
+            .append("equipmentNum", getEquipmentNum())
+            .append("equipmentName", getEquipmentName())
+            .append("channelNum", getChannelNum())
+            .append("channelRange", getChannelRange())
+            .append("leaveTime", getLeaveTime())
+            .append("playTime", getPlayTime())
+            .append("leaveRate", getLeaveRate())
+            .append("playRate", getPlayRate())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/manage/mapper/ParameterSetMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.manage.mapper;
+
+import com.ruoyi.manage.domain.ParameterSet;
+
+import java.util.List;
+
+/**
+ * 参数设置Mapper接口
+ * 
+ * @author boman
+ * @date 2025-06-18
+ */
+public interface ParameterSetMapper 
+{
+    /**
+     * 查询参数设置
+     * 
+     * @param parameterId 参数设置主键
+     * @return 参数设置
+     */
+    public ParameterSet selectParameterSetByParameterId(Long parameterId);
+    public ParameterSet selectParameterSetByChannelId(Long channelId);
+
+    /**
+     * 查询参数设置列表
+     * 
+     * @param parameterSet 参数设置
+     * @return 参数设置集合
+     */
+    public List<ParameterSet> selectParameterSetList(ParameterSet parameterSet);
+
+    /**
+     * 新增参数设置
+     * 
+     * @param parameterSet 参数设置
+     * @return 结果
+     */
+    public int insertParameterSet(ParameterSet parameterSet);
+
+    /**
+     * 修改参数设置
+     * 
+     * @param parameterSet 参数设置
+     * @return 结果
+     */
+    public int updateParameterSet(ParameterSet parameterSet);
+
+    /**
+     * 删除参数设置
+     * 
+     * @param parameterId 参数设置主键
+     * @return 结果
+     */
+    public int deleteParameterSetByParameterId(Long parameterId);
+
+    /**
+     * 批量删除参数设置
+     * 
+     * @param parameterIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteParameterSetByParameterIds(Long[] parameterIds);
+}

ruoyi-system/src/main/java/com/ruoyi/manage/service/IParameterSetService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.manage.service;
+
+import com.ruoyi.manage.domain.ParameterSet;
+
+import java.util.List;
+
+/**
+ * 参数设置Service接口
+ * 
+ * @author boman
+ * @date 2025-06-18
+ */
+public interface IParameterSetService 
+{
+    /**
+     * 查询参数设置
+     * 
+     * @param parameterId 参数设置主键
+     * @return 参数设置
+     */
+    public ParameterSet selectParameterSetByParameterId(Long parameterId);
+
+    /**
+     * 查询参数设置列表
+     * 
+     * @param parameterSet 参数设置
+     * @return 参数设置集合
+     */
+    public List<ParameterSet> selectParameterSetList(ParameterSet parameterSet);
+
+    /**
+     * 新增参数设置
+     * 
+     * @param parameterSet 参数设置
+     * @return 结果
+     */
+    public int insertParameterSet(ParameterSet parameterSet);
+
+    /**
+     * 修改参数设置
+     * 
+     * @param parameterSet 参数设置
+     * @return 结果
+     */
+    public int updateParameterSet(ParameterSet parameterSet);
+
+    /**
+     * 批量删除参数设置
+     * 
+     * @param parameterIds 需要删除的参数设置主键集合
+     * @return 结果
+     */
+    public int deleteParameterSetByParameterIds(Long[] parameterIds);
+
+    /**
+     * 删除参数设置信息
+     * 
+     * @param parameterId 参数设置主键
+     * @return 结果
+     */
+    public int deleteParameterSetByParameterId(Long parameterId);
+}

ruoyi-system/src/main/java/com/ruoyi/manage/service/impl/ChannelNumberServiceImpl.java

@@ -2,12 +2,17 @@ package com.ruoyi.manage.service.impl;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.manage.domain.ChannelNumber;
+import com.ruoyi.manage.domain.ParameterSet;
 import com.ruoyi.manage.mapper.ChannelNumberMapper;
+import com.ruoyi.manage.mapper.ParameterSetMapper;
 import com.ruoyi.manage.service.IChannelNumberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
 
+import static com.ruoyi.common.constant.Constants.N;
+import static com.ruoyi.common.constant.Constants.Y;
+
 
 /**
  * 通道管理Service业务层处理
@@ -21,6 +26,9 @@ public class ChannelNumberServiceImpl implements IChannelNumberService
     @Autowired
     private ChannelNumberMapper channelNumberMapper;
 
+    @Autowired
+    private ParameterSetMapper parameterSetMapper;
+
     /**
      * 查询通道管理
      * 
@@ -30,7 +38,15 @@ public class ChannelNumberServiceImpl implements IChannelNumberService
     @Override
     public ChannelNumber selectChannelNumberByChannelId(Long channelId)
     {
-        return channelNumberMapper.selectChannelNumberByChannelId(channelId);
+        ChannelNumber channelNumber = channelNumberMapper.selectChannelNumberByChannelId(channelId);
+        channelNumber.setIsChannel(N);
+        //判断是否设置过参数
+        ParameterSet parameterSet = parameterSetMapper.selectParameterSetByChannelId(channelId);
+        if (parameterSet != null) {
+            channelNumber.setIsChannel(Y);
+            channelNumber.setParameterSet(parameterSet);
+        }
+        return channelNumber;
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/manage/service/impl/ParameterSetServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.manage.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.manage.domain.ParameterSet;
+import com.ruoyi.manage.mapper.ParameterSetMapper;
+import com.ruoyi.manage.service.IParameterSetService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 参数设置Service业务层处理
+ * 
+ * @author boman
+ * @date 2025-06-18
+ */
+@Service
+public class ParameterSetServiceImpl implements IParameterSetService 
+{
+    @Autowired
+    private ParameterSetMapper parameterSetMapper;
+
+    /**
+     * 查询参数设置
+     * 
+     * @param parameterId 参数设置主键
+     * @return 参数设置
+     */
+    @Override
+    public ParameterSet selectParameterSetByParameterId(Long parameterId)
+    {
+        return parameterSetMapper.selectParameterSetByParameterId(parameterId);
+    }
+
+    /**
+     * 查询参数设置列表
+     * 
+     * @param parameterSet 参数设置
+     * @return 参数设置
+     */
+    @Override
+    public List<ParameterSet> selectParameterSetList(ParameterSet parameterSet)
+    {
+        return parameterSetMapper.selectParameterSetList(parameterSet);
+    }
+
+    /**
+     * 新增参数设置
+     * 
+     * @param parameterSet 参数设置
+     * @return 结果
+     */
+    @Override
+    public int insertParameterSet(ParameterSet parameterSet)
+    {
+        parameterSet.setCreateTime(DateUtils.getNowDate());
+        return parameterSetMapper.insertParameterSet(parameterSet);
+    }
+
+    /**
+     * 修改参数设置
+     * 
+     * @param parameterSet 参数设置
+     * @return 结果
+     */
+    @Override
+    public int updateParameterSet(ParameterSet parameterSet)
+    {
+        parameterSet.setUpdateTime(DateUtils.getNowDate());
+        return parameterSetMapper.updateParameterSet(parameterSet);
+    }
+
+    /**
+     * 批量删除参数设置
+     * 
+     * @param parameterIds 需要删除的参数设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteParameterSetByParameterIds(Long[] parameterIds)
+    {
+        return parameterSetMapper.deleteParameterSetByParameterIds(parameterIds);
+    }
+
+    /**
+     * 删除参数设置信息
+     * 
+     * @param parameterId 参数设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteParameterSetByParameterId(Long parameterId)
+    {
+        return parameterSetMapper.deleteParameterSetByParameterId(parameterId);
+    }
+}

ruoyi-system/src/main/resources/mapper/manage/ChannelNumberMapper.xml

@@ -6,8 +6,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ChannelNumber" id="ChannelNumberResult">
         <result property="channelId"    column="channel_id"    />
+        <result property="equipmentId"    column="equipment_id"    />
+        <result property="equipmentNum"    column="equipment_num"    />
+        <result property="equipmentName"    column="equipment_name"    />
         <result property="channelNum"    column="channel_num"    />
+        <result property="port"    column="port"    />
         <result property="videoAddress"    column="video_address"    />
+        <result property="account"    column="account"    />
+        <result property="password"    column="password"    />
         <result property="protocolType"    column="protocol_type"    />
         <result property="channelDetails"    column="channel_details"    />
         <result property="delFlag"    column="del_flag"    />
@@ -19,12 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectChannelNumberVo">
-        select channel_id, channel_num, video_address, protocol_type, channel_details, del_flag, create_by, create_time, update_by, update_time, remark from channel_number
+        select channel_id, channel_num,equipment_id, equipment_num, equipment_name, video_address,port, account,password,protocol_type, channel_details, del_flag, create_by, create_time, update_by, update_time, remark from channel_number
     </sql>
 
     <select id="selectChannelNumberList" parameterType="ChannelNumber" resultMap="ChannelNumberResult">
         <include refid="selectChannelNumberVo"/>
-        <where>  
+        <where>
+            <if test="equipmentNum != null  and equipmentNum != ''"> and equipment_num  like concat('%', #{equipmentNum}, '%')</if>
+            <if test="equipmentName != null  and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
             <if test="channelNum != null  and channelNum != ''"> and channel_num = #{channelNum}</if>
             <if test="videoAddress != null  and videoAddress != ''"> and video_address = #{videoAddress}</if>
             <if test="protocolType != null  and protocolType != ''"> and protocol_type = #{protocolType}</if>
@@ -40,8 +48,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertChannelNumber" parameterType="ChannelNumber" useGeneratedKeys="true" keyProperty="channelId">
         insert into channel_number
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="equipmentId != null">equipment_id,</if>
+            <if test="equipmentNum != null">equipment_num,</if>
+            <if test="equipmentName != null">equipment_name,</if>
             <if test="channelNum != null">channel_num,</if>
             <if test="videoAddress != null">video_address,</if>
+            <if test="account != null">account,</if>
+            <if test="port != null">port,</if>
+            <if test="password != null">password,</if>
             <if test="protocolType != null">protocol_type,</if>
             <if test="channelDetails != null">channel_details,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -52,8 +66,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="equipmentId != null">#{equipmentId},</if>
+            <if test="equipmentNum != null">#{equipmentNum},</if>
+            <if test="equipmentName != null">#{equipmentName},</if>
             <if test="channelNum != null">#{channelNum},</if>
             <if test="videoAddress != null">#{videoAddress},</if>
+            <if test="account != null">#{account},</if>
+            <if test="port != null">#{port},</if>
+            <if test="password != null">#{password},</if>
             <if test="protocolType != null">#{protocolType},</if>
             <if test="channelDetails != null">#{channelDetails},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -68,8 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateChannelNumber" parameterType="ChannelNumber">
         update channel_number
         <trim prefix="SET" suffixOverrides=",">
+            <if test="equipmentId != null">equipment_id = #{equipmentId},</if>
+            <if test="equipmentNum != null">equipment_num = #{equipmentNum},</if>
+            <if test="equipmentName != null">equipment_name = #{equipmentName},</if>
             <if test="channelNum != null">channel_num = #{channelNum},</if>
             <if test="videoAddress != null">video_address = #{videoAddress},</if>
+            <if test="account != null">account = #{account},</if>
+            <if test="port != null">port = #{port},</if>
+            <if test="password != null">password = #{password},</if>
             <if test="protocolType != null">protocol_type = #{protocolType},</if>
             <if test="channelDetails != null">channel_details = #{channelDetails},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>

ruoyi-system/src/main/resources/mapper/manage/EquipmentManageMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEquipmentManageList" parameterType="EquipmentManage" resultMap="EquipmentManageResult">
         <include refid="selectEquipmentManageVo"/>
         <where>  
-            <if test="equipmentNum != null  and equipmentNum != ''"> and equipment_num = #{equipmentNum}</if>
+            <if test="equipmentNum != null  and equipmentNum != ''"> and equipment_num  like concat('%', #{equipmentNum}, '%')</if>
             <if test="equipmentName != null  and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
             <if test="equipmentType != null  and equipmentType != ''"> and equipment_type = #{equipmentType}</if>
             <if test="equipmentAddress != null  and equipmentAddress != ''"> and equipment_address = #{equipmentAddress}</if>

ruoyi-system/src/main/resources/mapper/manage/ParameterSetMapper.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.manage.mapper.ParameterSetMapper">
+    
+    <resultMap type="ParameterSet" id="ParameterSetResult">
+        <result property="parameterId"    column="parameter_id"    />
+        <result property="channelId"    column="channel_id"    />
+        <result property="equipmentId"    column="equipment_id"    />
+        <result property="equipmentNum"    column="equipment_num"    />
+        <result property="equipmentName"    column="equipment_name"    />
+        <result property="channelNum"    column="channel_num"    />
+        <result property="channelRange"    column="channel_range"    />
+        <result property="leaveTime"    column="leave_time"    />
+        <result property="playTime"    column="play_time"    />
+        <result property="leaveRate"    column="leave_rate"    />
+        <result property="playRate"    column="play_rate"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectParameterSetVo">
+        select parameter_id, channel_id, equipment_id, equipment_num, equipment_name, channel_num, channel_range, leave_time, play_time, leave_rate, play_rate, del_flag, create_by, create_time, update_by, update_time, remark from parameter_set
+    </sql>
+
+    <select id="selectParameterSetList" parameterType="ParameterSet" resultMap="ParameterSetResult">
+        <include refid="selectParameterSetVo"/>
+        <where>  
+            <if test="channelId != null "> and channel_id = #{channelId}</if>
+            <if test="equipmentId != null "> and equipment_id = #{equipmentId}</if>
+            <if test="equipmentNum != null  and equipmentNum != ''"> and equipment_num = #{equipmentNum}</if>
+            <if test="equipmentName != null  and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
+            <if test="channelNum != null  and channelNum != ''"> and channel_num = #{channelNum}</if>
+            <if test="channelRange != null  and channelRange != ''"> and channel_range = #{channelRange}</if>
+            <if test="leaveTime != null  and leaveTime != ''"> and leave_time = #{leaveTime}</if>
+            <if test="playTime != null  and playTime != ''"> and play_time = #{playTime}</if>
+            <if test="leaveRate != null  and leaveRate != ''"> and leave_rate = #{leaveRate}</if>
+            <if test="playRate != null  and playRate != ''"> and play_rate = #{playRate}</if>
+        </where>
+    </select>
+    
+    <select id="selectParameterSetByParameterId" parameterType="Long" resultMap="ParameterSetResult">
+        <include refid="selectParameterSetVo"/>
+        where parameter_id = #{parameterId}
+    </select>
+    <select id="selectParameterSetByChannelId" parameterType="Long" resultMap="ParameterSetResult">
+        <include refid="selectParameterSetVo"/>
+        where channel_id = #{channelId}
+    </select>
+    <insert id="insertParameterSet" parameterType="ParameterSet" useGeneratedKeys="true" keyProperty="parameterId">
+        insert into parameter_set
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="channelId != null">channel_id,</if>
+            <if test="equipmentId != null">equipment_id,</if>
+            <if test="equipmentNum != null">equipment_num,</if>
+            <if test="equipmentName != null">equipment_name,</if>
+            <if test="channelNum != null">channel_num,</if>
+            <if test="channelRange != null">channel_range,</if>
+            <if test="leaveTime != null">leave_time,</if>
+            <if test="playTime != null">play_time,</if>
+            <if test="leaveRate != null">leave_rate,</if>
+            <if test="playRate != null">play_rate,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="channelId != null">#{channelId},</if>
+            <if test="equipmentId != null">#{equipmentId},</if>
+            <if test="equipmentNum != null">#{equipmentNum},</if>
+            <if test="equipmentName != null">#{equipmentName},</if>
+            <if test="channelNum != null">#{channelNum},</if>
+            <if test="channelRange != null">#{channelRange},</if>
+            <if test="leaveTime != null">#{leaveTime},</if>
+            <if test="playTime != null">#{playTime},</if>
+            <if test="leaveRate != null">#{leaveRate},</if>
+            <if test="playRate != null">#{playRate},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateParameterSet" parameterType="ParameterSet">
+        update parameter_set
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="channelId != null">channel_id = #{channelId},</if>
+            <if test="equipmentId != null">equipment_id = #{equipmentId},</if>
+            <if test="equipmentNum != null">equipment_num = #{equipmentNum},</if>
+            <if test="equipmentName != null">equipment_name = #{equipmentName},</if>
+            <if test="channelNum != null">channel_num = #{channelNum},</if>
+            <if test="channelRange != null">channel_range = #{channelRange},</if>
+            <if test="leaveTime != null">leave_time = #{leaveTime},</if>
+            <if test="playTime != null">play_time = #{playTime},</if>
+            <if test="leaveRate != null">leave_rate = #{leaveRate},</if>
+            <if test="playRate != null">play_rate = #{playRate},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where parameter_id = #{parameterId}
+    </update>
+
+    <delete id="deleteParameterSetByParameterId" parameterType="Long">
+        delete from parameter_set where parameter_id = #{parameterId}
+    </delete>
+
+    <delete id="deleteParameterSetByParameterIds" parameterType="String">
+        delete from parameter_set where parameter_id in 
+        <foreach item="parameterId" collection="array" open="(" separator="," close=")">
+            #{parameterId}
+        </foreach>
+    </delete>
+</mapper>