表名修改

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/MybatisGeneratorUtils.java

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("patrol_inspection_personnel");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("fire_alarm");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmFireController.java

@@ -0,0 +1,28 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.fire.service.AlarmFireService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 事件管理-火警告警处置
+ *
+ * @author JCB
+ * @since 2022-07-29
+ */
+@RestController
+@RequestMapping("/fireAlarm")
+public class AlarmFireController {
+
+    @Autowired
+    private AlarmFireService fireAlarmService;
+
+//    @GetMapping("fireAlarmList")
+//    public ApiResult<PageInfo<FireAlarm>> fireAlarmList() {
+//        return ApiResult.success(fireAlarmService.fireAlarmList());
+//    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionSiteController.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.PatrolInspectionSite;
-import com.usky.fire.domain.SiteContent;
+import com.usky.fire.domain.PatrolInspectionSiteContent;
 import com.usky.fire.service.PatrolInspectionContentService;
 import com.usky.fire.service.PatrolInspectionSiteService;
 import com.usky.fire.service.vo.PatrolInspectionAreaVo;
@@ -127,7 +127,7 @@ public class PatrolInspectionSiteController {
      * @return
      */
     @PostMapping("addSiteContent")
-    public ApiResult<Void> addSiteContent(@RequestBody List<SiteContent> siteContentList) {
+    public ApiResult<Void> addSiteContent(@RequestBody List<PatrolInspectionSiteContent> siteContentList) {
         patrolInspectionSiteService.addSiteContent(siteContentList);
         return ApiResult.success();
     }

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/AlarmFire.java

@@ -0,0 +1,135 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 火灾报警系统报警信息表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class AlarmFire implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 告警类型（2 火警、4 故障、16 监管等）
+     */
+    private Integer alarmType;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 上报地址
+     */
+    private String address;
+
+    /**
+     * 告警状态
+     */
+    private String alarmStatus;
+
+    /**
+     * 原始告警类型
+     */
+    private String originalType;
+
+    /**
+     * 告警名称
+     */
+    private String alarmName;
+
+    /**
+     * 原始点位地址
+     */
+    private String originalPoint;
+
+    /**
+     * 点位类型（0 通用设备、1 火灾报警控制器、10 可燃气体探测器、11 点型可燃气体探测器等）
+     */
+    private Integer pointType;
+
+    /**
+     * 点位描述
+     */
+    private String pointDescribe;
+
+    /**
+     * 端口号
+     */
+    private Integer portNum;
+
+    /**
+     * 主机号
+     */
+    private Integer hostNum;
+
+    /**
+     * 回路号
+     */
+    private Integer loopNum;
+
+    /**
+     * 点位号
+     */
+    private Integer ptNum;
+
+    /**
+     * 处理人
+     */
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handlingTime;
+
+    /**
+     * 处理内容
+     */
+    private String handlingContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlerPhone;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+
+    /**
+     * 是否误报（0、非误报 1、误报）
+     */
+    private Integer falseAlarm;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/ContentOption.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionContentOption.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class ContentOption implements Serializable {
+public class PatrolInspectionContentOption implements Serializable {
 
     private static final long serialVersionUID=1L;
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/SiteContent.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionSiteContent.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class SiteContent implements Serializable {
+public class PatrolInspectionSiteContent implements Serializable {
 
     private static final long serialVersionUID=1L;
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/SpecialRestDay.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionSpecialRestDay.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class SpecialRestDay implements Serializable {
+public class PatrolInspectionSpecialRestDay implements Serializable {
 
     private static final long serialVersionUID=1L;
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/AlarmFireMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.AlarmFire;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 火灾报警系统报警信息表 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-29
+ */
+public interface AlarmFireMapper extends CrudMapper<AlarmFire> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/ContentOptionMapper.java

@@ -1,16 +0,0 @@
-package com.usky.fire.mapper;
-
-import com.usky.fire.domain.ContentOption;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author JCB
- * @since 2022-07-15
- */
-public interface ContentOptionMapper extends CrudMapper<ContentOption> {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PatrolInspectionContentOptionMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.PatrolInspectionContentOption;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-15
+ */
+public interface PatrolInspectionContentOptionMapper extends CrudMapper<PatrolInspectionContentOption> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/SiteContentMapper.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PatrolInspectionSiteContentMapper.java

@@ -1,6 +1,6 @@
 package com.usky.fire.mapper;
 
-import com.usky.fire.domain.SiteContent;
+import com.usky.fire.domain.PatrolInspectionSiteContent;
 import com.usky.common.mybatis.core.CrudMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author JCB
  * @since 2022-07-15
  */
-public interface SiteContentMapper extends CrudMapper<SiteContent> {
+public interface PatrolInspectionSiteContentMapper extends CrudMapper<PatrolInspectionSiteContent> {
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PatrolInspectionSpecialRestDayMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.PatrolInspectionSpecialRestDay;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-20
+ */
+public interface PatrolInspectionSpecialRestDayMapper extends CrudMapper<PatrolInspectionSpecialRestDay> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/SpecialRestDayMapper.java

@@ -1,16 +0,0 @@
-package com.usky.fire.mapper;
-
-import com.usky.fire.domain.SpecialRestDay;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author JCB
- * @since 2022-07-20
- */
-public interface SpecialRestDayMapper extends CrudMapper<SpecialRestDay> {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/AlarmFireService.java

@@ -0,0 +1,17 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.AlarmFire;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 火灾报警系统报警信息表 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-29
+ */
+public interface AlarmFireService extends CrudService<AlarmFire> {
+
+//    PageInfo<FireAlarm> fireAlarmList();
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/ContentOptionService.java

@@ -1,16 +0,0 @@
-package com.usky.fire.service;
-
-import com.usky.fire.domain.ContentOption;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author JCB
- * @since 2022-07-15
- */
-public interface ContentOptionService extends CrudService<ContentOption> {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionContentOptionService.java

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.PatrolInspectionContentOption;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-15
+ */
+public interface PatrolInspectionContentOptionService extends CrudService<PatrolInspectionContentOption> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/SiteContentService.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionSiteContentService.java

@@ -1,6 +1,6 @@
 package com.usky.fire.service;
 
-import com.usky.fire.domain.SiteContent;
+import com.usky.fire.domain.PatrolInspectionSiteContent;
 import com.usky.common.mybatis.core.CrudService;
 
 /**
@@ -11,6 +11,6 @@ import com.usky.common.mybatis.core.CrudService;
  * @author JCB
  * @since 2022-07-15
  */
-public interface SiteContentService extends CrudService<SiteContent> {
+public interface PatrolInspectionSiteContentService extends CrudService<PatrolInspectionSiteContent> {
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionSiteService.java

@@ -3,7 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.PatrolInspectionSite;
-import com.usky.fire.domain.SiteContent;
+import com.usky.fire.domain.PatrolInspectionSiteContent;
 import com.usky.fire.service.vo.PatrolInspectionAreaVo;
 import com.usky.fire.service.vo.PatrolInspectionSiteExportVo;
 
@@ -29,7 +29,7 @@ public interface PatrolInspectionSiteService extends CrudService<PatrolInspectio
 
     void delPatrolInspectionSite(Integer id);
 
-    void addSiteContent(List<SiteContent> siteContentList);
+    void addSiteContent(List<PatrolInspectionSiteContent> siteContentList);
 
     Integer[] siteContentList(Integer siteId);
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionSpecialRestDayService.java

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.PatrolInspectionSpecialRestDay;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-20
+ */
+public interface PatrolInspectionSpecialRestDayService extends CrudService<PatrolInspectionSpecialRestDay> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/SpecialRestDayService.java

@@ -1,16 +0,0 @@
-package com.usky.fire.service;
-
-import com.usky.fire.domain.SpecialRestDay;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author JCB
- * @since 2022-07-20
- */
-public interface SpecialRestDayService extends CrudService<SpecialRestDay> {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/AlarmFireServiceImpl.java

@@ -0,0 +1,47 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.AlarmFire;
+import com.usky.fire.mapper.AlarmFireMapper;
+import com.usky.fire.service.AlarmFireService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.service.util.OnlineMethod;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 火灾报警系统报警信息表 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-29
+ */
+@Service
+public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, AlarmFire> implements AlarmFireService {
+
+
+//    @Override
+    public CommonPage<AlarmFire> alarmFireList(List<String> deviceCodeList, Integer handlingStatus, String startDate, String endDate, Integer pageNum, Integer pageSize) {
+        LambdaQueryWrapper<AlarmFire> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.in(AlarmFire::getDeviceCode,deviceCodeList);
+        if (handlingStatus!=null){
+            queryWrapper.eq(AlarmFire::getHandlingStatus,handlingStatus);
+        }
+
+        if (startDate!=null&&!"".equals(startDate)&&endDate!=null&&!"".equals(endDate)){
+            queryWrapper.between(AlarmFire::getAlarmTime, startDate, endDate);
+        }
+        int total = this.count(queryWrapper);
+        queryWrapper.orderByDesc(AlarmFire::getId);
+        if (pageNum!=null&&pageNum!=0&&pageSize!=null&&pageSize!=0){
+            Integer startFate = OnlineMethod.getStartFate(pageNum,pageSize);
+            queryWrapper.last("limit "+startFate+",pageSize ");
+        }
+        List<AlarmFire> list = this.list(queryWrapper);
+        return new CommonPage<>(list, total, pageSize,pageNum);
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ContentOptionServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.fire.service.impl;
-
-import com.usky.fire.domain.ContentOption;
-import com.usky.fire.mapper.ContentOptionMapper;
-import com.usky.fire.service.ContentOptionService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author JCB
- * @since 2022-07-15
- */
-@Service
-public class ContentOptionServiceImpl extends AbstractCrudService<ContentOptionMapper, ContentOption> implements ContentOptionService {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionContentOptionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.PatrolInspectionContentOption;
+import com.usky.fire.mapper.PatrolInspectionContentOptionMapper;
+import com.usky.fire.service.PatrolInspectionContentOptionService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-15
+ */
+@Service
+public class PatrolInspectionContentOptionServiceImpl extends AbstractCrudService<PatrolInspectionContentOptionMapper, PatrolInspectionContentOption> implements PatrolInspectionContentOptionService {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionContentServiceImpl.java

@@ -6,13 +6,13 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.fire.domain.ContentOption;
+import com.usky.fire.domain.PatrolInspectionContentOption;
 import com.usky.fire.domain.PatrolInspectionContent;
-import com.usky.fire.domain.SiteContent;
+import com.usky.fire.domain.PatrolInspectionSiteContent;
 import com.usky.fire.mapper.PatrolInspectionContentMapper;
-import com.usky.fire.service.ContentOptionService;
+import com.usky.fire.service.PatrolInspectionContentOptionService;
 import com.usky.fire.service.PatrolInspectionContentService;
-import com.usky.fire.service.SiteContentService;
+import com.usky.fire.service.PatrolInspectionSiteContentService;
 import com.usky.fire.service.vo.PatrolInspectionContentExportVo;
 import com.usky.fire.service.vo.PatrolInspectionContentVo;
 import com.usky.system.model.LoginUser;
@@ -38,9 +38,9 @@ import java.util.stream.Collectors;
 public class PatrolInspectionContentServiceImpl extends AbstractCrudService<PatrolInspectionContentMapper, PatrolInspectionContent> implements PatrolInspectionContentService {
 
     @Autowired
-    private ContentOptionService contentOptionService;
+    private PatrolInspectionContentOptionService contentOptionService;
     @Autowired
-    private SiteContentService siteContentService;
+    private PatrolInspectionSiteContentService siteContentService;
 
     @Override
     @Transactional
@@ -58,7 +58,7 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
         if (patrolInspectionContentVo.getContentOptionList().size() > 0) {
             Integer fid = patrolInspectionContent.getId();
             for (int i = 0; i < patrolInspectionContentVo.getContentOptionList().size(); i++) {
-                ContentOption contentOption = new ContentOption();
+                PatrolInspectionContentOption contentOption = new PatrolInspectionContentOption();
                 contentOption.setOptionName(patrolInspectionContentVo.getContentOptionList().get(i).getOptionName());
                 contentOption.setContentId(fid);
                 contentOption.setEnable(1);
@@ -72,9 +72,9 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
     @Override
     @Transactional
     public void updatePatrolInspectionContent(PatrolInspectionContentVo patrolInspectionContentVo) {
-        LambdaQueryWrapper<SiteContent> queryWrapperOne = Wrappers.lambdaQuery();
-        queryWrapperOne.eq(SiteContent::getContentId, patrolInspectionContentVo.getId());
-        List<SiteContent> siteContentList = siteContentService.list(queryWrapperOne);
+        LambdaQueryWrapper<PatrolInspectionSiteContent> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.eq(PatrolInspectionSiteContent::getContentId, patrolInspectionContentVo.getId());
+        List<PatrolInspectionSiteContent> siteContentList = siteContentService.list(queryWrapperOne);
         if (siteContentList.size() <= 0) {
             throw new BusinessException("巡检内容已绑定站点不可修改");
         }
@@ -85,10 +85,10 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
         patrolInspectionContent.setSubmissionMethod(patrolInspectionContentVo.getSubmissionMethod());
         patrolInspectionContent.setCompanyId(patrolInspectionContentVo.getCompanyId());
         this.updateById(patrolInspectionContent);
-        LambdaQueryWrapper<ContentOption> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(ContentOption::getEnable, 1)
-                .eq(ContentOption::getContentId, patrolInspectionContentVo.getId());
-        List<ContentOption> ContentOptionList = contentOptionService.list(queryWrapper);
+        LambdaQueryWrapper<PatrolInspectionContentOption> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionContentOption::getEnable, 1)
+                .eq(PatrolInspectionContentOption::getContentId, patrolInspectionContentVo.getId());
+        List<PatrolInspectionContentOption> ContentOptionList = contentOptionService.list(queryWrapper);
         if (ContentOptionList.size() > 0) {
             for (int i = 0; i < ContentOptionList.size(); i++) {
                 ContentOptionList.get(i).setEnable(0);
@@ -97,7 +97,7 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
         }
         if (patrolInspectionContentVo.getContentOptionList().size() > 0) {
             for (int i = 0; i < patrolInspectionContentVo.getContentOptionList().size(); i++) {
-                ContentOption contentOption = new ContentOption();
+                PatrolInspectionContentOption contentOption = new PatrolInspectionContentOption();
                 contentOption.setOptionName(patrolInspectionContentVo.getContentOptionList().get(i).getOptionName());
                 contentOption.setContentId(patrolInspectionContentVo.getId());
                 if (patrolInspectionContentVo.getContentOptionList().get(i).getId() != 0 &&
@@ -119,9 +119,9 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
     @Override
     @Transactional
     public void delPatrolInspectionContent(Integer id) {
-        LambdaQueryWrapper<SiteContent> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(SiteContent::getContentId, id);
-        List<SiteContent> siteContentList = siteContentService.list(queryWrapper);
+        LambdaQueryWrapper<PatrolInspectionSiteContent> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionSiteContent::getContentId, id);
+        List<PatrolInspectionSiteContent> siteContentList = siteContentService.list(queryWrapper);
         if (siteContentList.size() <= 0) {
             throw new BusinessException("巡检内容正在使用中不可删除");
         }
@@ -129,13 +129,13 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
         patrolInspectionContent.setId(id);
         patrolInspectionContent.setEnable(0);
         this.updateById(patrolInspectionContent);
-        LambdaQueryWrapper<ContentOption> queryWrapperOne = Wrappers.lambdaQuery();
-        queryWrapperOne.eq(ContentOption::getContentId, id)
-                .eq(ContentOption::getEnable, 1);
-        List<ContentOption> contentOptionList = contentOptionService.list(queryWrapperOne);
+        LambdaQueryWrapper<PatrolInspectionContentOption> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.eq(PatrolInspectionContentOption::getContentId, id)
+                .eq(PatrolInspectionContentOption::getEnable, 1);
+        List<PatrolInspectionContentOption> contentOptionList = contentOptionService.list(queryWrapperOne);
         if (contentOptionList.size() > 0) {
             for (int i = 0; i < contentOptionList.size(); i++) {
-                ContentOption contentOption = new ContentOption();
+                PatrolInspectionContentOption contentOption = new PatrolInspectionContentOption();
                 contentOption.setId(contentOptionList.get(i).getId());
                 contentOption.setEnable(0);
                 contentOptionService.updateById(contentOption);
@@ -172,10 +172,10 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
             for (int i = 0; i < patrolInspectionContentList.size(); i++) {
                 idList.add(patrolInspectionContentList.get(i).getId());
             }
-            LambdaQueryWrapper<ContentOption> queryWrapperOne = Wrappers.lambdaQuery();
-            queryWrapperOne.eq(ContentOption::getEnable, 1)
-                    .in(ContentOption::getContentId, idList);
-            List<ContentOption> contentOptionList = contentOptionService.list(queryWrapperOne);
+            LambdaQueryWrapper<PatrolInspectionContentOption> queryWrapperOne = Wrappers.lambdaQuery();
+            queryWrapperOne.eq(PatrolInspectionContentOption::getEnable, 1)
+                    .in(PatrolInspectionContentOption::getContentId, idList);
+            List<PatrolInspectionContentOption> contentOptionList = contentOptionService.list(queryWrapperOne);
             for (int i = 0; i < patrolInspectionContentList.size(); i++) {
                 PatrolInspectionContentVo patrolInspectionContentVo = new PatrolInspectionContentVo();
                 patrolInspectionContentVo.setXh(i+1);
@@ -188,7 +188,7 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
                 patrolInspectionContentVo.setCreator(patrolInspectionContentList.get(i).getCreator());
                 patrolInspectionContentVo.setCreateTime(patrolInspectionContentList.get(i).getCreateTime());
                 patrolInspectionContentVo.setEnable(patrolInspectionContentList.get(i).getEnable());
-                List<ContentOption> contentOptionListOne = new ArrayList<>();
+                List<PatrolInspectionContentOption> contentOptionListOne = new ArrayList<>();
                 for (int j = 0; j < contentOptionList.size(); j++) {
                     if (patrolInspectionContentList.get(i).getId() == contentOptionList.get(j).getContentId()) {
                         contentOptionListOne.add(contentOptionList.get(j));
@@ -232,10 +232,10 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
             for (int i = 0; i < patrolInspectionContentList.size(); i++) {
                 idList.add(patrolInspectionContentList.get(i).getId());
             }
-            LambdaQueryWrapper<ContentOption> queryWrapperOne = Wrappers.lambdaQuery();
-            queryWrapperOne.eq(ContentOption::getEnable, 1)
-                    .in(ContentOption::getContentId, idList);
-            List<ContentOption> contentOptionList = contentOptionService.list(queryWrapperOne);
+            LambdaQueryWrapper<PatrolInspectionContentOption> queryWrapperOne = Wrappers.lambdaQuery();
+            queryWrapperOne.eq(PatrolInspectionContentOption::getEnable, 1)
+                    .in(PatrolInspectionContentOption::getContentId, idList);
+            List<PatrolInspectionContentOption> contentOptionList = contentOptionService.list(queryWrapperOne);
             for (int i = 0; i < patrolInspectionContentList.size(); i++) {
                 PatrolInspectionContentExportVo patrolInspectionContentVo = new PatrolInspectionContentExportVo();
                 patrolInspectionContentVo.setXh(i+1);
@@ -248,7 +248,7 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
                 patrolInspectionContentVo.setCreator(patrolInspectionContentList.get(i).getCreator());
                 patrolInspectionContentVo.setCreateTime(patrolInspectionContentList.get(i).getCreateTime().format(df));
                 patrolInspectionContentVo.setEnable(patrolInspectionContentList.get(i).getEnable());
-                List<ContentOption> contentOptionListOne = new ArrayList<>();
+                List<PatrolInspectionContentOption> contentOptionListOne = new ArrayList<>();
                 for (int j = 0; j < contentOptionList.size(); j++) {
                     if (patrolInspectionContentList.get(i).getId() == contentOptionList.get(j).getContentId()) {
                         contentOptionListOne.add(contentOptionList.get(j));

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanServiceImpl.java

@@ -53,7 +53,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
     private PlanSiteSonService planSiteSonService;
 
     @Autowired
-    private SpecialRestDayService specialRestDayService;
+    private PatrolInspectionSpecialRestDayService specialRestDayService;
 
     @Autowired
     private PatrolInspectionSiteService patrolInspectionSiteService;
@@ -192,7 +192,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             Date date = Date.from(date1.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
             String week1 = OnlineMethod.getWeekOfDate(date);
             if (patrolInspectionPlanVo.getRestDay().contains(week1)) {
-                SpecialRestDay specialRestDay = new SpecialRestDay();
+                PatrolInspectionSpecialRestDay specialRestDay = new PatrolInspectionSpecialRestDay();
                 specialRestDay.setPlanId(fid);
                 specialRestDay.setRestDate(date1);
                 specialRestDayService.save(specialRestDay);
@@ -345,9 +345,9 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         }
 
         //特殊休息日关联信息更改
-        LambdaQueryWrapper<SpecialRestDay> queryWrapperFour = Wrappers.lambdaQuery();
-        queryWrapperFour.eq(SpecialRestDay::getPlanId, patrolInspectionPlanVo.getId());
-        List<SpecialRestDay> specialRestDayList = specialRestDayService.list(queryWrapperFour);
+        LambdaQueryWrapper<PatrolInspectionSpecialRestDay> queryWrapperFour = Wrappers.lambdaQuery();
+        queryWrapperFour.eq(PatrolInspectionSpecialRestDay::getPlanId, patrolInspectionPlanVo.getId());
+        List<PatrolInspectionSpecialRestDay> specialRestDayList = specialRestDayService.list(queryWrapperFour);
         for (int i = 0; i < specialRestDayList.size(); i++) {
             specialRestDayService.removeById(specialRestDayList.get(i).getId());
         }
@@ -364,7 +364,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             Date date = Date.from(date1.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
             String week1 = OnlineMethod.getWeekOfDate(date);
             if (patrolInspectionPlanVo.getRestDay().contains(week1)) {
-                SpecialRestDay specialRestDay = new SpecialRestDay();
+                PatrolInspectionSpecialRestDay specialRestDay = new PatrolInspectionSpecialRestDay();
                 specialRestDay.setPlanId(patrolInspectionPlanVo.getId());
                 specialRestDay.setRestDate(date1);
                 specialRestDayService.save(specialRestDay);

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionRecordServiceImpl.java

@@ -36,13 +36,13 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
     private PatrolInspectionRecordOptionService patrolInspectionRecordOptionService;
 
     @Autowired
-    private SiteContentService siteContentService;
+    private PatrolInspectionSiteContentService siteContentService;
 
     @Autowired
     private PatrolInspectionContentService patrolInspectionContentService;
 
     @Autowired
-    private ContentOptionService contentOptionService;
+    private PatrolInspectionContentOptionService contentOptionService;
 
     @Autowired
     private PatrolInspectionPlanSonService patrolInspectionPlanSonService;
@@ -108,9 +108,9 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
         List<PatrolInspectionRecordOption> patrolInspectionRecordOptionList = patrolInspectionRecordOptionService.list(queryWrapperTwo);
 
         //地点内容ID查询
-        LambdaQueryWrapper<SiteContent> queryWrapperThree = Wrappers.lambdaQuery();
-        queryWrapperThree.in(SiteContent::getSiteId, patrolInspectionRecordList.get(0).getSiteId());
-        List<SiteContent> siteContentList = siteContentService.list(queryWrapperThree);
+        LambdaQueryWrapper<PatrolInspectionSiteContent> queryWrapperThree = Wrappers.lambdaQuery();
+        queryWrapperThree.in(PatrolInspectionSiteContent::getSiteId, patrolInspectionRecordList.get(0).getSiteId());
+        List<PatrolInspectionSiteContent> siteContentList = siteContentService.list(queryWrapperThree);
 
         //内容ID重组
         List<Integer> contentIdList = new ArrayList<>();
@@ -125,10 +125,10 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
         List<PatrolInspectionContent> patrolInspectionContentList = patrolInspectionContentService.list(queryWrapperFour);
 
         //内容选择项查询
-        LambdaQueryWrapper<ContentOption> queryWrapperFive = Wrappers.lambdaQuery();
-        queryWrapperFive.in(ContentOption::getContentId, contentIdList)
-                .eq(ContentOption::getEnable, 1);
-        List<ContentOption> contentOptionList = contentOptionService.list(queryWrapperFive);
+        LambdaQueryWrapper<PatrolInspectionContentOption> queryWrapperFive = Wrappers.lambdaQuery();
+        queryWrapperFive.in(PatrolInspectionContentOption::getContentId, contentIdList)
+                .eq(PatrolInspectionContentOption::getEnable, 1);
+        List<PatrolInspectionContentOption> contentOptionList = contentOptionService.list(queryWrapperFive);
 
         //重组内容选项
         List<ContentOptionVo> contentOptionVoList = new ArrayList<>();

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionSiteContentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.PatrolInspectionSiteContent;
+import com.usky.fire.mapper.PatrolInspectionSiteContentMapper;
+import com.usky.fire.service.PatrolInspectionSiteContentService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-15
+ */
+@Service
+public class PatrolInspectionSiteContentServiceImpl extends AbstractCrudService<PatrolInspectionSiteContentMapper, PatrolInspectionSiteContent> implements PatrolInspectionSiteContentService {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionSiteServiceImpl.java

@@ -9,12 +9,12 @@ import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.PatrolInspectionArea;
 import com.usky.fire.domain.PatrolInspectionSite;
 import com.usky.fire.domain.PlanSite;
-import com.usky.fire.domain.SiteContent;
+import com.usky.fire.domain.PatrolInspectionSiteContent;
 import com.usky.fire.mapper.PatrolInspectionSiteMapper;
 import com.usky.fire.service.PatrolInspectionAreaService;
 import com.usky.fire.service.PatrolInspectionSiteService;
 import com.usky.fire.service.PlanSiteService;
-import com.usky.fire.service.SiteContentService;
+import com.usky.fire.service.PatrolInspectionSiteContentService;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.DataCountVo;
 import com.usky.fire.service.vo.PatrolInspectionAreaVo;
@@ -45,7 +45,7 @@ public class PatrolInspectionSiteServiceImpl extends AbstractCrudService<PatrolI
     private PatrolInspectionAreaService patrolInspectionAreaService;
 
     @Autowired
-    private SiteContentService siteContentService;
+    private PatrolInspectionSiteContentService siteContentService;
 
     @Autowired
     private PlanSiteService planSiteService;
@@ -181,10 +181,10 @@ public class PatrolInspectionSiteServiceImpl extends AbstractCrudService<PatrolI
 
     @Override
     @Transactional
-    public void addSiteContent(List<SiteContent> siteContentList) {
-        LambdaQueryWrapper<SiteContent> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(SiteContent::getSiteId, siteContentList.get(0).getSiteId());
-        List<SiteContent> siteContenListOne = siteContentService.list(queryWrapper);
+    public void addSiteContent(List<PatrolInspectionSiteContent> siteContentList) {
+        LambdaQueryWrapper<PatrolInspectionSiteContent> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionSiteContent::getSiteId, siteContentList.get(0).getSiteId());
+        List<PatrolInspectionSiteContent> siteContenListOne = siteContentService.list(queryWrapper);
         if (siteContenListOne.size() > 0) {
             for (int i = 0; i < siteContenListOne.size(); i++) {
                 siteContentService.removeById(siteContenListOne.get(i).getId());
@@ -202,9 +202,9 @@ public class PatrolInspectionSiteServiceImpl extends AbstractCrudService<PatrolI
      * @return
      */
     public Integer[] siteContentList(Integer siteId) {
-        LambdaQueryWrapper<SiteContent> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(SiteContent::getSiteId, siteId);
-        List<SiteContent> siteContenList = siteContentService.list(queryWrapper);
+        LambdaQueryWrapper<PatrolInspectionSiteContent> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionSiteContent::getSiteId, siteId);
+        List<PatrolInspectionSiteContent> siteContenList = siteContentService.list(queryWrapper);
         Integer[] contenIdList = new Integer[siteContenList.size()];
         if (siteContenList.size() > 0) {
             for (int i = 0; i < siteContenList.size(); i++) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionSpecialRestDayServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.PatrolInspectionSpecialRestDay;
+import com.usky.fire.mapper.PatrolInspectionSpecialRestDayMapper;
+import com.usky.fire.service.PatrolInspectionSpecialRestDayService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-07-20
+ */
+@Service
+public class PatrolInspectionSpecialRestDayServiceImpl extends AbstractCrudService<PatrolInspectionSpecialRestDayMapper, PatrolInspectionSpecialRestDay> implements PatrolInspectionSpecialRestDayService {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/SiteContentServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.fire.service.impl;
-
-import com.usky.fire.domain.SiteContent;
-import com.usky.fire.mapper.SiteContentMapper;
-import com.usky.fire.service.SiteContentService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author JCB
- * @since 2022-07-15
- */
-@Service
-public class SiteContentServiceImpl extends AbstractCrudService<SiteContentMapper, SiteContent> implements SiteContentService {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/SpecialRestDayServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.fire.service.impl;
-
-import com.usky.fire.domain.SpecialRestDay;
-import com.usky.fire.mapper.SpecialRestDayMapper;
-import com.usky.fire.service.SpecialRestDayService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author JCB
- * @since 2022-07-20
- */
-@Service
-public class SpecialRestDayServiceImpl extends AbstractCrudService<SpecialRestDayMapper, SpecialRestDay> implements SpecialRestDayService {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/util/OnlineMethod.java

@@ -15,6 +15,13 @@ import java.util.*;
 
 public class OnlineMethod {
 
+
+    public static  Integer getStartFate(Integer pageNum,Integer pageSize){
+        return (pageNum - 1) * pageSize;
+    }
+
+
+
     /**
      * 根据父节点的ID获取所有子节点
      *

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionContentExportVo.java

@@ -3,7 +3,7 @@ package com.usky.fire.service.vo;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.annotation.Excel;
-import com.usky.fire.domain.ContentOption;
+import com.usky.fire.domain.PatrolInspectionContentOption;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -85,7 +85,7 @@ public class PatrolInspectionContentExportVo implements Serializable {
     /**
      * 选项内容
      */
-    private List<ContentOption> contentOptionList;
+    private List<PatrolInspectionContentOption> contentOptionList;
 
     /**
      * 选项内容

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionContentVo.java

@@ -2,7 +2,7 @@ package com.usky.fire.service.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.usky.fire.domain.ContentOption;
+import com.usky.fire.domain.PatrolInspectionContentOption;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -80,7 +80,7 @@ public class PatrolInspectionContentVo implements Serializable {
     /**
      * 选项内容
      */
-    private List<ContentOption> contentOptionList;
+    private List<PatrolInspectionContentOption> contentOptionList;
 
     /**
      * 选项内容

service-fire/service-fire-biz/src/main/resources/mapper.fire/AlarmFireMapper.xml

@@ -0,0 +1,31 @@
+<?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.usky.fire.mapper.AlarmFireMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.AlarmFire">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="address" property="address" />
+        <result column="alarm_status" property="alarmStatus" />
+        <result column="original_type" property="originalType" />
+        <result column="alarm_name" property="alarmName" />
+        <result column="original_point" property="originalPoint" />
+        <result column="point_type" property="pointType" />
+        <result column="point_describe" property="pointDescribe" />
+        <result column="port_num" property="portNum" />
+        <result column="host_num" property="hostNum" />
+        <result column="loop_num" property="loopNum" />
+        <result column="pt_num" property="ptNum" />
+        <result column="handler" property="handler" />
+        <result column="handling_time" property="handlingTime" />
+        <result column="handling_content" property="handlingContent" />
+        <result column="handler_phone" property="handlerPhone" />
+        <result column="handling_status" property="handlingStatus" />
+        <result column="false_alarm" property="falseAlarm" />
+        <result column="site_photo" property="sitePhoto" />
+    </resultMap>
+
+</mapper>

service-fire/service-fire-biz/src/main/resources/mapper.fire/ContentOptionMapper.xml → service-fire/service-fire-biz/src/main/resources/mapper.fire/PatrolInspectionContentOptionMapper.xml

@@ -1,9 +1,9 @@
 <?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.usky.fire.mapper.ContentOptionMapper">
+<mapper namespace="com.usky.fire.mapper.PatrolInspectionContentOptionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.ContentOption">
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionContentOption">
         <id column="id" property="id" />
         <result column="option_name" property="optionName" />
         <result column="content_id" property="contentId" />

service-fire/service-fire-biz/src/main/resources/mapper.fire/SiteContentMapper.xml → service-fire/service-fire-biz/src/main/resources/mapper.fire/PatrolInspectionSiteContentMapper.xml

@@ -1,9 +1,9 @@
 <?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.usky.fire.mapper.SiteContentMapper">
+<mapper namespace="com.usky.fire.mapper.PatrolInspectionSiteContentMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.SiteContent">
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionSiteContent">
         <id column="id" property="id" />
         <result column="site_id" property="siteId" />
         <result column="content_id" property="contentId" />

service-fire/service-fire-biz/src/main/resources/mapper.fire/SpecialRestDayMapper.xml → service-fire/service-fire-biz/src/main/resources/mapper.fire/PatrolInspectionSpecialRestDayMapper.xml

@@ -1,9 +1,9 @@
 <?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.usky.fire.mapper.SpecialRestDayMapper">
+<mapper namespace="com.usky.fire.mapper.PatrolInspectionSpecialRestDayMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.SpecialRestDay">
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionSpecialRestDay">
         <id column="id" property="id" />
         <result column="plan_id" property="planId" />
         <result column="rest_date" property="restDate" />