事件管理相关接口开发

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

@@ -70,7 +70,8 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
                     AlarmElectricalFire::getDeviceName, AlarmElectricalFire::getAlarmType, AlarmElectricalFire::getAlarmTime,
                     AlarmElectricalFire::getCompanyId, AlarmElectricalFire::getCompanyName, AlarmElectricalFire::getHandlingStatus,
                     AlarmElectricalFire::getHandler, AlarmElectricalFire::getHandlingTime, AlarmElectricalFire::getHandlingContent,
-                    AlarmElectricalFire::getFalseAlarm, AlarmElectricalFire::getSitePhoto, AlarmElectricalFire::getAttributeValue4)
+                    AlarmElectricalFire::getFalseAlarm, AlarmElectricalFire::getSitePhoto, AlarmElectricalFire::getAttributeValue4,
+                    AlarmElectricalFire::getSystemType)
                     .in(AlarmElectricalFire::getCompanyId, companyIdList)
                     .like(StringUtils.isNotBlank(companyName), AlarmElectricalFire::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmElectricalFire::getHandlingStatus, handlingStatus)
@@ -247,7 +248,7 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
                     list.get(i).setHandlingTime(LocalDateTime.now());
                     list.get(i).setHandlingStatus(1);
                     list.get(i).setHandlingContent(alarmElectricalFire.getHandlingContent());
-                    list.get(i).setHandlerPhone("未定义");
+                    list.get(i).setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
                     list.get(i).setFalseAlarm(alarmElectricalFire.getFalseAlarm());
                     this.updateById(list.get(i));
                 }
@@ -256,7 +257,7 @@ public class AlarmElectricalFireServiceImpl extends AbstractCrudService<AlarmEle
             alarmElectricalFire.setHandler(SecurityUtils.getUsername());
             alarmElectricalFire.setHandlingTime(LocalDateTime.now());
             alarmElectricalFire.setHandlingStatus(1);
-            alarmElectricalFire.setHandlerPhone("未定义");
+            alarmElectricalFire.setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
             this.updateById(alarmElectricalFire);
         }
     }

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

@@ -212,7 +212,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
                     list.get(i).setHandlingTime(LocalDateTime.now());
                     list.get(i).setHandlingStatus(1);
                     list.get(i).setHandlingContent(alarmFire.getHandlingContent());
-                    list.get(i).setHandlerPhone("未定义");
+                    list.get(i).setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
                     list.get(i).setFalseAlarm(alarmFire.getFalseAlarm());
                     this.updateById(list.get(i));
                 }
@@ -221,7 +221,7 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
             alarmFire.setHandler(SecurityUtils.getUsername());
             alarmFire.setHandlingTime(LocalDateTime.now());
             alarmFire.setHandlingStatus(1);
-            alarmFire.setHandlerPhone("未定义");
+            alarmFire.setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
             this.updateById(alarmFire);
         }
     }

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

@@ -10,6 +10,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.AlarmHydrantWater;
+import com.usky.fire.domain.AlarmSprayWater;
 import com.usky.fire.domain.BaseUserCompany;
 import com.usky.fire.mapper.AlarmHydrantWaterMapper;
 import com.usky.fire.service.AlarmHydrantWaterService;
@@ -55,7 +56,8 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
                     AlarmHydrantWater::getDeviceName, AlarmHydrantWater::getAlarmType, AlarmHydrantWater::getAlarmTime,
                     AlarmHydrantWater::getCompanyId, AlarmHydrantWater::getCompanyName, AlarmHydrantWater::getHandlingStatus,
                     AlarmHydrantWater::getHandler, AlarmHydrantWater::getHandlingTime, AlarmHydrantWater::getHandlingContent,
-                    AlarmHydrantWater::getFalseAlarm, AlarmHydrantWater::getSitePhoto, AlarmHydrantWater::getAttributeValue4)
+                    AlarmHydrantWater::getFalseAlarm, AlarmHydrantWater::getSitePhoto, AlarmHydrantWater::getAttributeValue4,
+                    AlarmHydrantWater::getSystemType)
                     .in(AlarmHydrantWater::getCompanyId, companyIdList)
                     .like(StringUtils.isNotBlank(companyName), AlarmHydrantWater::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmHydrantWater::getHandlingStatus, handlingStatus)
@@ -97,7 +99,7 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
                     list.get(i).setHandlingTime(LocalDateTime.now());
                     list.get(i).setHandlingStatus(1);
                     list.get(i).setHandlingContent(alarmHydrantWater.getHandlingContent());
-                    list.get(i).setHandlerPhone("未定义");
+                    list.get(i).setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
                     list.get(i).setFalseAlarm(alarmHydrantWater.getFalseAlarm());
                     this.updateById(list.get(i));
                 }
@@ -106,7 +108,7 @@ public class AlarmHydrantWaterServiceImpl extends AbstractCrudService<AlarmHydra
             alarmHydrantWater.setHandler(SecurityUtils.getUsername());
             alarmHydrantWater.setHandlingTime(LocalDateTime.now());
             alarmHydrantWater.setHandlingStatus(1);
-            alarmHydrantWater.setHandlerPhone("未定义");
+            alarmHydrantWater.setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
             this.updateById(alarmHydrantWater);
         }
     }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.AlarmHydrantWater;
 import com.usky.fire.domain.AlarmSmokeControl;
 import com.usky.fire.domain.BaseUserCompany;
 import com.usky.fire.mapper.AlarmSmokeControlMapper;
@@ -55,7 +56,7 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
                     AlarmSmokeControl::getDeviceName, AlarmSmokeControl::getAlarmType, AlarmSmokeControl::getAlarmTime,
                     AlarmSmokeControl::getCompanyId, AlarmSmokeControl::getCompanyName, AlarmSmokeControl::getHandlingStatus,
                     AlarmSmokeControl::getHandler, AlarmSmokeControl::getHandlingTime, AlarmSmokeControl::getHandlingContent,
-                    AlarmSmokeControl::getFalseAlarm, AlarmSmokeControl::getSitePhoto)
+                    AlarmSmokeControl::getFalseAlarm, AlarmSmokeControl::getSitePhoto, AlarmSmokeControl::getSystemType)
                     .in(AlarmSmokeControl::getCompanyId, companyIdList)
                     .like(StringUtils.isNotBlank(companyName), AlarmSmokeControl::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmSmokeControl::getHandlingStatus, handlingStatus)
@@ -98,7 +99,7 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
                     list.get(i).setHandlingTime(LocalDateTime.now());
                     list.get(i).setHandlingStatus(1);
                     list.get(i).setHandlingContent(alarmSmokeControl.getHandlingContent());
-                    list.get(i).setHandlerPhone("未定义");
+                    list.get(i).setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
                     list.get(i).setFalseAlarm(alarmSmokeControl.getFalseAlarm());
                     this.updateById(list.get(i));
                 }
@@ -107,7 +108,7 @@ public class AlarmSmokeControlServiceImpl extends AbstractCrudService<AlarmSmoke
             alarmSmokeControl.setHandler(SecurityUtils.getUsername());
             alarmSmokeControl.setHandlingTime(LocalDateTime.now());
             alarmSmokeControl.setHandlingStatus(1);
-            alarmSmokeControl.setHandlerPhone("未定义");
+            alarmSmokeControl.setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
             this.updateById(alarmSmokeControl);
         }
     }

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

@@ -15,6 +15,7 @@ import com.usky.fire.mapper.AlarmSprayWaterMapper;
 import com.usky.fire.service.AlarmSprayWaterService;
 import com.usky.fire.service.BaseUserCompanyService;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.system.domain.SysPerson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,7 +56,8 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
                     AlarmSprayWater::getDeviceName, AlarmSprayWater::getAlarmType, AlarmSprayWater::getAlarmTime,
                     AlarmSprayWater::getCompanyId, AlarmSprayWater::getCompanyName, AlarmSprayWater::getHandlingStatus,
                     AlarmSprayWater::getHandler, AlarmSprayWater::getHandlingTime, AlarmSprayWater::getHandlingContent,
-                    AlarmSprayWater::getFalseAlarm, AlarmSprayWater::getSitePhoto, AlarmSprayWater::getAttributeValue4)
+                    AlarmSprayWater::getFalseAlarm, AlarmSprayWater::getSitePhoto, AlarmSprayWater::getAttributeValue4,
+                    AlarmSprayWater::getSystemType)
                     .in(CollectionUtils.isNotEmpty(companyIdList), AlarmSprayWater::getCompanyId, companyIdList)
                     .like(StringUtils.isNotBlank(companyName), AlarmSprayWater::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmSprayWater::getHandlingStatus, handlingStatus)
@@ -97,7 +99,7 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
                     list.get(i).setHandlingTime(LocalDateTime.now());
                     list.get(i).setHandlingStatus(1);
                     list.get(i).setHandlingContent(alarmSprayWater.getHandlingContent());
-                    list.get(i).setHandlerPhone("未定义");
+                    list.get(i).setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
                     list.get(i).setFalseAlarm(alarmSprayWater.getFalseAlarm());
                     this.updateById(list.get(i));
                 }
@@ -106,7 +108,7 @@ public class AlarmSprayWaterServiceImpl extends AbstractCrudService<AlarmSprayWa
             alarmSprayWater.setHandler(SecurityUtils.getUsername());
             alarmSprayWater.setHandlingTime(LocalDateTime.now());
             alarmSprayWater.setHandlingStatus(1);
-            alarmSprayWater.setHandlerPhone("未定义");
+            alarmSprayWater.setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
             this.updateById(alarmSprayWater);
         }
     }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.AlarmSmokeControl;
 import com.usky.fire.domain.AlarmVideo;
 import com.usky.fire.domain.BaseUserCompany;
 import com.usky.fire.mapper.AlarmVideoMapper;
@@ -55,7 +56,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
                     AlarmVideo::getDeviceName, AlarmVideo::getAlarmType, AlarmVideo::getAlarmTime,
                     AlarmVideo::getCompanyId, AlarmVideo::getCompanyName, AlarmVideo::getHandlingStatus,
                     AlarmVideo::getHandler, AlarmVideo::getHandlingTime, AlarmVideo::getHandlingContent,
-                    AlarmVideo::getFalseAlarm, AlarmVideo::getSitePhoto, AlarmVideo::getPortNum)
+                    AlarmVideo::getFalseAlarm, AlarmVideo::getSitePhoto, AlarmVideo::getPortNum, AlarmVideo::getSystemType)
                     .in(AlarmVideo::getCompanyId, companyIdList)
                     .like(StringUtils.isNotBlank(companyName), AlarmVideo::getCompanyName, companyName)
                     .eq(handlingStatus != null, AlarmVideo::getHandlingStatus, handlingStatus)
@@ -99,7 +100,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
                     list.get(i).setHandlingTime(LocalDateTime.now());
                     list.get(i).setHandlingStatus(1);
                     list.get(i).setHandlingContent(alarmVideo.getHandlingContent());
-                    list.get(i).setHandlerPhone("未定义");
+                    list.get(i).setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
                     list.get(i).setFalseAlarm(alarmVideo.getFalseAlarm());
                     this.updateById(list.get(i));
                 }
@@ -108,7 +109,7 @@ public class AlarmVideoServiceImpl extends AbstractCrudService<AlarmVideoMapper,
             alarmVideo.setHandler(SecurityUtils.getUsername());
             alarmVideo.setHandlingTime(LocalDateTime.now());
             alarmVideo.setHandlingStatus(1);
-            alarmVideo.setHandlerPhone("未定义");
+            alarmVideo.setHandlerPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
             this.updateById(alarmVideo);
         }
     }