From 29f6b0e24e516a4dcb4ad35491aa3eaeb0f409dc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Aug 2020 13:29:20 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9partyuserrankdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/screencoll/form/PartyUserRankDataFormDTO.java | 5 ----- .../data-statistical/data-statistical-server/pom.xml | 6 ++++++ .../java/com/epmet/controller/ScreenCollController.java | 8 ++++++-- .../com/epmet/dao/screen/ScreenPartyUserRankDataDao.java | 2 +- .../java/com/epmet/service/screen/ScreenCollService.java | 2 +- .../epmet/service/screen/impl/ScreenCollServiceImpl.java | 7 +++---- .../mapper/screen/ScreenPartyUserRankDataDao.xml | 4 ++-- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java index 6267736f51..b4e3884dae 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java @@ -14,11 +14,6 @@ public class PartyUserRankDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 年Id ：yyyy */ diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0dfdd97d91..cf116c4fb7 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -68,6 +68,12 @@ 2.0.0 compile + + com.epmet + epmet-commons-extapp-auth + 2.0.0 + compile + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java index 0052006dff..248bf39931 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java @@ -1,5 +1,7 @@ package com.epmet.controller; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; +import com.epmet.commons.extappauth.bean.ExternalAppRequestParam; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.screencoll.form.*; import com.epmet.service.screen.ScreenCollService; @@ -32,9 +34,11 @@ public class ScreenCollController { * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("partyuserrankdata") - public Result partyUserRankData(@RequestBody List formDTO) { - return screenCollService.insertPartyUserRankData(formDTO); + public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam,@RequestBody List formDTO) { + screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId()); + return new Result(); } /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java index c0ab9db8c1..de25a82b88 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java @@ -58,5 +58,5 @@ public interface ScreenPartyUserRankDataDao extends BaseDao list); + void batchInsertPartyUserRankData(@Param("list") List list,@Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java index 1c6c212588..dfd49c1e5c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java @@ -17,7 +17,7 @@ public interface ScreenCollService { * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertPartyUserRankData(List formDTO); + void insertPartyUserRankData(List formDTO,String customerId); /** * 8、党建引领-党员联系群众数据 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java index 922de2f876..00dbd2a516 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java @@ -75,20 +75,19 @@ public class ScreenCollServiceImpl implements ScreenCollService { @Override @Transactional(rollbackFor = Exception.class) - public Result insertPartyUserRankData(List formDTO) { + public void insertPartyUserRankData(List formDTO,String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenPartyUserRankDataDao.deletePartyUserRankData(formDTO.get(NumConstant.ZERO).getCustomerId(), + screenPartyUserRankDataDao.deletePartyUserRankData(customerId, formDTO.get(NumConstant.ZERO).getYearId(), formDTO.get(NumConstant.ZERO).getMonthId(), orgIds); - screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO); + screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO,customerId); } - return new Result(); } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml index 74e3377d18..1de992bd4d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml @@ -12,7 +12,7 @@ - + insert into screen_party_user_rank_data ( ID, @@ -37,7 +37,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.yearId}, #{item.monthId}, #{item.orgType}, From 79bf69cfb859485b3b9454656c42e071d5c8c86d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 19 Aug 2020 13:37:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86-?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E6=B4=BB=E5=8A=A8=E6=9C=8D=E5=8A=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E6=8E=A5=E5=8F=A3=E5=88=A0=E9=99=A4=EF=BC=88?= =?UTF-8?q?=E8=A1=A8=E5=BA=9F=E5=BC=83=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/VoluntaryActivityDataFormDTO.java | 61 ------------- .../controller/ScreenCollController.java | 13 --- .../ScreenVoluntaryActivityDataDao.java | 62 ------------- .../ScreenVoluntaryActivityDataEntity.java | 86 ------------------- .../service/screen/ScreenCollService.java | 12 --- .../screen/impl/ScreenCollServiceImpl.java | 20 ----- .../screen/ScreenVoluntaryActivityDataDao.xml | 57 ------------ 7 files changed, 311 deletions(-) delete mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java deleted file mode 100644 index 6746a60303..0000000000 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.epmet.dto.screencoll.form; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 13、党建引领-志愿活动服务数据 入参 - * @Auther: zhangyong - * @Date: 2020-08-18 09:59 - */ -@Data -public class VoluntaryActivityDataFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 客户id - */ - private String customerId; - - /** - * yyyy - */ - private String yearId; - - /** - * yyyyMM - */ - private String monthId; - - /** - * 组织类别 agency：组织；部门：department；网格：grid - */ - private String orgType; - - /** - * 组织Id 可以为网格，机关id - */ - private String orgId; - - /** - * 上级组织Id - */ - private String parentId; - - /** - * 组织名称 - */ - private String orgName; - - /** - * 组织活动次数 - */ - private Integer activetyCount; - - /** - * 活动参与人数 - */ - private Integer joinUserCount; -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java index 248bf39931..78230dd581 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java @@ -186,19 +186,6 @@ public class ScreenCollController { return screenCollService.insertCustomerAgency(formDTO); } - /** - * 13、党建引领-志愿活动服务数据 - * - * @param formDTO - * @return com.epmet.commons.tools.utils.Result - * @Author zhangyong - * @Date 10:52 2020-08-18 - **/ - @PostMapping("voluntaryactivitydata") - public Result voluntaryActivityData(@RequestBody List formDTO) { - return screenCollService.insertVoluntaryActivityData(formDTO); - } - /** * 12、中央区各类总数 * diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java deleted file mode 100644 index 13357e03c2..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

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

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

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.screen; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.screencoll.form.VoluntaryActivityDataFormDTO; -import com.epmet.entity.screen.ScreenVoluntaryActivityDataEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 党建引领-志愿活动服务数据 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 - */ -@Mapper -public interface ScreenVoluntaryActivityDataDao extends BaseDao { - - /** - * 13、党建引领-志愿活动服务数据 - * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 - * - * @param customerId - * @param yearId - * @param monthId - * @param orgIds 组织Id集合 - * @Author zhangyong - * @Date 10:52 2020-08-18 - **/ - void deleteVoluntaryActivityData(@Param("customerId") String customerId, - @Param("yearId") String yearId, - @Param("monthId") String monthId, - @Param("orgIds") String[] orgIds); - - /** - * 13、党建引领-志愿活动服务数据 - * 2) 在批量新增 - * - * @param list - * @Author zhangyong - * @Date 10:52 2020-08-18 - **/ - void batchInsertVoluntaryActivityData(@Param("list") List list); -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java deleted file mode 100644 index cd11e5b43a..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

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

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

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.screen; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 党建引领-志愿活动服务数据 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("screen_voluntary_activity_data") -public class ScreenVoluntaryActivityDataEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户Id - */ - private String customerId; - - /** - * 年Id - */ - private String yearId; - - /** - * 月份Id - */ - private String monthId; - - /** - * 组织类别 agency：组织；部门：department；网格：grid - */ - private String orgType; - - /** - * 组织Id 可以为网格，机关id - */ - private String orgId; - - /** - * 上级组织Id - */ - private String parentId; - - /** - * 组织名称 - */ - private String orgName; - - /** - * 组织活动次数 - */ - private Integer activetyCount; - - /** - * 活动参与人数 - */ - private Integer joinUserCount; - -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java index dfd49c1e5c..7fbddb072f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java @@ -151,18 +151,6 @@ public interface ScreenCollService { **/ Result insertCustomerAgency(List formDTO); - /** - * 13、党建引领-志愿活动服务数据 - * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 - * 2) 在新增 - * - * @param formDTO - * @return com.epmet.commons.tools.utils.Result - * @Author zhangyong - * @Date 10:52 2020-08-18 - **/ - Result insertVoluntaryActivityData(List formDTO); - /** * 12、中央区各类总数 * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java index 00dbd2a516..339fa96305 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java @@ -65,8 +65,6 @@ public class ScreenCollServiceImpl implements ScreenCollService { @Autowired private ScreenCustomerAgencyDao screenCustomerAgencyDao; @Autowired - private ScreenVoluntaryActivityDataDao screenVoluntaryActivityDataDao; - @Autowired private ScreenUserTotalDataDao screenUserTotalDataDao; @Autowired private ScreenUserJoinDao screenUserJoinDao; @@ -277,24 +275,6 @@ public class ScreenCollServiceImpl implements ScreenCollService { return new Result(); } - @Override - @Transactional(rollbackFor = Exception.class) - public Result insertVoluntaryActivityData(List formDTO) { - if (null != formDTO && formDTO.size() > NumConstant.ZERO){ - String[] orgIds = new String[formDTO.size()]; - for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ - orgIds[i] = formDTO.get(i).getOrgId(); - } - screenVoluntaryActivityDataDao.deleteVoluntaryActivityData(formDTO.get(NumConstant.ZERO).getCustomerId(), - formDTO.get(NumConstant.ZERO).getYearId(), - formDTO.get(NumConstant.ZERO).getMonthId(), - orgIds); - - screenVoluntaryActivityDataDao.batchInsertVoluntaryActivityData(formDTO); - } - return new Result(); - } - @Override @Transactional(rollbackFor = Exception.class) public Result insertUserTotalData(List formDTO) { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml deleted file mode 100644 index dc2c2585a6..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - delete from screen_voluntary_activity_data - where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} - AND ORG_ID IN - - #{item} - - - - - insert into screen_voluntary_activity_data - ( - ID, - CUSTOMER_ID, - YEAR_ID, - MONTH_ID, - ORG_TYPE, - ORG_ID, - PARENT_ID, - ORG_NAME, - ACTIVETY_COUNT, - JOIN_USER_COUNT, - DEL_FLAG, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME - ) values - - ( - (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, - #{item.yearId}, - #{item.monthId}, - #{item.orgType}, - #{item.orgId}, - #{item.parentId}, - #{item.orgName}, - #{item.activetyCount}, - #{item.joinUserCount}, - 0, - 0, - 'APP_USER', - now(), - 'APP_USER', - now() - ) - - - - From 8f8df6abb84e2b82667da37c7c9a8b9bc56282ae Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Aug 2020 13:38:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/entity/screen/ScreenEventDataEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java index 15f6503950..2dd7603939 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java @@ -95,7 +95,7 @@ public class ScreenEventDataEntity extends BaseEpmetEntity { private String eventImgUrl; /** - * 事件待处理级别 red:红；yellow：黄 + * 事件待处理级别 red:红；yellow：黄；绿色：green */ private String eventLevel; From 3b6b6ccdc038c2b4b8ae8c7964d09d291fa53662 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 19 Aug 2020 13:51:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9screen=5Fevent=5Fdata?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/entity/screen/ScreenDifficultyDataEntity.java | 2 +- .../com/epmet/entity/screen/ScreenEventDataEntity.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java index fa3b352711..76af0410c0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java @@ -104,7 +104,7 @@ public class ScreenDifficultyDataEntity extends BaseEpmetEntity { private String eventCategoryName; /** - * 事件状态编码 + * 事件状态key */ private String eventStatusCode; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java index 2dd7603939..9e605802f3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java @@ -124,4 +124,13 @@ public class ScreenEventDataEntity extends BaseEpmetEntity { */ private Date lastProcessDate; + /** + * 事件状态key + */ + private String eventStatusCode; + + /** + * 事件状态描述 + */ + private String eventStatusDesc; } From d8dbc5201692b9bdc107682ca05afdd0e371cc3d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 19 Aug 2020 14:36:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E3=80=81=E5=85=9A?= =?UTF-8?q?=E5=91=98=E5=88=86=E5=B8=83=E3=80=81top=E5=8C=BA=E6=A6=82?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/screen/dto/form/ProjectFormDTO.java | 24 ++++++++++ .../screen/dto/form/TopProfileFormDTO.java | 24 ++++++++++ .../screen/dto/result/BranchResultDTO.java | 6 +-- .../screen/dto/result/ProjectResultDTO.java | 45 +++++++++++++++++++ .../dto/result/TopProfileResultDTO.java | 45 +++++++++++++++++++ .../controller/screen/AgencyController.java | 1 + .../screen/DistributionController.java | 38 +++++++++++++--- .../dao/screen/ScreenEventDataDao.java | 14 +++++- .../dao/screen/ScreenUserTotalDataDao.java | 9 ++++ .../service/screen/DistributionService.java | 24 +++++++--- .../screen/impl/DistributionServiceImpl.java | 42 +++++++++++++++-- .../mapper/screen/ScreenEventDataDao.xml | 17 ++++++- .../mapper/screen/ScreenUserTotalDataDao.xml | 17 +++++++ 13 files changed, 285 insertions(+), 21 deletions(-) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java new file mode 100644 index 0000000000..445cefc453 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.screen.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/8/19 1:25 下午 + */ +@Data +public class ProjectFormDTO implements Serializable { + + private static final long serialVersionUID = 7114390205886348751L; + + public interface Project{} + + /** + * 机关ID + */ + @NotBlank(message = "机关ID不能为空",groups = {Project.class}) + private String agencyId; +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java new file mode 100644 index 0000000000..6b0d00dae1 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.screen.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/8/19 1:43 下午 + */ +@Data +public class TopProfileFormDTO implements Serializable { + + private static final long serialVersionUID = -287352242311433250L; + + public interface TopProfile{} + + /** + * 机关ID + */ + @NotBlank(message = "机关ID不能为空",groups = {TopProfile.class}) + private String agencyId; +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java index 0a836a6bfd..f4a611cc10 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java @@ -16,15 +16,15 @@ public class BranchResultDTO implements Serializable { /** * 网格ID */ - private String gridId; + private String gridId = ""; /** * 网格名称 */ - private String gridName; + private String gridName = ""; /** * 党支部(网格)位置 */ - private String partyMark; + private String partyMark = ""; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java new file mode 100644 index 0000000000..7a0a016b25 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java @@ -0,0 +1,45 @@ +package com.epmet.screen.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/8/19 1:27 下午 + */ +@Data +public class ProjectResultDTO implements Serializable { + + private static final long serialVersionUID = 7130615407473171093L; + + /** + * 项目标题 + */ + private String projectTitle = ""; + + /** + * red, green,yellow + */ + private String color = ""; + + /** + * 项目id + */ + private String projectId = ""; + + /** + * 网格名称 + */ + private String orgName = ""; + + /** + * 经度 + */ + private Double longitude = 0.0; + + /** + * 纬度 + */ + private Double latitude = 0.0; +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java new file mode 100644 index 0000000000..607891f5bf --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java @@ -0,0 +1,45 @@ +package com.epmet.screen.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/8/19 1:46 下午 + */ +@Data +public class TopProfileResultDTO implements Serializable { + + private static final long serialVersionUID = -5081563117620857359L; + + /** + * 用户总数 + */ + private Integer userNum = 0; + + /** + * 党员总数 + */ + private Integer partyMemberNum = 0; + + /** + * 党群总数 + */ + private Integer groupNum = 0; + + /** + * 话题总数 + */ + private Integer topicNum = 0; + + /** + * 议题总数 + */ + private Integer issueNum = 0; + + /** + * 项目总数 + */ + private Integer projectNum = 0; +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java index d4bbc8f160..d671c4cd05 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java @@ -49,6 +49,7 @@ public class AgencyController { * @author zxc * @date 2020/8/18 2:33 下午 */ + @ExternalAppRequestAuth @PostMapping("compartment") public Result compartment(@RequestBody CompartmentFormDTO compartmentFormDTO){ ValidatorUtils.validateEntity(compartmentFormDTO, CompartmentFormDTO.Compartment.class); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java index a85fe05054..648d1e088b 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java @@ -1,13 +1,10 @@ package com.epmet.datareport.controller.screen; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.screen.dto.form.BranchFormDTO; -import com.epmet.screen.dto.form.ParymemberFormDTO; -import com.epmet.screen.dto.form.UserFormDTO; -import com.epmet.screen.dto.result.BranchResultDTO; -import com.epmet.screen.dto.result.ParymemberResultDTO; -import com.epmet.screen.dto.result.UserResultDTO; +import com.epmet.screen.dto.form.*; +import com.epmet.screen.dto.result.*; import com.epmet.datareport.service.screen.DistributionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -36,6 +33,7 @@ public class DistributionController { * @author zxc * @date 2020/8/18 10:59 上午 */ + @ExternalAppRequestAuth @PostMapping("branch") public Result> branch(@RequestBody BranchFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class); @@ -48,6 +46,7 @@ public class DistributionController { * @author zxc * @date 2020/8/18 11:10 上午 */ + @ExternalAppRequestAuth @PostMapping("user") public Result user(@RequestBody UserFormDTO userFormDTO){ ValidatorUtils.validateEntity(userFormDTO, UserFormDTO.User.class); @@ -60,10 +59,37 @@ public class DistributionController { * @author zxc * @date 2020/8/18 11:20 上午 */ + @ExternalAppRequestAuth @PostMapping("parymember") public Result parymember(@RequestBody ParymemberFormDTO parymemberFormDTO){ ValidatorUtils.validateEntity(parymemberFormDTO, ParymemberFormDTO.Parymember.class); return new Result().ok(distributionService.parymember(parymemberFormDTO)); } + /** + * @Description 4、事件 + * @param projectFormDTO + * @author zxc + * @date 2020/8/19 1:29 下午 + */ +// @ExternalAppRequestAuth + @PostMapping("project") + public Result> project(@RequestBody ProjectFormDTO projectFormDTO){ + ValidatorUtils.validateEntity(projectFormDTO, ProjectFormDTO.Project.class); + return new Result>().ok(distributionService.project(projectFormDTO)); + } + + /** + * @Description 5、top区概况 + * @param topProfileFormDTO + * @author zxc + * @date 2020/8/19 1:52 下午 + */ +// @ExternalAppRequestAuth + @PostMapping("topprofile") + public Result topProfile(@RequestBody TopProfileFormDTO topProfileFormDTO){ + ValidatorUtils.validateEntity(topProfileFormDTO, TopProfileFormDTO.TopProfile.class); + return new Result().ok(distributionService.topProfile(topProfileFormDTO)); + } + } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java index 7ef0c0287b..362ada2193 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java @@ -17,7 +17,11 @@ package com.epmet.datareport.dao.screen; +import com.epmet.screen.dto.result.ProjectResultDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 中央区-事件数据 @@ -27,5 +31,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScreenEventDataDao{ - + + /** + * @Description 查询事件 + * @param parentId + * @author zxc + * @date 2020/8/19 2:09 下午 + */ + List selectEvent(@Param("parentId")String parentId); + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java index 70477e48c6..46576c5517 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java @@ -18,6 +18,7 @@ package com.epmet.datareport.dao.screen; import com.epmet.screen.dto.result.PartymemberPercentResultDTO; +import com.epmet.screen.dto.result.TopProfileResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -39,4 +40,12 @@ public interface ScreenUserTotalDataDao { **/ PartymemberPercentResultDTO selectAgencyPartymemberPercent(@Param("agencyId")String agencyId); + /** + * @Description 查询top区概况 + * @param agencyId + * @author zxc + * @date 2020/8/19 2:13 下午 + */ + TopProfileResultDTO selectTopProfile(@Param("agencyId")String agencyId); + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java index 02471cdf22..62a0d0d7bf 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java @@ -1,11 +1,7 @@ package com.epmet.datareport.service.screen; -import com.epmet.screen.dto.form.BranchFormDTO; -import com.epmet.screen.dto.form.ParymemberFormDTO; -import com.epmet.screen.dto.form.UserFormDTO; -import com.epmet.screen.dto.result.BranchResultDTO; -import com.epmet.screen.dto.result.ParymemberResultDTO; -import com.epmet.screen.dto.result.UserResultDTO; +import com.epmet.screen.dto.form.*; +import com.epmet.screen.dto.result.*; import java.util.List; @@ -41,4 +37,20 @@ public interface DistributionService { */ ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO); + /** + * @Description 4、事件 + * @param projectFormDTO + * @author zxc + * @date 2020/8/19 1:29 下午 + */ + List project(ProjectFormDTO projectFormDTO); + + /** + * @Description 5、top区概况 + * @param topProfileFormDTO + * @author zxc + * @date 2020/8/19 1:52 下午 + */ + TopProfileResultDTO topProfile(TopProfileFormDTO topProfileFormDTO); + } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java index 1c6356d550..a1d9025ead 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java @@ -1,10 +1,11 @@ package com.epmet.datareport.service.screen.impl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao; import com.epmet.datareport.dao.screen.ScreenCustomerGridDao; -import com.epmet.screen.dto.form.BranchFormDTO; -import com.epmet.screen.dto.form.ParymemberFormDTO; -import com.epmet.screen.dto.form.UserFormDTO; +import com.epmet.datareport.dao.screen.ScreenEventDataDao; +import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao; +import com.epmet.screen.dto.form.*; import com.epmet.screen.dto.result.*; import com.epmet.screen.constant.*; import com.epmet.datareport.service.screen.DistributionService; @@ -12,6 +13,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -27,6 +29,10 @@ public class DistributionServiceImpl implements DistributionService { private ScreenCustomerGridDao screenCustomerGridDao; @Autowired private ScreenCustomerAgencyDao screenCustomerAgencyDao; + @Autowired + private ScreenEventDataDao screenEventDataDao; + @Autowired + private ScreenUserTotalDataDao screenUserTotalDataDao; /** * @Description 1、党支部 @@ -87,4 +93,34 @@ public class DistributionServiceImpl implements DistributionService { } return parymemberResult; } + + /** + * @Description 4、事件 + * @param projectFormDTO + * @author zxc + * @date 2020/8/19 1:29 下午 + */ + @Override + public List project(ProjectFormDTO projectFormDTO) { + List projectResultDTOS = screenEventDataDao.selectEvent(projectFormDTO.getAgencyId()); + if (projectResultDTOS.size() == NumConstant.ZERO){ + return new ArrayList<>(); + } + return projectResultDTOS; + } + + /** + * @Description 5、top区概况 + * @param topProfileFormDTO + * @author zxc + * @date 2020/8/19 1:52 下午 + */ + @Override + public TopProfileResultDTO topProfile(TopProfileFormDTO topProfileFormDTO) { + TopProfileResultDTO topProfileResultDTO = screenUserTotalDataDao.selectTopProfile(topProfileFormDTO.getAgencyId()); + if (null == topProfileResultDTO){ + return new TopProfileResultDTO(); + } + return topProfileResultDTO; + } } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml index 813b3f74a3..6cfafcf70a 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml @@ -3,6 +3,19 @@ - - + + \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml index 72c533126d..673ffee04a 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml @@ -16,4 +16,21 @@ AND ORG_ID = #{agencyId} + + + \ No newline at end of file From 322e86635ccbabdaf4bfa7df618d307725ee251c Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 19 Aug 2020 15:14:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=87=E9=9B=86=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=EF=BC=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/screencoll/form/EventDataFormDTO.java | 10 +++++++ .../form/PartyBranchDataFormDTO.java | 17 +++++++----- .../dto/screencoll/form/UserJoinFormDTO.java | 26 +++++++------------ .../controller/ScreenCollController.java | 10 ++++--- .../dao/screen/ScreenPartyBranchDataDao.java | 4 +-- .../epmet/dao/screen/ScreenUserJoinDao.java | 8 ++++-- .../service/screen/ScreenCollService.java | 4 +-- .../screen/impl/ScreenCollServiceImpl.java | 2 ++ .../mapper/screen/ScreenEventDataDao.xml | 8 ++++-- .../screen/ScreenPartyBranchDataDao.xml | 10 ++++--- .../mapper/screen/ScreenUserJoinDao.xml | 20 +++++++------- 11 files changed, 70 insertions(+), 49 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java index 1f56464806..81800701c8 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java @@ -106,4 +106,14 @@ public class EventDataFormDTO implements Serializable { * 图片列表 */ private List imgDataList; + + /** + * 事件状态描述 + */ + private String eventStatusDesc; + + /** + * 事件状态key + */ + private String eventStatusCode; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java index 956a1db6aa..f05bd7bc80 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * 7、基层党建-建设情况数据（支部、联建） 入参 + * 7、基层党建-建设情况数据（支部、联建、志愿） 入参 * @Auther: zhangyong * @Date: 2020-08-18 09:59 */ @@ -30,7 +30,7 @@ public class PartyBranchDataFormDTO implements Serializable { private String monthId; /** - * 数据类别 party:支部建设;union:联合建设 + * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice */ private String type; @@ -55,14 +55,14 @@ public class PartyBranchDataFormDTO implements Serializable { private String orgName; /** - * 议题分类名称 + * 会议分类名称 */ - private String issueCategoryName; + private String meetCategoryName; /** - * 议题分类id + * 会议分类id */ - private String issueCategoryId; + private String meetCategoryId; /** * 组织次数 @@ -73,4 +73,9 @@ public class PartyBranchDataFormDTO implements Serializable { * 参加人数 */ private Integer joinUserCount; + + /** + * 平均参加人数 + */ + private Integer averageJoinUserCount; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java index 65b563795d..d474115972 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.screencoll.form; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; /** * 11、基层治理-公众参与 入参 @@ -41,32 +40,27 @@ public class UserJoinFormDTO implements Serializable { private String orgName; /** - * 总的参与次数 + * 组织次数 */ - private Integer joinTotal; + private Integer organizeTotal; /** - * 总的参与次数较上月增长率 + * 参与次数 */ - private BigDecimal joinTotalUpRate; - - /** - * 人均议题 - */ - private Integer avgIssue; + private Integer joinTotal; /** - * 人均议题较上月增长率 + * 平均参与人数 */ - private BigDecimal avgIssueUpRate; + private Integer avgJoinUser; /** - * 平均参与度 + * 年Id ：yyyy */ - private Integer avgJoin; + private String yearId; /** - * 平均参与度较上月增长率 + * 月份Id ：yyyyMM */ - private BigDecimal avgJoinUpRate; + private String monthId; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java index 78230dd581..bb0e64b694 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java @@ -1,5 +1,7 @@ package com.epmet.controller; +import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; +import com.epmet.commons.extappauth.bean.ExternalAppRequestParam; import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth; import com.epmet.commons.extappauth.bean.ExternalAppRequestParam; import com.epmet.commons.tools.utils.Result; @@ -36,7 +38,7 @@ public class ScreenCollController { **/ @ExternalAppRequestAuth @PostMapping("partyuserrankdata") - public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam,@RequestBody List formDTO) { + public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId()); return new Result(); } @@ -55,15 +57,15 @@ public class ScreenCollController { } /** - * 7、基层党建-建设情况数据（支部、联建） + * 7、基层党建-建设情况数据（支部、联建、志愿） * * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - @PostMapping("partybranchdata") - public Result partyBranchData(@RequestBody List formDTO) { + @PostMapping("meetdata") + public Result meetData(@RequestBody List formDTO) { return screenCollService.insertPartyBranchData(formDTO); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java index 9dc6a142c1..00b9f0df8d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java @@ -34,7 +34,7 @@ import java.util.List; @Mapper public interface ScreenPartyBranchDataDao extends BaseDao { /** - * 7、基层党建-建设情况数据（支部、联建） + * 7、基层党建-建设情况数据（支部、联建、志愿） * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 * * @param customerId @@ -50,7 +50,7 @@ public interface ScreenPartyBranchDataDao extends BaseDao { /** * 11、基层治理-公众参与 - * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 + * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 * * @param customerId + * @param yearId + * @param monthId * @param orgIds 组织Id集合 * @Author zhangyong * @Date 10:52 2020-08-18 **/ void deleteUserJoin(@Param("customerId") String customerId, - @Param("orgIds") String[] orgIds); + @Param("yearId") String yearId, + @Param("monthId") String monthId, + @Param("orgIds") String[] orgIds); /** * 11、基层治理-公众参与 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java index 7fbddb072f..dcb9268db3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java @@ -32,7 +32,7 @@ public interface ScreenCollService { Result insertPartyLinkMassesData(List formDTO); /** - * 7、基层党建-建设情况数据（支部、联建） + * 7、基层党建-建设情况数据（支部、联建、志愿） * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 * 2) 在新增 * @@ -165,7 +165,7 @@ public interface ScreenCollService { /** * 11、基层治理-公众参与 - * 1) 根据CUSTOMER_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 + * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 * 2) 在新增 * * @param formDTO diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java index 339fa96305..14787a6762 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java @@ -300,6 +300,8 @@ public class ScreenCollServiceImpl implements ScreenCollService { orgIds[i] = formDTO.get(i).getOrgId(); } screenUserJoinDao.deleteUserJoin(formDTO.get(NumConstant.ZERO).getCustomerId(), + formDTO.get(NumConstant.ZERO).getYearId(), + formDTO.get(NumConstant.ZERO).getMonthId(), orgIds); screenUserJoinDao.batchInsertUserJoin(formDTO); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml index c861d869ed..a6cdd87a2e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml @@ -34,7 +34,9 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + EVENT_STATUS_CODE, + EVENT_STATUS_DESC ) values ( @@ -61,7 +63,9 @@ 'APP_USER', now(), 'APP_USER', - now() + now(), + #{item.eventStatusCode}, + #{item.eventStatusDesc} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml index c7cf37d027..05c5d92066 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml @@ -24,10 +24,11 @@ ORG_ID, PARENT_ID, ORG_NAME, - ISSUE_CATEGORY_ID, - ISSUE_CATEGORY_NAME, + MEET_CATEGORY_ID, + MEET_CATEGORY_NAME, ORGANIZE_COUNT, JOIN_USER_COUNT, + AVERAGE_JOIN_USER_COUNT, DEL_FLAG, REVISION, CREATED_BY, @@ -46,10 +47,11 @@ #{item.orgId}, #{item.parentId}, #{item.orgName}, - #{item.issueCategoryId}, - #{item.issueCategoryName}, + #{item.meetCategoryId}, + #{item.meetCategoryName}, #{item.organizeCount}, #{item.joinUserCount}, + #{item.averageJoinUserCount}, 0, 0, 'APP_USER', diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml index 3e5acce57a..b09c3e6690 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml @@ -5,7 +5,7 @@ delete from screen_user_join - where CUSTOMER_ID = #{customerId} + where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} AND ORG_ID IN #{item} @@ -17,16 +17,15 @@ ( ID, CUSTOMER_ID, + YEAR_ID, + MONTH_ID, ORG_TYPE, ORG_ID, PARENT_ID, ORG_NAME, + ORGANIZE_TOTAL, JOIN_TOTAL, - JOIN_TOTAL_UP_RATE, - AVG_ISSUE, - AVG_ISSUE_UP_RATE, - AVG_JOIN, - AGVG_JOIN_UP_RATE, + AVG_JOIN_USER, DEL_FLAG, REVISION, CREATED_BY, @@ -38,16 +37,15 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), #{item.customerId}, + #{item.yearId}, + #{item.monthId}, #{item.orgType}, #{item.orgId}, #{item.parentId}, #{item.orgName}, + #{item.organizeTotal}, #{item.joinTotal}, - #{item.joinTotalUpRate}, - #{item.avgIssue}, - #{item.avgIssueUpRate}, - #{item.avgJoin}, - #{item.avgJoinUpRate}, + #{item.avgJoinUser}, 0, 0, 'APP_USER',