diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java new file mode 100644 index 0000000..59949dd --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java @@ -0,0 +1,97 @@ +package com.elink.esua.epdc.modules.screen.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO; +import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO; +import com.elink.esua.epdc.modules.screen.service.ScreenProjectDataService; +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; + +/** + * 大屏项目数据上报 + * + * @Author：songyunpeng + * @Date：2021/2/23 14:06 + */ +@RestController +@RequestMapping("data/stats/project") +public class ScreenProjectDataController { + + + @Autowired + private ScreenProjectDataService screenProjectDataService; + + /** + * @Description 项目信息上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("uploadprojectinfo") + private Result uploadProjectInfo(@RequestBody ScreenProjectFormDTO screenProjectFormDTO){ + return screenProjectDataService.uploadProjectInfo(screenProjectFormDTO); + } + /** + * @Description 项目处理进展上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("uploadprojectprocess") + private Result uploadProjectProcess(@RequestBody ScreenProjectFormDTO screenProjectFormDTO){ + return screenProjectDataService.uploadProjectProcess(screenProjectFormDTO); + } + + /** + * @describe: 【事件/项目分析】网格内事件 + * @author wangtong + * @date 2021/2/23 14:53 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("project-grid-daily") + private Result projectGridDaily(){ + return screenProjectDataService.projectGridDaily(); + } + + /** + * @describe: 【事件/项目分析】组织内事件 + * @author wangtong + * @date 2021/2/24 9:29 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("project/project-org-daily") + private Result projectOrgDaily(){ + return screenProjectDataService.projectOrgDaily(); + } + + /** + * @describe: 【事件/项目分析】网格内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:38 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("quantity-grid-monthly") + private Result quantityGridMonthly(@RequestBody ScreenJobFormDTO formDto){ + return screenProjectDataService.quantityGridMonthly(formDto.getYearMonth()); + } + + /** + * @describe: 【事件/项目分析】组织内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:57 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("quantity-org-monthly") + private Result quantityOrgMonthly(@RequestBody ScreenJobFormDTO formDto){ + return screenProjectDataService.quantityOrgMonthly(formDto.getYearMonth()); + } +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java index 7ecdd79..16d1e1b 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java @@ -1,9 +1,11 @@ package com.elink.esua.epdc.modules.screen.controller; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.modules.screen.service.ScreenPublicDataService; 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; @@ -56,4 +58,119 @@ public class ScreenPublicDataController { return screenPublicDataService.customerDept(); } + + + /** + * @describe: 001、基层党建-党员基本情况 + * @author wk + * @date 2020/8/19 17:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("cpcbasedata") + public Result cpcbasedata() { + return screenPublicDataService.cpcbasedata(); + } + /** + * @describe: 002、党建引领-先锋模范数据 + * @author wangtong + * @date 2020/8/20 18:02 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("pioneerdata") + public Result pioneerdata() { + return screenPublicDataService.pioneerdata(); + } + + /** + * @describe: 003、党建引领-党员联系群众数据 + * @author wangtong + * @date 2020/8/20 14:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("partylinkmassesdata") + public Result partylinkmassesdata() { + return screenPublicDataService.partylinkmassesdata(); + } + /** + * 004、党建引领-先进排行榜单-先进支部排行 + * @Params: + * @Return: OrgrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + @PostMapping("orgrankdata") + public Result orgrankdata(@RequestBody ScreenJobFormDTO formDto) { + return screenPublicDataService.getOrgrankdata(formDto.getYearMonth()); + } + /** + * 005、党建引领|基层治理-居民（党员）积分排行榜 + * @Params: + * @Return: PartyuserrankdataResultDTO + * @Author: wk + * @Date: 2020/08/20 + */ + @PostMapping("partyuserrankdata") + public Result partyuserrankdata() { + return screenPublicDataService.getPartyuserrankdata(); + + } + /** + * 006、基层治理-难点赌点项目上报 + * @Params: + * @Return: DifficultydataResultDTO + * @Author: wk + * @Date: 2020/08/19 + */ + @PostMapping("difficultydata") + public Result difficultydata() { + return screenPublicDataService.getDifficultydata(); + } + /** + * 007、基层治理-公众参与 + * @Params: + * @Return: UserjoinResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/20 + */ + @PostMapping("userjoin") + public Result userjoin(@RequestBody ScreenJobFormDTO formDto) { + return screenPublicDataService.getUserjoin(formDto.getYearMonth()); + + } + /** + * @describe: 008、公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("publicpartitotaldata") + public Result publicpartitotaldata() { + return screenPublicDataService.publicpartitotaldata(); + } + /** + * 009、基层治理-治理能力数据 + * @Params: + * @Return: GovernrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + @PostMapping("governrankdata") + public Result governrankdata(@RequestBody ScreenJobFormDTO formDto) { + return screenPublicDataService.getGovernrankdata(formDto.getYearMonth()); + } + /** + * @describe: 010、中央区各类总数 + * @author wk + * @date 2020/8/21 10:32 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("usertotaldata") + public Result usertotaldata() { + return screenPublicDataService.usertotaldata(); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java new file mode 100644 index 0000000..e4c94a1 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java @@ -0,0 +1,70 @@ +package com.elink.esua.epdc.modules.screen.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO; +import com.elink.esua.epdc.dto.screen.result.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Author：songunpeng + * @Date：2021/2/23 18:03 + */ +@Mapper +public interface ScreenProjectDataDao extends BaseDao { + + /** + * @Description 项目信息上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return java.util.List + * + * @param screenProjectFormDTO*/ + List uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO); + /** + * @Description 项目处理进展上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return java.util.List + **/ + List uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO); + /** + * @describe: + * @author wangtong + * @date 2021/2/23 14:55 + * @params [] + * @return java.util.List + */ + List selectProjectGridDaily(@Param("yesterDayDate") String yesterDayDate); + + /** + * @describe: 【事件/项目分析】组织内事件 + * @author wangtong + * @date 2021/2/24 9:30 + * @params [yesterDayDate] + * @return java.util.List + */ + List selectProjectOrgDaily(@Param("yesterDayDate") String yesterDayDate); + + /** + * @describe: 【事件/项目分析】网格内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:43 + * @params [lastMonth] + * @return java.util.List + */ + List selectQuantityGridMonthly(@Param("yearMonth") String yearMonth); + + /** + * @describe: 【事件/项目分析】组织内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:58 + * @params [lastMonth] + * @return java.util.List + */ + List selectQuantityOrgMonthly(@Param("yearMonth") String yearMonth); +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java index 3b02211..fdaee39 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java @@ -1,11 +1,9 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerAgencyDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerDeptDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerGridDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenPublicDataResultDTO; +import com.elink.esua.epdc.dto.screen.result.*; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -42,4 +40,92 @@ public interface ScreenPublicDataDao extends BaseDao * @since 2020/9/17 14:23 */ List customerDept(); + + /** + * @describe: 中央区各类总数 + * @author wk + * @date 2020/8/21 10:32 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List usertotaldata(); + + /** + * @describe: 001、基层党建-党员基本情况 + * @author wk + * @date 2020/8/19 17:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List cpcbasedata(); + /** + * @describe: 002、党建引领-先锋模范数据 + * @author wangtong + * @date 2020/8/20 18:02 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List pioneerdata(); + + /** + * @describe: 003、党建引领-党员联系群众数据 + * @author wangtong + * @date 2020/8/20 14:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List partylinkmassesdata(); + /** + * 004、党建引领-先进排行榜单-先进支部排行 + * @Params: + * @Return: OrgrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + * @param yearMonth + */ + List getOrgrankdata(@Param("yearMonth")String yearMonth); + /** + * 005、党建引领|基层治理-居民（党员）积分排行榜 + * @Params: + * @Return: PartyuserrankdataResultDTO + * @Author: wk + * @Date: 2020/08/20 + */ + List getPartyuserrankdata(); + /** + * 006、基层治理-难点赌点项目上报 + * @Params: + * @Return: DifficultydataResultDTO + * @Author: wk + * @Date: 2020/08/19 + */ + List getDifficultydata(); + + /** + * 007、基层治理-公众参与 + * @Params: + * @Return: UserjoinResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/20 + * @param yearMonth + */ + List getUserjoin(@Param("yearMonth")String yearMonth); + + /** + * @describe: 008、公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List publicpartitotaldata(); + /** + * 009、基层治理-治理能力数据 + * @Params: + * @Return: GovernrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + * @param yearMonth + */ + List getGovernrankdata(@Param("yearMonth")String yearMonth); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java new file mode 100644 index 0000000..8f211d4 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java @@ -0,0 +1,69 @@ +package com.elink.esua.epdc.modules.screen.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO; + +/** + * 大屏项目信息上报 + * + * @Author：songyunpeng + * @Date：2020/2/23 18:04 + */ +public interface ScreenProjectDataService { + + /** + * @Description 项目信息上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * + * @param screenProjectFormDTO*/ + Result uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO); + + /** + * @Description 项目处理进展上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * + * @param screenProjectFormDTO*/ + Result uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO); + + /** + * @describe: 【事件/项目分析】网格内事件 + * @author wangtong + * @date 2021/2/23 14:54 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result projectGridDaily(); + + /** + * @describe: 事件/项目分析】组织内事件 + * @author wangtong + * @date 2021/2/24 9:29 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result projectOrgDaily(); + + /** + * @describe: 【事件/项目分析】网格内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:39 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result quantityGridMonthly(String yearMonth); + + /** + * @describe: 【事件/项目分析】组织内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:57 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result quantityOrgMonthly(String yearMonth); +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java index a86af7e..02c33f7 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java @@ -36,4 +36,99 @@ public interface ScreenPublicDataService { * @since 2020/9/17 14:24 */ Result customerDept(); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 001、基层党建-党员基本情况 + * @author wk + * @date 2020/8/19 17:25 + * @params [] + */ + Result cpcbasedata(); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 002、党建引领-先锋模范数据 + * @author wangtong + * @date 2020/8/20 18:02 + * @params [] + */ + Result pioneerdata(); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 003、党建引领-党员联系群众数据 + * @author wangtong + * @date 2020/8/20 14:25 + * @params [] + */ + Result partylinkmassesdata(); + + /** + * 004、党建引领-先进排行榜单-先进支部排行 + * + * @Params: + * @Return: OrgrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + Result getOrgrankdata(String yearMonth); + + /** + * 005、党建引领|基层治理-居民（党员）积分排行榜 + * + * @Params: + * @Return: PartyuserrankdataResultDTO + * @Author: wk + * @Date: 2020/08/20 + */ + Result getPartyuserrankdata(); + + /** + * 006、基层治理-难点赌点项目上报 + * + * @Params: + * @Return: DifficultydataResultDTO + * @Author: wk + * @Date: 2020/08/19 + */ + Result getDifficultydata(); + + /** + * 007、基层治理-公众参与 + * + * @Params: + * @Return: UserjoinResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/20 + */ + Result getUserjoin(String yearMonth); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 008、公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + */ + Result publicpartitotaldata(); + + /** + * 009、基层治理-治理能力数据 + * + * @Params: + * @Return: GovernrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + Result getGovernrankdata(String yearMonth); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 010 中央区各类总数 + * @author wk + * @date 2020/8/21 10:32 + * @params [] + */ + Result usertotaldata(); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java new file mode 100644 index 0000000..ff8c5aa --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java @@ -0,0 +1,131 @@ +package com.elink.esua.epdc.modules.screen.service.impl; + +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.EpmetConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.utils.DateUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO; +import com.elink.esua.epdc.dto.screen.result.*; +import com.elink.esua.epdc.modules.screen.dao.ScreenProjectDataDao; +import com.elink.esua.epdc.modules.screen.service.ScreenProjectDataService; +import com.elink.esua.epdc.utils.EpmetUtils; +import com.elink.esua.epdc.utils.ScreenDataUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @Author：liuchuang + * @Date：2020/9/9 18:05 + */ +@Service +public class ScreenProjectDataServiceImpl extends BaseServiceImpl implements ScreenProjectDataService { + @Autowired + private EpmetUtils epmetUtils; + + @Override + public Result uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO) { + // 数据统计 + List data = baseDao.uploadProjectInfo(screenProjectFormDTO); + if(data.size()!=0) { + if (data.size() > 1000) { + List> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND); + if (formList != null && formList.size() > NumConstant.ZERO) { + for (int i = NumConstant.ZERO; i < formList.size(); i++) { + String dataJson = ""; + // 数据格式化 + dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson); + } + } + } else { + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson); + } + } + return new Result(); + } + + @Override + public Result uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO) { + // 数据统计 + List data = baseDao.uploadProjectProcess(screenProjectFormDTO); + if(data.size()!=0){ + if (data.size() > 1000) { + List> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND); + if (formList != null && formList.size() > NumConstant.ZERO) { + for (int i = NumConstant.ZERO; i < formList.size(); i++) { + String dataJson = ""; + // 数据格式化 + dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson); + } + } + } else { + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson); + } + } + return new Result(); + } + + @Override + public Result projectGridDaily() { + String yesterDayDate = ScreenDataUtils.getYesterdayDate(); + // 数据统计 + List data = baseDao.selectProjectGridDaily(yesterDayDate); + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_GRID_DAILY, dataJson); + return new Result(); + } + + @Override + public Result projectOrgDaily() { + String yesterDayDate = ScreenDataUtils.getYesterdayDate(); + // 数据统计 + List data = baseDao.selectProjectOrgDaily(yesterDayDate); + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_ORG_DAILY, dataJson); + return new Result(); + } + + @Override + public Result quantityGridMonthly(String yearMonth) { + // 如果统计月份为空，则统计上个月的数据 + yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth; + // 数据统计 + List data = baseDao.selectQuantityGridMonthly(yearMonth); + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataMonthJson(data, yearMonth,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_GRID_MONTHLY, dataJson); + return new Result(); + } + + @Override + public Result quantityOrgMonthly(String yearMonth) { + // 如果统计月份为空，则统计上个月的数据 + yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth; + // 数据统计 + List data = baseDao.selectQuantityOrgMonthly(yearMonth); + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataMonthJson(data, yearMonth,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_ORG_MONTHLY, dataJson); + return new Result(); + } +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java index 0ee86a2..249195a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java @@ -3,24 +3,28 @@ package com.elink.esua.epdc.modules.screen.service.impl; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.EpmetConstant; +import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerAgencyDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerDeptDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerGridDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenPublicDataResultDTO; +import com.elink.esua.epdc.dto.screen.result.*; import com.elink.esua.epdc.modules.screen.dao.ScreenPublicDataDao; import com.elink.esua.epdc.modules.screen.service.ScreenPublicDataService; import com.elink.esua.epdc.utils.EpmetUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Date; import java.util.List; + /** * @Author：liuchuang * @Date：2020/9/17 14:08 */ @Service +@Slf4j public class ScreenPublicDataServiceImpl extends BaseServiceImpl implements ScreenPublicDataService { @Autowired @@ -55,4 +59,240 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl + */ + @Override + public Result cpcbasedata() { + List list = baseDao.cpcbasedata(); + // 将list转换为json格式 + CpcbasedataDTO result = new CpcbasedataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_CPC_BASE, json); + log.info(body); + return null; + } + + /** + * @describe: 002、党建引领-先锋模范数据 + * @author wangtong + * @date 2020/8/20 18:02 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @Override + public Result pioneerdata() { + List list = baseDao.pioneerdata(); + // 将list转换为json格式 + PioneerdataDTO result = new PioneerdataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_PIONEER, json); + log.info(body); + return null; + } + + /** + * @describe: 003、党建引领-党员联系群众数据 + * @author wangtong + * @date 2020/8/20 14:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @Override + public Result partylinkmassesdata() { + List list = baseDao.partylinkmassesdata(); + // 将list转换为json格式 + PartylinkmassesdataDTO result = new PartylinkmassesdataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_PARTY_LINK_MESSAGE, json); + log.info(body); + return null; + } + + /** + * 004、党建引领-先进排行榜单-先进支部排行 + * @Params: + * @Return: OrgrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + @Override + public Result getOrgrankdata(String yearMonth) { + // 如果统计月份为空，则统计上个月的数据 + yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth; + List list = baseDao.getOrgrankdata(yearMonth); + // 将list转换为json格式 + if(list != null && list.size()>0){ + OrgrankdataDTO result = new OrgrankdataDTO(); + result.setDataList(list); + result.setMonthId(yearMonth); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_ORG_RANK, json); + log.info(body); + } + return null; + } + + /** + * 005、党建引领|基层治理-居民（党员）积分排行榜 + * @Params: + * @Return: PartyuserrankdataResultDTO + * @Author: wk + * @Date: 2020/08/20 + */ + @Override + public Result getPartyuserrankdata() { + List list = baseDao.getPartyuserrankdata(); + // 将list转换为json格式 + if(list != null && list.size()>0){ + PartyuserrankdataDTO result = new PartyuserrankdataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_PARTY_USER_RANK, json); + log.info(body); + } + return null; + } + + /** + * 006、基层治理-难点赌点项目上报 + * @Params: + * @Return: DifficultydataResultDTO + * @Author: wk + * @Date: 2020/08/19 + */ + @Override + public Result getDifficultydata() { + List list = baseDao.getDifficultydata(); + List> formList = fixedGrouping(list, 1000); + if (formList != null && formList.size()>0) { + for (int i = 0; i < formList.size(); i++) { + DifficultyResultDTO difficultyResultDTO = new DifficultyResultDTO(); + if (i == 0) { + difficultyResultDTO.setIsFirst(true); + } + difficultyResultDTO.setDataList(formList.get(i)); + // 将list转换为json格式 + String json = JSONObject.toJSONString(difficultyResultDTO); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_DIFFICULTY, json); + log.info(body); + } + } + return null; + } + + /** + * 007、基层治理-公众参与 + * @Params: + * @Return: UserjoinResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/20 + */ + @Override + public Result getUserjoin(String yearMonth) { + // 如果统计月份为空，则统计上个月的数据 + yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth; + List list = baseDao.getUserjoin(yearMonth); + // 将list转换为json格式 + if(list != null && list.size()>0) { + UserjoinDTO result = new UserjoinDTO(); + result.setDataList(list); + result.setMonthId(yearMonth); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_USER_JOIN, json); + log.info(body); + } + return null; + } + + /** + * @describe: 008、公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @Override + public Result publicpartitotaldata() { + List list = baseDao.publicpartitotaldata(); + // 将list转换为json格式 + PublicpartitotaldataDTO result = new PublicpartitotaldataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_PUBLIC_PARTY_TOTAL, json); + log.info(body); + return null; + } + + /** + * 009、基层治理-治理能力数据 + * @Params: + * @Return: GovernrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + @Override + public Result getGovernrankdata(String yearMonth) { + // 如果统计月份为空，则统计上个月的数据 + yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth; + List list = baseDao.getGovernrankdata(yearMonth); + // 将list转换为json格式 + if(list != null && list.size()>0){ + GovernrankdataDTO result = new GovernrankdataDTO(); + result.setDataList(list); + result.setMonthId(yearMonth); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_GOVERN_RANK, json); + log.info(body); + } + return null; + } + + /** + * 将一组数据固定分组，每组n个元素 + * + * @param source 要分组的数据源 + * @param n 每组n个元素 + * @param + * @return + */ + public static List> fixedGrouping(List source, int n) { + + if (null == source || source.size() == 0 || n <= 0) + return null; + List> result = new ArrayList>(); + int remainder = source.size() % n; + int size = (source.size() / n); + for (int i = 0; i < size; i++) { + List subset = null; + subset = source.subList(i * n, (i + 1) * n); + result.add(subset); + } + if (remainder > 0) { + List subset = null; + subset = source.subList(size * n, size * n + remainder); + result.add(subset); + } + return result; + } + + @Override + public Result usertotaldata() { + List list = baseDao.usertotaldata(); + // 将list转换为json格式 + UsertotaldataDTO result = new UsertotaldataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_USER_TOTAL, json); + log.info(body); + return null; + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/worklog/controller/WorkLogAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/worklog/controller/WorkLogAnalysisController.java new file mode 100644 index 0000000..406cc0c --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/worklog/controller/WorkLogAnalysisController.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.modules.worklog.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description 获取customID + * @Author songyunpeng + * @Date 2020/2/10 16:06 + */ +@RestController +@RequestMapping("workLog") +public class WorkLogAnalysisController { + + @Value("${epmet.config.customerId}") + private String customId; + + + /** + * @Description 获取customId + * @Author songyunpeng + * @Date 2021/1/27 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping("getCustomId") + public Result getCustomId(){ + return new Result().ok(customId); + } + + + +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java index 5c52e0b..dd31549 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java @@ -8,7 +8,10 @@ import com.elink.esua.epdc.dto.screen.result.ScreenDataDateDTO; import com.elink.esua.epdc.dto.screen.result.ScreenDataMonthDTO; import org.apache.commons.lang3.StringUtils; +import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; /** * 大屏上报数据JSON处理 @@ -87,7 +90,7 @@ public class ScreenDataUtils { /** * 只携带first * - * @param data 数据 + * @param data 数据 * @param isFirst 是否首次 * @return java.lang.String * @author Liuchuang @@ -103,4 +106,33 @@ public class ScreenDataUtils { return JSONObject.toJSONString(dateDto); } + /** + * @return String + * @describe: 获取昨日日期：yyyy-MM-dd + * @author wangtong + * @date 2021/2/23 15:02 + * @params [] + */ + public static String getYesterdayDate() { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(new Date()); + calendar.add(calendar.DATE, -1); + return simpleDateFormat.format(calendar.getTime()); + } + + /** + * @return java.lang.String + * @describe: 获取上个月日期：yyyy-MM + * @author wangtong + * @date 2021/2/24 10:40 + * @params [] + */ + public static String getLastMonthDate() { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM"); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(new Date()); + calendar.add(calendar.MONTH, -1); + return simpleDateFormat.format(calendar.getTime()); + } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/logback-spring.xml b/epdc-cloud-analysis-pc/src/main/resources/logback-spring.xml index e704170..d50d35f 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/logback-spring.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/logback-spring.xml @@ -151,7 +151,7 @@ - + diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml index d933b52..c51cb56 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml @@ -5,15 +5,15 @@ - + + + + + + + + + diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml index 8d54cef..c68a51e 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml @@ -18,22 +18,22 @@ t8.vounteerCount FROM( SELECT COUNT(sd.id) AS gridCount - FROM .sys_dept sd + FROM `esua_epdc_admin`.sys_dept sd WHERE sd.del_flag= 0 AND sd.type_key= 'grid_party' AND sd.`ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t0, ( SELECT COUNT(tmp.GRID_ID) AS openedGridCount FROM( SELECT edmc.`GRID_ID` - FROM .epdc_dept_ma_code edmc + FROM esua_epdc_admin.epdc_dept_ma_code edmc WHERE edmc.DEL_FLAG= '0' AND edmc.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY edmc.GRID_ID) tmp) t1, ( @@ -43,66 +43,66 @@ OR t.`DEPT_ID`= 0 OR t.`DEPT_ID`= '' THEN( SELECT t1.`GRID_ID` - FROM .`epdc_user_grid_relation` t1 + FROM `esua_epdc_user`.`epdc_user_grid_relation` t1 WHERE t1.`DEL_FLAG`= '0' AND t1.`USER_ID`= t.`ID` ORDER BY t1.`CREATED_TIME` LIMIT 1) ELSE t.`DEPT_ID` END AS GRID_ID - FROM .`epdc_user` t + FROM `esua_epdc_user`.`epdc_user` t WHERE t.`DEL_FLAG`= '0') tmp WHERE tmp.GRID_ID NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t2, ( SELECT COUNT(ei.`ID`) AS issueCount, SUM(ei.`ISSUE_STATE`= 4) AS projectCount - FROM .`epdc_issue` ei + FROM `esua_epdc_events`.`epdc_issue` ei WHERE ei.`DEL_FLAG`= '0' AND ei.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t3, ( SELECT COUNT(eg.`ID`) AS groupCount - FROM .`epdc_group` eg + FROM `esua_epdc_group`.`epdc_group` eg WHERE eg.`DEL_FLAG`= '0' AND eg.`STATE` IN(10, 15) AND eg.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t4, ( SELECT COUNT(et.`ID`) AS topicCount - FROM .`epdc_topic` et + FROM `esua_epdc_group`.`epdc_topic` et WHERE et.`DEL_FLAG`= '0' AND et.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t5, ( SELECT COUNT(en.`ID`) AS newsCount, SUM(en.`READING_AMOUNT`) AS readCount - FROM .`epdc_news` en + FROM `esua_epdc_news`.`epdc_news` en WHERE en.`DEL_FLAG`= '0' AND en.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t6, ( SELECT COUNT(eai.`ID`) AS actCount - FROM .`epdc_act_info` eai + FROM `esua_epdc_mutuality`.`epdc_act_info` eai WHERE eai.`DEL_FLAG`= '0' AND eai.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t7, ( SELECT COUNT(evi.`ID`) AS vounteerCount - FROM .`epdc_volunteer_info` evi + FROM `esua_epdc_user`.`epdc_volunteer_info` evi WHERE evi.`DEL_FLAG`= '0' AND evi.`AUDIT_STATUS` ]]> '2' AND evi.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t8 @@ -122,43 +122,43 @@ IFNULL(t0.issueCount, 0) AS passedCount, IFNULL(t0.itemCount, 0) AS shiftToProjectCount, IFNULL(t2.avgAuditTime, 0) AS avgAuditTime - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT ei.`GRID_ID` AS gridId, COUNT(ei.`ID`) AS issueCount, SUM(ei.`ISSUE_STATE`= 0) AS processingCount, SUM(ei.`ISSUE_STATE`= 2) AS closedCount, SUM(ei.`ISSUE_STATE`= 4) AS itemCount, SUM(ee.`BROWSE_NUM`) AS issueViewCount, SUM(ee.`APPROVE_NUM`+ ee.`OPPOSE_NUM`+ ee.`COMMENT_NUM`) AS voteCount - FROM .`epdc_issue` ei - LEFT JOIN .`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` + FROM `esua_epdc_events`.`epdc_issue` ei + LEFT JOIN `esua_epdc_events`.`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` AND ee.`DEL_FLAG`= '0' WHERE ei.`DEL_FLAG`= '0' AND ei.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ei.`GRID_ID`) t0 ON t0.gridId= sd.`id` LEFT JOIN( SELECT ee.`GRID_ID`, COUNT(ee.`ID`) AS reportCount, SUM(ee.`EVENT_STATE`= 0) AS pendingCount, SUM(ee.`EVENT_STATE`= 2) AS rejectedCount - FROM .`epdc_events` ee + FROM `esua_epdc_events`.`epdc_events` ee WHERE ee.`DEL_FLAG`= '0' AND ee.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ee.`GRID_ID`) t1 ON t1.GRID_ID= sd.`id` LEFT JOIN( SELECT ei.`GRID_ID`, round(SUM(TIMESTAMPDIFF(MINUTE, ee.`CREATED_TIME`, ei.`CREATED_TIME`)) / COUNT(ei.`ID`), 2) AS 'avgAuditTime' - FROM .`epdc_issue` ei - LEFT JOIN .`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` + FROM `esua_epdc_events`.`epdc_issue` ei + LEFT JOIN `esua_epdc_events`.`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` AND ee.`DEL_FLAG`= '0' WHERE ei.`DEL_FLAG`= '0' AND ei.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ei.`GRID_ID`) t2 ON t2.GRID_ID= sd.`id` WHERE sd.`del_flag`= '0' AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -168,22 +168,22 @@ sd.`name` AS gridName, sd.`pid` AS parentAgencyId, IFNULL(t0.reportCount, 0) AS reportCount - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT ee.`GRID_ID`, COUNT(ee.`ID`) AS reportCount - FROM .`epdc_events` ee + FROM `esua_epdc_events`.`epdc_events` ee WHERE ee.`DEL_FLAG`= '0' AND DATE_FORMAT(ee.`CREATED_TIME`, '%Y-%m')= #{yearMonth} AND ee.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ee.`GRID_ID`) t0 ON t0.GRID_ID= sd.`id` WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -203,7 +203,7 @@ IFNULL(t0.ageLevel6, 0) AS ageLevel6, IFNULL(t0.malePartyUserCount, 0) AS malePartyUserCount, IFNULL(t0.femalePartyUserCount, 0) AS femalePartyUserCount - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT tmp.GRID_ID, COUNT(tmp.ID) AS visitorCount, SUM(tmp.PARTY_FLAG= '1') AS partyCount, SUM(tmp.PARTY_FLAG= '1' AND tmp.age 20) AS ageLevel1, SUM(tmp.PARTY_FLAG= '1' @@ -223,13 +223,13 @@ OR t.`DEPT_ID`= 0 OR t.`DEPT_ID`= '' THEN( SELECT t1.`GRID_ID` - FROM .`epdc_user_grid_relation` t1 + FROM `esua_epdc_user`.`epdc_user_grid_relation` t1 WHERE t1.`DEL_FLAG`= '0' AND t1.`USER_ID`= t.`ID` ORDER BY t1.`CREATED_TIME` LIMIT 1) ELSE t.`DEPT_ID` END AS GRID_ID - FROM .`epdc_user` t - LEFT JOIN .`epdc_user_grid_relation` t1 ON t1.`USER_ID`= t.`ID` + FROM `esua_epdc_user`.`epdc_user` t + LEFT JOIN `esua_epdc_user`.`epdc_user_grid_relation` t1 ON t1.`USER_ID`= t.`ID` AND t1.`DEL_FLAG`= '0' WHERE t.`DEL_FLAG`= '0' GROUP BY t.`ID`) tmp @@ -238,7 +238,7 @@ AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -254,16 +254,16 @@ eu.`POINTS` AS points FROM( SELECT evi.`ID`, evi.`GRID_ID`, evi.`USER_ID`, evi.`REAL_NAME`, evi.`KINDNESS_TIME` - FROM .`epdc_volunteer_info` evi + FROM `esua_epdc_user`.`epdc_volunteer_info` evi WHERE evi.`DEL_FLAG`= '0' AND evi.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) ORDER BY evi.`KINDNESS_TIME` DESC, evi.`PARTICIPATION_NUM` DESC, evi.`CREATED_TIME` LIMIT #{pageSize}) tmp - LEFT JOIN .`sys_dept` sd ON sd.`id`= tmp.GRID_ID - LEFT JOIN .`epdc_user` eu ON eu.`ID`= tmp.USER_ID + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd ON sd.`id`= tmp.GRID_ID + LEFT JOIN `esua_epdc_user`.`epdc_user` eu ON eu.`ID`= tmp.USER_ID @@ -318,39 +318,39 @@ SELECT COUNT(*) AS actCount, SUM(tmp.actPoints) AS rewardPointCount FROM( SELECT(eai.`REWARD` * SUM(eaur.`STATUS`= '5')) AS actPoints - FROM .`epdc_act_info` eai - LEFT JOIN .`epdc_act_user_relation` eaur ON eaur.`ACT_ID`= eai.`ID` + FROM `esua_epdc_mutuality`.`epdc_act_info` eai + LEFT JOIN `esua_epdc_mutuality`.`epdc_act_user_relation` eaur ON eaur.`ACT_ID`= eai.`ID` AND eaur.`DEL_FLAG`= '0' WHERE eai.`DEL_FLAG`= '0' AND eai.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY eai.`ID`) tmp) t0, ( SELECT COUNT(evi.`ID`) AS volunteerCount, SUM(evi.`KINDNESS_TIME`) AS heartTime - FROM .`epdc_volunteer_info` evi + FROM `esua_epdc_user`.`epdc_volunteer_info` evi WHERE evi.`DEL_FLAG`= '0' AND evi.`AUDIT_STATUS` ]]> '2' AND evi.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t1, ( SELECT COUNT(eaur.`ID`) AS partiUserCount - FROM .`epdc_act_user_relation` eaur + FROM `esua_epdc_mutuality`.`epdc_act_user_relation` eaur WHERE eaur.`DEL_FLAG`= '0' AND eaur.`STATUS` IN('1', '2', '5', '6')) t2 @@ -367,7 +367,7 @@ IFNULL(t0.ageLevel6, 0) AS ageLevel6, IFNULL(t0.maleCount, 0) AS maleCount, IFNULL(t0.femaleCount, 0) AS femaleCount - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT tmp.GRID_ID, SUM(tmp.age 20) AS ageLevel1, SUM(tmp.age = ]]> 20 AND tmp.age 30) AS ageLevel2, SUM(tmp.age = ]]> 30 @@ -376,14 +376,14 @@ AND tmp.age 60) AS ageLevel5, SUM(tmp.age = ]]> 60) AS ageLevel6, SUM(tmp.SEX= '1') AS maleCount, SUM(tmp.SEX= '0') AS femaleCount FROM( SELECT evi.`GRID_ID`, evi.`SEX`, IFNULL(TIMESTAMPDIFF(YEAR, evi.BIRTHDAY, CURDATE()), 0) AS age - FROM .`epdc_volunteer_info` evi + FROM `esua_epdc_user`.`epdc_volunteer_info` evi WHERE evi.`DEL_FLAG`= '0') tmp GROUP BY tmp.GRID_ID) t0 ON t0.GRID_ID= sd.`id` WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -400,13 +400,13 @@ IFNULL(t0.projectViewCount, 0) AS projectViewCount, IFNULL(t0.voteCount, 0) AS voteCount, IFNULL(t2.avgClosedCaseTime, 0) AS avgClosedCaseTime - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT tmp.GRID_ID, COUNT(*) AS projectCount, SUM(tmp.`ITEM_STATE`= 0) AS processingCount, SUM(tmp.`ITEM_STATE`= 5) AS closedCount, SUM(tmp.`ITEM_STATE`= 10) AS closedCaseCount, SUM(tmp.`BROWSE_NUM`) AS projectViewCount, SUM(tmp.`voteCount`) AS voteCount FROM( SELECT ei.`GRID_ID`, ei.`ITEM_STATE`, ee.`BROWSE_NUM`,(ee.`APPROVE_NUM`+ ee.`OPPOSE_NUM`+ ee.`COMMENT_NUM`) AS voteCount - FROM .`epdc_item` ei - LEFT JOIN .`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` + FROM `esua_epdc_events`.`epdc_item` ei + LEFT JOIN `esua_epdc_events`.`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` WHERE ei.`DEL_FLAG`= '0' GROUP BY ei.`ISSUE_ID`) tmp GROUP BY tmp.GRID_ID) t0 ON t0.GRID_ID= sd.`id` @@ -414,29 +414,29 @@ SELECT tmp.GRID_ID, SUM(tmp.moveCount) AS moveCount FROM( SELECT eid.`ITEM_ID`, ei.`GRID_ID`,(COUNT(eid.`ID`) - 1) AS moveCount - FROM .`epdc_item_dept` eid - LEFT JOIN .`epdc_item` ei ON ei.`ID`= eid.`ITEM_ID` + FROM `esua_epdc_events`.`epdc_item_dept` eid + LEFT JOIN `esua_epdc_events`.`epdc_item` ei ON ei.`ID`= eid.`ITEM_ID` GROUP BY eid.`ITEM_ID`) tmp GROUP BY tmp.GRID_ID) t1 ON t1.GRID_ID= sd.`id` LEFT JOIN( SELECT ei.`GRID_ID`, round(SUM(tmp.itemTime) / COUNT(tmp.ITEM_ID), 2) AS avgClosedCaseTime FROM( SELECT t.`ITEM_ID`, TIMESTAMPDIFF(MINUTE, MIN(t.`CREATED_TIME`), MAX(t.`CREATED_TIME`)) AS itemTime - FROM .`epdc_item_handle_process` t + FROM `esua_epdc_events`.`epdc_item_handle_process` t WHERE t.`ITEM_ID` IN( SELECT eihp.`ITEM_ID` - FROM .`epdc_item_handle_process` eihp + FROM `esua_epdc_events`.`epdc_item_handle_process` eihp WHERE eihp.`DEL_FLAG`= '0' AND eihp.`STATE`= 10) GROUP BY t.`ITEM_ID` ORDER BY `CREATED_TIME`) tmp - LEFT JOIN .`epdc_item` ei ON ei.`ID`= tmp.ITEM_ID + LEFT JOIN `esua_epdc_events`.`epdc_item` ei ON ei.`ID`= tmp.ITEM_ID GROUP BY ei.`GRID_ID`) t2 ON t2.GRID_ID= sd.`id` WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -450,15 +450,15 @@ COUNT(tmp.ID) AS projectCount FROM( SELECT ei.`ID`, ei.`GRID_ID`, ei.`FIRST_CATEGORY_CODE` - FROM .`epdc_item` ei + FROM `esua_epdc_events`.`epdc_item` ei WHERE ei.`DEL_FLAG`= '0' AND ei.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ei.`ISSUE_ID`) tmp - LEFT JOIN .`epdc_category` ec ON ec.`category_code`= tmp.FIRST_CATEGORY_CODE - LEFT JOIN .`sys_dept` sd ON sd.`id`= tmp.GRID_ID + LEFT JOIN `esua_epdc_events`.`epdc_category` ec ON ec.`category_code`= tmp.FIRST_CATEGORY_CODE + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd ON sd.`id`= tmp.GRID_ID GROUP BY tmp.GRID_ID, tmp.FIRST_CATEGORY_CODE @@ -471,10 +471,10 @@ IFNULL(t0.disSatisfaction, 0) AS disSatisfaction, IFNULL(t0.goodSatisfaction, 0) AS goodSatisfaction, IFNULL(t0.greatSatisfaction, 0) AS greatSatisfaction - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT ei.`GRID_ID`, SUM(ei.`EVALUATION_SCORE`= 0) AS disSatisfaction, SUM(ei.`EVALUATION_SCORE`= 1) AS goodSatisfaction, SUM(ei.`EVALUATION_SCORE`= 2) AS greatSatisfaction - FROM .`epdc_item` ei + FROM `esua_epdc_events`.`epdc_item` ei WHERE ei.`DEL_FLAG`= '0' AND DATE_FORMAT(ei.`EVALUATION_TIME`, '%Y-%m')= #{yearMonth} GROUP BY ei.`GRID_ID`) t0 ON t0.GRID_ID= sd.`id` @@ -482,7 +482,7 @@ AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -491,42 +491,46 @@ SUM(en.`READING_AMOUNT`) AS readCount, SUM(en.`LIKE_NUMBER`) AS likeCount, 0 AS commentCount - FROM .`epdc_news` en + FROM `esua_epdc_news`.`epdc_news` en WHERE en.`DEL_FLAG`= '0' AND en.`NEWS_RELEASE_STATE`= '0' AND en.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -561,11 +565,11 @@ IFNULL(t1.topicCount, 0) AS topicCount, IFNULL(t1.partiCount, 0) AS partiCount, IFNULL(t1.shiftIssueCount, 0) AS shiftIssueCount - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT eg.`GRID_ID`, COUNT(DISTINCT eg.`ID`) AS groupCount, COUNT(DISTINCT eug.`ID`) AS memberCount - FROM .`epdc_group` eg - LEFT JOIN .`epdc_user_group` eug ON eug.`GROUP_ID`= eg.`ID` + FROM `esua_epdc_group`.`epdc_group` eg + LEFT JOIN `esua_epdc_group`.`epdc_user_group` eug ON eug.`GROUP_ID`= eg.`ID` AND eug.`DEL_FLAG`= '0' AND eug.`STATE`= 10 WHERE eg.`DEL_FLAG`= '0' @@ -574,8 +578,8 @@ LEFT JOIN( SELECT eg.`GRID_ID`, COUNT(DISTINCT et.`ID`) AS topicCount, SUM(et.`COMMENT_NUM`) AS partiCount, SUM(et.`STATE`= 10 OR et.`STATE`= 15) AS shiftIssueCount - FROM .`epdc_group` eg - LEFT JOIN .`epdc_topic` et ON et.`GROUP_ID`= eg.`ID` + FROM `esua_epdc_group`.`epdc_group` eg + LEFT JOIN `esua_epdc_group`.`epdc_topic` et ON et.`GROUP_ID`= eg.`ID` AND et.`DEL_FLAG`= '0' WHERE eg.`DEL_FLAG`= '0' AND eg.`STATE` IN(10, 15) @@ -584,7 +588,7 @@ AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -602,25 +606,25 @@ FROM( SELECT eg.`GRID_ID`, eg.`ID`, eg.`GROUP_NAME`, eug.`NICKNAME`,( SELECT COUNT(t.`ID`) - FROM .`epdc_user_group` t + FROM `esua_epdc_group`.`epdc_user_group` t WHERE t.`DEL_FLAG`= '0' AND t.`STATE`= 10 AND t.`GROUP_ID`= eg.`ID`) AS memberCount, COUNT(et.`ID`) AS topicCount, SUM(et.`STATE`= 10 OR et.`STATE`= 15) AS shiftIssueCount - FROM .`epdc_group` eg - LEFT JOIN .`epdc_user_group` eug ON eug.`GROUP_ID`= eg.`ID` + FROM `esua_epdc_group`.`epdc_group` eg + LEFT JOIN `esua_epdc_group`.`epdc_user_group` eug ON eug.`GROUP_ID`= eg.`ID` AND eug.`DEL_FLAG`= '0' AND eug.`STATE`= 10 AND eug.`LORD_FLAG`= '1' - LEFT JOIN .`epdc_topic` et ON et.`GROUP_ID`= eg.`ID` + LEFT JOIN `esua_epdc_group`.`epdc_topic` et ON et.`GROUP_ID`= eg.`ID` AND et.`DEL_FLAG`= '0' WHERE eg.`DEL_FLAG`= '0' AND eg.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY eg.`ID`) t0 - LEFT JOIN .`sys_dept` sd ON sd.`id`= t0.GRID_ID + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd ON sd.`id`= t0.GRID_ID @@ -663,20 +667,20 @@ OR t.`DEPT_ID`= 0 OR t.`DEPT_ID`= '' THEN( SELECT t1.`GRID_ID` - FROM .`epdc_user_grid_relation` t1 + FROM `esua_epdc_user`.`epdc_user_grid_relation` t1 WHERE t1.`DEL_FLAG`= '0' AND t1.`USER_ID`= t.`ID` ORDER BY t1.`CREATED_TIME` LIMIT 1) ELSE t.`DEPT_ID` END AS GRID_ID - FROM .`epdc_user` t + FROM `esua_epdc_user`.`epdc_user` t WHERE t.`DEL_FLAG`= '0' ORDER BY t.`POINTS` DESC LIMIT #{pageSize}) t0 - LEFT JOIN .`sys_dept` sd ON sd.`id`= t0.GRID_ID - LEFT JOIN .`sys_dept` sd1 ON sd1.`id`= sd.`pid` + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd ON sd.`id`= t0.GRID_ID + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd1 ON sd1.`id`= sd.`pid` WHERE t0.GRID_ID NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml index 0619d9c..e313e87 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml @@ -24,14 +24,14 @@ IFNULL( partyGroup.groupActiveUserCount, 0 ) AS groupActiveUserCount, 0 joinThreeMeetsCount FROM - .sys_dept d - LEFT JOIN .sys_dept co on co.id=d.pid - LEFT JOIN .epdc_user us ON us.DEPT_ID = d.id + esua_epdc_admin.sys_dept d + LEFT JOIN esua_epdc_admin.sys_dept co on co.id=d.pid + LEFT JOIN esua_epdc_user.epdc_user us ON us.DEPT_ID = d.id LEFT JOIN ( SELECT USER_ID, count( et.id ) AS createTopicCount - FROM .epdc_topic et + FROM esua_epdc_group.epdc_topic et WHERE et.DEL_FLAG = '0' AND et.PARTY_MEMBER = '1' @@ -43,7 +43,7 @@ SELECT USER_ID, count( et.id ) AS createTopicCount - FROM .epdc_topic_comment et + FROM esua_epdc_group.epdc_topic_comment et WHERE et.DEL_FLAG = '0' AND et.PARTY_FLAG = '1' @@ -56,7 +56,7 @@ USER_ID, count( et.id ) AS shiftIssueCount FROM - .epdc_topic et + esua_epdc_group.epdc_topic et WHERE et.DEL_FLAG = '0' AND et.PARTY_MEMBER = '1' @@ -70,7 +70,7 @@ USER_ID, count( et.id ) AS shiftProjectCount FROM - .epdc_item et + esua_epdc_events.epdc_item et WHERE et.DEL_FLAG = '0' AND et.IS_PARTY_MEMBER = '1' @@ -83,7 +83,7 @@ USER_ID, round( ( count( ISSUE_STATE = 4 ) / count( id ) ) * 100, 2 ) AS topicToIssueRatio FROM - .epdc_issue ei + esua_epdc_events.epdc_issue ei WHERE DEL_FLAG = '0' AND ei.IS_PARTY_MEMBER = '1' @@ -101,22 +101,22 @@ eg.id AS GROUP_ID, eug.USER_ID FROM - .epdc_group eg - LEFT JOIN .epdc_user_group eug ON eug.GROUP_ID = eg.id + esua_epdc_group.epdc_group eg + LEFT JOIN esua_epdc_group.epdc_user_group eug ON eug.GROUP_ID = eg.id WHERE eg.DEL_FLAG = '0' AND eug.LORD_FLAG = '1' AND eg.STATE = 10 GROUP BY eg.id ) meGroup LEFT JOIN( SELECT GROUP_ID, count( id ) AS userCount - FROM .epdc_user_group WHERE DEL_FLAG = '0' AND STATE = 10 GROUP BY GROUP_ID + FROM esua_epdc_group.epdc_user_group WHERE DEL_FLAG = '0' AND STATE = 10 GROUP BY GROUP_ID ) userCount ON userCount.GROUP_ID = meGroup.GROUP_ID LEFT JOIN ( SELECT GROUP_ID, count( id ) AS topicCount FROM - .epdc_topic + esua_epdc_group.epdc_topic WHERE DEL_FLAG = '0' AND date_format( CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} @@ -135,8 +135,8 @@ eg.id AS GROUP_ID, et.USER_ID FROM - .epdc_group eg - LEFT JOIN .epdc_topic et ON et.GROUP_ID = eg.id + esua_epdc_group.epdc_group eg + LEFT JOIN esua_epdc_group.epdc_topic et ON et.GROUP_ID = eg.id WHERE eg.DEL_FLAG = '0' AND eg.STATE = 10 @@ -147,9 +147,9 @@ eg.id AS GROUP_ID, etc.USER_ID FROM - .epdc_group eg - LEFT JOIN .epdc_topic et ON et.GROUP_ID = eg.id - LEFT JOIN .epdc_topic_comment etc ON etc.TOPIC_ID = et.id + esua_epdc_group.epdc_group eg + LEFT JOIN esua_epdc_group.epdc_topic et ON et.GROUP_ID = eg.id + LEFT JOIN esua_epdc_group.epdc_topic_comment etc ON etc.TOPIC_ID = et.id WHERE eg.DEL_FLAG = '0' AND eg.STATE = 10 @@ -161,10 +161,10 @@ eg.id AS GROUP_ID, cua.USER_ID FROM - . epdc_group eg - LEFT JOIN .epdc_topic et ON et.GROUP_ID = eg.id - LEFT JOIN .epdc_topic_comment etc ON etc.TOPIC_ID = et.id - LEFT JOIN .epdc_topic_comment_user_attitude cua ON cua.COMMENT_ID = etc.id + esua_epdc_group. epdc_group eg + LEFT JOIN esua_epdc_group.epdc_topic et ON et.GROUP_ID = eg.id + LEFT JOIN esua_epdc_group.epdc_topic_comment etc ON etc.TOPIC_ID = et.id + LEFT JOIN esua_epdc_group.epdc_topic_comment_user_attitude cua ON cua.COMMENT_ID = etc.id WHERE eg.DEL_FLAG = '0' AND eg.STATE = 10 @@ -185,7 +185,7 @@ AND us.DEL_FLAG = '0' AND us.PARTY_FLAG = '1' AND d.id NOT IN ( - SELECT t.DEPT_ID FROM .`sys_dept_config` t WHERE t.DEL_FLAG = '0' + SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) ORDER BY d.TYPE_KEY @@ -214,13 +214,13 @@ IFNULL(issue.issNum, 0) issueTotal, 0 createThreeMeetsCount, 0 joinThreeMeetsCount - FROM .sys_dept sd + FROM esua_epdc_admin.sys_dept sd LEFT JOIN ( SELECT count(*) userNum, count(uu.PARTY_FLAG = '1' OR NULL) partyNum, uu.DEPT_ID - FROM .epdc_user uu + FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' GROUP BY uu.DEPT_ID ) users ON ( users.DEPT_ID = sd.ID ) @@ -229,8 +229,8 @@ SELECT top.GRID_ID, count(*) topNum - FROM .epdc_topic top - LEFT JOIN .epdc_issue mei ON mei.TOPIC_ID = top.ID AND mei.DEL_FLAG = '0' + FROM esua_epdc_group.epdc_topic top + LEFT JOIN esua_epdc_events.epdc_issue mei ON mei.TOPIC_ID = top.ID AND mei.DEL_FLAG = '0' WHERE top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} GROUP BY top.GRID_ID @@ -241,7 +241,7 @@ count(et.IS_PARTY_MEMBER = '1' OR NULL) partyToItemNum, count(et.IS_PARTY_MEMBER = '0' OR NULL) userToItemNum FROM - .epdc_item et + esua_epdc_events.epdc_item et WHERE et.DEL_FLAG = '0' AND date_format( et.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} @@ -255,15 +255,15 @@ SELECT g.GRID_ID DEPT_ID, ug.USER_ID,count(*) createGroupNum - FROM .epdc_group g - LEFT JOIN .epdc_user_group ug ON ug.GROUP_ID = g.ID AND ug.DEL_FLAG = '0' AND ug.LORD_FLAG = '1' AND ug.PARTY_MEMBER = '1' + FROM esua_epdc_group.epdc_group g + LEFT JOIN esua_epdc_group.epdc_user_group ug ON ug.GROUP_ID = g.ID AND ug.DEL_FLAG = '0' AND ug.LORD_FLAG = '1' AND ug.PARTY_MEMBER = '1' WHERE g.DEL_FLAG = '0' AND ug.USER_ID IS NOT NULL GROUP BY ug.USER_ID ) cg GROUP BY cg.DEPT_ID ) groupUser on groupUser.DEPT_ID = sd.ID LEFT JOIN ( SELECT count(*) newNum , n.DEPT_ID - FROM .epdc_news n + FROM esua_epdc_news.epdc_news n WHERE n.DEL_FLAG = '0' AND n.NEWS_RELEASE_STATE = '0' AND n.NEWS_UP_DOWN_STATE = '0' and date_format(n.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} GROUP BY n.DEPT_ID @@ -272,7 +272,7 @@ SELECT iss.GRID_ID, count(*) issNum - FROM .epdc_issue iss + FROM esua_epdc_events.epdc_issue iss WHERE iss.DEL_FLAG = '0' and date_format(iss.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} GROUP BY iss.GRID_ID @@ -282,7 +282,7 @@ sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.id NOT IN ( - SELECT t.DEPT_ID FROM .`sys_dept_config` t WHERE t.DEL_FLAG = '0' + SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) AND sd.TYPE_KEY = 'grid_party' @@ -290,7 +290,8 @@ @@ -335,12 +336,12 @@ IFNULL(actInfo.volunteerNum,0) volunteerTotal, IFNULL(actInfo.volunteerNum,0) volunteerUserTotal, IFNULL(actInfo.userNum,0) regUserTotal - from .sys_dept sd + from esua_epdc_admin.sys_dept sd left join ( select DEPT_ID, count(*) actNum - from .epdc_act_info + from esua_epdc_mutuality.epdc_act_info where DEL_FLAG = '0' and ACT_STATUS = '1' and SIGNUP_END_TIME <= now() @@ -362,9 +363,9 @@ count((vol.AUDIT_STATUS = '1' or vol.AUDIT_STATUS = '0') or null) volunteerNum, count(((vol.AUDIT_STATUS = '1' or vol.AUDIT_STATUS = '0') and ur.PARTY_FLAG = '1') or null) partyVolunteerNum from - .epdc_act_info act - left join .epdc_act_user_relation ur on ur.ACT_ID = act.ID and ur.DEL_FLAG = '0' and ur.`STATUS` = '1' - left join .epdc_volunteer_info vol on vol.USER_ID = ur.USER_ID and vol.DEL_FLAG = '0' + esua_epdc_mutuality.epdc_act_info act + left join esua_epdc_mutuality.epdc_act_user_relation ur on ur.ACT_ID = act.ID and ur.DEL_FLAG = '0' and ur.`STATUS` = '1' + left join esua_epdc_user.epdc_volunteer_info vol on vol.USER_ID = ur.USER_ID and vol.DEL_FLAG = '0' where act.DEL_FLAG = '0' and act.ACT_STATUS = '1' and act.SIGNUP_END_TIME <= now() @@ -376,7 +377,7 @@ where sd.DEL_FLAG = '0' and sd.id not in ( - select t.DEPT_ID from .`sys_dept_config` t where t.DEL_FLAG = '0' + select t.DEPT_ID from `esua_epdc_admin`.`sys_dept_config` t where t.DEL_FLAG = '0' ) and sd.TYPE_KEY = 'grid_party' @@ -384,7 +385,8 @@ @@ -440,19 +442,19 @@ IFNULL(itemCount.itemCloseAndScoreNum,0) satisfactionRatioFm, IFNULL(itemCount.itemNum,0) issueToProjectRatioFz, IFNULL(issueCount.issueNum,0) issueToProjectRatioFm - from .sys_dept sd + from esua_epdc_admin.sys_dept sd left join ( select mei.GRID_ID DEPT_ID , count(*) issueNum - from .epdc_issue mei + from esua_epdc_events.epdc_issue mei where mei.DEL_FLAG = '0' and date_format(mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} group by mei.GRID_ID ) issueCount on issueCount.DEPT_ID = sd.ID left join ( - select count(*) userNum,uu.DEPT_ID from .epdc_user uu where uu.DEL_FLAG = '0' group by uu.DEPT_ID + select count(*) userNum,uu.DEPT_ID from esua_epdc_user.epdc_user uu where uu.DEL_FLAG = '0' group by uu.DEPT_ID ) users on users.DEPT_ID = sd.ID left join ( @@ -464,8 +466,8 @@ count((item.ITEM_STATE = 10 and item.EVALUATION_SCORE is not null) or null) itemCloseAndScoreNum, count((item.ITEM_STATE = 10 and item.EVALUATION_SCORE = 1) or null) itemSatisfiedNum, count((item.ITEM_STATE = 10 and item.EVALUATION_SCORE = 2) or null) itemVeryNum - from .epdc_item item - left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID + from esua_epdc_events.epdc_item item + left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID ) ide on ide.ITEM_ID = item.ID where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} @@ -475,7 +477,7 @@ where sd.DEL_FLAG = '0' and sd.id not in ( - select t.DEPT_ID FROM .`sys_dept_config` t where t.DEL_FLAG = '0' + select t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t where t.DEL_FLAG = '0' ) and sd.TYPE_KEY = 'grid_party' @@ -483,7 +485,8 @@ @@ -573,15 +576,15 @@ IFNULL(tr.closedProjectRatio,0.00) AS closedProjectRatio, IFNULL(tr.satisfactionRatio,0.00) AS satisfactionRatio, IFNULL(tr.handleProjectRatio,0.00) AS handleProjectRatio, - IFNULL(tr.respProjectRatioFz,0) AS respProjectRatioFz, - IFNULL(tr.respProjectRatioFm,0) AS respProjectRatioFm, - IFNULL(tr.handleProjectRatioFz,0) AS handleProjectRatioFz, - IFNULL(tr.handleProjectRatioFm,0) AS handleProjectRatioFm, - IFNULL(tr.closedProjectRatioFz,0) AS closedProjectRatioFz, - IFNULL(tr.closedProjectRatioFm,0) AS closedProjectRatioFm, - IFNULL(tr.satisfactionRatioFz,0) AS satisfactionRatioFz, - IFNULL(tr.satisfactionRatioFm,0) AS satisfactionRatioFm - FROM .sys_dept d + IFNULL(tr.respProjectRatioFz,0) AS respProjectRatioFz, + IFNULL(tr.respProjectRatioFm,0) AS respProjectRatioFm, + IFNULL(tr.handleProjectRatioFz,0) AS handleProjectRatioFz, + IFNULL(tr.handleProjectRatioFm,0) AS handleProjectRatioFm, + IFNULL(tr.closedProjectRatioFz,0) AS closedProjectRatioFz, + IFNULL(tr.closedProjectRatioFm,0) AS closedProjectRatioFm, + IFNULL(tr.satisfactionRatioFz,0) AS satisfactionRatioFz, + IFNULL(tr.satisfactionRatioFm,0) AS satisfactionRatioFm + FROM esua_epdc_admin.sys_dept d left join (select t.DEPT_ID, sum(t.transferedCount) as transferedCount, @@ -606,21 +609,21 @@ sum(if(hp.CREATED_TIME is not null, TIMESTAMPDIFF(HOUR,ei.CREATED_TIME,hp.CREATED_TIME), TIMESTAMPDIFF(HOUR,ei.CREATED_TIME,now()))) respProject - from .epdc_item_dept ei - left join .epdc_item_handle_process hp on hp.id=ei.ITEM_HANDLE_ID and hp.DEL_FLAG=0 + from esua_epdc_events.epdc_item_dept ei + left join esua_epdc_events.epdc_item_handle_process hp on hp.id=ei.ITEM_HANDLE_ID and hp.DEL_FLAG=0 where ei.DEL_FLAG = '0' and date_format(ei.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} group by ei.DEPT_ID,ei.ITEM_ID )t - left join .epdc_item me on t.ITEM_ID=me.id and me.DEL_FLAG = '0' - left join .epdc_item_handle_process eih on eih.ITEM_ID=me.id - LEFT JOIN .epdc_category c ON me.CATEGORY_CODE = c.CATEGORY_CODE + left join esua_epdc_events.epdc_item me on t.ITEM_ID=me.id and me.DEL_FLAG = '0' + left join esua_epdc_events.epdc_item_handle_process eih on eih.ITEM_ID=me.id + LEFT JOIN esua_epdc_events.epdc_category c ON me.CATEGORY_CODE = c.CATEGORY_CODE group by t.DEPT_ID )tr on tr.DEPT_ID=d.id - WHERE d.TYPE_KEY IN ('street_dept', 'district_dept') + WHERE d.TYPE_KEY = 'district_dept' and d.DEL_FLAG = '0' and d.id not in ( - SELECT t.DEPT_ID FROM .`sys_dept_config` t WHERE t.DEL_FLAG = '0' + SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) ORDER BY d.TYPE_KEY diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml new file mode 100644 index 0000000..e726ff0 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 1fd3785..8228afa 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -6,8 +6,8 @@ @@ -37,12 +38,12 @@ '' AS partyMark, DATE_FORMAT(NOW(), '%Y%m%d') AS dataEndTime, sd.area_code - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -55,13 +56,3016 @@ '' AS deptMark, DATE_FORMAT(NOW(), '%Y%m%d') AS dataEndTime, sd.area_code - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd WHERE sd.`del_flag`= 0 AND sd.`type_key` IN ('street_dept', 'district_dept') AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..9c7af19 --- /dev/null +++ b/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.esua.epdc.yushan + epdc-cloud-analysis-pc-yushan + 1.0.0 + pom + 榆山党群e家微服务数据分析模块 + + + epdc-cloud-analysis-pc + epdc-cloud-client-yushan + epdc-cloud-commons-yushan + epdc-cloud-gateway-yushan + epdc-cloud-parent-yushan + +