Merge remote-tracking branch 'origin/master'

zhongrj

2024-02-07 3a5ea5a84c338e0cb7a942e03a98e883a0b23115

 src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java

@@ -17,9 +17,9 @@
package org.springblade.modules.taskPlaceRectification.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.lettuce.core.ScriptOutputType;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
@@ -27,20 +27,17 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.house.excel.HouseExcel;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.service.IPatrolRecordService;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
import org.springblade.modules.place.entity.PlaceCheckEntity;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.place.service.IPlaceCheckService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
@@ -51,13 +48,11 @@
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.excel.PlaceRectificationsExcel;
import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.taskPlaceRectification.mapper.TaskPlaceRectificationMapper;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.ArrayList;
import java.util.List;
@@ -172,8 +167,8 @@
   @Override
   public List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationsVO taskPlaceRectificationVO) {
      // todo
      List<String> regionChildCodesList = new ArrayList<>();//SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdmin() == true ? 1 : 2;
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      List<TaskPlaceRectificationExcel> export = baseMapper.export(taskPlaceRectificationVO, regionChildCodesList, isAdministrator);
      IDictBizService bean = SpringUtils.getBean(IDictBizService.class);
      List<DictBiz> nineType = bean.list(Wrappers.<DictBiz>lambdaQuery().eq(DictBiz::getCode, "nineType").eq(DictBiz::getIsDeleted, 0));
@@ -216,9 +211,9 @@
   public void importPlaceRectifications(List<PlaceRectificationsExcel> data, Boolean isCovered) {
      IPlaceService bean = SpringUtils.getBean(IPlaceService.class);
      IUserService bean1 = SpringUtils.getBean(IUserService.class);
      IPlaceCheckService bean2 = SpringUtils.getBean(IPlaceCheckService.class);
      IDoorplateAddressService bean3 = SpringUtils.getBean(IDoorplateAddressService.class);
      IPlaceService bean4 = SpringUtils.getBean(IPlaceService.class);
      IPoliceAffairsGridService policeAffairsGridService = SpringUtils.getBean(IPoliceAffairsGridService.class);

      List<String> objects = new ArrayList<>();
      List<String> objects2 = new ArrayList<>();
@@ -240,29 +235,33 @@
            // 新增场所
            DoorplateAddressEntity doorplateAddressEntity = bean3.getOne(Wrappers.<DoorplateAddressEntity>lambdaQuery()
               .eq(DoorplateAddressEntity::getAddressCode, datum.getHouseCode()));
            if (doorplateAddressEntity == null) {
            if (doorplateAddressEntity != null) {
               objects.add(datum.getHouseCode());
               continue;
            } else {
               PoliceAffairsGridEntity one1 = policeAffairsGridService.getOne(Wrappers.<PoliceAffairsGridEntity>lambdaQuery()
                  .like(PoliceAffairsGridEntity::getCommunityName, datum.getCommunityName()).last("limit 1"));
               if (one1 == null) {
                  continue;
               }
               PlaceVO placeVO = new PlaceVO();
               placeVO.setJwGridCode(one1.getJwGridCode());
               placeVO.setHouseCode(datum.getHouseCode());
               placeVO.setIsNine(1);
               placeVO.setPrincipal(StringUtils.isBlank(datum.getPrincipal().trim()) ? "demo" : datum.getPrincipal().trim());
               placeVO.setPrincipalPhone(datum.getPrincipalPhone());
               placeVO.setRoleName("民警");
               placeVO.setBuildingCode(doorplateAddressEntity.getBuildingCode());
               placeVO.setLat(doorplateAddressEntity.getY());
               placeVO.setLng(doorplateAddressEntity.getX());
               placeVO.setLocation(datum.getAddressName());
               placeVO.setSource(1);
               placeVO.setLocation(datum.getPlaceAddress());
               placeVO.setSource(2);
               placeVO.setIsScene(1);
               placeVO.setIsNine(1);
               placeVO.setPlaceName(datum.getPlaceName());
               if (StringUtils.isNotBlank(datum.getNineType())) {
                  placeVO.setNineType(Integer.valueOf(datum.getNineType()));
               }
               Boolean aBoolean = bean4.addOrUpdate(placeVO);

               objects2.add(datum.getHouseCode());
               continue;
            }
         }
         // 2.判断负责人电话是否存在
@@ -328,6 +327,9 @@


   private String getPhone(String text) {
      if (StringUtils.isBlank(text)) {
         return "";
      }
      Pattern pattern = Pattern.compile("1[3-9]\\d{9}");
      Matcher matcher = pattern.matcher(text);

@@ -338,6 +340,9 @@
   }

   private String getName(String text) {
      if (StringUtils.isBlank(text)) {
         return "";
      }
      // Pattern pattern = Pattern.compile("[\\\\u4e00-\\\\u9fa5]+");
      // Matcher matcher = pattern.matcher(text);