From 0636a0eac9bc614e7ce4fe7304a6448e73e13792 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 23 八月 2022 15:51:08 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index dfc8765..2350d81 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -207,7 +207,7 @@
* @return token
*/
@Override
- public R updateInsertUser(String openid, String sessionKey, String unionid) {
+ public R updateInsertUser(String openid, String sessionKey, String unionid,String appId) {
SysUserDO sysUserDO =
userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid, openid));
boolean empty = ObjectUtils.isEmpty(sysUserDO);
@@ -223,6 +223,7 @@
sysUserDO1.setLastLoginTime(date);
sysUserDO1.setPassword(encode);
sysUserDO1.setType(1);
+ sysUserDO1.setAppId(appId);
num = userDao.insert(sysUserDO1);
} else {
String encode = new BCryptPasswordEncoder().encode(UserConstants.PASSWORD);
@@ -231,6 +232,7 @@
sysUserDO.setPassword(encode);
sysUserDO.setLastLoginTime(date);
sysUserDO.setType(1);
+ sysUserDO.setAppId(appId);
num = userDao.updateById(sysUserDO);
}
if (num > 0) {
@@ -1216,6 +1218,7 @@
String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
administratorsUserVO.setPassword(encode);
BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
+ sysUserDO.setAppId(administratorsUserVO.getAppid());
int insert = 0;
try {
insert = userDao.insert(sysUserDO);
@@ -2910,7 +2913,7 @@
*/
@Override
public R dataKanBans(DataKanBansDto dataKanBansDto){
- IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(dataKanBansDto.getAreaCode());
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(dataKanBansDto.getAppId());
List<String> communityUserX = new ArrayList<>();
List<Integer> communityUserY = new ArrayList<>();
@@ -2928,9 +2931,9 @@
page.setSize(20L);
}
if(dataKanBansDto.getType() != null && dataKanBansDto.getType().equals(DataKanBansDto.type.by)){
- dataKanbanDTOS = userDao.selectCommunityUserOrderMonth(page, dataKanBansDto.getAreaCode()).getRecords();
+ dataKanbanDTOS = userDao.selectCommunityUserOrderMonth(page, dataKanBansDto.getAppId()).getRecords();
}else{
- dataKanbanDTOS = userDao.selectCommunityUserOrder(page, dataKanBansDto.getAreaCode()).getRecords();
+ dataKanbanDTOS = userDao.selectCommunityUserOrder(page, dataKanBansDto.getAppId()).getRecords();
}
if (!ObjectUtils.isEmpty(dataKanbanDTOS)) {
dataKanbanDTOS.forEach(dataKanbanDTO -> {
@@ -2943,7 +2946,7 @@
List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
serverndays.forEach(date -> {
// 查询社区活动数量
- DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAreaCode(),date);
+ DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAppId(),date);
communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
communityActiveUserY.add(dataKanbanDTO.getNum());
communityActiveUserZ.add(dataKanbanDTO.getDayNum());
@@ -3299,8 +3302,8 @@
}
@Override
- public R newIndexData(Integer type, Long streetId,Long areaCode) {
- IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
+ public R newIndexData(Integer type, Long streetId,Long areaCode,String appId) {
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(appId);
IndexDataAnalysisVO vo=new IndexDataAnalysisVO();
if (ObjectUtils.isEmpty(type)){
//不传默认为所有区县
@@ -3381,7 +3384,7 @@
}
@Override
- public R userRate(Integer type, Long streetId, Long areaCode, Integer range) {
+ public R userRate(Integer type, Long streetId, Long areaCode, Integer range,String appId) {
IndexDataAnalysisVO analysisVO=new IndexDataAnalysisVO();
if (type.equals(BYSTREET) || type.equals(BYAREA)){
//街道，区县筛选
@@ -3389,7 +3392,7 @@
BeanUtils.copyProperties(indexDataVO,analysisVO );
}else {
//总量数据
- IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(appId);
BeanUtils.copyProperties(indexDataKanbanVO,analysisVO );
}
String date="";
@@ -3399,7 +3402,7 @@
date = DateUtil.parse(dateTime.toString(), "yyyy-MM-dd HH:mm:ss").toString();
}
}
- List<UserProportion> userProportions = userDao.userAnalysis(type, date, streetId,areaCode);
+ List<UserProportion> userProportions = userDao.userAnalysis(type, date, streetId,areaCode,appId);
List<UserRateAnalysisVO> userRateAnalysisVOList=new ArrayList<>();
Boolean monthRange=false;
if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(range)){
@@ -3417,7 +3420,7 @@
}
//获取本月的用户总数作为计算占比的用户总数
//IndexDataKanbanVO data = userDao.dataKanBanStreet(streetId, areaCode, date);
- Integer monthUsers = userDao.getMonthUsers(streetId, areaCode, date);
+ Integer monthUsers = userDao.getMonthUsers(streetId, areaCode, date,appId);
vo.setRate(getRate(monthUsers,userProportion.getUser()));
}else{
vo.setRate(getRate(analysisVO.getAllUser(),userProportion.getUser()));
@@ -3446,7 +3449,7 @@
}
@Override
- public R realUser(Integer type, Long streetId, Long areaCode, Integer range) {
+ public R realUser(Integer type, Long streetId, Long areaCode, Integer range,String appId) {
IndexDataAnalysisVO analysisVO=new IndexDataAnalysisVO();
if (type.equals(BYSTREET) || type.equals(BYAREA)){
//街道，区县筛选
@@ -3454,7 +3457,7 @@
BeanUtils.copyProperties(indexDataVO,analysisVO );
}else {
//总量数据
- IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(appId);
BeanUtils.copyProperties(indexDataKanbanVO,analysisVO );
}
String date="";
@@ -3465,7 +3468,7 @@
}
}
RealUserVO realUserVO=new RealUserVO();
- List<RealUser> realUsers = userDao.realUserCount(type, date, streetId, areaCode);
+ List<RealUser> realUsers = userDao.realUserCount(type, date, streetId, areaCode,appId);
List<RealUserAnalysisVO> realUserList=new ArrayList<>();
realUserVO.setRealUserCount(getStreetRealUser(realUsers));
Integer rate = getRate(analysisVO.getAllUser(), realUserVO.getRealUserCount());
--
Gitblit v1.7.1