From d5208f24fbf0e71d21171a06b64ce457bad40d43 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 31 八月 2022 16:10:40 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java       |    2 +-
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java                  |    2 +-
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java                  |    5 +++--
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   11 ++---------
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java                 |    8 ++++----
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java          |    5 +++--
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml                                      |    3 +++
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java
index 00ff825..0bee419 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java
@@ -225,7 +225,7 @@
         if (StringUtils.isNotEmpty(range)){
             r=Integer.parseInt(range);
         }
-        return userService.userActivity(type,sId,aCode,r);
+        return userService.userActivity(type,sId,aCode,r, this.getAppId());
     }
 
     @ApiOperation(value = "获取区县街道选项",response = AreaVO.class)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 0222238..8dc4c55 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1250,10 +1250,10 @@
                @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false) String appId);
 
     @GetMapping("/indexData/userActivity")
-    R userActivity(@RequestParam(value = "type",required = false) Integer type,
-                   @RequestParam(value = "streetId",required = false) Long streetId,
-                   @RequestParam(value = "areaCode",required = false) Long areaCode,
-                   @RequestParam(value = "range",required = false) Integer range);
+    R userActivity(@RequestParam(value = "type", required = false) Integer type,
+                   @RequestParam(value = "streetId", required = false) Long streetId,
+                   @RequestParam(value = "areaCode", required = false) Long areaCode,
+                   @RequestParam(value = "range", required = false) Integer range, @RequestParam(value = "appId",required = false) String appId);
 
     @GetMapping("/indexData/getAreaAndStreet")
     R getAreaAndStreet();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 274bd08..d2488b7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1404,8 +1404,9 @@
     public R userActivity(@RequestParam(value = "type",required = false) Integer type,
                           @RequestParam(value = "streetId",required = false) Long streetId,
                           @RequestParam(value = "areaCode",required = false) Long areaCode,
-                          @RequestParam(value = "range",required = false) Integer range){
-        return userService.userActivity(type,streetId,areaCode,range);
+                          @RequestParam(value = "range",required = false) Integer range,
+                          @RequestParam(value = "appId",required = false) String appId){
+        return userService.userActivity(type,streetId,areaCode,range, appId);
     }
 
 
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index a14ccb0..6e7df5a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -339,7 +339,7 @@
     /**
      * 获取当天的新增和日活
      * */
-    Map<String,Long> getDailyAddAndActive(@Param("date") Date date,@Param("id") Long streetId,@Param("areaCode") Long areaCode);
+    Map<String,Long> getDailyAddAndActive(@Param("date") Date date, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
 
 
     List<StreetVOS> selectStreetByAreaCode(Integer code);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 86773e5..1b97ce8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -884,8 +884,9 @@
      * @param type 查看类型
      * @param streetId 街道id
      * @param areaCode 区县code
-     * @param range  */
-    R userActivity(Integer type, Long streetId, Long areaCode, Integer range);
+     * @param range
+     * @param appId    */
+    R userActivity(Integer type, Long streetId, Long areaCode, Integer range, String appId);
 
     /**
      * 获取区县即下属街道名
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 8082e80..83cbc65 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
@@ -2,7 +2,6 @@
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
-import static org.apache.commons.lang3.StringUtils.capitalize;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.math.BigDecimal;
@@ -13,8 +12,6 @@
 
 import javax.annotation.Resource;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
@@ -23,7 +20,6 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
 import com.panzhihua.common.model.vos.community.ComAreaTownCommunityVO;
@@ -44,7 +40,6 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -100,7 +95,6 @@
 import com.panzhihua.service_user.model.dos.SysUserAgreementDO;
 import com.panzhihua.service_user.model.dos.SysUserDO;
 import com.panzhihua.service_user.model.dos.SysUserFeedbackDO;
-import com.panzhihua.service_user.model.dos.SysUserInputDO;
 import com.panzhihua.service_user.model.dos.SysUserNoticeDO;
 import com.panzhihua.service_user.model.dos.SysUserRoleDO;
 import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
@@ -109,7 +103,6 @@
 
 import cn.hutool.core.util.IdcardUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestParam;
 
 // import com.panzhihua.common.service.grid.GridService;
 
@@ -3513,7 +3506,7 @@
     }
 
     @Override
-    public R userActivity(Integer type, Long streetId, Long areaCode, Integer range) {
+    public R userActivity(Integer type, Long streetId, Long areaCode, Integer range, String appId) {
         UserActivityAnalysisVO vo=new UserActivityAnalysisVO();
         List<Date> activeX=getTwentyDays();
         List<String> activeY=new ArrayList<>();
@@ -3526,7 +3519,7 @@
         }
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
         for (Date date : activeX) {
-            Map<String, Long> map = userDao.getDailyAddAndActive(DateUtil.parse(sdf.format(date)), streetId,areaCode);
+            Map<String, Long> map = userDao.getDailyAddAndActive(DateUtil.parse(sdf.format(date)), streetId,areaCode, appId);
             adY.add(map.get("addUser").toString());
             activeY.add(map.get("activeUser").toString());
         }
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
index 940c8d6..e418b0e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -697,6 +697,9 @@
         left join com_street as cs on ac.street_id=cs.street_id
         where su.community_id&lt;>''
         and cs.area_code&lt;>''
+        <if test="appId != null and appId != &quot;&quot;">
+            and su.app_id = #{appId}
+        </if>
         <if test="id != null">
             and cs.street_id=#{id}
         </if>

--
Gitblit v1.7.1