大屏活动接口

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java

@@ -238,11 +238,13 @@ public class IssueController {
     }
 
     /**
-     * @Description: 锦水大屏月度统计
+     * @Description: 锦水大屏统计
-     * @param id:
+     * @param startDate:
-     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.IssueContentDetailDTO>
+     * @param endDate:
+     * @param type:
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.issue.ScreenIssueCensusDTO>>
      * @Author: lichao
-     * @Date: 2023/9/6 15:06
+     * @Date: 2023/9/12 17:22
      */
     @GetMapping("screenJinShui/issueCensus")
     public Result<List<ScreenIssueCensusDTO>> screenIssueCensus(@RequestParam String startDate, @RequestParam String endDate, @RequestParam String type) {

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ScreenActCensusDTO.java

@@ -0,0 +1,19 @@
+package com.elink.esua.epdc.activity.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 大屏统计
+ * @Author LC
+ * @Date 2019/9/6 15:58
+ */
+@Data
+public class ScreenActCensusDTO implements Serializable {
+    private static final long serialVersionUID = 8931053684837605978L;
+
+    private String date;
+
+    private Integer count;
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.activity.ActInfoDTO;
 import com.elink.esua.epdc.activity.form.ActInfoFormDTO;
 import com.elink.esua.epdc.activity.form.ActTopFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoResultDTO;
+import com.elink.esua.epdc.activity.result.ScreenActCensusDTO;
 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.utils.ExcelUtils;
@@ -31,6 +32,7 @@ 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.constant.ActStateConstant;
+import com.elink.esua.epdc.dto.issue.ScreenIssueCensusDTO;
 import com.elink.esua.epdc.dto.item.ItemTopFormDTO;
 import com.elink.esua.epdc.modules.activity.excel.ActInfoExcel;
 import com.elink.esua.epdc.modules.activity.service.ActInfoService;
@@ -136,4 +138,20 @@ public class ActInfoController {
         ValidatorUtils.validateEntity(formDto);
         return actInfoService.modifyActTopFlag(formDto);
     }
+
+
+    /**
+     * @Description: 锦水大屏统计
+     * @param startDate:
+     * @param endDate:
+     * @param type:
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.activity.result.ScreenActCensusDTO>>
+     * @Author: lichao
+     * @Date: 2023/9/12 17:21
+     */
+    @GetMapping("screenJinShui/actCensus")
+    public Result<List<ScreenActCensusDTO>> screenactCensus(@RequestParam String startDate, @RequestParam String endDate, @RequestParam String type) {
+        List<ScreenActCensusDTO> result = actInfoService.screenactCensus(startDate,endDate,type);
+        return new Result<List<ScreenActCensusDTO>>().ok(result);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java

@@ -169,4 +169,10 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
     * @return java.util.List<com.elink.esua.epdc.modules.activity.entity.ActInfoEntity>
     */
     List<ActInfoEntity> selectByTeamId(@Param("teamId") String teamId);
+
+    List<ScreenActCensusDTO> screenactCensusForMonth(String startDate, String endDate);
+
+    List<ScreenActCensusDTO> screenactCensusForQuarter(String startDate, String endDate);
+
+    List<ScreenActCensusDTO> screenactCensusForYear(String startDate, String endDate);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java

@@ -22,10 +22,7 @@ import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.form.ActInfoFormDTO;
 import com.elink.esua.epdc.activity.form.ActSignInListFormDTO;
 import com.elink.esua.epdc.activity.form.ActTopFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
+import com.elink.esua.epdc.activity.result.*;
-import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.activity.result.ActInfoResultDTO;
-import com.elink.esua.epdc.activity.result.ActSignInListResultDTO;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -255,4 +252,6 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result modifyActTopFlag(ActTopFormDTO formDto);
+
+    List<ScreenActCensusDTO> screenactCensus(String startDate, String endDate, String type);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java

@@ -51,6 +51,7 @@ import com.elink.esua.epdc.constant.*;
 import com.elink.esua.epdc.dto.ScheduleJobDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeUpdateFormDTO;
+import com.elink.esua.epdc.dto.issue.ScreenIssueCensusDTO;
 import com.elink.esua.epdc.modules.activity.dao.*;
 import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity;
@@ -875,6 +876,29 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         return new Result();
     }
 
+    @Override
+    public List<ScreenActCensusDTO> screenactCensus(String startDate, String endDate, String type) {
+
+        List<ScreenActCensusDTO> result = new ArrayList<>();
+
+        // type 月份  季度  年份
+        if (type.equals("month")){
+
+            result = baseDao.screenactCensusForMonth(startDate,endDate);
+
+        }else if (type.equals("quarter")){
+
+            result = baseDao.screenactCensusForQuarter(startDate,endDate);
+
+        }else if (type.equals("year")){
+
+            result = baseDao.screenactCensusForYear(startDate,endDate);
+
+        }
+
+        return result;
+    }
+
     /**
      * 校验活动详细时间段
      *

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -609,4 +609,40 @@
         select * from epdc_act_info where TEAM_ID=#{teamId}
             AND DEL_FLAG='0'
     </select>
+    <select id="screenactCensusForMonth" resultType="com.elink.esua.epdc.activity.result.ScreenActCensusDTO">
+
+        SELECT
+            DATE_FORMAT(act.CREATED_TIME,'%Y-%m') AS date,
+            COUNT(*) AS count
+        FROM
+            epdc_act_info act
+        WHERE
+            STR_TO_DATE(act.CREATED_TIME, '%Y-%m') BETWEEN STR_TO_DATE(#{startDate}, '%Y-%m') AND STR_TO_DATE(#{endDate}, '%Y-%m')
+          AND act.DEL_FLAG = '0'
+        GROUP BY date
+    </select>
+    <select id="screenactCensusForQuarter" resultType="com.elink.esua.epdc.activity.result.ScreenActCensusDTO">
+        SELECT
+            CONCAT(YEAR(act.CREATED_TIME), '-第',QUARTER(act.CREATED_TIME),'季度') AS date,
+            COUNT(*) AS count
+        FROM
+            epdc_act_info act
+        WHERE
+            STR_TO_DATE(act.CREATED_TIME, '%Y-%m') BETWEEN STR_TO_DATE(#{startDate}, '%Y-%m') AND STR_TO_DATE(#{endDate}, '%Y-%m')
+          AND act.DEL_FLAG = '0'
+        GROUP BY
+            date
+    </select>
+    <select id="screenactCensusForYear" resultType="com.elink.esua.epdc.activity.result.ScreenActCensusDTO">
+        SELECT
+            YEAR(act.CREATED_TIME) AS date,
+            COUNT(*) AS count
+        FROM
+            epdc_act_info act
+        WHERE
+            YEAR(act.CREATED_TIME) BETWEEN CAST(#{startDate} as SIGNED) AND CAST(#{endDate} as SIGNED)
+          AND act.DEL_FLAG = '0'
+        GROUP BY
+            date
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenCommunityDTO.java

@@ -113,6 +113,11 @@ public class ScreenCommunityDTO implements Serializable {
      */
     private String partyGroupId;
 
+    /**
+     * 产品组织id
+     */
+    private String agencyId;
+
     /**
      * 创建人
      */

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenCommunityEntity.java

@@ -113,4 +113,9 @@ public class ScreenCommunityEntity extends BaseEpdcEntity {
 	 */
 	private String partyGroupId;
 
+	/**
+	 * 产品组织id
+	 */
+	private String agencyId;
+
 }

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenCommunityDao.xml

@@ -18,6 +18,7 @@
         <result property="partyMemberNum" column="PARTY_MEMBER_NUM"/>
         <result property="volunteerCount" column="VOLUNTEER_COUNT"/>
         <result property="isParty" column="IS_PARTY"/>
+        <result property="agencyId" column="AGENCY_ID"/>
         <result property="deptId" column="DEPT_ID"/>
         <result property="partyGroupId" column="PARTY_GROUP_ID"/>
         <result property="createdBy" column="CREATED_BY"/>

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerDetailDTO.java

@@ -0,0 +1,77 @@
+/**
+ * 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.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 志愿者信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-11
+ */
+@Data
+public class ScreenVolunteerDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 爱心时长(单位：分钟)
+     */
+    private BigDecimal kindnessTime;
+
+
+    /**
+     * 志愿者昵称
+     */
+    private String volunteerNickname;
+
+
+    private String deptName;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 性别(0-女，1-男)
+     */
+    private String sex;
+
+    /**
+     * 积分，连user表查询
+     */
+    private int points;
+
+
+    /**
+     * 志愿者注册时间
+     */
+    private String registTimeString;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerInfoDTO.java

@@ -0,0 +1,62 @@
+/**
+ * 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.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 志愿者信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-11
+ */
+@Data
+public class ScreenVolunteerInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 爱心时长(单位：分钟)
+     */
+    private BigDecimal kindnessTime;
+
+
+    /**
+     * 志愿者昵称
+     */
+    private String volunteerNickname;
+
+    /**
+     * 志愿者头像
+     */
+    private String volunteerFaceImg;
+
+    private String deptName;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java

@@ -24,6 +24,8 @@ 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.dto.ScreenVolunteerDetailDTO;
+import com.elink.esua.epdc.dto.ScreenVolunteerInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
@@ -285,5 +287,32 @@ public class VolunteerInfoController {
         return new Result<PageData<VolunteerInfoDTO>>().ok(page);
     }
 
+    /**
+     * @Description: 大屏志愿者统计分页
+     * @param params:
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.ScreenVolunteerInfoDTO>>
+     * @Author: lichao
+     * @Date: 2023/9/12 16:39
+     */
+    @GetMapping("screenJinShui/page")
+    public Result<PageData<ScreenVolunteerInfoDTO>> screenPage(@RequestParam Map<String, Object> params) {
+        PageData<ScreenVolunteerInfoDTO> page = volunteerInfoService.screenPage(params);
+        return new Result<PageData<ScreenVolunteerInfoDTO>>().ok(page);
+    }
+
+
+    /**
+     * @Description: 大屏志愿者详情
+     * @param volunteerId:
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ScreenVolunteerDetailDTO>
+     * @Author: lichao
+     * @Date: 2023/9/12 16:56
+     */
+    @GetMapping("screenJinShui/detail")
+    public Result<ScreenVolunteerDetailDTO> screenDetail(@RequestParam String volunteerId) {
+        ScreenVolunteerDetailDTO result = volunteerInfoService.screenDetail(volunteerId);
+        return new Result<ScreenVolunteerDetailDTO>().ok(result);
+    }
+
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java

@@ -18,6 +18,8 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.ScreenVolunteerDetailDTO;
+import com.elink.esua.epdc.dto.ScreenVolunteerInfoDTO;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO;
@@ -58,6 +60,11 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
      */
     List<VolunteerInfoDTO> volunteerInfoList(Map<String, Object> params);
 
+
+    List<ScreenVolunteerInfoDTO> volunteerScreenInfoList();
+
+    ScreenVolunteerDetailDTO volunteerScreenDetail(@Param("volunteerId") String volunteerId);
+
     /**
      * 根据志愿者ID，查询志愿者 单条详情
      *      积分需要连user表查询

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java

@@ -20,6 +20,8 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ScreenVolunteerDetailDTO;
+import com.elink.esua.epdc.dto.ScreenVolunteerInfoDTO;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
@@ -49,6 +51,9 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      */
     PageData<VolunteerInfoDTO> volunteerInfo(Map<String, Object> params);
 
+
+    PageData<ScreenVolunteerInfoDTO> screenPage(Map<String, Object> params);
+
     /**
      * 根据志愿者ID，查询志愿者 单条详情
      *     积分需要连user表查询
@@ -279,4 +284,6 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.VolunteerInfoDTO>>
      */
     PageData<VolunteerInfoDTO> getVolunteerListForPionner(Map<String, Object> params);
+
+    ScreenVolunteerDetailDTO screenDetail(String volunteerId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java

@@ -35,10 +35,7 @@ import com.elink.esua.epdc.constant.UserFieldConsant;
 import com.elink.esua.epdc.constant.VolunteerInfoNoticeConstant;
 import com.elink.esua.epdc.dao.VlounteerTeamRealationDao;
 import com.elink.esua.epdc.dao.VolunteerInfoDao;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.UserTagDTO;
-import com.elink.esua.epdc.dto.VolunteerInfoDTO;
-import com.elink.esua.epdc.dto.VolunteerTagRelationDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
@@ -116,6 +113,13 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return new PageData<>(list, page.getTotal());
     }
 
+    @Override
+    public PageData<ScreenVolunteerInfoDTO> screenPage(Map<String, Object> params) {
+        IPage<VolunteerInfoDTO> page = getPage(params);
+        List<ScreenVolunteerInfoDTO> list = baseDao.volunteerScreenInfoList();
+        return new PageData<>(list, page.getTotal());
+    }
+
     /**
      * 根据志愿者ID，查询志愿者 单条详情
      * 积分需要连user表查询
@@ -611,6 +615,11 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return getPageData(list, page.getTotal(), VolunteerInfoDTO.class);
     }
 
+    @Override
+    public ScreenVolunteerDetailDTO screenDetail(String volunteerId) {
+        return baseDao.volunteerScreenDetail(volunteerId);
+    }
+
     /**
      * 组织机构信息处理
      *

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -358,4 +358,38 @@
         where VOLUNTEER_ID = #{volunteerId}
         and DEL_FLAG='0'
     </select>
+
+
+    <select id="volunteerScreenInfoList" resultType="com.elink.esua.epdc.dto.ScreenVolunteerInfoDTO">
+        SELECT
+        v.ID id,
+        v.VOLUNTEER_NICKNAME volunteerNickname,
+        v.KINDNESS_TIME kindnessTime,
+        v.REGIST_TIME volunteerFaceImg,
+        d.dept_name
+        FROM
+        epdc_volunteer_info v
+        left join epdc_volunteer_dept d on d.id = v.volunteer_dept_id
+        left join epdc_user u on v.USER_ID = u.ID and u.del_flag = '0'
+        where v.del_flag = '0' and u.id is not null
+        ORDER BY v.KINDNESS_TIME desc
+    </select>
+
+    <select id="volunteerScreenDetail" resultType="com.elink.esua.epdc.dto.ScreenVolunteerDetailDTO">
+        SELECT
+            v.ID id,
+            v.REAL_NAME realName,
+            v.VOLUNTEER_NICKNAME volunteerNickname,
+            v.SEX sex,
+            v.KINDNESS_TIME kindnessTime,
+            u.POINTS points,
+            date_format(v.REGIST_TIME,'%Y-%m-%d %H:%i:%S') registTimeString,
+            d.dept_name
+        FROM
+            epdc_volunteer_info v
+                left join epdc_volunteer_dept d on d.id = v.volunteer_dept_id
+                left join epdc_user u on v.USER_ID = u.ID and u.del_flag = '0'
+        where v.ID = #{volunteerId}
+        ORDER BY v.KINDNESS_TIME desc
+    </select>
 </mapper>