事件管理-火灾告警处置相关接口开发

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

@@ -33,6 +33,7 @@ import java.util.Map;
 @Service
 public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, AlarmFire> implements AlarmFireService {
 
+    @Override
     public CommonPage<AlarmFireVo> alarmFireLowerList(Integer handlingStatus, String startDate, String endDate,
                                                       Integer pageNum, Integer pageSize, Integer alarmType) {
         String userType = null;
@@ -74,6 +75,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
     }
 
 
+    @Override
     public Map<String, Object> fireStatistics(Integer alarmType) {
         String userType = null;
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -105,6 +107,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
 
 
 
+    @Override
     public Map<String, Object> fireStatisticalChart(Integer alarmType, String startDate, String endDate){
         String userType = null;
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -139,6 +142,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
      * @param alarmType 告警类型（2 火警、4 故障、16 监管等）
      * @return
      */
+    @Override
     public Integer fireCount(List<String> deviceCodeList, Integer handlingStatus,Integer alarmType) {
         LambdaQueryWrapper<AlarmFire> queryWrapper = Wrappers.lambdaQuery();
         if (deviceCodeList.size() > 0) {

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

@@ -60,7 +60,7 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
         }
     }
 
-
+    @Override
     public void addPatrolInspectionAreaSon(PatrolInspectionArea patrolInspectionArea) {
         LambdaQueryWrapper<PatrolInspectionArea> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolInspectionArea::getEnable, 1)
@@ -121,6 +121,7 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
      * @param pageSize 每页条数
      * @return
      */
+    @Override
     public CommonPage<PatrolInspectionArea> patrolInspectionAreaList(Integer id, String areaName, Integer pageNum, Integer pageSize) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userType = null;
@@ -156,6 +157,7 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
      *
      * @return
      */
+    @Override
     public List<PatrolInspectionArea> patrolInspectionAreaSelect(Integer areaFid) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userType = null;

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

@@ -58,6 +58,7 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
         this.save(patrolInspectionPersonnel);
     }
 
+    @Override
     public void updatePatrolInspectionPersonnel(PatrolInspectionPersonnel patrolInspectionPersonnel) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userType = null;
@@ -79,6 +80,7 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
         this.updateById(patrolInspectionPersonnel);
     }
 
+    @Override
     public void delPatrolInspectionPersonnel(Integer id) {
         LambdaQueryWrapper<PlanSchedule> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PlanSchedule::getPersonnelId, id);

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

@@ -508,7 +508,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
 //        }
     }
 
-
+    @Override
     public CommonPage<PatrolInspectionPlanDataVo> patrolInspectionPlanList(String planName, Integer planType, Integer areaId, Integer pageNum, Integer pageSize, Integer id) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userType = null;
@@ -610,6 +610,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
     }
 
 
+    @Override
     public List<PatrolInspectionSiteVo> patrolInspectionSiteVoList(Integer planId, Integer areaId) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userType = null;

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

@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -51,6 +50,7 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
     @Autowired
     private PlanSiteSonService planSiteSonService;
 
+    @Override
     public CommonPage<PatrolInspectionRecord> patrolInspectionRecordLsit(String areaName, String siteName, String name,
                                                                          Integer planType, String startDateTime, String endDateTime,
                                                                          Integer pageNum, Integer pageSize) {
@@ -84,7 +84,7 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
         queryWrapper.orderByDesc(PatrolInspectionRecord::getId);
         if (pageNum != null && pageNum != 0 && pageSize != null && pageSize != 0) {
             Integer startFate = OnlineMethod.getStartFate(pageNum, pageSize);
-            queryWrapper.last("limit " + startFate + ","+pageSize);
+            queryWrapper.last("limit " + startFate + "," + pageSize);
         }
 
         List<PatrolInspectionRecord> patrolInspectionRecordList = this.list(queryWrapper);
@@ -98,6 +98,7 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
 //        queryWrapper.eq(PatrolInspectionRecord::getTenantId, SecurityUtils.getTenantId());
 //    }
 
+    @Override
     public List<PatrolInspectionRecordVo> patrolInspectionRecordDetails(Integer id) {
         //记录查询
         LambdaQueryWrapper<PatrolInspectionRecord> queryWrapper = Wrappers.lambdaQuery();
@@ -313,8 +314,8 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
 
     @Override
     public List<PatrolInspectionRecordExportVo> recordLsitExport(String areaName, String siteName, String name,
-                                                               Integer planType, String startDateTime,
-                                                               String endDateTime) {
+                                                                 Integer planType, String startDateTime,
+                                                                 String endDateTime) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userType = null;

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

@@ -206,6 +206,7 @@ public class PatrolInspectionSiteServiceImpl extends AbstractCrudService<PatrolI
      * @param siteId 巡检地点ID
      * @return
      */
+    @Override
     public Integer[] siteContentList(Integer siteId) {
         LambdaQueryWrapper<PatrolInspectionSiteContent> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolInspectionSiteContent::getSiteId, siteId);