diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/controller/EpdcBackstageController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/controller/EpdcBackstageController.java new file mode 100644 index 0000000..d7172ce --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/controller/EpdcBackstageController.java @@ -0,0 +1,39 @@ +package com.elink.esua.epdc.modules.backstage.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.backstage.form.EpdcWorkbenchDataStatisticsFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.backstage.result.EpdcWorkbenchDataStatisticsResultDTO; +import com.elink.esua.epdc.modules.backstage.service.EpdcBackstageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * PC端-工作台 + * + * @Author:liuchuang + * @Date:2021/8/25 14:39 + */ +@RestController +@RequestMapping("backstage") +public class EpdcBackstageController { + + @Autowired + private EpdcBackstageService epdcBackstageService; + + /** + * PC端-工作台-数据统计 + * + * @param formDto + * @return com.elink.esua.epdc.dto.analysis.pc.backstage.result.EpdcWorkbenchDataStatisticsResultDTO + * @author lc + * @since 2021/8/24 15:23 + */ + @GetMapping("dataStatistics") + public Result dataStatistics(EpdcWorkbenchDataStatisticsFormDTO formDto) { + EpdcWorkbenchDataStatisticsResultDTO data = epdcBackstageService.workbenchDataStatistics(formDto); + return new Result().ok(data); + } + +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/dao/EpdcBackstageDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/dao/EpdcBackstageDao.java new file mode 100644 index 0000000..c048f9f --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/dao/EpdcBackstageDao.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.modules.backstage.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.analysis.pc.backstage.form.EpdcWorkbenchDataStatisticsFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.backstage.result.EpdcWorkbenchDataStatisticsResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +/** + * @Author:liuchuang + * @Date:2021/8/24 13:28 + */ +@Mapper +public interface EpdcBackstageDao extends BaseDao { + + /** + * 话题数量统计 + * + * @param formDto + * @return com.elink.esua.epdc.dto.analysis.pc.backstage.result.EpdcWorkbenchDataStatisticsResultDTO + * @author lc + * @since 2021/8/24 13:56 + */ + EpdcWorkbenchDataStatisticsResultDTO workbenchDataStatistics(EpdcWorkbenchDataStatisticsFormDTO formDto, List deptIdList); +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/service/EpdcBackstageService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/service/EpdcBackstageService.java new file mode 100644 index 0000000..0b65a1d --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/service/EpdcBackstageService.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.modules.backstage.service; + +import com.elink.esua.epdc.dto.analysis.pc.backstage.form.EpdcWorkbenchDataStatisticsFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.backstage.result.EpdcWorkbenchDataStatisticsResultDTO; + +/** + * @Author:liuchuang + * @Date:2021/8/24 15:21 + */ +public interface EpdcBackstageService { + + /** + * PC端-工作台-数据统计 + * + * @param formDto + * @return com.elink.esua.epdc.dto.analysis.pc.backstage.result.EpdcWorkbenchDataStatisticsResultDTO + * @author lc + * @since 2021/8/24 15:23 + */ + EpdcWorkbenchDataStatisticsResultDTO workbenchDataStatistics(EpdcWorkbenchDataStatisticsFormDTO formDto); +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/service/impl/EpdcBackstageServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/service/impl/EpdcBackstageServiceImpl.java new file mode 100644 index 0000000..4f76f12 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/backstage/service/impl/EpdcBackstageServiceImpl.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.modules.backstage.service.impl; + +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.exception.RenException; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; +import com.elink.esua.epdc.dto.analysis.pc.backstage.form.EpdcWorkbenchDataStatisticsFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.backstage.result.EpdcWorkbenchDataStatisticsResultDTO; +import com.elink.esua.epdc.modules.backstage.dao.EpdcBackstageDao; +import com.elink.esua.epdc.modules.backstage.service.EpdcBackstageService; +import org.springframework.stereotype.Service; + +/** + * @Author:liuchuang + * @Date:2021/8/24 15:22 + */ +@Service +public class EpdcBackstageServiceImpl extends BaseServiceImpl implements EpdcBackstageService { + + @Override + public EpdcWorkbenchDataStatisticsResultDTO workbenchDataStatistics(EpdcWorkbenchDataStatisticsFormDTO formDto) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RenException("登陆状态失效,请退出重新登陆"); + } + return baseDao.workbenchDataStatistics(formDto, user.getDeptIdList()); + } +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 75678e4..babe906 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -210,8 +210,9 @@ public class EpdcScreenController { * @since 2021/8/12 10:10 */ @GetMapping("epidemic/vaccinationStatistics") - public Result epidemicVaccinationStatistics(){ - return epdcScreenService.epidemicVaccinationStatistics(); + public Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.epidemicVaccinationStatistics(formDto); } /** diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 0837227..528aed2 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -150,7 +150,7 @@ public interface EpdcScreenDao extends BaseDao epidemicVaccinationStatistics(); + Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto); /** * 疫情防控-社区接种情况统计(社区接种情况总览、地图数据) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index c7693f0..214cb72 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -120,8 +120,8 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl epidemicVaccinationStatistics() { - EpdcScreenEpidemicVaccinationStatisticsResultDTO data = baseDao.epidemicVaccinationStatistics(); + public Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) { + EpdcScreenEpidemicVaccinationStatisticsResultDTO data = baseDao.epidemicVaccinationStatistics(formDto); return new Result().ok(data); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/GridOpeningJobController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/GridOpeningJobController.java new file mode 100644 index 0000000..fc7841d --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/GridOpeningJobController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.analysis.pc.user.GridOpeningJobDTO; +import com.elink.esua.epdc.modules.user.excel.GridOpeningJobExcel; +import com.elink.esua.epdc.modules.user.service.GridOpeningJobService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@RestController +@RequestMapping("gridopeningjob") +public class GridOpeningJobController { + + @Autowired + private GridOpeningJobService gridOpeningJobService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = gridOpeningJobService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + GridOpeningJobDTO data = gridOpeningJobService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody GridOpeningJobDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + gridOpeningJobService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody GridOpeningJobDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + gridOpeningJobService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + gridOpeningJobService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = gridOpeningJobService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, GridOpeningJobExcel.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java index 021798b..5158925 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java @@ -6,29 +6,23 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.analysis.pc.user.form.ExportOperationFormDTO; import com.elink.esua.epdc.dto.analysis.pc.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO; import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO; import com.elink.esua.epdc.dto.analysis.pc.user.result.*; -import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.result.YoungMemberRankResultDTO; import com.elink.esua.epdc.excel.ExportOperationDataExcel; import com.elink.esua.epdc.excel.GridOpiningExcel; +import com.elink.esua.epdc.excel.PartyAnalysExcel; +import com.elink.esua.epdc.excel.RegisterExcel; import com.elink.esua.epdc.modules.user.service.OldMemberRankService; +import com.elink.esua.epdc.modules.user.service.UserAnalysisService; import com.elink.esua.epdc.modules.user.service.YoungMemberRankService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.elink.esua.epdc.excel.PartyAnalysExcel; -import com.elink.esua.epdc.excel.RegisterExcel; -import com.elink.esua.epdc.modules.user.service.UserAnalysisService; -import java.util.HashMap; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; - /** * 数据端,用户数据分析相关接口 * @@ -90,6 +84,19 @@ public class UserAnalysisController { return new Result>().ok(page); } + /*** + * 开通网格分页-无条件 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/2/11 16:01 + */ + @GetMapping("pageGridOpeningWithout") + public Result> pageGridOpeningWithout(@RequestParam Map params) { + PageData page = userAnalysisService.pageGridOpeningWithout(params); + return new Result>().ok(page); + } + /** * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Description 党员老龄化列表 @@ -213,4 +220,16 @@ public class UserAnalysisController { List list = userAnalysisService.listExportOperationCount(exportOperationFormDTO); ExcelUtils.exportExcelToTarget(response, "开通网格情况", list, ExportOperationDataExcel.class); } + + /** + * @describe: 定时任务-网格开通情况 + * @author wangtong + * @date 2021/8/24 13:42 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("gridOpeningJob") + public void gridOpeningJob() { + userAnalysisService.gridOpeningJob(); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/GridOpeningJobDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/GridOpeningJobDao.java new file mode 100644 index 0000000..e9f680f --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/GridOpeningJobDao.java @@ -0,0 +1,41 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.modules.user.entity.GridOpeningJobEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Mapper +public interface GridOpeningJobDao extends BaseDao { + + /** + * @describe: 删除所有数据 + * @author wangtong + * @date 2021/8/24 16:46 + * @params [] + * @return void + */ + void deleteAllInfo(); +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java index 6c3a4c9..fa81e0b 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java @@ -270,5 +270,12 @@ public interface UserAnalysisDao extends BaseMapper { */ List selectExportEnterpriseCountByGridId(Map params); - + /** + * @describe: 开通网格分页-无条件 + * @author wangtong + * @date 2021/8/24 17:05 + * @params [params] + * @return java.util.List + */ + List pageGridOpeningWithout(Map params); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/entity/GridOpeningJobEntity.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/entity/GridOpeningJobEntity.java new file mode 100644 index 0000000..1305128 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/entity/GridOpeningJobEntity.java @@ -0,0 +1,133 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_grid_opening_job") +public class GridOpeningJobEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 网格id + */ + private String gridId; + + /** + * 街道社区网格 + */ + private String allDeptName; + + /** + * 用户注册数 + */ + private Integer registerCount; + + /** + * 居民数(包括认证成功和党员认证失败的居民) + */ + private Integer residentCount; + + /** + * 认证党员数 + */ + private Integer partyCount; + + /** + * 未认证用户(根据用户第一次扫码的网格统计) + */ + private Integer unAuthorizedCount; + + /** + * 居民扫码数 + */ + private Integer ewmCount; + + /** + * 新闻数 + */ + private Integer newsCount; + + /** + * 通知数 + */ + private Integer noticeCount; + + /** + * 议题数 + */ + private Integer eventCount; + + /** + * 项目数 + */ + private Integer itemCount; + + /** + * 项目解决数 + */ + private Integer itemCloseCount; + + /** + * 项目好评数(满意度评价为非常满意) + */ + private Integer itemPraiseCount; + + /** + * 社群数 + */ + private Integer communityCount; + + /** + * 社群成员数 + */ + private Integer communityMemberCount; + + /** + * 社群话题数 + */ + private Integer communityTopicCount; + + /** + * 企业数 + */ + private Integer enterpriseCount; + + /** + * 网格长姓名 + */ + private String gridLeader; + + /** + * 所有网格id + */ + private String allDeptIds; + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/excel/GridOpeningJobExcel.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/excel/GridOpeningJobExcel.java new file mode 100644 index 0000000..6ffa55f --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/excel/GridOpeningJobExcel.java @@ -0,0 +1,110 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Data +public class GridOpeningJobExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "网格id") + private String gridid; + + @Excel(name = "街道社区网格") + private String alldeptname; + + @Excel(name = "用户注册数") + private Integer registercount; + + @Excel(name = "居民数(包括认证成功和党员认证失败的居民)") + private Integer residentcount; + + @Excel(name = "认证党员数") + private Integer partycount; + + @Excel(name = "未认证用户(根据用户第一次扫码的网格统计)") + private Integer unauthorizedcount; + + @Excel(name = "居民扫码数") + private Integer ewmcount; + + @Excel(name = "新闻数") + private Integer newscount; + + @Excel(name = "通知数") + private Integer noticecount; + + @Excel(name = "议题数") + private Integer eventcount; + + @Excel(name = "项目数") + private Integer itemcount; + + @Excel(name = "项目解决数") + private Integer itemclosecount; + + @Excel(name = "项目好评数(满意度评价为非常满意)") + private Integer itempraisecount; + + @Excel(name = "社群数") + private Integer communitycount; + + @Excel(name = "社群成员数") + private Integer communitymembercount; + + @Excel(name = "社群话题数") + private Integer communitytopiccount; + + @Excel(name = "企业数") + private Integer enterprisecount; + + @Excel(name = "网格长姓名") + private String gridleader; + + @Excel(name = "所有网格id") + private String alldeptids; + + @Excel(name = "删除标记(0-否,1-是)") + private String delFlag; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/redis/GridOpeningJobRedis.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/redis/GridOpeningJobRedis.java new file mode 100644 index 0000000..eb6993a --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/redis/GridOpeningJobRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.redis; + +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Component +public class GridOpeningJobRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/GridOpeningJobService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/GridOpeningJobService.java new file mode 100644 index 0000000..e239039 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/GridOpeningJobService.java @@ -0,0 +1,96 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.service; + + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.analysis.pc.user.GridOpeningJobDTO; +import com.elink.esua.epdc.modules.user.entity.GridOpeningJobEntity; + +import java.util.List; +import java.util.Map; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +public interface GridOpeningJobService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-08-24 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-08-24 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return GridOpeningJobDTO + * @author generator + * @date 2021-08-24 + */ + GridOpeningJobDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-24 + */ + void save(GridOpeningJobDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-24 + */ + void update(GridOpeningJobDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-08-24 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java index f12c789..0a749d5 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java @@ -124,4 +124,22 @@ public interface UserAnalysisService { * @date 2020/3/26 13:32 */ List getToLeadUserRegisterRandData(Map params); + + /** + * @describe: 定时任务-网格开通情况 + * @author wangtong + * @date 2021/8/24 13:56 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + void gridOpeningJob( ); + + /*** + * 开通网格分页-无条件 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/2/11 16:01 + */ + PageData pageGridOpeningWithout(Map params); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/GridOpeningJobServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/GridOpeningJobServiceImpl.java new file mode 100644 index 0000000..1cd9b68 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/GridOpeningJobServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.dto.analysis.pc.user.GridOpeningJobDTO; +import com.elink.esua.epdc.modules.user.dao.GridOpeningJobDao; +import com.elink.esua.epdc.modules.user.entity.GridOpeningJobEntity; +import com.elink.esua.epdc.modules.user.redis.GridOpeningJobRedis; +import com.elink.esua.epdc.modules.user.service.GridOpeningJobService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Service +public class GridOpeningJobServiceImpl extends BaseServiceImpl implements GridOpeningJobService { + + @Autowired + private GridOpeningJobRedis gridOpeningJobRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, GridOpeningJobDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, GridOpeningJobDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public GridOpeningJobDTO get(String id) { + GridOpeningJobEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GridOpeningJobDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(GridOpeningJobDTO dto) { + GridOpeningJobEntity entity = ConvertUtils.sourceToTarget(dto, GridOpeningJobEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(GridOpeningJobDTO dto) { + GridOpeningJobEntity entity = ConvertUtils.sourceToTarget(dto, GridOpeningJobEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除(@TableLogic 注解) + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index 702a49e..ceb7d0a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java @@ -9,24 +9,28 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.datasources.annotation.DataSource; import com.elink.esua.epdc.dto.analysis.pc.user.UserAnalysisDTO; import com.elink.esua.epdc.dto.analysis.pc.user.form.ExportOperationFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO; import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO; +import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO; import com.elink.esua.epdc.dto.analysis.pc.user.result.*; +import com.elink.esua.epdc.modules.user.dao.GridOpeningJobDao; import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao; +import com.elink.esua.epdc.modules.user.entity.GridOpeningJobEntity; +import com.elink.esua.epdc.modules.user.service.GridOpeningJobService; import com.elink.esua.epdc.modules.user.service.UserAnalysisService; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * 用户数据分析业务实现 @@ -38,6 +42,12 @@ import java.util.Map; @Service public class UserAnalysisServiceImpl extends BaseServiceImpl implements UserAnalysisService { + @Autowired + private GridOpeningJobService gridOpeningJobService; + + @Autowired + private GridOpeningJobDao gridOpeningJobDao; + @Override public PageData listPageGridOpening(Map params) { params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); @@ -45,6 +55,18 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl list = baseDao.selectListGridHasMaCode(params); list = fillFieldForGridOpening(list, params); + list = list.stream().sorted(Comparator.comparing(GridOpeningResultDTO::getRegisterCount) + .thenComparing(GridOpeningResultDTO::getPartyCount).reversed()).collect(Collectors.toList()); + + PageData page = new PageData<>(list, iPage.getTotal()); + return page; + } + + @Override + public PageData pageGridOpeningWithout(Map params) { + IPage iPage = this.getPage(params); + + List list = baseDao.pageGridOpeningWithout(params); PageData page = new PageData<>(list, iPage.getTotal()); return page; @@ -401,5 +423,23 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl params = new HashMap(); + params.put("category","1");//已开通网格 + List list = baseDao.selectListGridHasMaCode(params); + + list = fillFieldForGridOpening(list, params); + + List entityList = ConvertUtils.sourceToTarget(list, GridOpeningJobEntity.class); + + gridOpeningJobService.insertBatch(entityList); + } + + + } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/backstage/EpdcBackstageDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/backstage/EpdcBackstageDao.xml new file mode 100644 index 0000000..0053a65 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/backstage/EpdcBackstageDao.xml @@ -0,0 +1,74 @@ + + + + + + + + diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index abd66c7..72df194 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -311,6 +311,9 @@ SUM(NOT_VACCINATED_NUM) as notVaccinatedNum FROM esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' + + AND TYPE_KEY = #{typeKey} + + diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 3b4c1c3..5b564cd 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 3b4c1c3076a2ea432cafe8ebe21b64eb74db8a5a +Subproject commit 5b564cde29b3dd3539da42136c9514fdd1463761