Merge remote-tracking branch 'origin/master'

pipe-network-service/pom.xml

@@ -42,6 +42,7 @@
         <spring-security.version>5.7.12</spring-security.version>
         <spring-framework.version>5.3.39</spring-framework.version>
         <mybatis-plus.version>3.5.7</mybatis-plus.version>
+        <hutool.version>5.7.14</hutool.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -230,6 +231,12 @@
                 <artifactId>mybatis-plus-boot-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
+            <!-- hutool工具包-->
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>${hutool.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/base/AlarmAssignDetailController.java

@@ -0,0 +1,71 @@
+package com.zksy.web.controller.base;
+
+import com.zksy.base.domain.AlarmAssignDetail;
+import com.zksy.base.service.IAlarmAssignDetailService;
+import com.zksy.common.annotation.Anonymous;
+import com.zksy.common.core.controller.BaseController;
+import com.zksy.common.core.domain.AjaxResult;
+import com.zksy.common.core.domain.AjaxResult2;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 报警清单处理明细Controller
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+@RestController
+@RequestMapping("/alarmAssignDetail")
+@Api(tags = "报警清单处理明细")
+public class AlarmAssignDetailController extends BaseController
+{
+    @Autowired
+    private IAlarmAssignDetailService alarmAssignDetailService;
+
+    /**
+     * 获取报警清单处理明细详细信息
+     */
+    @Anonymous
+    @GetMapping(value = "/getById/{id}")
+    @ApiOperation(value = "获取报警清单处理明细详细信息")
+    public AjaxResult2<AlarmAssignDetail> getById(@PathVariable("id") Long id)
+    {
+        return AjaxResult2.success(alarmAssignDetailService.selectAlarmAssignDetailByAlarmAssignDetailId(id));
+    }
+
+    /**
+     * 新增报警清单处理明细
+     */
+    @Anonymous
+    @PostMapping(value = "/save")
+    @ApiOperation(value = "新增报警清单处理明细")
+    public AjaxResult save(@RequestBody AlarmAssignDetail alarmAssignDetail)
+    {
+        return toAjax(alarmAssignDetailService.insertAlarmAssignDetail(alarmAssignDetail));
+    }
+
+    /**
+     * 修改报警清单处理明细
+     */
+    @Anonymous
+    @PostMapping(value = "/update")
+    @ApiOperation(value = "修改报警清单处理明细")
+    public AjaxResult update(@RequestBody AlarmAssignDetail alarmAssignDetail)
+    {
+        return toAjax(alarmAssignDetailService.updateAlarmAssignDetail(alarmAssignDetail));
+    }
+
+    /**
+     * 批量删除报警清单处理明细
+     */
+    @Anonymous
+    @PostMapping(value = "/deleteBatch")
+    @ApiOperation(value = "批量删除报警清单处理明细")
+    public AjaxResult deleteBatch(@RequestBody Long[] ids)
+    {
+        return toAjax(alarmAssignDetailService.deleteAlarmAssignDetailByAlarmAssignDetailIds(ids));
+    }
+}

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/base/AlarmAssignListController.java

@@ -0,0 +1,98 @@
+package com.zksy.web.controller.base;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.base.domain.AlarmAssignList;
+import com.zksy.base.dto.AlarmAssignListPageInDTO;
+import com.zksy.base.service.IAlarmAssignListService;
+import com.zksy.common.annotation.Anonymous;
+import com.zksy.common.core.controller.BaseController;
+import com.zksy.common.core.domain.AjaxResult;
+import com.zksy.common.core.domain.AjaxResult2;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 报警清单Controller
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+@RestController
+@RequestMapping("/alarmAssignList")
+@Api(tags = "报警清单")
+public class AlarmAssignListController extends BaseController
+{
+    @Autowired
+    private IAlarmAssignListService alarmAssignListService;
+
+    /**
+     * 分页查询报警清单列表
+     */
+    @Anonymous
+    @GetMapping(value = "/findByPage")
+    @ApiOperation(value = "分页查询报警清单列表")
+    public AjaxResult2<Page<AlarmAssignList>> findByPage(@RequestBody AlarmAssignListPageInDTO pageInDTO)
+    {
+        return AjaxResult2.success(alarmAssignListService.findByPage(pageInDTO));
+    }
+
+    /**
+     * 导出报警清单列表
+     */
+    /*@Anonymous
+    @PostMapping("/export")
+    @ApiOperation(value = "导出报警清单列表")
+    public void export(HttpServletResponse response, AlarmAssignList alarmAssignList)
+    {
+        List<AlarmAssignList> list = alarmAssignListService.selectAlarmAssignListList(alarmAssignList);
+        ExcelUtil<AlarmAssignList> util = new ExcelUtil<AlarmAssignList>(AlarmAssignList.class);
+        util.exportExcel(response, list, "报警清单数据");
+    }*/
+
+    /**
+     * 获取报警清单详细信息
+     */
+    @Anonymous
+    @GetMapping(value = "/getById/{id}")
+    @ApiOperation(value = "获取报警清单详细信息")
+    public AjaxResult2<AlarmAssignList> getById(@PathVariable("id") Long id)
+    {
+        return AjaxResult2.success(alarmAssignListService.selectAlarmAssignListByAlarmAssignId(id));
+    }
+
+    /**
+     * 新增报警清单
+     */
+    @Anonymous
+    @PostMapping(value = "/save")
+    @ApiOperation(value = "新增报警清单")
+    public AjaxResult save(@RequestBody AlarmAssignList alarmAssignList)
+    {
+        return toAjax(alarmAssignListService.insertAlarmAssignList(alarmAssignList));
+    }
+
+    /**
+     * 修改报警清单
+     */
+    @Anonymous
+    @PostMapping(value = "/update")
+    @ApiOperation(value = "修改报警清单")
+    public AjaxResult update(@RequestBody AlarmAssignList alarmAssignList)
+    {
+        return toAjax(alarmAssignListService.updateAlarmAssignList(alarmAssignList));
+    }
+
+    /**
+     * 批量删除报警清单
+     */
+    @Anonymous
+    @PostMapping(value = "/deleteBatch")
+    @ApiOperation(value = "批量删除报警清单")
+    public AjaxResult deleteBatch(@RequestBody Long[] ids)
+    {
+        return toAjax(alarmAssignListService.deleteAlarmAssignListByAlarmAssignIds(ids));
+    }
+}

pipe-network-service/zksy-common/src/main/java/com/zksy/common/core/domain/AjaxResult2.java

@@ -0,0 +1,49 @@
+package com.zksy.common.core.domain;
+
+import com.zksy.common.constant.HttpStatus;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 操作消息提醒2
+ *
+ * @author xianggx
+ */
+@Data
+public class AjaxResult2<T> {
+
+    @ApiModelProperty(value = "状态码", required = true)
+    private int code;
+
+    @ApiModelProperty(value = "返回内容", required = true)
+    private String msg;
+
+    @ApiModelProperty(value = "返回数据对象", required = false)
+    private T data;
+
+    /**
+     * 返回错误消息
+     *
+     * @param msg 返回内容
+     * @return 错误消息
+     */
+    public static <T> AjaxResult2<T> error(String msg) {
+        AjaxResult2<T> apiResult = new AjaxResult2();
+        apiResult.setCode(HttpStatus.ERROR);
+        apiResult.setMsg(msg);
+        return apiResult;
+    }
+
+    /**
+     * 返回成功数据
+     *
+     * @return 成功消息
+     */
+    public static <T> AjaxResult2<T> success(T data) {
+        AjaxResult2<T> apiResult = new AjaxResult2();
+        apiResult.setCode(HttpStatus.SUCCESS);
+        apiResult.setMsg("操作成功");
+        apiResult.setData(data);
+        return apiResult;
+    }
+}

pipe-network-service/zksy-system/pom.xml

@@ -35,6 +35,10 @@
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/AlarmAssignDetail.java

@@ -0,0 +1,53 @@
+package com.zksy.base.domain;
+
+import com.zksy.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 报警清单处理明细对象 alarm_assign_detail
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+@Data
+@ApiModel(value = "报警清单处理明细入参", description = "报警清单处理明细入参")
+public class AlarmAssignDetail implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 报警清单明细ID */
+    @ApiModelProperty(value = "报警清单明细ID", required = true)
+    private Long alarmAssignDetailId;
+
+    /** 报警清单ID */
+    @ApiModelProperty(value = "报警清单ID", required = true)
+    private Long alarmAssignId;
+
+    /** 处理人ID */
+    @Excel(name = "处理人ID")
+    @ApiModelProperty(value = "处理人ID", required = true)
+    private Long handleUserId;
+
+    /** 处理人姓名 */
+    @Excel(name = "处理人姓名")
+    @ApiModelProperty(value = "处理人姓名", required = true)
+    private String handleUserName;
+
+    /** 处理人手机号 */
+    @Excel(name = "处理人手机号")
+    @ApiModelProperty(value = "处理人手机号", required = true)
+    private String handlePhone;
+
+    /** 处理人部门名称 */
+    @Excel(name = "处理人部门名称")
+    @ApiModelProperty(value = "处理人部门名称", required = false)
+    private String handleDeptName;
+
+    /** 备注 */
+    @ApiModelProperty(value = "备注", required = false)
+    private String remark;
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/AlarmAssignList.java

@@ -0,0 +1,81 @@
+package com.zksy.base.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zksy.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 报警清单对象 alarm_assign_list
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+@Data
+@ApiModel(value = "报警清单入参", description = "报警清单入参")
+public class AlarmAssignList implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 报警清单ID */
+    @Excel(name = "报警清单ID")
+    @ApiModelProperty(value = "报警清单ID", required = true)
+    private Long alarmAssignId;
+
+    /** 设备编码 */
+    @Excel(name = "设备编码")
+    @ApiModelProperty(value = "设备编码", required = true)
+    private String deviceCode;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    @ApiModelProperty(value = "设备名称", required = true)
+    private String deviceName;
+
+    /** 设备厂商 */
+    @Excel(name = "设备厂商")
+    @ApiModelProperty(value = "设备厂商", required = false)
+    private String manufacturer;
+
+    /** 设备报警状态：(0-正常，1-报警) */
+    @Excel(name = "设备报警状态：(0-正常，1-报警)")
+    @ApiModelProperty(value = "设备报警状态：(0-正常，1-报警)", required = true)
+    private Integer alarmStatus;
+
+    /** 隐患类型 */
+    @Excel(name = "隐患类型")
+    @ApiModelProperty(value = "隐患类型", required = true)
+    private String hiddenDangerType;
+
+    /** 隐患描述 */
+    @ApiModelProperty(value = "隐患描述", required = true)
+    private String hiddenDangerRemark;
+
+    /** 报警时间 */
+    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "报警时间", required = true)
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date alarmTime;
+
+    /** 处理状态：0-未处理 1-已处理 */
+    @Excel(name = "处理状态：0-未处理 1-已处理")
+    @ApiModelProperty(value = "处理状态：0-未处理 1-已处理", required = true)
+    private Integer assignStatus;
+
+    /** 派发时间 */
+    @ApiModelProperty(value = "派发时间", required = false)
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date assignTime;
+
+    /** 派发人 */
+    @ApiModelProperty(value = "派发人", required = false)
+    private Long assignUserId;
+
+    /** 派发备注 */
+    @ApiModelProperty(value = "派发备注", required = false)
+    private String assignRemark;
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/base/dto/AlarmAssignListPageInDTO.java

@@ -0,0 +1,39 @@
+package com.zksy.base.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 分页查询报警清单列表-入参
+ *
+ * @author xianggx
+ */
+@Data
+@ApiModel(value = "分页查询报警清单列表-入参", description = "分页查询报警清单列表-入参")
+public class AlarmAssignListPageInDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备编码")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "设备报警状态：(0-正常，1-报警)")
+    private Integer alarmStatus;
+
+    @ApiModelProperty(value = "处理状态：0-未处理 1-已处理")
+    private Integer assignStatus;
+
+    @ApiModelProperty(value = "设备厂商")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "当前记录起始索引", required = true)
+    private Long pageNum;
+
+    @ApiModelProperty(value = "每页显示记录数", required = true)
+    private Long pageSize;
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/base/mapper/AlarmAssignDetailMapper.java

@@ -0,0 +1,65 @@
+package com.zksy.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.base.domain.AlarmAssignDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 报警清单处理明细Mapper接口
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+@Mapper
+public interface AlarmAssignDetailMapper extends BaseMapper<AlarmAssignDetail>
+{
+    /**
+     * 查询报警清单处理明细
+     * 
+     * @param alarmAssignDetailId 报警清单处理明细主键
+     * @return 报警清单处理明细
+     */
+    public AlarmAssignDetail selectAlarmAssignDetailByAlarmAssignDetailId(Long alarmAssignDetailId);
+
+    /**
+     * 查询报警清单处理明细列表
+     * 
+     * @param alarmAssignDetail 报警清单处理明细
+     * @return 报警清单处理明细集合
+     */
+    public List<AlarmAssignDetail> selectAlarmAssignDetailList(AlarmAssignDetail alarmAssignDetail);
+
+    /**
+     * 新增报警清单处理明细
+     * 
+     * @param alarmAssignDetail 报警清单处理明细
+     * @return 结果
+     */
+    public int insertAlarmAssignDetail(AlarmAssignDetail alarmAssignDetail);
+
+    /**
+     * 修改报警清单处理明细
+     * 
+     * @param alarmAssignDetail 报警清单处理明细
+     * @return 结果
+     */
+    public int updateAlarmAssignDetail(AlarmAssignDetail alarmAssignDetail);
+
+    /**
+     * 删除报警清单处理明细
+     * 
+     * @param alarmAssignDetailId 报警清单处理明细主键
+     * @return 结果
+     */
+    public int deleteAlarmAssignDetailByAlarmAssignDetailId(Long alarmAssignDetailId);
+
+    /**
+     * 批量删除报警清单处理明细
+     * 
+     * @param alarmAssignDetailIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAlarmAssignDetailByAlarmAssignDetailIds(Long[] alarmAssignDetailIds);
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/base/mapper/AlarmAssignListMapper.java

@@ -0,0 +1,65 @@
+package com.zksy.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.base.domain.AlarmAssignList;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 报警清单Mapper接口
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+@Mapper
+public interface AlarmAssignListMapper extends BaseMapper<AlarmAssignList>
+{
+    /**
+     * 查询报警清单
+     * 
+     * @param alarmAssignId 报警清单主键
+     * @return 报警清单
+     */
+    public AlarmAssignList selectAlarmAssignListByAlarmAssignId(Long alarmAssignId);
+
+    /**
+     * 查询报警清单列表
+     * 
+     * @param alarmAssignList 报警清单
+     * @return 报警清单集合
+     */
+    public List<AlarmAssignList> selectAlarmAssignListList(AlarmAssignList alarmAssignList);
+
+    /**
+     * 新增报警清单
+     * 
+     * @param alarmAssignList 报警清单
+     * @return 结果
+     */
+    public int insertAlarmAssignList(AlarmAssignList alarmAssignList);
+
+    /**
+     * 修改报警清单
+     * 
+     * @param alarmAssignList 报警清单
+     * @return 结果
+     */
+    public int updateAlarmAssignList(AlarmAssignList alarmAssignList);
+
+    /**
+     * 删除报警清单
+     * 
+     * @param alarmAssignId 报警清单主键
+     * @return 结果
+     */
+    public int deleteAlarmAssignListByAlarmAssignId(Long alarmAssignId);
+
+    /**
+     * 批量删除报警清单
+     * 
+     * @param alarmAssignIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAlarmAssignListByAlarmAssignIds(Long[] alarmAssignIds);
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/IAlarmAssignDetailService.java

@@ -0,0 +1,61 @@
+package com.zksy.base.service;
+
+import java.util.List;
+import com.zksy.base.domain.AlarmAssignDetail;
+
+/**
+ * 报警清单处理明细Service接口
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+public interface IAlarmAssignDetailService 
+{
+    /**
+     * 查询报警清单处理明细
+     * 
+     * @param alarmAssignDetailId 报警清单处理明细主键
+     * @return 报警清单处理明细
+     */
+    public AlarmAssignDetail selectAlarmAssignDetailByAlarmAssignDetailId(Long alarmAssignDetailId);
+
+    /**
+     * 查询报警清单处理明细列表
+     * 
+     * @param alarmAssignDetail 报警清单处理明细
+     * @return 报警清单处理明细集合
+     */
+    public List<AlarmAssignDetail> selectAlarmAssignDetailList(AlarmAssignDetail alarmAssignDetail);
+
+    /**
+     * 新增报警清单处理明细
+     * 
+     * @param alarmAssignDetail 报警清单处理明细
+     * @return 结果
+     */
+    public int insertAlarmAssignDetail(AlarmAssignDetail alarmAssignDetail);
+
+    /**
+     * 修改报警清单处理明细
+     * 
+     * @param alarmAssignDetail 报警清单处理明细
+     * @return 结果
+     */
+    public int updateAlarmAssignDetail(AlarmAssignDetail alarmAssignDetail);
+
+    /**
+     * 批量删除报警清单处理明细
+     * 
+     * @param alarmAssignDetailIds 需要删除的报警清单处理明细主键集合
+     * @return 结果
+     */
+    public int deleteAlarmAssignDetailByAlarmAssignDetailIds(Long[] alarmAssignDetailIds);
+
+    /**
+     * 删除报警清单处理明细信息
+     * 
+     * @param alarmAssignDetailId 报警清单处理明细主键
+     * @return 结果
+     */
+    public int deleteAlarmAssignDetailByAlarmAssignDetailId(Long alarmAssignDetailId);
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/IAlarmAssignListService.java

@@ -0,0 +1,72 @@
+package com.zksy.base.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.base.domain.AlarmAssignList;
+import com.zksy.base.dto.AlarmAssignListPageInDTO;
+
+import java.util.List;
+
+/**
+ * 报警清单Service接口
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+public interface IAlarmAssignListService extends IService<AlarmAssignList>
+{
+    /**
+     * 查询报警清单
+     * 
+     * @param alarmAssignId 报警清单主键
+     * @return 报警清单
+     */
+    public AlarmAssignList selectAlarmAssignListByAlarmAssignId(Long alarmAssignId);
+
+    /**
+     * 查询报警清单列表
+     * 
+     * @param alarmAssignList 报警清单
+     * @return 报警清单集合
+     */
+    public List<AlarmAssignList> selectAlarmAssignListList(AlarmAssignList alarmAssignList);
+
+    /**
+     * 新增报警清单
+     * 
+     * @param alarmAssignList 报警清单
+     * @return 结果
+     */
+    public int insertAlarmAssignList(AlarmAssignList alarmAssignList);
+
+    /**
+     * 修改报警清单
+     * 
+     * @param alarmAssignList 报警清单
+     * @return 结果
+     */
+    public int updateAlarmAssignList(AlarmAssignList alarmAssignList);
+
+    /**
+     * 批量删除报警清单
+     * 
+     * @param alarmAssignIds 需要删除的报警清单主键集合
+     * @return 结果
+     */
+    public int deleteAlarmAssignListByAlarmAssignIds(Long[] alarmAssignIds);
+
+    /**
+     * 删除报警清单信息
+     * 
+     * @param alarmAssignId 报警清单主键
+     * @return 结果
+     */
+    public int deleteAlarmAssignListByAlarmAssignId(Long alarmAssignId);
+
+    /**
+     * 分页查询报警清单列表
+     * @param pageInDTO
+     * @return
+     */
+    public Page<AlarmAssignList> findByPage(AlarmAssignListPageInDTO pageInDTO);
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/AlarmAssignDetailServiceImpl.java

@@ -0,0 +1,93 @@
+package com.zksy.base.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zksy.base.mapper.AlarmAssignDetailMapper;
+import com.zksy.base.domain.AlarmAssignDetail;
+import com.zksy.base.service.IAlarmAssignDetailService;
+
+/**
+ * 报警清单处理明细Service业务层处理
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+@Service
+public class AlarmAssignDetailServiceImpl implements IAlarmAssignDetailService 
+{
+    @Autowired
+    private AlarmAssignDetailMapper alarmAssignDetailMapper;
+
+    /**
+     * 查询报警清单处理明细
+     * 
+     * @param alarmAssignDetailId 报警清单处理明细主键
+     * @return 报警清单处理明细
+     */
+    @Override
+    public AlarmAssignDetail selectAlarmAssignDetailByAlarmAssignDetailId(Long alarmAssignDetailId)
+    {
+        return alarmAssignDetailMapper.selectAlarmAssignDetailByAlarmAssignDetailId(alarmAssignDetailId);
+    }
+
+    /**
+     * 查询报警清单处理明细列表
+     * 
+     * @param alarmAssignDetail 报警清单处理明细
+     * @return 报警清单处理明细
+     */
+    @Override
+    public List<AlarmAssignDetail> selectAlarmAssignDetailList(AlarmAssignDetail alarmAssignDetail)
+    {
+        return alarmAssignDetailMapper.selectAlarmAssignDetailList(alarmAssignDetail);
+    }
+
+    /**
+     * 新增报警清单处理明细
+     * 
+     * @param alarmAssignDetail 报警清单处理明细
+     * @return 结果
+     */
+    @Override
+    public int insertAlarmAssignDetail(AlarmAssignDetail alarmAssignDetail)
+    {
+        return alarmAssignDetailMapper.insertAlarmAssignDetail(alarmAssignDetail);
+    }
+
+    /**
+     * 修改报警清单处理明细
+     * 
+     * @param alarmAssignDetail 报警清单处理明细
+     * @return 结果
+     */
+    @Override
+    public int updateAlarmAssignDetail(AlarmAssignDetail alarmAssignDetail)
+    {
+        return alarmAssignDetailMapper.updateAlarmAssignDetail(alarmAssignDetail);
+    }
+
+    /**
+     * 批量删除报警清单处理明细
+     * 
+     * @param alarmAssignDetailIds 需要删除的报警清单处理明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAlarmAssignDetailByAlarmAssignDetailIds(Long[] alarmAssignDetailIds)
+    {
+        return alarmAssignDetailMapper.deleteAlarmAssignDetailByAlarmAssignDetailIds(alarmAssignDetailIds);
+    }
+
+    /**
+     * 删除报警清单处理明细信息
+     * 
+     * @param alarmAssignDetailId 报警清单处理明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAlarmAssignDetailByAlarmAssignDetailId(Long alarmAssignDetailId)
+    {
+        return alarmAssignDetailMapper.deleteAlarmAssignDetailByAlarmAssignDetailId(alarmAssignDetailId);
+    }
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/AlarmAssignListServiceImpl.java

@@ -0,0 +1,131 @@
+package com.zksy.base.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.base.domain.AlarmAssignDetail;
+import com.zksy.base.domain.AlarmAssignList;
+import com.zksy.base.dto.AlarmAssignListPageInDTO;
+import com.zksy.base.mapper.AlarmAssignDetailMapper;
+import com.zksy.base.mapper.AlarmAssignListMapper;
+import com.zksy.base.service.IAlarmAssignListService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 报警清单Service业务层处理
+ * 
+ * @author zksy
+ * @date 2026-05-06
+ */
+@Service
+public class AlarmAssignListServiceImpl extends ServiceImpl<AlarmAssignListMapper, AlarmAssignList> implements IAlarmAssignListService
+{
+    @Autowired
+    private AlarmAssignDetailMapper alarmAssignDetailMapper;
+
+    /**
+     * 查询报警清单
+     * 
+     * @param alarmAssignId 报警清单主键
+     * @return 报警清单
+     */
+    @Override
+    public AlarmAssignList selectAlarmAssignListByAlarmAssignId(Long alarmAssignId)
+    {
+        AlarmAssignList alarmAssignList = this.baseMapper.selectAlarmAssignListByAlarmAssignId(alarmAssignId);
+        if(alarmAssignList == null){
+            return alarmAssignList;
+        }
+        LambdaQueryWrapper<AlarmAssignDetail> lambdaQueryWrapper = new LambdaQueryWrapper<AlarmAssignDetail>()
+                .eq(AlarmAssignDetail::getAlarmAssignId, alarmAssignId)
+                .orderByDesc(AlarmAssignDetail::getAlarmAssignDetailId);
+        List<AlarmAssignDetail> detailList = alarmAssignDetailMapper.selectList(lambdaQueryWrapper);
+        if(CollUtil.isNotEmpty(detailList)){
+
+        }
+        return alarmAssignList;
+    }
+
+    /**
+     * 查询报警清单列表
+     * 
+     * @param alarmAssignList 报警清单
+     * @return 报警清单
+     */
+    @Override
+    public List<AlarmAssignList> selectAlarmAssignListList(AlarmAssignList alarmAssignList)
+    {
+        return this.baseMapper.selectAlarmAssignListList(alarmAssignList);
+    }
+
+    /**
+     * 新增报警清单
+     * 
+     * @param alarmAssignList 报警清单
+     * @return 结果
+     */
+    @Override
+    public int insertAlarmAssignList(AlarmAssignList alarmAssignList)
+    {
+        return this.baseMapper.insertAlarmAssignList(alarmAssignList);
+    }
+
+    /**
+     * 修改报警清单
+     * 
+     * @param alarmAssignList 报警清单
+     * @return 结果
+     */
+    @Override
+    public int updateAlarmAssignList(AlarmAssignList alarmAssignList)
+    {
+        return this.baseMapper.updateAlarmAssignList(alarmAssignList);
+    }
+
+    /**
+     * 批量删除报警清单
+     * 
+     * @param alarmAssignIds 需要删除的报警清单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAlarmAssignListByAlarmAssignIds(Long[] alarmAssignIds)
+    {
+        return this.baseMapper.deleteAlarmAssignListByAlarmAssignIds(alarmAssignIds);
+    }
+
+    /**
+     * 删除报警清单信息
+     * 
+     * @param alarmAssignId 报警清单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAlarmAssignListByAlarmAssignId(Long alarmAssignId)
+    {
+        return this.baseMapper.deleteAlarmAssignListByAlarmAssignId(alarmAssignId);
+    }
+
+    /**
+     * 分页查询报警清单列表
+     * @param pageInDTO
+     * @return
+     */
+    @Override
+    public Page<AlarmAssignList> findByPage(AlarmAssignListPageInDTO pageInDTO) {
+        Page<AlarmAssignList> page = new Page<>(pageInDTO.getPageNum(), pageInDTO.getPageSize());
+        LambdaQueryWrapper<AlarmAssignList> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(pageInDTO.getDeviceCode()), AlarmAssignList::getDeviceCode, pageInDTO.getDeviceCode())
+                .eq(pageInDTO.getAlarmStatus() != null, AlarmAssignList::getAlarmStatus, pageInDTO.getAlarmStatus())
+                .eq(pageInDTO.getAssignStatus() != null, AlarmAssignList::getAssignStatus, pageInDTO.getAssignStatus())
+                .like(StringUtils.isNotEmpty(pageInDTO.getDeviceName()), AlarmAssignList::getDeviceName, pageInDTO.getDeviceName())
+                .like(StringUtils.isNotEmpty(pageInDTO.getManufacturer()), AlarmAssignList::getManufacturer, pageInDTO.getManufacturer());
+        queryWrapper.orderByDesc(AlarmAssignList::getAlarmTime);
+        return this.page(page, queryWrapper);
+    }
+}

pipe-network-service/zksy-system/src/main/resources/mapper/base/AlarmAssignDetailMapper.xml

@@ -0,0 +1,77 @@
+<?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.zksy.base.mapper.AlarmAssignDetailMapper">
+    
+    <resultMap type="AlarmAssignDetail" id="AlarmAssignDetailResult">
+        <result property="alarmAssignDetailId"    column="alarm_assign_detail_id"    />
+        <result property="alarmAssignId"    column="alarm_assign_id"    />
+        <result property="handleUserId"    column="handle_user_id"    />
+        <result property="handleUserName"    column="handle_user_name"    />
+        <result property="handlePhone"    column="handle_phone"    />
+        <result property="handleDeptName"    column="handle_dept_name"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectAlarmAssignDetailVo">
+        select alarm_assign_detail_id, alarm_assign_id, handle_user_id, handle_user_name, handle_phone, handle_dept_name, remark from alarm_assign_detail
+    </sql>
+
+    <select id="selectAlarmAssignDetailList" parameterType="AlarmAssignDetail" resultMap="AlarmAssignDetailResult">
+        <include refid="selectAlarmAssignDetailVo"/>
+        <where>  
+            <if test="alarmAssignDetailId != null "> and alarm_assign_detail_id = #{alarmAssignDetailId}</if>
+            <if test="alarmAssignId != null "> and alarm_assign_id = #{alarmAssignId}</if>
+        </where>
+    </select>
+    
+    <select id="selectAlarmAssignDetailByAlarmAssignDetailId" parameterType="Long" resultMap="AlarmAssignDetailResult">
+        <include refid="selectAlarmAssignDetailVo"/>
+        where alarm_assign_detail_id = #{alarmAssignDetailId}
+    </select>
+
+    <insert id="insertAlarmAssignDetail" parameterType="AlarmAssignDetail" useGeneratedKeys="true" keyProperty="alarmAssignDetailId">
+        insert into alarm_assign_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="alarmAssignId != null">alarm_assign_id,</if>
+            <if test="handleUserId != null">handle_user_id,</if>
+            <if test="handleUserName != null">handle_user_name,</if>
+            <if test="handlePhone != null">handle_phone,</if>
+            <if test="handleDeptName != null">handle_dept_name,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="alarmAssignId != null">#{alarmAssignId},</if>
+            <if test="handleUserId != null">#{handleUserId},</if>
+            <if test="handleUserName != null">#{handleUserName},</if>
+            <if test="handlePhone != null">#{handlePhone},</if>
+            <if test="handleDeptName != null">#{handleDeptName},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAlarmAssignDetail" parameterType="AlarmAssignDetail">
+        update alarm_assign_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="alarmAssignId != null">alarm_assign_id = #{alarmAssignId},</if>
+            <if test="handleUserId != null">handle_user_id = #{handleUserId},</if>
+            <if test="handleUserName != null">handle_user_name = #{handleUserName},</if>
+            <if test="handlePhone != null">handle_phone = #{handlePhone},</if>
+            <if test="handleDeptName != null">handle_dept_name = #{handleDeptName},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where alarm_assign_detail_id = #{alarmAssignDetailId}
+    </update>
+
+    <delete id="deleteAlarmAssignDetailByAlarmAssignDetailId" parameterType="Long">
+        delete from alarm_assign_detail where alarm_assign_detail_id = #{alarmAssignDetailId}
+    </delete>
+
+    <delete id="deleteAlarmAssignDetailByAlarmAssignDetailIds" parameterType="String">
+        delete from alarm_assign_detail where alarm_assign_detail_id in 
+        <foreach item="alarmAssignDetailId" collection="array" open="(" separator="," close=")">
+            #{alarmAssignDetailId}
+        </foreach>
+    </delete>
+</mapper>

pipe-network-service/zksy-system/src/main/resources/mapper/base/AlarmAssignListMapper.xml

@@ -0,0 +1,101 @@
+<?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.zksy.base.mapper.AlarmAssignListMapper">
+    
+    <resultMap type="AlarmAssignList" id="AlarmAssignListResult">
+        <result property="alarmAssignId"    column="alarm_assign_id"    />
+        <result property="deviceCode"    column="device_code"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="manufacturer"    column="manufacturer"    />
+        <result property="alarmStatus"    column="alarm_status"    />
+        <result property="hiddenDangerType"    column="hidden_danger_type"    />
+        <result property="hiddenDangerRemark"    column="hidden_danger_remark"    />
+        <result property="alarmTime"    column="alarm_time"    />
+        <result property="assignStatus"    column="assign_status"    />
+        <result property="assignTime"    column="assign_time"    />
+        <result property="assignUserId"    column="assign_user_id"    />
+        <result property="assignRemark"    column="assign_remark"    />
+    </resultMap>
+
+    <sql id="selectAlarmAssignListVo">
+        select alarm_assign_id, device_code, device_name, manufacturer, alarm_status, hidden_danger_type, hidden_danger_remark, alarm_time, assign_status, assign_time, assign_user_id, assign_remark from alarm_assign_list
+    </sql>
+
+    <select id="selectAlarmAssignListList" parameterType="AlarmAssignList" resultMap="AlarmAssignListResult">
+        <include refid="selectAlarmAssignListVo"/>
+        <where>  
+            <if test="alarmAssignId != null "> and alarm_assign_id = #{alarmAssignId}</if>
+            <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="manufacturer != null  and manufacturer != ''"> and manufacturer like concat('%', #{manufacturer}, '%')</if>
+            <if test="alarmStatus != null "> and alarm_status = #{alarmStatus}</if>
+            <!-- <if test="params.beginAlarmTime != null and params.beginAlarmTime != '' and params.endAlarmTime != null and params.endAlarmTime != ''"> and alarm_time between #{params.beginAlarmTime} and #{params.endAlarmTime}</if> -->
+            <if test="assignStatus != null "> and assign_status = #{assignStatus}</if>
+        </where>
+    </select>
+    
+    <select id="selectAlarmAssignListByAlarmAssignId" parameterType="Long" resultMap="AlarmAssignListResult">
+        <include refid="selectAlarmAssignListVo"/>
+        where alarm_assign_id = #{alarmAssignId}
+    </select>
+
+    <insert id="insertAlarmAssignList" parameterType="AlarmAssignList" useGeneratedKeys="true" keyProperty="alarmAssignId">
+        insert into alarm_assign_list
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">device_code,</if>
+            <if test="deviceName != null and deviceName != ''">device_name,</if>
+            <if test="manufacturer != null">manufacturer,</if>
+            <if test="alarmStatus != null">alarm_status,</if>
+            <if test="hiddenDangerType != null">hidden_danger_type,</if>
+            <if test="hiddenDangerRemark != null">hidden_danger_remark,</if>
+            <if test="alarmTime != null">alarm_time,</if>
+            <if test="assignStatus != null">assign_status,</if>
+            <if test="assignTime != null">assign_time,</if>
+            <if test="assignUserId != null">assign_user_id,</if>
+            <if test="assignRemark != null">assign_remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
+            <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
+            <if test="manufacturer != null">#{manufacturer},</if>
+            <if test="alarmStatus != null">#{alarmStatus},</if>
+            <if test="hiddenDangerType != null">#{hiddenDangerType},</if>
+            <if test="hiddenDangerRemark != null">#{hiddenDangerRemark},</if>
+            <if test="alarmTime != null">#{alarmTime},</if>
+            <if test="assignStatus != null">#{assignStatus},</if>
+            <if test="assignTime != null">#{assignTime},</if>
+            <if test="assignUserId != null">#{assignUserId},</if>
+            <if test="assignRemark != null">#{assignRemark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAlarmAssignList" parameterType="AlarmAssignList">
+        update alarm_assign_list
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
+            <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
+            <if test="manufacturer != null">manufacturer = #{manufacturer},</if>
+            <if test="alarmStatus != null">alarm_status = #{alarmStatus},</if>
+            <if test="hiddenDangerType != null">hidden_danger_type = #{hiddenDangerType},</if>
+            <if test="hiddenDangerRemark != null">hidden_danger_remark = #{hiddenDangerRemark},</if>
+            <if test="alarmTime != null">alarm_time = #{alarmTime},</if>
+            <if test="assignStatus != null">assign_status = #{assignStatus},</if>
+            <if test="assignTime != null">assign_time = #{assignTime},</if>
+            <if test="assignUserId != null">assign_user_id = #{assignUserId},</if>
+            <if test="assignRemark != null">assign_remark = #{assignRemark},</if>
+        </trim>
+        where alarm_assign_id = #{alarmAssignId}
+    </update>
+
+    <delete id="deleteAlarmAssignListByAlarmAssignId" parameterType="Long">
+        delete from alarm_assign_list where alarm_assign_id = #{alarmAssignId}
+    </delete>
+
+    <delete id="deleteAlarmAssignListByAlarmAssignIds" parameterType="String">
+        delete from alarm_assign_list where alarm_assign_id in 
+        <foreach item="alarmAssignId" collection="array" open="(" separator="," close=")">
+            #{alarmAssignId}
+        </foreach>
+    </delete>
+</mapper>