From 4147a7291ecd0470a0a556b4f5ac941cbcda970f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 9 Sep 2021 14:54:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=EF=BC=9A=E5=A4=A7=E5=B1=8F=E6=96=B0=E5=A2=9E=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8=EF=BC=9A=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B9=B3=E9=98=B4=E6=95=B4=E4=B8=AA=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=B8=8B=EF=BC=8C=E8=BF=9130=E5=A4=A9=E5=86=85?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=90=8D=E7=A7=B0=EF=BC=88=E5=89=8D=E7=AB=AF=E6=88=AA?= =?UTF-8?q?=E5=8F=96=E7=AC=AC=E4=B8=80=E4=B8=AA-=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=EF=BC=89=E3=80=81=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E3=80=81=E9=A1=B9=E7=9B=AE=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E3=80=82=E7=82=B9=E5=87=BB8=E4=B8=AA=E8=A1=97=E9=81=93?= =?UTF-8?q?=EF=BC=8C=E8=81=94=E5=8A=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index c740aa4c5e..3d673b31c4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -85,6 +85,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { /** * @Description 中央区事件分析-项目分布 * 【2021-06-03 修改查询红黄绿事件事件范围为一个月】 + * 【2021-09-09】大屏新增普通事件列表：首次查询平阴整个客户下，近30天内的项目，展示分类名称（前端截取第一个-之前的文字）、颜色等级、项目标题。点击8个街道，联动。 * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author liushaowen From 1ef07c1406f9f1f2a174dc66711903b6bc507d2d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 10 Sep 2021 09:20:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=9C=89=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BC=93=E5=AD=98=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8F=91=E5=B8=83=EF=BC=9Auser=E3=80=81repor?= =?UTF-8?q?t=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/impl/ScreenProjectServiceImpl.java | 15 +++++++------ .../epmet/feign/EpmetUserOpenFeignClient.java | 11 ++++++++++ .../EpmetUserOpenFeignClientFallback.java | 13 ++++++++++++ .../com/epmet/controller/UserController.java | 21 +++++++++++++++---- .../src/main/java/com/epmet/dao/UserDao.java | 11 ++++++++++ .../java/com/epmet/service/UserService.java | 10 +++++++++ .../epmet/service/impl/UserServiceImpl.java | 13 ++++++++++++ .../src/main/resources/mapper/UserDao.xml | 14 +++++++++++++ 8 files changed, 98 insertions(+), 10 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 3d673b31c4..a23152697e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.datareport.service.evaluationindex.screen.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; @@ -11,6 +12,7 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventImgDataDao; import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao; import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectDataDao; import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService; +import com.epmet.dto.UserDTO; import com.epmet.dto.form.CustomerAgencyUserRoleFormDTO; import com.epmet.dto.form.screen.CategoryAnalysisFormDTO; import com.epmet.dto.form.screen.ColorProjectTotalFormDTO; @@ -23,7 +25,6 @@ import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO; import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO; import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.feign.OperCrmOpenFeignClient; import com.epmet.project.CustomerProjectCategoryDTO; import com.epmet.project.dto.form.CategoryTopAppealFormDTO; import com.epmet.project.dto.result.CategoryTopAppealResultDTO; @@ -60,8 +61,6 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { @Autowired private ScreenProjectCategoryOrgDailyDao screenProjectCategoryOrgDailyDao; @Autowired - private OperCrmOpenFeignClient operCrmOpenFeignClient; - @Autowired private EpmetUserOpenFeignClient userOpenFeignClient; /** @@ -118,9 +117,13 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { CustomerAgencyUserRoleFormDTO userRoleFormDTO = new CustomerAgencyUserRoleFormDTO(); userRoleFormDTO.setCustomerId(formDTO.getCustomerId()); userRoleFormDTO.setStaffId(item.getReportUserId()); - Map staffRoleMap = CustomerStaffRedis.getStaffRoleMap(formDTO.getCustomerId(), item.getReportUserId()); - if (!CollectionUtils.isEmpty(staffRoleMap)){ - item.setReportUserRoleSet(staffRoleMap.keySet()); + //只有工作端的用户才调用此接口 + Result userDTOResult = userOpenFeignClient.queryUserClient(item.getReportUserId()); + if (userDTOResult.success() && null != userDTOResult.getData() && AppClientConstant.APP_GOV.equals(userDTOResult.getData().getFromApp())) { + Map staffRoleMap = CustomerStaffRedis.getStaffRoleMap(formDTO.getCustomerId(), item.getReportUserId()); + if (!CollectionUtils.isEmpty(staffRoleMap)) { + item.setReportUserRoleSet(staffRoleMap.keySet()); + } } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 2c913bd585..cbec879b5b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -635,4 +635,15 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/statsstaffpatrolrecorddaily/patrolinfo") Result> patrolInfo(@RequestParam("agencyId")String agencyId); + + /** + * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员 + * + * @param userId + * @return + * @author yinzuomei + * @date 2021/9/10 8:56 上午 + */ + @GetMapping(value = "/epmetuser/user/queryUserClient/{userId}") + Result queryUserClient(@PathVariable("userId") String userId); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index a68cab52f5..183196dad8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -450,4 +450,17 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> patrolInfo(String agencyId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolInfo", agencyId); } + + /** + * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员 + * + * @param userId + * @return + * @author yinzuomei + * @date 2021/9/10 8:56 上午 + */ + @Override + public Result queryUserClient(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryUserClient", userId); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java index d4a4148450..f1cbcb114a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java @@ -12,11 +12,9 @@ import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.UserService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @Description @@ -172,4 +170,19 @@ public class UserController { return new Result().ok(userService.saveUserInfo(formDTO)); } + /** + * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员 + * + * @param userId + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/9/10 8:49 上午 + */ + @GetMapping("queryUserClient/{userId}") + public Result queryUserClient(@PathVariable String userId){ + if(StringUtils.isBlank(userId)){ + return new Result<>(); + } + return new Result().ok(userService.queryUserClient(userId)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java index 7dc2a768d8..e4c7a2cec5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.UserDTO; import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.form.UserBasicInfoFormDTO; import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; @@ -52,4 +53,14 @@ public interface UserDao extends BaseDao { * @Description 居民端-查询用户基础信息 **/ UserBasicInfo selectUserBasicInfo(UserBasicInfoFormDTO formDTO); + + /** + * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员 + * + * @param userId + * @return com.epmet.dto.UserDTO + * @author yinzuomei + * @date 2021/9/10 8:51 上午 + */ + UserDTO selectByUserId(String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java index cc2fb1aecf..33e7b1c7ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java @@ -94,4 +94,14 @@ public interface UserService extends BaseService { * @date 2021/1/19 上午10:35 */ UserDTO saveUserInfo(UserInfoFormDTO formDTO); + + /** + * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员 + * + * @param userId + * @return com.epmet.dto.UserDTO + * @author yinzuomei + * @date 2021/9/10 8:50 上午 + */ + UserDTO queryUserClient(String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 515f2ccba9..6c56b705a8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -329,4 +329,17 @@ public class UserServiceImpl extends BaseServiceImpl implem return result; } + /** + * 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员 + * + * @param userId + * @return com.epmet.dto.UserDTO + * @author yinzuomei + * @date 2021/9/10 8:50 上午 + */ + @Override + public UserDTO queryUserClient(String userId) { + return baseDao.selectByUserId(userId); + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml index a46001c8c6..bbdaf024ba 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -67,4 +67,18 @@ AND u.id = #{userId} LIMIT 1 + + + From fb0bf999015840970fe2c0caf35a69176329148a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 10 Sep 2021 15:09:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E8=BF=98=E5=8E=9F-=E7=9B=B8?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/user/impl/UserServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java index c154ead20b..13665c52f8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java @@ -116,16 +116,16 @@ public class UserServiceImpl implements UserService { if(null != agencyMap && agencyMap.size() > NumConstant.ZERO){ agencyMap.forEach((agencyId,v) -> { if(null != v && v.size() > NumConstant.ZERO){ - /*queryUserData(ModuleConstant.DIM_BELONGING_GRID, + queryUserData(ModuleConstant.DIM_BELONGING_GRID, agencyId, // v.get(NumConstant.ZERO).getPid(), v.get(NumConstant.ZERO).getCustomerId(), new HashSet<>(v.get(NumConstant.ZERO).getGridIds()), targetDate, dataPacket, - timeDimension);*/ - traverseGridUserDispose(agencyId,v.get(NumConstant.ZERO).getCustomerId(),new HashSet<>(v.get(NumConstant.ZERO).getGridIds()) - ,targetDate,dataPacket,timeDimension); + timeDimension); + /*traverseGridUserDispose(agencyId,v.get(NumConstant.ZERO).getCustomerId(),new HashSet<>(v.get(NumConstant.ZERO).getGridIds()) + ,targetDate,dataPacket,timeDimension);*/ } }); }