Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -52,8 +52,6 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
import org.springblade.modules.policeAlarmRecords.service.IPoliceAlarmRecordsService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
@@ -831,14 +829,16 @@
   @Override
   public List<User> getPoliceUser(String longitude, String latitude, String houseCode) {
      List<User> policeUser = baseMapper.getPoliceUser(longitude, latitude);
      // todo 自动生成警单
      IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
      PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
      policeAlarmRecordsEntity.setHouseCode(houseCode);
      if (policeUser != null && policeUser.size() == 1) {
         policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
      }
      policeAlarmRecordsService.save(policeAlarmRecordsEntity);
      // 自动生成警单
//      if (StringUtils.isNotBlank(houseCode)) {
//         IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
//         PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
//         policeAlarmRecordsEntity.setHouseCode(houseCode);
//         if (policeUser != null && policeUser.size() == 1) {
//            policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
//         }
//         policeAlarmRecordsService.save(policeAlarmRecordsEntity);
//      }
      return policeUser;
   }
}