From 17378a8c5956b132bcea91097c35780351dbf1b4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 2 Sep 2020 16:29:50 +0800 Subject: [PATCH] =?UTF-8?q?indexcal=20=E6=8C=87=E6=A0=87=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=EF=BC=8C=E7=BB=93=E6=9E=9C=EF=BC=9B=20indexcoll=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/DemoController.java | 2 +- .../FactIndexCollectController.java | 2 +- .../AgencyScoreDao.java | 4 +- .../{indexscore => indexcal}/CpcScoreDao.java | 4 +- .../DeptScoreDao.java | 4 +- .../GridScoreDao.java | 4 +- .../AgencyScoreEntity.java | 2 +- .../CpcScoreEntity.java | 2 +- .../DeptScoreEntity.java | 2 +- .../GridScoreEntity.java | 2 +- .../service/indexcal/AgencyScoreService.java | 2 +- .../indexcal/DeptCorreLationService.java | 20 ----- .../service/indexcal/DeptScoreService.java | 69 ++------------- .../indexcal/GridCorreLationService.java | 1 - .../indexcal/impl/AgencyScoreServiceImpl.java | 4 +- .../impl/CpcIndexCalculateServiceImpl.java | 4 +- .../impl/DeptCorreLationServiceImpl.java | 33 -------- .../indexcal/impl/DeptScoreServiceImpl.java | 83 +++++-------------- .../impl/GridCorreLationServiceImpl.java | 6 +- .../FactIndexCollectService.java | 2 +- .../impl/FactIndexCollectServiceImpl.java | 4 +- .../AgencyScoreDao.xml | 2 +- .../{indexscore => indexcal}/CpcScoreDao.xml | 4 +- .../{indexcoll => indexcal}/DeptScoreDao.xml | 2 +- .../{indexscore => indexcal}/GridScoreDao.xml | 4 +- 25 files changed, 62 insertions(+), 206 deletions(-) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/{indexscore => indexcal}/AgencyScoreDao.java (94%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/{indexscore => indexcal}/CpcScoreDao.java (97%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/{indexscore => indexcal}/DeptScoreDao.java (92%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/{indexscore => indexcal}/GridScoreDao.java (96%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/{indexcoll => indexcal}/AgencyScoreEntity.java (98%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/{indexscore => indexcal}/CpcScoreEntity.java (97%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/{indexcoll => indexcal}/DeptScoreEntity.java (98%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/{indexscore => indexcal}/GridScoreEntity.java (98%) delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/DeptCorreLationService.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptCorreLationServiceImpl.java rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/{indexcollect => indexcoll}/FactIndexCollectService.java (98%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/{indexcollect => indexcoll}/impl/FactIndexCollectServiceImpl.java (98%) rename epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/{indexcoll => indexcal}/AgencyScoreDao.xml (95%) rename epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/{indexscore => indexcal}/CpcScoreDao.xml (96%) rename epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/{indexcoll => indexcal}/DeptScoreDao.xml (68%) rename epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/{indexscore => indexcal}/GridScoreDao.xml (96%) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 6c6f22f8a2..2530e1e065 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -4,10 +4,10 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.IndexCalConstant; +import com.epmet.dao.indexcal.GridScoreDao; import com.epmet.dao.indexcoll.FactIndexGovrnAblityGridMonthlyDao; import com.epmet.dao.indexcoll.FactIndexPartyAblityGridMonthlyDao; import com.epmet.dao.indexcoll.FactIndexServiceAblityGridMonthlyDao; -import com.epmet.dao.indexscore.GridScoreDao; import com.epmet.dao.screen.ScreenCustomerGridDao; import com.epmet.dto.AgencySubTreeDto; import com.epmet.dto.indexcal.CalculateCommonFormDTO; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java index 7c12fec411..ac0704204d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java @@ -4,7 +4,7 @@ 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.indexcollect.form.*; -import com.epmet.service.indexcollect.FactIndexCollectService; +import com.epmet.service.indexcoll.FactIndexCollectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/AgencyScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/AgencyScoreDao.java similarity index 94% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/AgencyScoreDao.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/AgencyScoreDao.java index 245d72e3fd..e693ccf851 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/AgencyScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/AgencyScoreDao.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package com.epmet.dao.indexscore; +package com.epmet.dao.indexcal; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.screen.FactIndexCommunityScoreDTO; -import com.epmet.entity.indexcoll.AgencyScoreEntity; +import com.epmet.entity.indexcal.AgencyScoreEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/CpcScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/CpcScoreDao.java similarity index 97% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/CpcScoreDao.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/CpcScoreDao.java index 2142128e3b..bf0810ad59 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/CpcScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/CpcScoreDao.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package com.epmet.dao.indexscore; +package com.epmet.dao.indexcal; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.indexcal.CalculateCommonFormDTO; -import com.epmet.entity.indexscore.CpcScoreEntity; +import com.epmet.entity.indexcal.CpcScoreEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/DeptScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/DeptScoreDao.java similarity index 92% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/DeptScoreDao.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/DeptScoreDao.java index 6a3d15d529..652c9ccf63 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/DeptScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/DeptScoreDao.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.epmet.dao.indexscore; +package com.epmet.dao.indexcal; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.indexcoll.DeptScoreEntity; +import com.epmet.entity.indexcal.DeptScoreEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/GridScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/GridScoreDao.java similarity index 96% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/GridScoreDao.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/GridScoreDao.java index 71316cf4f4..bb5cbf7be2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/GridScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/GridScoreDao.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package com.epmet.dao.indexscore; +package com.epmet.dao.indexcal; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.indexcal.CalculateCommonFormDTO; import com.epmet.dto.indexcal.GridScoreDTO; -import com.epmet.entity.indexscore.GridScoreEntity; +import com.epmet.entity.indexcal.GridScoreEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/AgencyScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/AgencyScoreEntity.java similarity index 98% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/AgencyScoreEntity.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/AgencyScoreEntity.java index 4b6182e30f..0c736519ca 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/AgencyScoreEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/AgencyScoreEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.epmet.entity.indexcoll; +package com.epmet.entity.indexcal; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexscore/CpcScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/CpcScoreEntity.java similarity index 97% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexscore/CpcScoreEntity.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/CpcScoreEntity.java index cca1b90ff2..b07e2e33fa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexscore/CpcScoreEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/CpcScoreEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.epmet.entity.indexscore; +package com.epmet.entity.indexcal; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/DeptScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/DeptScoreEntity.java similarity index 98% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/DeptScoreEntity.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/DeptScoreEntity.java index 4e6db805a5..64409c1cdb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/DeptScoreEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/DeptScoreEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.epmet.entity.indexcoll; +package com.epmet.entity.indexcal; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexscore/GridScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/GridScoreEntity.java similarity index 98% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexscore/GridScoreEntity.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/GridScoreEntity.java index 9b1bdf2f73..2274bbb38e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexscore/GridScoreEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcal/GridScoreEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.epmet.entity.indexscore; +package com.epmet.entity.indexcal; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/AgencyScoreService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/AgencyScoreService.java index 6ff75f918f..50dd915d91 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/AgencyScoreService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/AgencyScoreService.java @@ -20,7 +20,7 @@ package com.epmet.service.indexcal; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.indexcal.AgencyScoreDTO; -import com.epmet.entity.indexcoll.AgencyScoreEntity; +import com.epmet.entity.indexcal.AgencyScoreEntity; import java.util.List; import java.util.Map; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/DeptCorreLationService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/DeptCorreLationService.java deleted file mode 100644 index d40cf46f13..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/DeptCorreLationService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.epmet.service.indexcal; - -import com.epmet.dto.indexcal.CalculateCommonFormDTO; - -/** - * 区直部门指标计算 - * - * @author yinzuomei@elink-cn.com - * @date 2020/9/2 14:57 - */ -public interface DeptCorreLationService { - /** - * @return java.lang.Boolean - * @param formDTO - * @author yinzuomei - * @description 区直部门，分值计算 - * @Date 2020/8/26 10:51 - **/ - Boolean calculateDeptCorreLation(CalculateCommonFormDTO formDTO); -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/DeptScoreService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/DeptScoreService.java index 5d6f090d97..dfcf0585f6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/DeptScoreService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/DeptScoreService.java @@ -19,8 +19,9 @@ package com.epmet.service.indexcal; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.indexcal.CalculateCommonFormDTO; import com.epmet.dto.indexcal.DeptScoreDTO; -import com.epmet.entity.indexcoll.DeptScoreEntity; +import com.epmet.entity.indexcal.DeptScoreEntity; import java.util.List; import java.util.Map; @@ -32,64 +33,12 @@ import java.util.Map; * @since v1.0.0 2020-09-02 */ public interface DeptScoreService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-09-02 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-09-02 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return DeptScoreDTO - * @author generator - * @date 2020-09-02 - */ - DeptScoreDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-09-02 - */ - void save(DeptScoreDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-09-02 - */ - void update(DeptScoreDTO dto); - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-09-02 - */ - void delete(String[] ids); + * @return java.lang.Boolean + * @param formDTO + * @author yinzuomei + * @description 区直部门，分值计算 + * @Date 2020/8/26 10:51 + **/ + Boolean calculateDeptCorreLation(CalculateCommonFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/GridCorreLationService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/GridCorreLationService.java index 6648205d5c..9fa2b11209 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/GridCorreLationService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/GridCorreLationService.java @@ -1,6 +1,5 @@ package com.epmet.service.indexcal; -import com.epmet.commons.tools.utils.Result; import com.epmet.dto.ScreenCustomerGridDTO; import com.epmet.dto.indexcal.CalculateCommonFormDTO; import com.epmet.dto.indexcal.PageQueryGridFormDTO; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/AgencyScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/AgencyScoreServiceImpl.java index 2d84d1326d..40fc823b08 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/AgencyScoreServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/AgencyScoreServiceImpl.java @@ -23,9 +23,9 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.indexscore.AgencyScoreDao; +import com.epmet.dao.indexcal.AgencyScoreDao; import com.epmet.dto.indexcal.AgencyScoreDTO; -import com.epmet.entity.indexcoll.AgencyScoreEntity; +import com.epmet.entity.indexcal.AgencyScoreEntity; import com.epmet.service.indexcal.AgencyScoreService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java index fd79fc52e9..be2eb94aee 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java @@ -6,11 +6,11 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.constant.IndexCalConstant; +import com.epmet.dao.indexcal.CpcScoreDao; import com.epmet.dao.indexcoll.FactIndexPartyAblityCpcMonthlyDao; -import com.epmet.dao.indexscore.CpcScoreDao; import com.epmet.dao.screen.IndexCodeFieldReDao; import com.epmet.dto.indexcal.CalculateCommonFormDTO; -import com.epmet.entity.indexscore.CpcScoreEntity; +import com.epmet.entity.indexcal.CpcScoreEntity; import com.epmet.entity.screen.IndexGroupDetailEntity; import com.epmet.eum.IndexCodeEnum; import com.epmet.service.indexcal.CpcIndexCalculateService; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptCorreLationServiceImpl.java deleted file mode 100644 index 70769882f8..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptCorreLationServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.epmet.service.indexcal.impl; - -import com.epmet.dao.indexcoll.FactIndexGovrnAblityDeptMonthlyDao; -import com.epmet.dto.indexcal.CalculateCommonFormDTO; -import com.epmet.service.indexcal.DeptCorreLationService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * 区直部门指标计算 - * - * @author yinzuomei@elink-cn.com - * @date 2020/9/2 14:58 - */ -@Slf4j -@Service -public class DeptCorreLationServiceImpl implements DeptCorreLationService { - @Autowired - private FactIndexGovrnAblityDeptMonthlyDao factIndexGovrnAblityDeptMonthlyDao; - - /** - * @param formDTO - * @return java.lang.Boolean - * @author yinzuomei - * @description 区直部门，分值计算 - * @Date 2020/8/26 10:51 - **/ - @Override - public Boolean calculateDeptCorreLation(CalculateCommonFormDTO formDTO) { - return null; - } -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptScoreServiceImpl.java index da1f056c19..f6c80cf116 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptScoreServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptScoreServiceImpl.java @@ -17,23 +17,15 @@ package com.epmet.service.indexcal.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.indexscore.DeptScoreDao; -import com.epmet.dto.indexcal.DeptScoreDTO; -import com.epmet.entity.indexcoll.DeptScoreEntity; +import com.epmet.dao.indexcal.DeptScoreDao; +import com.epmet.dao.indexcoll.FactIndexGovrnAblityDeptMonthlyDao; +import com.epmet.dto.indexcal.CalculateCommonFormDTO; +import com.epmet.entity.indexcal.DeptScoreEntity; import com.epmet.service.indexcal.DeptScoreService; -import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Map; /** * 区直部门分值表 @@ -44,56 +36,25 @@ import java.util.Map; @Service public class DeptScoreServiceImpl extends BaseServiceImpl implements DeptScoreService { - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, DeptScoreDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, DeptScoreDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public DeptScoreDTO get(String id) { - DeptScoreEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, DeptScoreDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(DeptScoreDTO dto) { - DeptScoreEntity entity = ConvertUtils.sourceToTarget(dto, DeptScoreEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(DeptScoreDTO dto) { - DeptScoreEntity entity = ConvertUtils.sourceToTarget(dto, DeptScoreEntity.class); - updateById(entity); - } + @Autowired + private FactIndexGovrnAblityDeptMonthlyDao factIndexGovrnAblityDeptMonthlyDao; + /** + * @param formDTO + * @return java.lang.Boolean + * @author yinzuomei + * @description 区直部门，分值计算 + * @Date 2020/8/26 10:51 + **/ @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); + public Boolean calculateDeptCorreLation(CalculateCommonFormDTO formDTO) { + //获取指标权重 + /*List parentIndexDetails = getDetailListByParentCode.getDetailListByParentCode(formDTO.getCustomerId(), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode()); + if (CollectionUtils.isEmpty(parentIndexDetails)) { + log.warn("cpcIndexCalculate customerId:{} have not any indexGroupDetail", formDTO.getCustomerId()); + throw new RenException("客户【党员相关】指标权重信息不存在"); + }*/ + return null; } } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java index 3719f5138b..4ea43bf80c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java @@ -9,15 +9,15 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.DataSourceConstant; import com.epmet.constant.IndexCalConstant; +import com.epmet.dao.indexcal.CpcScoreDao; +import com.epmet.dao.indexcal.GridScoreDao; import com.epmet.dao.indexcoll.FactIndexGovrnAblityGridMonthlyDao; import com.epmet.dao.indexcoll.FactIndexPartyAblityGridMonthlyDao; import com.epmet.dao.indexcoll.FactIndexServiceAblityGridMonthlyDao; -import com.epmet.dao.indexscore.CpcScoreDao; -import com.epmet.dao.indexscore.GridScoreDao; import com.epmet.dao.screen.ScreenCustomerGridDao; import com.epmet.dto.ScreenCustomerGridDTO; import com.epmet.dto.indexcal.*; -import com.epmet.entity.indexscore.GridScoreEntity; +import com.epmet.entity.indexcal.GridScoreEntity; import com.epmet.entity.screen.IndexGroupDetailEntity; import com.epmet.eum.IndexCodeEnum; import com.epmet.service.indexcal.GridCorreLationService; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/FactIndexCollectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcoll/FactIndexCollectService.java similarity index 98% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/FactIndexCollectService.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcoll/FactIndexCollectService.java index c9d876996b..7e4bd639a1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/FactIndexCollectService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcoll/FactIndexCollectService.java @@ -1,4 +1,4 @@ -package com.epmet.service.indexcollect; +package com.epmet.service.indexcoll; import com.epmet.dto.indexcollect.form.*; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcoll/impl/FactIndexCollectServiceImpl.java similarity index 98% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcoll/impl/FactIndexCollectServiceImpl.java index cd767ff580..385efc6273 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcoll/impl/FactIndexCollectServiceImpl.java @@ -1,11 +1,11 @@ -package com.epmet.service.indexcollect.impl; +package com.epmet.service.indexcoll.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.constant.DataSourceConstant; import com.epmet.dao.indexcoll.*; import com.epmet.dto.indexcollect.form.*; -import com.epmet.service.indexcollect.FactIndexCollectService; +import com.epmet.service.indexcoll.FactIndexCollectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/AgencyScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/AgencyScoreDao.xml similarity index 95% rename from epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/AgencyScoreDao.xml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/AgencyScoreDao.xml index d19bf16699..1bf9f3c031 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/AgencyScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/AgencyScoreDao.xml @@ -1,7 +1,7 @@ - + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexscore/CpcScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/CpcScoreDao.xml similarity index 96% rename from epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexscore/CpcScoreDao.xml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/CpcScoreDao.xml index c3483cbc32..f88176c8ed 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexscore/CpcScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/CpcScoreDao.xml @@ -1,9 +1,9 @@ - + - + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/DeptScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/DeptScoreDao.xml similarity index 68% rename from epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/DeptScoreDao.xml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/DeptScoreDao.xml index 380d746009..0ad28570c3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/DeptScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/DeptScoreDao.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexscore/GridScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/GridScoreDao.xml similarity index 96% rename from epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexscore/GridScoreDao.xml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/GridScoreDao.xml index 35a12160ce..ae593f5535 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexscore/GridScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/GridScoreDao.xml @@ -1,9 +1,9 @@ - + - +