From 022c7acba3b50078f61dfc0dab4983392c22e7ba Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Apr 2022 15:25:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?list=E8=BD=ACmap=20key=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todata/impl/FactGridMemberStatisticsDailyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridMemberStatisticsDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridMemberStatisticsDailyServiceImpl.java index 08a2528e8e..1be162db2d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridMemberStatisticsDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridMemberStatisticsDailyServiceImpl.java @@ -82,7 +82,7 @@ public class FactGridMemberStatisticsDailyServiceImpl extends BaseServiceImpl staffMap = staffInfoList.stream().collect(Collectors.toMap(StaffRoleInfoDTO :: getStaffId, - Function.identity())); + Function.identity(), (key1, key2) -> key2)); List list = staffGridList.stream().filter(p -> null != staffMap.get(p.getStaffId())).map(item -> { StaffRoleInfoDTO staffInfo = staffMap.get(item.getStaffId()); return initEntity(customerId, dateId, item, staffInfo); From 28e3d7c64d4608e11cc1c62dc8561b4fb29c5535 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Apr 2022 09:25:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?/api/gov/org/customergrid/gridoption?= =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 1 + .../main/java/com/epmet/controller/CustomerGridController.java | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 83be8dc38a..1666816a65 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -505,6 +505,7 @@ epmet: - /gov/org/icbuildingunit/unitoption - /gov/org/ichouse/houseoption - /epmetuser/icresicollect/save + - /gov/org/customergrid/gridoption # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: - /data/report/** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 34628a197f..3bf68a00ca 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -308,6 +308,7 @@ public class CustomerGridController { * @Return {@link Result>} * @Author zhaoqifeng * @Date 2021/10/26 14:02 + * ！！！：此接口给城阳小程序使用，已经在gateway中放开此接口无需校验token */ @PostMapping("gridoption") public Result> getGridOption(@RequestBody GridOptionFormDTO formDTO){ From bac2917190aa386cb8a6360ae71ee9863290b205 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 29 Apr 2022 14:39:44 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BA=94=E5=89=8D=E7=AB=AF=E8=A6=81?= =?UTF-8?q?=E6=B1=82=20=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E4=BC=A0appId=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/grid/controller/ResiMineGridController.java | 7 ++++--- .../grid/service/impl/ResiMineGridServiceImpl.java | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java index 606d4d9d44..318b7f6aa6 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java @@ -50,15 +50,16 @@ public class ResiMineGridController { /** * @return - * @param appId * @Author sun * @Description 单客户-获取用户最近访问网格 * @Date 2020/8/3 **/ @GetMapping("latestgridinfo") - public Result latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) { + //public Result latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) { + public Result latestGridInfo_new(@LoginUser TokenDto token) { LatestGridInfoFormDTO formDTO = new LatestGridInfoFormDTO(); - formDTO.setAppId(appId); + //formDTO.setAppId(appId); + formDTO.setCustomerId(token.getCustomerId()); formDTO.setUserId(token.getUserId()); return new Result().ok(resiMineGridService.latestGridInfo(formDTO)); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index 68ac4ef3c1..3778e941c3 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java @@ -130,7 +130,10 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { } } } - //1.调用third服务，根据appId获取客户Id + + /* + //2022.4.29 应前端要求 入参不再传appid值 + //1.调用third服务，根据appId获取客户Id JSONObject jsonObject = new JSONObject(); String customerMsgUrl = "https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/"; String data = HttpClientManager.getInstance().sendPostByJSON(customerMsgUrl + formDTO.getAppId(), JSON.toJSONString(jsonObject)).getData(); @@ -148,10 +151,10 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); Map map = (Map) json.get("customer"); PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); - logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer); + logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer);*/ //2.调用epmet-user服务，根据客户Id和用户Id查询最后一次访问记录 - formDTO.setCustomerId(customer.getId()); + //formDTO.setCustomerId(customer.getId()); Result userResult = epmetUserOpenFeignClient.latestGridInfo(formDTO); if (!userResult.success()) { logger.error(String.format("居民端获取用户最近访问网格失败,接口入参客户Id->%s,appId->%s,调用epmet-user-server服务返回->%s", formDTO.getCustomerId(), formDTO.getAppId(), JSON.toJSONString(userResult))); From ec3981e40a4e854a14cf83ea92020fa80acf957c Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 29 Apr 2022 15:17:08 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/OperUserController.java | 20 +++++++++++++++++++ .../com/epmet/service/OperUserService.java | 10 +++++++++- .../service/impl/OperUserServiceImpl.java | 15 ++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java index fabb61d0a0..7e5f554200 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java @@ -18,6 +18,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -29,9 +31,11 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.OperUserDTO; +import com.epmet.dto.PasswordDTO; import com.epmet.dto.result.QueryOperUserResultDto; import com.epmet.excel.OperUserExcel; import com.epmet.service.OperUserService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -82,6 +86,22 @@ public class OperUserController { return new Result(); } + /** + * desc:修改运营端用户 密码 + * @param tokenDto + * @param dto + * @return + */ + @PutMapping(value = "updatePwd") + public Result updatePwd(@LoginUser TokenDto tokenDto,@RequestBody PasswordDTO dto) { + if (StringUtils.isBlank(dto.getNewPassword())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误"); + } + operUserService.updatePwd(tokenDto.getUserId(),dto); + return new Result(); + } + + @DeleteMapping public Result delete(@RequestBody String[] ids) { //效验数据 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/OperUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/OperUserService.java index fd7b4f60e8..4aff1ed012 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/OperUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/OperUserService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.OperUserDTO; +import com.epmet.dto.PasswordDTO; import com.epmet.entity.OperUserEntity; import java.util.List; @@ -99,4 +100,11 @@ public interface OperUserService extends BaseService { * @return */ OperUserDTO getOperUserInfoById(String id); -} \ No newline at end of file + + /** + * desc:修改密码 + * @param userId + * @param dto + */ + void updatePwd(String userId, PasswordDTO dto); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java index aba125363b..f5c37265b0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -29,6 +30,7 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.OperUserDao; import com.epmet.dto.OperUserDTO; +import com.epmet.dto.PasswordDTO; import com.epmet.entity.OperUserEntity; import com.epmet.entity.UserEntity; import com.epmet.feign.OperRoleUserFeignClient; @@ -40,6 +42,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -142,4 +145,16 @@ public class OperUserServiceImpl extends BaseServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(OperUserEntity::getUserId,userId); + baseDao.update(param, lambdaQueryWrapper); + } + } From 2c8c91433bce6a9ae6d8181c691527af725c6520 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 29 Apr 2022 15:26:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/OperUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java index 7e5f554200..e20d047808 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java @@ -92,7 +92,7 @@ public class OperUserController { * @param dto * @return */ - @PutMapping(value = "updatePwd") + @PostMapping(value = "updatePwd") public Result updatePwd(@LoginUser TokenDto tokenDto,@RequestBody PasswordDTO dto) { if (StringUtils.isBlank(dto.getNewPassword())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误"); From d49fdf513a42126f64e49303a5d36ba111b5949e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 29 Apr 2022 15:47:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/OperUserController.java | 3 ++- .../main/java/com/epmet/service/impl/OperUserServiceImpl.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java index e20d047808..02d15a0b46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -94,7 +95,7 @@ public class OperUserController { */ @PostMapping(value = "updatePwd") public Result updatePwd(@LoginUser TokenDto tokenDto,@RequestBody PasswordDTO dto) { - if (StringUtils.isBlank(dto.getNewPassword())){ + if (StringUtils.isBlank(dto.getNewPassword()) && AppClientConstant.APP_OPER.equals(tokenDto.getClient())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误"); } operUserService.updatePwd(tokenDto.getUserId(),dto); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java index f5c37265b0..f3dddd6a59 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java @@ -148,7 +148,6 @@ public class OperUserServiceImpl extends BaseServiceImpl