Merge remote-tracking branch 'origin/master'

lin

2024-04-15 bdcca1cd1f1c4c5d7d187d74a7c75f1caac8b491

 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.house.service.impl;

import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,6 +32,8 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
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.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.service.IGridRangeService;
@@ -250,6 +253,7 @@
    */
   @Transactional(rollbackFor = Exception.class)
   public void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
      IDoorplateAddressService doorplateAddressService = SpringUtils.getBean(IDoorplateAddressService.class);
      // 查询库中是否已存在
      QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("house_code", houseAndHoldExcel.getHouseCode())
@@ -259,9 +263,29 @@
      if (null == one) {
         HouseEntity houseEntity = new HouseEntity();
         houseEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
         houseEntity.setHouseName(houseAndHoldExcel.getHouseName());
         houseEntity.setDistrictName(houseAndHoldExcel.getDistrictName());
         houseEntity.setUnit(houseAndHoldExcel.getUnit());
         if (Strings.isBlank(houseAndHoldExcel.getHouseName())) {
            // 查询地址总表对应的数据
            QueryWrapper<DoorplateAddressEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("address_code",houseAndHoldExcel.getHouseCode());
            DoorplateAddressEntity addressEntity = doorplateAddressService.getOne(queryWrapper);
            if (null!=addressEntity){
               houseEntity.setHouseName(addressEntity.getAddressName());
               houseEntity.setAddress(addressEntity.getAddressName());
               houseEntity.setDistrictCode(addressEntity.getAoiCode());
               houseEntity.setDistrictName(addressEntity.getAoiName());
               houseEntity.setLng(addressEntity.getX());
               houseEntity.setLat(addressEntity.getY());
            }
         }else {
            houseEntity.setHouseName(houseAndHoldExcel.getHouseName());
            houseEntity.setAddress(houseAndHoldExcel.getHouseName());
         }
         if (!Strings.isBlank(houseAndHoldExcel.getDistrictName())) {
            houseEntity.setDistrictName(houseAndHoldExcel.getDistrictName());
         }
         if (!Strings.isBlank(houseAndHoldExcel.getUnit())) {
            houseEntity.setUnit(houseAndHoldExcel.getUnit());
         }
         if (!Strings.isBlank(houseAndHoldExcel.getFloor())) {
            houseEntity.setFloor(houseAndHoldExcel.getFloor());
         }
@@ -294,10 +318,29 @@
         save(houseEntity);
      }else {
         // 更新
         one.setHouseName(houseAndHoldExcel.getHouseName());
         one.setAddress(houseAndHoldExcel.getHouseName());
         one.setDistrictName(houseAndHoldExcel.getDistrictName());
         one.setUnit(houseAndHoldExcel.getUnit());
         if (Strings.isBlank(houseAndHoldExcel.getHouseName())) {
            // 查询地址总表对应的数据
            QueryWrapper<DoorplateAddressEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("address_code",houseAndHoldExcel.getHouseCode());
            DoorplateAddressEntity addressEntity = doorplateAddressService.getOne(queryWrapper);
            if (null!=addressEntity){
               one.setHouseName(addressEntity.getAddressName());
               one.setAddress(addressEntity.getAddressName());
               one.setDistrictCode(addressEntity.getAoiCode());
               one.setDistrictName(addressEntity.getAoiName());
               one.setLng(addressEntity.getX());
               one.setLat(addressEntity.getY());
            }
         }else {
            one.setHouseName(houseAndHoldExcel.getHouseName());
            one.setAddress(houseAndHoldExcel.getHouseName());
         }
         if (!Strings.isBlank(houseAndHoldExcel.getDistrictName())) {
            one.setDistrictName(houseAndHoldExcel.getDistrictName());
         }
         if (!Strings.isBlank(houseAndHoldExcel.getUnit())) {
            one.setUnit(houseAndHoldExcel.getUnit());
         }
         if (!Strings.isBlank(houseAndHoldExcel.getFloor())) {
            one.setFloor(houseAndHoldExcel.getFloor());
         }
@@ -354,9 +397,13 @@
         }
         // 居民身份证
         if (!Strings.isBlank(houseAndHoldExcel.getIdCard())) {
            // 身份证类型为居民身份证
            householdEntity.setCardType(111);
            householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
            if (IdcardUtil.isValidCard(houseAndHoldExcel.getIdCard())) {
               // 身份证类型为居民身份证
               householdEntity.setCardType(111);
               householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
            }else {
               householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
            }
         }
         // 党员
         if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
@@ -471,9 +518,13 @@
         }
         // 居民身份证
         if (!Strings.isBlank(houseAndHoldExcel.getIdCard())) {
            // 身份证类型为居民身份证
            one.setCardType(111);
            one.setIdCard(houseAndHoldExcel.getIdCard());
            if (IdcardUtil.isValidCard(houseAndHoldExcel.getIdCard())) {
               // 身份证类型为居民身份证
               one.setCardType(111);
               one.setIdCard(houseAndHoldExcel.getIdCard());
            }else {
               one.setIdCard(houseAndHoldExcel.getIdCard());
            }
         }
         // 党员
         if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
@@ -597,17 +648,26 @@
         IUserHouseLabelService bean = SpringUtils.getBean(IUserHouseLabelService.class);
         ILabelService bean1 = SpringUtils.getBean(ILabelService.class);
         for (String s : split) {
            // 查询标签信息
            LabelEntity one1 = bean1.getOne(Wrappers.<LabelEntity>lambdaQuery().eq(LabelEntity::getLabelName, s));
            if (one1 != null) {
               UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
               userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
               userHouseLabelEntity.setHouseholdId(householdEntity.getId());
               // 设置默认的绿色
               userHouseLabelEntity.setColor("green");
               userHouseLabelEntity.setLableType(1);
               userHouseLabelEntity.setLabelName(s);
               userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
               bean.save(userHouseLabelEntity);
               // 判断是否已存在关联关系，没有则新增
               QueryWrapper<UserHouseLabelEntity> wrapper = new QueryWrapper<>();
               wrapper.eq("label_id",one1.getId())
                  .eq("house_code",householdEntity.getHouseCode())
                  .eq("household_id",householdEntity.getId());
               UserHouseLabelEntity houseLabelEntity = bean.getOne(wrapper);
               if (null==houseLabelEntity) {
                  UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
                  userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
                  userHouseLabelEntity.setHouseholdId(householdEntity.getId());
                  // 设置默认的绿色
                  userHouseLabelEntity.setColor("green");
                  userHouseLabelEntity.setLableType(1);
                  userHouseLabelEntity.setLabelName(s);
                  userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
                  bean.save(userHouseLabelEntity);
               }
            }
         }
      }