From 08efa913a7501b4061b253a9f7b26d2be90bc009 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 19 Aug 2020 16:25:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...mDTO.java => IndexDataMonthlyFormDTO.java} | 4 +- .../form/IndexDataYearlyFormDTO.java | 66 +++++++++++++++++++ .../controller/ScreenCollController.java | 23 +++++-- .../dao/screen/ScreenIndexDataMonthlyDao.java | 6 +- .../dao/screen/ScreenIndexDataYearlyDao.java | 31 ++++++++- .../service/screen/ScreenCollService.java | 16 ++++- .../screen/impl/ScreenCollServiceImpl.java | 27 ++++++-- .../screen/ScreenIndexDataMonthlyDao.xml | 4 +- .../screen/ScreenIndexDataYearlyDao.xml | 54 ++++++++++++++- .../externalapp/ExtAppJwtTokenUtils.java | 2 +- 10 files changed, 209 insertions(+), 24 deletions(-) rename epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/{IndexDataFormDTO.java => IndexDataMonthlyFormDTO.java} (91%) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java similarity index 91% rename from epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java rename to epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java index d6d3065992..5b3699f82b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java @@ -5,12 +5,12 @@ import lombok.Data; import java.io.Serializable; /** - * 1、指数相关 入参 + * 1、指数_按月统计 入参 * @Auther: zhangyong * @Date: 2020-08-18 09:59 */ @Data -public class IndexDataFormDTO implements Serializable { +public class IndexDataMonthlyFormDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java new file mode 100644 index 0000000000..6c44c9411a --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java @@ -0,0 +1,66 @@ +package com.epmet.dto.screencoll.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 17、指数_按年统计 入参 + * @Auther: zhangyong + * @Date: 2020-08-18 09:59 + */ +@Data +public class IndexDataYearlyFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * yyyy + */ + private String yearId; + + /** + * 组织类别 agency：组织；部门：department；网格：grid + */ + private String orgType; + + /** + * 组织Id 可以为网格，机关id + */ + private String orgId; + + /** + * 上级组织Id + */ + private String parentId; + + /** + * 组织名称 + */ + private String orgName; + + /** + * 总指数 + */ + private Integer indexTotal; + + /** + * 党建能力指数 + */ + private Integer partyDevAblity; + + /** + * 服务能力指数 + */ + private Integer serviceAblity; + + /** + * 治理能力指数 + */ + private Integer governAblity; +} 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 bb0e64b694..981c056313 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,7 +1,5 @@ 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; @@ -135,20 +133,33 @@ public class ScreenCollController { } /** - * 1、指数相关 + * 1、指数_按月统计 * * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - @PostMapping("indexdata") - public Result indexData(@RequestBody List formDTO) { - return screenCollService.insertIndexData(formDTO); + @PostMapping("indexdatamonthly") + public Result indexDataMonthly(@RequestBody List formDTO) { + return screenCollService.insertIndexDataMonthly(formDTO); } // -- + /** + * 17、指数_按年统计 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 10:52 2020-08-18 + **/ + @PostMapping("indexdatayearly") + public Result indexDataYearly(@RequestBody List formDTO) { + return screenCollService.insertIndexDataYearly(formDTO); + } + /** * 16、部门信息上传 * diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java index c949f23a9a..ec102d2499 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java @@ -18,7 +18,7 @@ package com.epmet.dao.screen; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.screencoll.form.IndexDataFormDTO; +import com.epmet.dto.screencoll.form.IndexDataMonthlyFormDTO; import com.epmet.entity.screen.ScreenIndexDataMonthlyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -45,7 +45,7 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao list); + void batchInsertIndexDataMonthly(@Param("list") List list); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java index 76da4e689c..6c27ae9e70 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java @@ -18,8 +18,12 @@ package com.epmet.dao.screen; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.screencoll.form.IndexDataYearlyFormDTO; import com.epmet.entity.screen.ScreenIndexDataYearlyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 指数-指数数据(按年统计) @@ -29,5 +33,28 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScreenIndexDataYearlyDao extends BaseDao { - -} \ No newline at end of file + + /** + * 17、指数_按年统计 + * 1) 根据CUSTOMER_ID、YEAR_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 + * + * @param customerId + * @param yearId + * @param orgIds 组织Id集合 + * @Author zhangyong + * @Date 10:52 2020-08-18 + **/ + void deleteIndexDataYearly(@Param("customerId") String customerId, + @Param("yearId") String yearId, + @Param("orgIds") String[] orgIds); + + /** + * 17、指数_按年统计 + * 2) 在批量新增 + * + * @param list + * @Author zhangyong + * @Date 10:52 2020-08-18 + **/ + void batchInsertIndexDataYearly(@Param("list") List list); +} 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 dcb9268db3..d2bc9d0bdb 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 @@ -104,7 +104,7 @@ public interface ScreenCollService { Result insertCpcbaseData(List formDTO); /** - * 1、指数相关 + * 1、指数_按月统计 * 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 * 2) 在新增 * @@ -113,7 +113,19 @@ public interface ScreenCollService { * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertIndexData(List formDTO); + Result insertIndexDataMonthly(List formDTO); + + /** + * 17、指数_按年统计 + * 1) 根据CUSTOMER_ID、YEAR_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 + * 2) 在新增 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 10:52 2020-08-18 + **/ + Result insertIndexDataYearly(List formDTO); /** * 16、部门信息上传 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 14787a6762..3f2a95ae03 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 @@ -57,7 +57,7 @@ public class ScreenCollServiceImpl implements ScreenCollService { @Autowired private ScreenCpcBaseDataDao screenCpcBaseDataDao; @Autowired - private ScreenIndexDataDao screenIndexDataDao; + private ScreenIndexDataMonthlyDao screenIndexDataMonthlyDao; @Autowired private ScreenCustomerDeptDao screenCustomerDeptDao; @Autowired @@ -70,7 +70,8 @@ public class ScreenCollServiceImpl implements ScreenCollService { private ScreenUserJoinDao screenUserJoinDao; @Autowired private ScreenPioneerDataDao screenPioneerDataDao; - + @Autowired + private ScreenIndexDataYearlyDao screenIndexDataYearlyDao; @Override @Transactional(rollbackFor = Exception.class) public void insertPartyUserRankData(List formDTO,String customerId) { @@ -214,18 +215,34 @@ public class ScreenCollServiceImpl implements ScreenCollService { @Override @Transactional(rollbackFor = Exception.class) - public Result insertIndexData(List formDTO) { + public Result insertIndexDataMonthly(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(); } - screenIndexDataDao.deleteIndexData(formDTO.get(NumConstant.ZERO).getCustomerId(), + screenIndexDataMonthlyDao.deleteIndexDataMonthly(formDTO.get(NumConstant.ZERO).getCustomerId(), formDTO.get(NumConstant.ZERO).getYearId(), formDTO.get(NumConstant.ZERO).getMonthId(), orgIds); - screenIndexDataDao.batchInsertIndexData(formDTO); + screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO); + } + return new Result(); + } + + @Override + public Result insertIndexDataYearly(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(); + } + screenIndexDataYearlyDao.deleteIndexDataYearly(formDTO.get(NumConstant.ZERO).getCustomerId(), + formDTO.get(NumConstant.ZERO).getYearId(), + orgIds); + + screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO); } return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 9cf0ef9a41..182ea29161 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -3,7 +3,7 @@ - + delete from screen_index_data_monthly where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} AND ORG_ID IN @@ -12,7 +12,7 @@ - + insert into screen_index_data_monthly ( ID, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml index 3896921c0e..2fb2faae43 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml @@ -3,6 +3,58 @@ + + delete from screen_index_data_yearly + where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} + AND ORG_ID IN + + #{item} + + + + insert into screen_index_data_yearly + ( + ID, + CUSTOMER_ID, + YEAR_ID, + ORG_TYPE, + ORG_ID, + PARENT_ID, + ORG_NAME, + INDEX_TOTAL, + PARTY_DEV_ABLITY, + SERVICE_ABLITY, + GOVERN_ABLITY, + DEL_FLAG, + REVISION, + CREATED_BY, + CREATED_TIME, + UPDATED_BY, + UPDATED_TIME + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + #{item.customerId}, + #{item.yearId}, + #{item.orgType}, + #{item.orgId}, + #{item.parentId}, + #{item.orgName}, - \ No newline at end of file + #{item.indexTotal}, + #{item.partyDevAblity}, + #{item.serviceAblity}, + #{item.governAblity}, + 0, + 0, + 'APP_USER', + now(), + 'APP_USER', + now() + ) + + + + diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java index 1c3a326c75..a1639646a2 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java @@ -75,7 +75,7 @@ public class ExtAppJwtTokenUtils { public static void genToken() { HashMap claim = new HashMap<>(); - claim.put("appId", "227fb75ae4baa820755aaf43bf7f0a69"); + claim.put("appId", "dbfad3110c124c89948d16e8b06a8888"); claim.put("customerId", "c1"); claim.put("ts", System.currentTimeMillis() - 1000 * 60 * 4);