From 0eb28fecafb15512c82aeae00b40fb1bca65f08c Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期五, 21 三月 2025 18:41:57 +0800 Subject: [PATCH] 修改按钮权限 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java index 5b1cb3e..72dbb0a 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java @@ -1,6 +1,7 @@ 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; @@ -8,7 +9,6 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.redis.RedisUtils; 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.query.BasePage; @@ -17,11 +17,12 @@ 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 com.panzhihua.sangeshenbian.warpper.PermissionsVO; import io.swagger.annotations.Api; 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.*; @@ -57,6 +58,7 @@ // 获取党员信息 PartyMember partyMember = partyMemberService.getOne(new LambdaQueryWrapper<PartyMember>() .eq(PartyMember::getPhone, loginUserInfo.getPhone()) + .eq(PartyMember::getAuditStatus, 1) .eq(PartyMember::getDelFlag, 0)); PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO(); @@ -110,7 +112,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); + } + } /** * 获取身份信息 */ @@ -118,7 +128,9 @@ @ApiOperation("获取身份信息") public R<IdentityInformationVO> getIdentityInfo() { LoginUserInfoVO loginUserInfo = getLoginUserInfo(); - IdentityInformationVO identityInformationVO = identityInformationService.getIdentityInformationVO(loginUserInfo); + IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfo); + IdentityInformationVO identityInformationVO = new IdentityInformationVO(); + BeanUtils.copyProperties(identityInformation, identityInformationVO); return R.ok(identityInformationVO); } -- Gitblit v1.7.1