巡检模块表调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PlanSchedule.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionPlanSchedule.java

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

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PlanSite.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionPlanSite.java

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

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PlanSiteSon.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionPlanSiteSon.java

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

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PlanScheduleMapper.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PatrolInspectionPlanScheduleMapper.java

@@ -1,6 +1,6 @@
 package com.usky.fire.mapper;
 
-import com.usky.fire.domain.PlanSchedule;
+import com.usky.fire.domain.PatrolInspectionPlanSchedule;
 import com.usky.common.mybatis.core.CrudMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author JCB
  * @since 2022-07-19
  */
-public interface PlanScheduleMapper extends CrudMapper<PlanSchedule> {
+public interface PatrolInspectionPlanScheduleMapper extends CrudMapper<PatrolInspectionPlanSchedule> {
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PlanSiteMapper.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PatrolInspectionPlanSiteMapper.java

@@ -1,6 +1,6 @@
 package com.usky.fire.mapper;
 
-import com.usky.fire.domain.PlanSite;
+import com.usky.fire.domain.PatrolInspectionPlanSite;
 import com.usky.common.mybatis.core.CrudMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author JCB
  * @since 2022-07-18
  */
-public interface PlanSiteMapper extends CrudMapper<PlanSite> {
+public interface PatrolInspectionPlanSiteMapper extends CrudMapper<PatrolInspectionPlanSite> {
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PlanSiteSonMapper.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PatrolInspectionPlanSiteSonMapper.java

@@ -1,6 +1,6 @@
 package com.usky.fire.mapper;
 
-import com.usky.fire.domain.PlanSiteSon;
+import com.usky.fire.domain.PatrolInspectionPlanSiteSon;
 import com.usky.common.mybatis.core.CrudMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author JCB
  * @since 2022-07-18
  */
-public interface PlanSiteSonMapper extends CrudMapper<PlanSiteSon> {
+public interface PatrolInspectionPlanSiteSonMapper extends CrudMapper<PatrolInspectionPlanSiteSon> {
 
 }

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

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

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PlanSiteSonService.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionPlanSiteService.java

@@ -1,6 +1,6 @@
 package com.usky.fire.service;
 
-import com.usky.fire.domain.PlanSiteSon;
+import com.usky.fire.domain.PatrolInspectionPlanSite;
 import com.usky.common.mybatis.core.CrudService;
 
 /**
@@ -11,6 +11,6 @@ import com.usky.common.mybatis.core.CrudService;
  * @author JCB
  * @since 2022-07-18
  */
-public interface PlanSiteSonService extends CrudService<PlanSiteSon> {
+public interface PatrolInspectionPlanSiteService extends CrudService<PatrolInspectionPlanSite> {
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PlanSiteService.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionPlanSiteSonService.java

@@ -1,6 +1,6 @@
 package com.usky.fire.service;
 
-import com.usky.fire.domain.PlanSite;
+import com.usky.fire.domain.PatrolInspectionPlanSiteSon;
 import com.usky.common.mybatis.core.CrudService;
 
 /**
@@ -11,6 +11,6 @@ import com.usky.common.mybatis.core.CrudService;
  * @author JCB
  * @since 2022-07-18
  */
-public interface PlanSiteService extends CrudService<PlanSite> {
+public interface PatrolInspectionPlanSiteSonService extends CrudService<PatrolInspectionPlanSiteSon> {
 
 }

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

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

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

@@ -11,7 +11,7 @@ import com.usky.fire.domain.*;
 import com.usky.fire.mapper.PatrolInspectionPersonnelMapper;
 import com.usky.fire.service.PatrolInspectionAreaService;
 import com.usky.fire.service.PatrolInspectionPersonnelService;
-import com.usky.fire.service.PlanScheduleService;
+import com.usky.fire.service.PatrolInspectionPlanScheduleService;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.DataCountVo;
 import com.usky.fire.service.vo.PatrolInspectionAreaVo;
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
 public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<PatrolInspectionPersonnelMapper, PatrolInspectionPersonnel> implements PatrolInspectionPersonnelService {
 
     @Autowired
-    private PlanScheduleService planScheduleService;
+    private PatrolInspectionPlanScheduleService planScheduleService;
 
     @Autowired
     private PatrolInspectionAreaService patrolInspectionAreaService;
@@ -82,9 +82,9 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
 
     @Override
     public void delPatrolInspectionPersonnel(Integer id) {
-        LambdaQueryWrapper<PlanSchedule> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(PlanSchedule::getPersonnelId, id);
-        List<PlanSchedule> listOne = planScheduleService.list(queryWrapper);
+        LambdaQueryWrapper<PatrolInspectionPlanSchedule> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionPlanSchedule::getPersonnelId, id);
+        List<PatrolInspectionPlanSchedule> listOne = planScheduleService.list(queryWrapper);
         if (listOne.size() > 0) {
             throw new BusinessException("人员使用中重复不可删除");
         }

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

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

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

@@ -41,16 +41,16 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
     private PatrolInspectionAreaService patrolInspectionAreaService;
 
     @Autowired
-    private PlanSiteService planSiteService;
+    private PatrolInspectionPlanSiteService planSiteService;
 
     @Autowired
     private PatrolInspectionPlanSonService patrolInspectionPlanSonService;
 
     @Autowired
-    private PlanScheduleService planScheduleService;
+    private PatrolInspectionPlanScheduleService planScheduleService;
 
     @Autowired
-    private PlanSiteSonService planSiteSonService;
+    private PatrolInspectionPlanSiteSonService planSiteSonService;
 
     @Autowired
     private PatrolInspectionSpecialRestDayService specialRestDayService;
@@ -172,7 +172,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         }
         //主计划地点添加
         for (int i = 0; i < patrolInspectionPlanVo.getSiteArray().length; i++) {
-            PlanSite planSite = new PlanSite();
+            PatrolInspectionPlanSite planSite = new PatrolInspectionPlanSite();
             planSite.setPlanId(fid);
             planSite.setSiteId(patrolInspectionPlanVo.getSiteArray()[i]);
             planSiteService.save(planSite);
@@ -231,7 +231,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
                         patrolInspectionPlanSonService.save(patrolInspectionPlanSon);
                         Integer zfid = patrolInspectionPlanSon.getId();
                         for (int k = 0; k < patrolInspectionPlanVo.getSiteArray().length; k++) {
-                            PlanSiteSon planSiteSon = new PlanSiteSon();
+                            PatrolInspectionPlanSiteSon planSiteSon = new PatrolInspectionPlanSiteSon();
                             planSiteSon.setPlanId(zfid);
                             planSiteSon.setSiteId(patrolInspectionPlanVo.getSiteArray()[k]);
                             planSiteSon.setInspectionStatus(1);
@@ -263,7 +263,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
                 patrolInspectionPlanSonService.save(patrolInspectionPlanSon);
                 Integer zfid = patrolInspectionPlanSon.getId();
                 for (int k = 0; k < patrolInspectionPlanVo.getSiteArray().length; k++) {
-                    PlanSiteSon planSiteSon = new PlanSiteSon();
+                    PatrolInspectionPlanSiteSon planSiteSon = new PatrolInspectionPlanSiteSon();
                     planSiteSon.setPlanId(zfid);
                     planSiteSon.setSiteId(patrolInspectionPlanVo.getSiteArray()[k]);
                     planSiteSon.setInspectionStatus(1);
@@ -320,9 +320,9 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         patrolInspectionPlan.setWeekCount(patrolInspectionPlanVo.getWeekCount());
         this.updateById(patrolInspectionPlan);
         //巡检日程更新
-        LambdaQueryWrapper<PlanSchedule> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(PlanSchedule::getPlanId, patrolInspectionPlanVo.getId());
-        List<PlanSchedule> planScheduleList = planScheduleService.list(queryWrapper);
+        LambdaQueryWrapper<PatrolInspectionPlanSchedule> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionPlanSchedule::getPlanId, patrolInspectionPlanVo.getId());
+        List<PatrolInspectionPlanSchedule> planScheduleList = planScheduleService.list(queryWrapper);
         for (int i = 0; i < planScheduleList.size(); i++) {
             planScheduleService.removeById(planScheduleList.get(i).getId());
         }
@@ -331,14 +331,14 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             planScheduleService.save(patrolInspectionPlanVo.getPlanScheduleList().get(i));
         }
         //主计划地点更新
-        LambdaQueryWrapper<PlanSite> queryWrapperOne = Wrappers.lambdaQuery();
-        queryWrapperOne.eq(PlanSite::getPlanId, patrolInspectionPlanVo.getId());
-        List<PlanSite> planSiteList = planSiteService.list(queryWrapperOne);
+        LambdaQueryWrapper<PatrolInspectionPlanSite> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.eq(PatrolInspectionPlanSite::getPlanId, patrolInspectionPlanVo.getId());
+        List<PatrolInspectionPlanSite> planSiteList = planSiteService.list(queryWrapperOne);
         for (int i = 0; i < planSiteList.size(); i++) {
             planSiteService.removeById(planSiteList.get(i).getId());
         }
         for (int i = 0; i < patrolInspectionPlanVo.getSiteArray().length; i++) {
-            PlanSite planSite = new PlanSite();
+            PatrolInspectionPlanSite planSite = new PatrolInspectionPlanSite();
             planSite.setPlanId(patrolInspectionPlanVo.getId());
             planSite.setSiteId(patrolInspectionPlanVo.getSiteArray()[i]);
             planSiteService.save(planSite);
@@ -375,9 +375,9 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         queryWrapperTwo.eq(PatrolInspectionPlanSon::getPlanId, patrolInspectionPlanVo.getId());
         List<PatrolInspectionPlanSon> patrolInspectionPlanSonList = patrolInspectionPlanSonService.list(queryWrapperTwo);
         for (int i = 0; i < patrolInspectionPlanSonList.size(); i++) {
-            LambdaQueryWrapper<PlanSiteSon> queryWrapperThree = Wrappers.lambdaQuery();
-            queryWrapperThree.eq(PlanSiteSon::getPlanId, patrolInspectionPlanSonList.get(i).getId());
-            List<PlanSiteSon> planSiteSonList = planSiteSonService.list(queryWrapperThree);
+            LambdaQueryWrapper<PatrolInspectionPlanSiteSon> queryWrapperThree = Wrappers.lambdaQuery();
+            queryWrapperThree.eq(PatrolInspectionPlanSiteSon::getPlanId, patrolInspectionPlanSonList.get(i).getId());
+            List<PatrolInspectionPlanSiteSon> planSiteSonList = planSiteSonService.list(queryWrapperThree);
             for (int j = 0; j < planSiteSonList.size(); j++) {
                 planSiteSonService.removeById(planSiteSonList.get(j).getId());
             }
@@ -416,7 +416,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
                         patrolInspectionPlanSonService.save(patrolInspectionPlanSon);
                         Integer zfid = patrolInspectionPlanSon.getId();
                         for (int k = 0; k < patrolInspectionPlanVo.getSiteArray().length; k++) {
-                            PlanSiteSon planSiteSon = new PlanSiteSon();
+                            PatrolInspectionPlanSiteSon planSiteSon = new PatrolInspectionPlanSiteSon();
                             planSiteSon.setPlanId(zfid);
                             planSiteSon.setSiteId(patrolInspectionPlanVo.getSiteArray()[k]);
                             planSiteSon.setInspectionStatus(1);
@@ -448,7 +448,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
                 patrolInspectionPlanSonService.save(patrolInspectionPlanSon);
                 Integer zfid = patrolInspectionPlanSon.getId();
                 for (int k = 0; k < patrolInspectionPlanVo.getSiteArray().length; k++) {
-                    PlanSiteSon planSiteSon = new PlanSiteSon();
+                    PatrolInspectionPlanSiteSon planSiteSon = new PatrolInspectionPlanSiteSon();
                     planSiteSon.setPlanId(zfid);
                     planSiteSon.setSiteId(patrolInspectionPlanVo.getSiteArray()[k]);
                     planSiteSon.setInspectionStatus(1);
@@ -543,7 +543,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             queryWrapper.last("limit " + startFate + ","+pageSize);
         }
         List<PatrolInspectionPlan> patrolInspectionPlanSonList = this.list(queryWrapper);
-        List<PlanSchedule> planScheduleList = planScheduleService.list();
+        List<PatrolInspectionPlanSchedule> planScheduleList = planScheduleService.list();
         List<PatrolInspectionPersonnelVo> personnelList = patrolInspectionPersonnelService.patrolInspectionPersonnelSelect(areaId);
         List<PlanScheduleVo> list = new ArrayList<>();
         for (int i = 0; i < planScheduleList.size(); i++) {
@@ -625,9 +625,9 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             queryWrapper.eq(PatrolInspectionSite::getCreator, SecurityUtils.getUsername());
         }
         List<PatrolInspectionSite> patrolInspectionSiteList = patrolInspectionSiteService.list();
-        LambdaQueryWrapper<PlanSite> queryWrapperOne = Wrappers.lambdaQuery();
-        queryWrapperOne.eq(PlanSite::getPlanId, planId);
-        List<PlanSite> planSiteList = planSiteService.list(queryWrapperOne);
+        LambdaQueryWrapper<PatrolInspectionPlanSite> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.eq(PatrolInspectionPlanSite::getPlanId, planId);
+        List<PatrolInspectionPlanSite> planSiteList = planSiteService.list(queryWrapperOne);
         LambdaQueryWrapper<PatrolInspectionArea> queryWrapperTwo = Wrappers.lambdaQuery();
         queryWrapperTwo.eq(PatrolInspectionArea::getEnable, 1)
                 .eq(PatrolInspectionArea::getTenantId, SecurityUtils.getTenantId());

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

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

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

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

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

@@ -48,7 +48,7 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
     private PatrolInspectionPlanSonService patrolInspectionPlanSonService;
 
     @Autowired
-    private PlanSiteSonService planSiteSonService;
+    private PatrolInspectionPlanSiteSonService planSiteSonService;
 
     @Override
     public CommonPage<PatrolInspectionRecord> patrolInspectionRecordLsit(String areaName, String siteName, String name,
@@ -253,10 +253,10 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
      */
     @Override
     public Integer getPlanSiteSonCount(List<Integer> planSonidList, Integer inspectionStatus) {
-        LambdaQueryWrapper<PlanSiteSon> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.in(PlanSiteSon::getPlanId, planSonidList);
+        LambdaQueryWrapper<PatrolInspectionPlanSiteSon> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.in(PatrolInspectionPlanSiteSon::getPlanId, planSonidList);
         if (inspectionStatus != 0 && inspectionStatus != null) {
-            queryWrapper.eq(PlanSiteSon::getInspectionStatus, inspectionStatus);
+            queryWrapper.eq(PatrolInspectionPlanSiteSon::getInspectionStatus, inspectionStatus);
         }
         Integer taskCount = planSiteSonService.count(queryWrapper);
         return taskCount;

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

@@ -10,7 +10,7 @@ import com.usky.fire.domain.*;
 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.PatrolInspectionPlanSiteService;
 import com.usky.fire.service.PatrolInspectionSiteContentService;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.DataCountVo;
@@ -45,7 +45,7 @@ public class PatrolInspectionSiteServiceImpl extends AbstractCrudService<PatrolI
     private PatrolInspectionSiteContentService siteContentService;
 
     @Autowired
-    private PlanSiteService planSiteService;
+    private PatrolInspectionPlanSiteService planSiteService;
 
     @Override
     public List<PatrolInspectionAreaVo> areaLeftList() {
@@ -160,9 +160,9 @@ public class PatrolInspectionSiteServiceImpl extends AbstractCrudService<PatrolI
 
     @Override
     public void updatePatrolInspectionSite(PatrolInspectionSite patrolInspectionSite) {
-        LambdaQueryWrapper<PlanSite> queryWrapperOne = Wrappers.lambdaQuery();
-        queryWrapperOne.eq(PlanSite::getSiteId, patrolInspectionSite.getId());
-        List<PlanSite> planSiteList = planSiteService.list(queryWrapperOne);
+        LambdaQueryWrapper<PatrolInspectionPlanSite> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.eq(PatrolInspectionPlanSite::getSiteId, patrolInspectionSite.getId());
+        List<PatrolInspectionPlanSite> planSiteList = planSiteService.list(queryWrapperOne);
         if (planSiteList.size() <= 0) {
             throw new BusinessException("巡检地点已绑定计划不可修改");
         }
@@ -171,9 +171,9 @@ public class PatrolInspectionSiteServiceImpl extends AbstractCrudService<PatrolI
 
     @Override
     public void delPatrolInspectionSite(Integer id) {
-        LambdaQueryWrapper<PlanSite> queryWrapperOne = Wrappers.lambdaQuery();
-        queryWrapperOne.eq(PlanSite::getSiteId, id);
-        List<PlanSite> planSiteList = planSiteService.list(queryWrapperOne);
+        LambdaQueryWrapper<PatrolInspectionPlanSite> queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.eq(PatrolInspectionPlanSite::getSiteId, id);
+        List<PatrolInspectionPlanSite> planSiteList = planSiteService.list(queryWrapperOne);
         if (planSiteList.size() <= 0) {
             throw new BusinessException("巡检地点已绑定计划不可删除");
         }

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

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

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

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

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

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

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionPlanVo.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.PlanSchedule;
+import com.usky.fire.domain.PatrolInspectionPlanSchedule;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -126,7 +126,7 @@ public class PatrolInspectionPlanVo implements Serializable {
     /**
      * 巡检日程
      */
-    private List<PlanSchedule> planScheduleList;
+    private List<PatrolInspectionPlanSchedule> planScheduleList;
 
 
 }

service-fire/service-fire-biz/src/main/resources/mapper.fire/PlanScheduleMapper.xml → service-fire/service-fire-biz/src/main/resources/mapper.fire/PatrolInspectionPlanScheduleMapper.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.PlanScheduleMapper">
+<mapper namespace="com.usky.fire.mapper.PatrolInspectionPlanScheduleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PlanSchedule">
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionPlanSchedule">
         <id column="id" property="id" />
         <result column="plan_id" property="planId" />
         <result column="start_time" property="startTime" />

service-fire/service-fire-biz/src/main/resources/mapper.fire/PlanSiteMapper.xml → service-fire/service-fire-biz/src/main/resources/mapper.fire/PatrolInspectionPlanSiteMapper.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.PlanSiteMapper">
+<mapper namespace="com.usky.fire.mapper.PatrolInspectionPlanSiteMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PlanSite">
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionPlanSite">
         <id column="id" property="id" />
         <result column="plan_id" property="planId" />
         <result column="site_id" property="siteId" />

service-fire/service-fire-biz/src/main/resources/mapper.fire/PlanSiteSonMapper.xml → service-fire/service-fire-biz/src/main/resources/mapper.fire/PatrolInspectionPlanSiteSonMapper.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.PlanSiteSonMapper">
+<mapper namespace="com.usky.fire.mapper.PatrolInspectionPlanSiteSonMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PlanSiteSon">
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionPlanSiteSon">
         <id column="id" property="id" />
         <result column="plan_id" property="planId" />
         <result column="site_id" property="siteId" />