Merge remote-tracking branch 'origin/feature/screenJop' into feature/screenJop

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java

@@ -111,7 +111,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
     public void save(SysRoleDTO dto) {
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
 
-        checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
+        //checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
 
         //保存角色
         insert(entity);
@@ -170,7 +170,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
     @Transactional(rollbackFor = Exception.class)
     public void update(SysRoleDTO dto) {
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
-        checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
+        //checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
         //更新角色
         updateById(entity);
 

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java

@@ -0,0 +1,82 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 党员基本情况
+ * @author: wangtong
+ * @create: 2020-08-19 13:58
+ **/
+@Data
+public class CpcbasedataDTO implements Serializable {
+
+    private static final long serialVersionUID = 7240758113851172699L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *注册用户数
+     */
+    private Integer registerUserCount;
+
+    /**
+     *群众用户数
+     */
+    private Integer resiTotal;
+
+    /**
+     *注册党员数
+     */
+    private Integer partyMemberCount;
+
+    /**
+     *小于20岁
+     */
+    private Integer ageLevel1;
+
+    /**
+     *20-30岁
+     */
+    private Integer ageLevel2;
+
+    /**
+     *31-40岁
+     */
+    private Integer ageLevel3;
+
+    /**
+     *41-50岁
+     */
+    private Integer ageLevel4;
+
+    /**
+     *51-60岁
+     */
+    private Integer ageLevel5;
+
+    /**
+     *60+岁
+     */
+    private Integer ageLevel6;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomeragencyResultDTO.java

@@ -0,0 +1,74 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 组织层级
+ * @author: wangtong
+ * @create: 2020-08-21 18:14
+ **/
+@Data
+public class CustomeragencyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2415663167177454669L;
+
+    /**
+     *组织id
+     */
+    private String agencyId;
+
+    /**
+     *组织名称
+     */
+    private String agencyName;
+
+    /**
+     *父级id ,顶级，此列为0
+     */
+    private String pid;
+
+    /**
+     *所有上级ID，用逗号分开
+     */
+    private String pids;
+
+    /**
+     *所有组织名称以-链接
+     */
+    private String allParentNames;
+
+    /**
+     *坐标区域
+     */
+    private String areaMarks;
+
+    /**
+     *中心点位
+     */
+    private String centerMark;
+
+    /**
+     *党工委|街道党委的位置，预留字段
+     */
+    private String partyMark;
+
+    /**
+     *机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+     */
+    private String level;
+
+    /**
+     *行政地区编码
+     */
+    private String areaCode;
+
+    /**
+     *数据更新至: yyyy|yyyyMM|yyyyMMdd
+     */
+    private String dataEndTime;
+
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomergridResultDTO.java

@@ -0,0 +1,52 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 网格信息上传
+ * @author: wangtong
+ * @create: 2020-08-21 18:11
+ **/
+@Data
+public class CustomergridResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8040800736309043807L;
+
+    /**
+     *网格id
+     */
+    private String gridId;
+
+    /**
+     *网格名称
+     */
+    private String gridName;
+
+    /**
+     *网格所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     *坐标区域可空
+     */
+    private String areaMarks;
+
+    /**
+     *中心点位可空
+     */
+    private String centerMark;
+
+    /**
+     *党支部的位置！！！
+     */
+    private String partyMark;
+
+    /**
+     *数据更新至: yyyy|yyyyMM|yyyyMMdd
+     */
+    private String dataEndTime;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DataStatsScreencollResultDTO.java

@@ -0,0 +1,18 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 大屏展示
+ * @author: wangtong
+ * @create: 2020-08-19 13:46
+ **/
+@Data
+public class DataStatsScreencollResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -83110725240264840L;
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataImgListDTO.java

@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 事件数据-图片列表
+ * @author: wangtong
+ * @create: 2020-08-20 13:38
+ **/
+@Data
+public class EventdataImgListDTO implements Serializable {
+
+    private static final long serialVersionUID = -5661511223100857441L;
+
+    /**
+     * 原始事件id
+     */
+    private String eventId;
+
+    /**
+     * 图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataResultDTO.java

@@ -0,0 +1,121 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 事件数据
+ * @author: wangtong
+ * @create: 2020-08-20 11:20
+ **/
+@Data
+public class EventdataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3736021322966785928L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *原始事件Id
+     */
+    private String eventId;
+
+    /**
+     *事件名称
+     */
+    private String eventTitle;
+
+    /**
+     *yyyy-MM-dd HH:mm:ss事件时间
+     */
+    private String eventCreateTime;
+
+    /**
+     *联系人
+     */
+    private String linkMobile;
+
+    /**
+     *事件内容
+     */
+    private String eventContent;
+
+    /**
+     *事件图片（如果有图片，此列为第一张图片）
+     */
+    private String eventImgUrl;
+
+    /**
+     *事件待处理级别 red:红；yellow：黄 , green绿色
+     */
+    private String eventLevel;
+
+    /**
+     *事件发生的地址
+     */
+    private String eventAddress;
+
+    /**
+     *经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     *纬度
+     */
+    private BigDecimal latitude;
+
+    /**
+     *最后处理的组织名称
+     */
+    private String lastProcessDept;
+
+    /**
+     *最后处理的时间
+     */
+    private String lastProcessDate;
+
+    /**
+     * 图片列表
+     */
+    private List<EventdataImgListDTO> imgDataList;
+
+    /**
+     *事件状态描述
+     */
+    private String eventStatusDesc;
+
+    /**
+     *事件状态key
+     */
+    private String eventStatusCode;
+
+    /**
+     *最近一次操作说明 eg: 转项目，结案，流转
+     */
+    private String latestOperateDesc;
+
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/MeetdataResultDTO.java

@@ -0,0 +1,77 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 基层党建-建设情况数据（支部、联建、志愿）
+ * @author: wangtong
+ * @create: 2020-08-20 13:58
+ **/
+@Data
+public class MeetdataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7240758113851172699L;
+
+    /**
+     * 年Id:yyyy
+     */
+    private String yearId;
+
+    /**
+     * 月id:yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice
+     */
+    private String type;
+
+    /**
+     * 组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     * 组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     * 上级组织Id,顶级组织默认是0
+     */
+    private String parentId;
+
+    /**
+     * 组织名称
+     */
+    private String orgName;
+
+    /**
+     * 会议分类名称
+     */
+    private String meetCategoryName;
+
+    /**
+     * 会议分类id
+     */
+    private String meetCategoryId;
+
+    /**
+     * 组织次数
+     */
+    private Integer organizeCount;
+
+    /**
+     * 参加人数
+     */
+    private Integer joinUserCount;
+
+    /**
+     * 平均参加人数
+     */
+    private Integer averageJoinUserCount;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java

@@ -0,0 +1,47 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 党建引领-党员联系群众数据
+ * @author: wangtong
+ * @create: 2020-08-20 14:25
+ **/
+@Data
+public class PartylinkmassesdataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4303651299312624786L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *建群总数
+     */
+    private Integer createGroupTotal;
+
+    /**
+     *群成员总数
+     */
+    private Integer groupUserTotal;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java

@@ -0,0 +1,63 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 党建引领-先锋模范数据
+ * @author: wangtong
+ * @create: 2020-08-20 18:03
+ **/
+@Data
+public class PioneerdataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4681354998669289322L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *用户总数
+     */
+    private Integer userTotal;
+
+    /**
+     *议事数
+     */
+    private Integer issueTotal;
+
+    /**
+     *话题总数
+     */
+    private Integer topicTotal;
+
+    /**
+     *议题转项目数
+     */
+    private Integer shiftProjectTotal;
+
+    /**
+     *解决项目总数
+     */
+    private Integer resolvedProjectTotal;
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java

@@ -0,0 +1,67 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 中央区各类总数
+ * @author: wangtong
+ * @create: 2020-08-21 10:34
+ **/
+@Data
+public class UsertotaldataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4308356025431997272L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *用户总数
+     */
+    private Integer userTotal;
+
+    /**
+     *注册党员数
+     */
+    private Integer partyTotal;
+
+    /**
+     *小组（党群）总数
+     */
+    private Integer groupTotal;
+
+    /**
+     *议事数
+     */
+    private Integer issueTotal;
+
+    /**
+     *话题总数
+     */
+    private Integer topicTotal;
+
+    /**
+     *项目总数
+     */
+    private Integer projectTotal;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java

@@ -0,0 +1,120 @@
+package com.elink.esua.epdc.modules.screen.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.modules.screen.service.DataStatsScreencollService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 大屏展示相关
+ *
+ * @author wangtong
+ * @since 2020-08-19
+ */
+@RestController
+@RequestMapping("data/stats/screencoll")
+public class DataStatsScreencollController {
+
+    @Autowired
+    private DataStatsScreencollService dataStatsScreencollService;
+
+    /**
+    * @describe: 党员基本情况
+    * @author wangtong
+    * @date 2020/8/19 17:25
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO>
+    */
+    @PostMapping("cpcbasedata")
+    public Result cpcbasedata() {
+        return dataStatsScreencollService.cpcbasedata();
+    }
+
+    /**
+    * @describe: 事件数据
+    * @author wangtong
+    * @date 2020/8/20 11:19
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("eventdata")
+    public Result eventdata() {
+        return dataStatsScreencollService.eventdata();
+    }
+
+    
+    /**
+    * @describe: 党建引领-党员联系群众数据
+    * @author wangtong
+    * @date 2020/8/20 14:25
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("partylinkmassesdata")
+    public Result partylinkmassesdata() {
+        return dataStatsScreencollService.partylinkmassesdata();
+    }
+
+    /**
+    * @describe: 党建引领-先锋模范数据
+    * @author wangtong
+    * @date 2020/8/20 18:02
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("pioneerdata")
+    public Result pioneerdata() {
+        return dataStatsScreencollService.pioneerdata();
+    }
+
+    /**
+    * @describe: 中央区各类总数
+    * @author wangtong
+    * @date 2020/8/21 10:32
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("usertotaldata")
+    public Result usertotaldata() {
+        return dataStatsScreencollService.usertotaldata();
+    }
+
+
+    /**
+    * @describe: 基层党建-建设情况数据（支部、联建、志愿）
+    * @author wangtong
+    * @date 2020/8/21 18:01
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("meetdata")
+    public Result meetdata() {
+        return dataStatsScreencollService.meetdata();
+    }
+
+    /**
+    * @describe: 网格信息上传
+    * @author wangtong
+    * @date 2020/8/21 18:09
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("customergrid")
+    public Result customergrid() {
+        return dataStatsScreencollService.customergrid();
+    }
+
+    /**
+    * @describe: 组织层级
+    * @author wangtong
+    * @date 2020/8/21 18:19
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("customeragency")
+    public Result customeragency() {
+        return dataStatsScreencollService.customeragency();
+    }
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java

@@ -0,0 +1,105 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.*;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Description 大屏展示
+ * @Author wangtong
+ * @Date 2020/08/19 13:43
+ */
+@Mapper
+public interface DataStatsScreencollDao extends BaseDao<DataStatsScreencollResultDTO> {
+
+    /**
+    * @describe: 党员基本情况
+    * @author wangtong
+    * @date 2020/8/19 17:21
+    * @params []
+    * @return com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO
+    */
+    List<CpcbasedataDTO> cpcbasedata();
+
+    /**
+    * @describe: 事件数据
+    * @author wangtong
+    * @date 2020/8/20 13:41
+    * @params []
+    * @return com.elink.esua.epdc.dto.screen.result.EventdataResultDTO
+    */
+    List<EventdataResultDTO> eventdata();
+
+    /**
+    * @describe: 党建引领-党员联系群众数据
+    * @author wangtong
+    * @date 2020/8/20 14:34
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.PartylinkmassesdataResultDTO>
+    */
+    List<PartylinkmassesdataResultDTO> partylinkmassesdata();
+
+    /**
+    * @describe: 党建引领-先锋模范数据
+    * @author wangtong
+    * @date 2020/8/20 18:05
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.PioneerdataResultDTO>
+    */
+    List<PioneerdataResultDTO> pioneerdata();
+
+    /**
+    * @describe: 
+    * @author wangtong
+    * @date 2020/8/21 10:38
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.UsertotaldataResultDTO>
+    */
+    List<UsertotaldataResultDTO> usertotaldata();
+
+    /**
+    * @describe: 基层党建-建设情况数据（支部、联建、志愿）
+    * @author wangtong
+    * @date 2020/8/21 18:03
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.MeetdataResultDTO>
+    */
+    List<MeetdataResultDTO> meetdata();
+
+    /**
+    * @describe: 网格信息上传
+    * @author wangtong
+    * @date 2020/8/21 18:18
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CustomergridResultDTO>
+    */
+    List<CustomergridResultDTO> customergrid();
+
+    /**
+    * @describe: 组织层级
+    * @author wangtong
+    * @date 2020/8/21 18:21
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CustomeragencyResultDTO>
+    */
+    List<CustomeragencyResultDTO> customeragency();
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java

@@ -0,0 +1,86 @@
+package com.elink.esua.epdc.modules.screen.service;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO;
+
+/**
+ * 项目模块
+ *
+ * @Author wanttong
+ * @Date 2020/08/19 13:43
+ */
+public interface DataStatsScreencollService {
+
+
+    /**
+    * @describe: 党员基本情况
+    * @author wangtong
+    * @date 2020/8/19 13:53
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result<CpcbasedataDTO> cpcbasedata();
+
+    /**
+    * @describe: 事件数据
+    * @author wangtong
+    * @date 2020/8/20 11:19
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result eventdata();
+
+    /**
+    * @describe: 党建引领-党员联系群众数据
+    * @author wangtong
+    * @date 2020/8/20 14:25
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result partylinkmassesdata();
+
+    /**
+    * @describe: 党建引领-先锋模范数据
+    * @author wangtong
+    * @date 2020/8/20 18:03
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result pioneerdata();
+
+    /**
+    * @describe: 中央区各类总数
+    * @author wangtong
+    * @date 2020/8/21 10:33
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result usertotaldata();
+
+    /**
+    * @describe: 基层党建-建设情况数据（支部、联建、志愿）
+    * @author wangtong
+    * @date 2020/8/21 18:01
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result meetdata();
+
+    /**
+    * @describe: 网格信息上传
+    * @author wangtong
+    * @date 2020/8/21 18:10
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result customergrid();
+
+    /**
+    * @describe: 组织层级
+    * @author wangtong
+    * @date 2020/8/21 18:20
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result customeragency();
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java

@@ -0,0 +1,79 @@
+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.utils.Result;
+import com.elink.esua.epdc.dto.screen.result.*;
+import com.elink.esua.epdc.modules.screen.dao.DataStatsScreencollDao;
+import com.elink.esua.epdc.modules.screen.service.DataStatsScreencollService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description 大屏展示相关
+ * @Author wangtong
+ * @Date 2020/08/19 13:43
+ */
+@Service
+public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScreencollDao, DataStatsScreencollResultDTO> implements DataStatsScreencollService {
+
+	private Logger logger = LoggerFactory.getLogger(getClass());
+
+
+
+	@Override
+	public Result<CpcbasedataDTO> cpcbasedata() {
+		List<CpcbasedataDTO> result = baseDao.cpcbasedata();
+		return null;
+	}
+
+	@Override
+	public Result eventdata() {
+		List<EventdataResultDTO> resultList = baseDao.eventdata();
+		for(EventdataResultDTO re : resultList){
+			for(int x = 0;x < re.getImgDataList().size();x++){
+				re.getImgDataList().get(x).setEventId(re.getEventId());
+				re.getImgDataList().get(x).setSort(x+1);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public Result partylinkmassesdata() {
+		List<PartylinkmassesdataResultDTO> resultList = baseDao.partylinkmassesdata();
+		return null;
+	}
+
+	@Override
+	public Result pioneerdata() {
+		List<PioneerdataResultDTO> resultList = baseDao.pioneerdata();
+		return null;
+	}
+
+	@Override
+	public Result usertotaldata() {
+		List<UsertotaldataResultDTO> resultList = baseDao.usertotaldata();
+		return null;
+	}
+
+	@Override
+	public Result meetdata() {
+		List<MeetdataResultDTO> resultList = baseDao.meetdata();
+		return null;
+	}
+
+	@Override
+	public Result customergrid() {
+		List<CustomergridResultDTO> resultList = baseDao.customergrid();
+		return null;
+	}
+
+	@Override
+	public Result customeragency() {
+		List<CustomeragencyResultDTO> resultList = baseDao.customeragency();
+		return null;
+	}
+}