Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

Pu Zhibing

2025-03-17 b6332c39450cbea5ed3c2fd15d2d09f5fbc7ccf0

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java

@@ -15,13 +15,9 @@
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.common.utlis.HttpClientUtil;
import com.panzhihua.common.utlis.ServletUtils;
import com.panzhihua.sangeshenbian.model.entity.SystemMenu;
import com.panzhihua.sangeshenbian.model.entity.SystemRoleMenu;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.entity.*;
import com.panzhihua.sangeshenbian.model.vo.RegionVO;
import com.panzhihua.sangeshenbian.service.ISystemMenuService;
import com.panzhihua.sangeshenbian.service.ISystemRoleMenuService;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.service.*;
import com.panzhihua.sangeshenbian.utils.SignatureUtil;
import com.panzhihua.sangeshenbian.warpper.*;
import io.swagger.annotations.Api;
@@ -30,6 +26,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -73,6 +70,13 @@

   @Resource
   private ISystemMenuService systemMenuService;

   @Resource
   private IBcRegionService bcRegionService;
   @Resource
   private IComStreetService comStreetService;
   @Resource
   private IComActService comActService;



@@ -227,6 +231,25 @@
      if(0 < count){
         return R.fail("手机号重复。");
      }

      String districtsCode = systemUser.getDistrictsCode();
      if (!StringUtils.isEmpty(districtsCode)){
         BcRegion bcRegion = bcRegionService.getOne(new LambdaQueryWrapper<BcRegion>().eq(BcRegion::getRegionCode, districtsCode));
         systemUser.setDistricts(bcRegion.getRegionName());
      }

      String streetId = systemUser.getStreetId();
      if (!StringUtils.isEmpty(streetId)){
         ComStreet comStreet = comStreetService.getById(streetId);
         systemUser.setStreet(comStreet.getName());
      }
      Long communityId = systemUser.getCommunityId();
      if (communityId != null){
         ComAct act = comActService.getById(communityId);
         systemUser.setCommunity(act.getName());
      }


      systemUser.setStatus(1);
      systemUser.setCreateTime(LocalDateTime.now());
      systemUserService.save(systemUser);
@@ -243,6 +266,25 @@
      if(0 < count){
         return R.fail("手机号重复。");
      }

      String districtsCode = systemUser.getDistrictsCode();
      if (!StringUtils.isEmpty(districtsCode)){
         BcRegion bcRegion = bcRegionService.getOne(new LambdaQueryWrapper<BcRegion>().eq(BcRegion::getRegionCode, districtsCode));
         systemUser.setDistricts(bcRegion.getRegionName());
      }

      String streetId = systemUser.getStreetId();
      if (!StringUtils.isEmpty(streetId)){
         ComStreet comStreet = comStreetService.getById(streetId);
         systemUser.setStreet(comStreet.getName());
      }
      Long communityId = systemUser.getCommunityId();
      if (communityId != null){
         ComAct act = comActService.getById(communityId);
         systemUser.setCommunity(act.getName());
      }


      systemUser.setStatus(1);
      systemUser.setCreateTime(LocalDateTime.now());
      systemUserService.updateById(systemUser);