修改bug

liujie

1 天以前 ee6a2aa9e265f498ce7df9c603d3148487c0b1e8

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

@@ -1,26 +1,33 @@
package com.panzhihua.sangeshenbian.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.redis.RedisUtils;
import com.panzhihua.sangeshenbian.model.dto.UserIdentityDTO;
import com.panzhihua.sangeshenbian.model.entity.Banner;
import com.panzhihua.sangeshenbian.model.entity.Department;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.entity.SystemUserLevel;
import com.panzhihua.sangeshenbian.model.query.BasePage;
import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
import com.panzhihua.sangeshenbian.model.vo.MessageNotificationVO;
import com.panzhihua.sangeshenbian.model.vo.PartyCardInfoVO;
import com.panzhihua.sangeshenbian.service.*;
import com.panzhihua.sangeshenbian.utils.BaiduMapUtil;
import com.panzhihua.sangeshenbian.warpper.IdentityInformation;
import com.panzhihua.sangeshenbian.warpper.IdentityInformationVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;

@@ -41,7 +48,8 @@
    private final ISystemUserService systemUserService;
    private final IPartyMemberService partyMemberService;
    private final RedisUtils redisUtils;

    private final IdentityInformationService identityInformationService;
    private final ISystemUserLevelService systemUserLevelService;
    @ApiOperation("获取banner列表")
    @GetMapping("/banner-list")
    public R<List<Banner>> getBannerList() {
@@ -55,9 +63,11 @@
        // 获取党员信息
        PartyMember partyMember = partyMemberService.getOne(new LambdaQueryWrapper<PartyMember>()
                .eq(PartyMember::getPhone, loginUserInfo.getPhone())
                .eq(PartyMember::getAuditStatus, 1)
                .eq(PartyMember::getDelFlag, 0));

        PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO();
        partyCardInfoVO.setAvatar(partyMember.getAvatar());
        partyCardInfoVO.setName(partyMember.getName());
        partyCardInfoVO.setIdCard(partyMember.getIdNumber());
        partyCardInfoVO.setDistricts(partyMember.getDistricts());
@@ -82,7 +92,17 @@
    @GetMapping("/current-user-info")
    @ApiOperation("获取三个身边当前用户信息 用于判断用户是否是上级")
    public R<SystemUser> getCurrentUserInfo() {
        return R.ok(systemUserService.getSystemUserAdminByPhone(getLoginUserInfo().getPhone()).orElse(null));
        SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(getLoginUserInfo().getPhone()).orElse(null);
        Object o1 = redisUtils.get("identity:" + getLoginUserInfo().getPhone());
        if(o1!=null){
            UserIdentityDTO o2 = (UserIdentityDTO) o1;
            Integer levelId = o2.getLevelId();
            if(levelId!=null) {
                SystemUserLevel systemUserLevel = systemUserLevelService.getById(levelId);
                systemUser.setLevelId(systemUserLevel.getLevel());
            }
        }
        return R.ok(systemUser);
    }

    /**
@@ -107,7 +127,15 @@
    public R<JSONArray> searchLocation(String query, String location) {
        return R.ok(BaiduMapUtil.searchLocation(query, location));
    }

    @GetMapping("/geoconv")
    @ApiOperation("百度地图经纬度转换")
    public R<JSONObject> geoconv(String coords) {
        try {
            return R.ok(BaiduMapUtil.geoconv(coords));
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }
    /**
     * 获取身份信息
     */
@@ -115,42 +143,12 @@
    @ApiOperation("获取身份信息")
    public R<IdentityInformationVO> getIdentityInfo() {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        // 获取党员信息
        PartyMember partyMember = partyMemberService.getOne(new LambdaQueryWrapper<PartyMember>()
                .eq(PartyMember::getPhone, loginUserInfo.getPhone())
                .eq(PartyMember::getDelFlag, 0));

        // 获取管理员信息
        SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(getLoginUserInfo().getPhone()).orElse(null);
        // 获取身份
        Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
        List<Integer> permissions = new ArrayList<>();
        IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfo);
        IdentityInformationVO identityInformationVO = new IdentityInformationVO();
        if (partyMember != null){
            identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1);
        }
        if (systemUser != null){
            identityInformationVO.setIsFrozen(systemUser.getStatus() == 2);
        }

        if (identity == null && systemUser != null){
            identityInformationVO.setIdentity(2);
        }else {
            identityInformationVO.setIdentity(identity);
        }

        identityInformationVO.setIsPartymember(partyMember != null);
        identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1);
        identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
        if (partyMember !=null){
            permissions.add(1);
        }
        if (systemUser != null){
            permissions.add(2);
        }
        identityInformationVO.setPermissions(permissions);
        BeanUtils.copyProperties(identityInformation, identityInformationVO);
        return R.ok(identityInformationVO);
    }



    /**
@@ -158,9 +156,32 @@
     */
    @GetMapping("/change-identity")
    @ApiOperation("切换身份")
    public R<?> changeIdentity(Integer identity) {
    @ApiImplicitParams({
            @ApiImplicitParam(name = "identity", value = "身份 1：党员 2：管理员", required = true, dataType = "Integer"),
            @ApiImplicitParam(name = "levelId", value = "身份层级id,党员身份不传，管理员必传", required = true, dataType = "Integer")
    })
    public R<?> changeIdentity(@RequestParam(value = "identity", required = true) Integer identity,
                               @RequestParam(value = "levelId", required = false) Integer levelId) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        redisUtils.set("identity:" + loginUserInfo.getPhone(), identity);
        if (identity.equals(2) && Objects.isNull(levelId)) {
            throw new ServiceException("管理员所属层级id不能为空");
        }
        // 存储到Redis
        redisUtils.set("identity:" + loginUserInfo.getPhone(), UserIdentityDTO.builder()
                .identity(identity)
                .levelId(levelId)
                .build());
        return R.ok();
    }

    /**
     * 提示内容确认
     */
    @GetMapping("/confirm-content")
    @ApiOperation("提示内容确认")
    public R<?> confirmContent() {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        redisUtils.set("confirmContent:" + loginUserInfo.getPhone(), 1);
        return R.ok();
    }
}