rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_bugfix_ljj' into dev

dev
sunyuchao 4 years ago
parent
2dd9efcb11 fb0bf99901
commit
0e54ab3da5
9 changed files with 103 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
  2. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
  3. 11
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
  4. 13
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
  5. 21
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
  6. 11
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java
  7. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java
  8. 13
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
  9. 14
      epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml

10
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
View File

@ -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;
/**
@ -85,6 +84,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
@ -117,11 +117,15 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
CustomerAgencyUserRoleFormDTO userRoleFormDTO = new CustomerAgencyUserRoleFormDTO();
userRoleFormDTO.setCustomerId(formDTO.getCustomerId());
userRoleFormDTO.setStaffId(item.getReportUserId());
//只有工作端的用户才调用此接口
Result<UserDTO> userDTOResult = userOpenFeignClient.queryUserClient(item.getReportUserId());
if (userDTOResult.success() && null != userDTOResult.getData() && AppClientConstant.APP_GOV.equals(userDTOResult.getData().getFromApp())) {
Map<String, String> staffRoleMap = CustomerStaffRedis.getStaffRoleMap(formDTO.getCustomerId(), item.getReportUserId());
if (!CollectionUtils.isEmpty(staffRoleMap)) {
item.setReportUserRoleSet(staffRoleMap.keySet());
}
}
}
//项目图片
List<String> imgList = screenProjectDataDao.selectProjectImgs(formDTO.getProjectId(),item.getCustomerId());

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
View File

@ -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);*/
}
});
}

11
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
View File

@ -635,4 +635,15 @@ public interface EpmetUserOpenFeignClient {
*/
@PostMapping("/epmetuser/statsstaffpatrolrecorddaily/patrolinfo")
Result<List<PatrolYuShanResultDTO>> patrolInfo(@RequestParam("agencyId")String agencyId);
/**
* 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员
*
* @param userId
* @return
* @author yinzuomei
* @date 2021/9/10 8:56 上午
*/
@GetMapping(value = "/epmetuser/user/queryUserClient/{userId}")
Result<UserDTO> queryUserClient(@PathVariable("userId") String userId);
}

13
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
View File

@ -450,4 +450,17 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
public Result<List<PatrolYuShanResultDTO>> 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<UserDTO> queryUserClient(String userId) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryUserClient", userId);
}
}

21
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
View File

@ -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<UserDTO>().ok(userService.saveUserInfo(formDTO));
}
/**
* 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员
*
* @param userId
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserDTO>
* @author yinzuomei
* @date 2021/9/10 8:49 上午
*/
@GetMapping("queryUserClient/{userId}")
public Result<UserDTO> queryUserClient(@PathVariable String userId){
if(StringUtils.isBlank(userId)){
return new Result<>();
}
return new Result<UserDTO>().ok(userService.queryUserClient(userId));
}
}

11
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java
View File

@ -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<UserEntity> {
* @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);
}

10
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java
View File

@ -94,4 +94,14 @@ public interface UserService extends BaseService<UserEntity> {
* @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);
}

13
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
View File

@ -329,4 +329,17 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> 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);
}
}

14
epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
View File

@ -67,4 +67,18 @@
AND u.id = #{userId}
LIMIT 1
</select>
<!-- 根据userId查询用户所属终端，是居民端的用户还是工作人员，还是运营人员 -->
<select id="selectByUserId" parameterType="java.lang.String" resultType="com.epmet.dto.UserDTO">
SELECT
u.id,
u.CUSTOMER_ID,
u.FROM_APP,
u.FROM_CLIENT
FROM
USER u
WHERE
u.DEL_FLAG = '0'
AND u.id = #{userId}
</select>
</mapper>

Write Preview
Loading…
Cancel
Save