From f4e0eb78c33daea9e15b6767e066835d06a9e838 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 19 Dec 2019 10:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=B8=B8=E9=87=8F?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...Constant.java => RoleTypeKeyConstant.java} |  7 +--
 .../epdc/service/impl/SysDeptServiceImpl.java |  9 ++-
 .../epdc/service/impl/SysRoleServiceImpl.java |  8 +--
 .../service/impl/KpiFormulaServiceImpl.java   |  3 +-
 .../service/impl/KpiMetaDataServiceImpl.java  | 55 +++++++++----------
 .../impl/KpiTimeLimitItemServiceImpl.java     | 11 ----
 6 files changed, 36 insertions(+), 57 deletions(-)
 rename esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/{TypeKeyConstant.java => RoleTypeKeyConstant.java} (62%)

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/TypeKeyConstant.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java
similarity index 62%
rename from esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/TypeKeyConstant.java
rename to esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java
index 9ef4895c4..4ac881e24 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/TypeKeyConstant.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java
@@ -6,12 +6,7 @@ package com.elink.esua.epdc.constant;
  * @author work@yujt.net.cn
  * @date 2019/12/18 10:10
  */
-public interface TypeKeyConstant {
-
-    /**
-     * 机构：基础网格
-     */
-    String DEPT_GRID_PARTY = "grid_party";
+public interface RoleTypeKeyConstant {
 
     /**
      * 角色：网格长
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 43b55bd3a..5f4bd995d 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -26,7 +26,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
-import com.elink.esua.epdc.constant.TypeKeyConstant;
+import com.elink.esua.epdc.constant.RoleTypeKeyConstant;
 import com.elink.esua.epdc.dao.SysDeptDao;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
@@ -445,7 +445,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
      * @param allParentNode     所有的上级机构节点
      * @param dataScopeDeptList 拥有数据权限的部门
      * @param parentDeptIdList  上级部门id
-     * @return java.util.Map<java.lang.String ,   java.lang.Object>
+     * @return java.util.Map<java.lang.String, java.lang.Object>
      * @author work@yujt.net.cn
      * @date 2019/11/29 10:27
      */
@@ -552,8 +552,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             parentDeptNames = StringUtils.join(deptNameList, StrConstant.HYPHEN);
         }
         // 全部机构名称
-        String allDeptNames = StringUtils.isBlank(parentDeptNames) ? deptName :
-                parentDeptNames.concat(StrConstant.HYPHEN).concat(deptName);
+        String allDeptNames = StringUtils.isBlank(parentDeptNames) ? deptName : parentDeptNames.concat(StrConstant.HYPHEN).concat(deptName);
 
         DeptLevelAndLeaderDTO deptLevel = new DeptLevelAndLeaderDTO();
         deptLevel.setDeptId(deptId);
@@ -565,7 +564,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         deptLevel.setTypeKey(sysDeptEntity.getTypeKey());
 
         if (YesOrNoEnum.YES.value().equals(leaderFlag)) {
-            String leaderName = baseDao.selectDeptLeaderName(deptId, TypeKeyConstant.ROLE_GRID_LEADER);
+            String leaderName = baseDao.selectDeptLeaderName(deptId, RoleTypeKeyConstant.ROLE_GRID_LEADER);
             deptLevel.setLeaderName(leaderName);
         }
 
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
index 0cd44cda8..2d6fc7038 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
@@ -15,14 +15,14 @@ import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.constant.TypeKeyConstant;
+import com.elink.esua.epdc.constant.RoleTypeKeyConstant;
 import com.elink.esua.epdc.dao.SysRoleDao;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysRoleDTO;
@@ -128,7 +128,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
      * @date 2019/12/18 10:14
      */
     private void checkDeptRoleAmount(String roleType, List<Long> deptidList) {
-        if (TypeKeyConstant.ROLE_GRID_LEADER.equals(roleType)) {
+        if (RoleTypeKeyConstant.ROLE_GRID_LEADER.equals(roleType)) {
             List<Map<String, Object>> resultList = baseDao.selectAmountByRoleTpye(roleType, deptidList);
             if (CollUtil.isEmpty(resultList)) {
                 return;
@@ -139,7 +139,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
                 map = resultList.get(i);
 
                 mapValue = map.get("typeKey").toString();
-                if (!mapValue.equals(TypeKeyConstant.DEPT_GRID_PARTY)) {
+                if (!mapValue.equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
                     continue;
                 }
 
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java
index 72051af4b..d6edd767a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java
@@ -53,10 +53,9 @@ import java.util.Map;
 @Service
 public class KpiFormulaServiceImpl extends BaseServiceImpl<KpiFormulaDao, KpiFormulaEntity> implements KpiFormulaService {
 
-    @Autowired
-    private KpiFormulaRedis kpiFormulaRedis;
     @Autowired
     private KpiRuleDao kpiRuleDao;
+
     @Override
     public PageData<KpiFormulaDTO> page(Map<String, Object> params) {
         QueryWrapper<KpiFormulaEntity> wrapper=new QueryWrapper<>();
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
index 03aab96df..f01110505 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java
@@ -151,39 +151,35 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
 
     @Override
     public void createEvaluationData() {
-        //查询sql入参
-        //月
-        KpiEventEvaluationFromDTO monthFromDto;
-        //季度
-        KpiEventEvaluationFromDTO quarterFromDto;
-        // 年
-        KpiEventEvaluationFromDTO yearFromDto;
-        //统计月
-        //取本月第一天
+
+        // 本年本月
         YearMonth now = YearMonth.now();
-        LocalDate startTime = now.minusMonths(NumConstant.ONE).atDay(NumConstant.ONE);
-        LocalDate endTime = now.atDay(NumConstant.ONE);
-        Date endTimeDate = LocalDateUtils.localDateToDate(startTime);
-        //按月统计
+        int nowMonth = now.getMonthValue();
 
-        monthFromDto = new KpiEventEvaluationFromDTO();
+        // 月统计
+        LocalDate startTime = now.minusMonths(NumConstant.ONE).atDay(NumConstant.ONE);
+        LocalDate endTime = now.minusMonths(NumConstant.ONE).atEndOfMonth();
+        // 组装参数
+        KpiEventEvaluationFromDTO monthFromDto= new KpiEventEvaluationFromDTO();
+        monthFromDto.setStartTime(LocalDateUtils.localDateToDate(startTime));
         monthFromDto.setEndTime(LocalDateUtils.localDateToDate(endTime));
-        monthFromDto.setStartTime(endTimeDate);
 
-        // 按照季度
-        int nowMonth = now.getMonthValue();
-        // 上个季度第一天
-        LocalDate lastQuarter = now.minusMonths(NumConstant.THREE).atDay(NumConstant.ONE);
-        Date startQuarterDate = LocalDateUtils.localDateToDate(lastQuarter);
-        quarterFromDto = new KpiEventEvaluationFromDTO();
-        quarterFromDto.setStartTime(startQuarterDate);
-        quarterFromDto.setEndTime(endTimeDate);
-        // 年统计
-        // 上个季度第一天
-        LocalDate lastYear = now.minusYears(NumConstant.ONE).atDay(NumConstant.ONE);
-        yearFromDto = new KpiEventEvaluationFromDTO();
-        yearFromDto.setStartTime(LocalDateUtils.localDateToDate(lastYear));
-        yearFromDto.setEndTime(endTimeDate);
+        // 季度统计
+        LocalDate startOfLastQuarter = now.minusMonths(NumConstant.THREE).atDay(NumConstant.ONE);
+        LocalDate endOfLastQuarter = now.minusMonths(NumConstant.ONE).atEndOfMonth();
+        // 组装参数
+        KpiEventEvaluationFromDTO quarterFromDto = new KpiEventEvaluationFromDTO();
+        quarterFromDto.setStartTime(LocalDateUtils.localDateToDate(startOfLastQuarter));
+        monthFromDto.setEndTime(LocalDateUtils.localDateToDate(endOfLastQuarter));
+
+        // 年度统计
+        LocalDate startOfLastYear = now.minusYears(NumConstant.ONE).atDay(NumConstant.ONE);
+        LocalDate endOfLastYear = now.minusMonths(NumConstant.ONE).atEndOfMonth();
+        // 组装参数
+        KpiEventEvaluationFromDTO yearFromDto  = new KpiEventEvaluationFromDTO();
+        yearFromDto.setStartTime(LocalDateUtils.localDateToDate(startOfLastYear));
+        yearFromDto.setEndTime(LocalDateUtils.localDateToDate(endOfLastYear));
+
         // 页容量
         int pageSize = NumConstant.TEN;
         // 页码
@@ -214,4 +210,5 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
             gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, pageSize, pageIndex);
         } while (CollUtil.isNotEmpty(gridList));
     }
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java
index 7933f8262..cdba31433 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java
@@ -153,17 +153,6 @@ public class KpiTimeLimitItemServiceImpl extends BaseServiceImpl<KpiTimeLimitIte
         return new Result();
     }
 
-    public static void main(String[] args) {
-        List<Long> aa = Lists.newArrayList();
-        aa.add(0L);
-        aa.add(1L);
-
-        Long[] bb = aa.toArray(new Long[aa.size()]);
-        for (Long aLong : bb) {
-            System.out.println(aLong);
-        }
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(KpiTimeLimitItemDTO dto) {