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,19 +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;
@@ -50,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;
@@ -171,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));
@@ -215,10 +211,18 @@
   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<>();
      List<String> objects3 = new ArrayList<>();
      List<String> objects4 = new ArrayList<>();
      int a = 0;
      for (PlaceRectificationsExcel datum : data) {
         a++;
         System.out.println(a + "第几个：" + datum.getHouseCode());
         String phone1 = getPhone(datum.getPrincipals());
         String name = getName(datum.getPrincipals());
         datum.setPrincipalPhone(phone1);
@@ -229,47 +233,40 @@
            .eq(PlaceEntity::getIsDeleted, 0));
         if (one == null) {
            // 新增场所
            DoorplateAddressEntity one1 = bean3.getOne(Wrappers.<DoorplateAddressEntity>lambdaQuery()
            DoorplateAddressEntity doorplateAddressEntity = bean3.getOne(Wrappers.<DoorplateAddressEntity>lambdaQuery()
               .eq(DoorplateAddressEntity::getAddressCode, datum.getHouseCode()));
            if (one1 == null) {
            if (doorplateAddressEntity != null) {
               objects.add(datum.getHouseCode());
            }
            PlaceCheckEntity placeCheckEntity = new PlaceCheckEntity();
            String police = datum.getPolice();
            String phone = getPhone(police);
            if (StringUtils.isNotBlank(phone)) {
               User one3 = bean1.getOne(Wrappers.<User>lambdaQuery()
                  .eq(User::getPhone, phone)
                  .eq(User::getIsDeleted, 0));
               if (one3 != null) {
                  placeCheckEntity.setCreateUser(one3.getId());
               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.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;
            }
            // 4.保存检查表
            placeCheckEntity.setHouseCode(datum.getHouseCode());
            bean2.save(placeCheckEntity);
            continue;
         }
         // 2.判断负责人电话是否存在
         if (StringUtils.isBlank(datum.getPrincipalPhone())) {
            one.setLocation(datum.getAddressName());
            one.setPlaceName(datum.getPlaceName());
            bean.updateById(one);

            PlaceCheckEntity placeCheckEntity = new PlaceCheckEntity();
            String police = datum.getPolice();
            String phone = getPhone(police);
            if (StringUtils.isNotBlank(phone)) {
               User one3 = bean1.getOne(Wrappers.<User>lambdaQuery()
                  .eq(User::getPhone, phone)
                  .eq(User::getIsDeleted, 0));
               if (one3 != null) {
                  placeCheckEntity.setCreateUser(one3.getId());
               }
            }
            // 4.保存检查表
            placeCheckEntity.setHouseCode(datum.getHouseCode());
            bean2.save(placeCheckEntity);
            objects4.add(datum.getHouseCode());
            continue;
         }
         // 2.判断负责人是否存在
@@ -282,27 +279,38 @@
            //如果用户不存在，则新增一个用户
            newUser.setAccount(datum.getPrincipalPhone().trim());
            newUser.setPhone(datum.getPrincipalPhone().trim());
            newUser.setName(datum.getPrincipal().trim());
            newUser.setRealName(datum.getPrincipal().trim());
            newUser.setName(StringUtils.isBlank(datum.getPrincipal().trim()) ? "demo" : datum.getPrincipal().trim());
            newUser.setRealName(StringUtils.isBlank(datum.getPrincipal().trim()) ? "demo" : datum.getPrincipal().trim());
            // 社区群众部门
            newUser.setDeptId("1727979636479037441");
            // 目前暂定居民角色，
            newUser.setRoleId("1717429059648606209");
            //默认密码为 123456
            newUser.setPassword("123456");
            // 设置机构
            // 用户新增
            boolean submit = bean1.submit(newUser);

            // 3.更新场所负责人
            one.setPrincipal(newUser.getRealName());
            one.setPrincipalUserId(newUser.getId());
            one.setPrincipalPhone(newUser.getPhone());
            one.setLocation(datum.getAddressName());
            one.setPlaceName(datum.getPlaceName());
            one.setIsNine(1);
            if (StringUtils.isNotBlank(datum.getNineType())) {
               one.setNineType(Integer.valueOf(datum.getNineType()));
            }
            bean.updateById(one);
         } else {
            if (one == null) {
               one = bean.getOne(Wrappers.<PlaceEntity>lambdaQuery()
                  .eq(PlaceEntity::getHouseCode, datum.getHouseCode())
                  .eq(PlaceEntity::getIsDeleted, 0));
            }
            // 3.更新场所负责人
            one.setIsNine(1);
            if (StringUtils.isNotBlank(datum.getNineType())) {
               one.setNineType(Integer.valueOf(datum.getNineType()));
            }
            one.setPrincipal(one1.getRealName());
            one.setPrincipalUserId(one1.getId());
            one.setPrincipalPhone(one1.getPhone());
@@ -310,26 +318,18 @@
            one.setPlaceName(datum.getPlaceName());
            bean.updateById(one);
         }
         PlaceCheckEntity placeCheckEntity = new PlaceCheckEntity();
         String police = datum.getPolice();
         String phone = getPhone(police);
         if (StringUtils.isNotBlank(phone)) {
            User one3 = bean1.getOne(Wrappers.<User>lambdaQuery()
               .eq(User::getPhone, phone)
               .eq(User::getIsDeleted, 0));
            if (one3 != null) {
               placeCheckEntity.setCreateUser(one3.getId());
            }
         }
         // 4.保存检查表
         placeCheckEntity.setHouseCode(datum.getHouseCode());
         bean2.save(placeCheckEntity);
      }
      System.out.println("没有数据:" + JSON.toJSONString(objects));
      System.out.println("没有数据2:" + JSON.toJSONString(objects2));
      System.out.println("没有数据3:" + JSON.toJSONString(objects3));
      System.out.println("没有数据4:" + JSON.toJSONString(objects4));
   }


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

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

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