Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test

张天森

2022-07-06 584431221914d207c011755d0e325c0e59c997d6

Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/IndexDataDTO.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.common.model.dtos.user;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data
@ApiModel(value = "首页数据查询入参")
public class IndexDataDTO  implements Serializable {

    @ApiModelProperty("数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选")
    private Integer range;

    @ApiModelProperty("街道id")
    private Long streetId;



}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataVO.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.common.model.vos.user;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data
@ApiModel("首页统计结果")
public class IndexDataVO implements Serializable {

    @ApiModelProperty("用户总数")
    private Integer allUser;

    @ApiModelProperty("新增用户")
    private Integer addUser;

    @ApiModelProperty("日活跃用户")
    private Integer activeDayUser;

    @ApiModelProperty("周活跃用户")
    private Integer activeWeekUser;


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -1073,13 +1073,25 @@
        Integer memberServiceCount=0;
        Integer memberServiceTotalTome=0;
        for (UnitActivityAnalysisVO vo : unitActivityAnalysisVOS) {
            if (ObjectUtils.isNotEmpty(vo)){
                if (ObjectUtils.isNotEmpty(vo.getServiceTime())){
            unitServiceCount+=vo.getServiceTime();
                }
                if (ObjectUtils.isNotEmpty(vo.getServiceTimes())){
            unitServiceTotalTime+=vo.getServiceTimes();
        }
            }
        }
        for (PartyMemberAnalysisVO vo : partyMemberAnalysisVOS) {
            if (ObjectUtils.isNotEmpty(vo)){
                if (ObjectUtils.isNotEmpty(vo.getServiceTime())){
            memberServiceCount+=vo.getServiceTime();
                }
                if (ObjectUtils.isNotEmpty(vo.getServiceTimes())){
            memberServiceTotalTome+=vo.getServiceTimes();
        }
            }
        }
        activityVO.setUnitServiceTotalCount(unitServiceCount);
        activityVO.setUnitServiceTotalTime(unitServiceTotalTime);
        activityVO.setPartyMemberServiceTotalCount(memberServiceCount);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -10,6 +10,8 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.model.dtos.PageDTO;
@@ -1356,6 +1358,16 @@
        return userService.uuLogin(uuLoginVO);
    }

    @PostMapping("/indexData")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选",dataType = "Integer"),
            @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "Long")
    })
    public R indexData(@RequestParam(value = "type",required = false) Integer type,
                       @RequestParam(value = "type",required = false) Long streetId){
        return userService.newIndexData(type,streetId);
    }

    /**
     *导出验证密码
     */

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -853,4 +853,6 @@
     * @return
     */
    R checkExport(@RequestParam("account")String account, @RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);

    R newIndexData(Integer type, Long streetId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -146,6 +146,10 @@
    private SysAppConfigDao sysAppConfigDao;
    @Resource
    private SysTemplateConfigDao sysTemplateConfigDao;
    public static final Integer ALLCOUNTY=1;
    public static final Integer ALLSTREET=2;
    public static final Integer ALLCOMMUNITY=3;

    // @Resource
    // private GridService gridService;

@@ -3296,4 +3300,16 @@
        }
        return R.fail();
    }

    @Override
    public R newIndexData(Integer type, Long streetId) {
        IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
        //判断数据范围
        if (type.equals(ALLCOUNTY)){
            //数据范围：全部区县
        }
        return null;
    }


}