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

Pu Zhibing

2025-03-17 b6332c39450cbea5ed3c2fd15d2d09f5fbc7ccf0

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

 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);

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java

@@ -59,6 +59,7 @@
                .eq(PartyMember::getDelFlag, 0));

        PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO();
        partyCardInfoVO.setAvatar(partyMember.getAvatar());
        partyCardInfoVO.setName(partyMember.getName());
        partyCardInfoVO.setIdCard(partyMember.getIdNumber());
        partyCardInfoVO.setDistricts(partyMember.getDistricts());
@@ -181,10 +182,12 @@
            if (accountLevel == 1){
                adminPermissions.setName(String.format("%s%s%s%s%s", "攀枝花市",districts, street, community, "管理员"));
            }if (accountLevel == 2) {
                adminPermissions.setIdentity(2);
                adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员"));
            } else if (accountLevel == 3) {
                adminPermissions.setIdentity(2);
                adminPermissions.setName(String.format("%s%s%s",  street, community, "管理员"));
            } else if (accountLevel == 4) {
                adminPermissions.setName(String.format("%s%s",   community, "管理员"));
                adminPermissions.setIdentity(2);
            }
            permissions.add(adminPermissions);

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/PartyCardInfoVO.java

@@ -16,6 +16,9 @@
    @ApiModelProperty(value = "姓名")
    private String name;

    @ApiModelProperty(value = "头像")
    private String avatar;

    @ApiModelProperty(value = "身份证号码")
    private String idCard;