首页-返回值调整

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/AnnualInspectionDataService.java

@@ -7,6 +7,7 @@ import cn.com.ty.lift.batch.applet.dao.model.request.AnnualInspectionDataRequest
 import cn.com.ty.lift.batch.applet.dao.model.request.CommonRequest;
 import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -107,7 +108,8 @@ public class AnnualInspectionDataService {
                     .filter(a -> a.getStatus() == 2).count();
             annualStatusToNum.put(3, beyondAnnualCount);
         }
-        return RestResponse.success(annualStatusToNum, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(annualStatusToNum),
+                ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
     /**

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/ContractDataService.java

@@ -9,6 +9,7 @@ import cn.com.ty.lift.batch.applet.dao.model.response.DueToContractResponse;
 import cn.com.ty.lift.batch.applet.dao.model.response.LostContractResponse;
 import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -139,7 +140,8 @@ public class ContractDataService {
                     }).count();
             contractTypeToNum.put(3, lostContractNum);
         }
-        return RestResponse.success(contractTypeToNum, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(contractTypeToNum),
+                ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
     /**

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/EmergencyRepairDataService.java

@@ -8,6 +8,7 @@ import cn.com.ty.lift.batch.applet.dao.model.request.EmergencyRepairDataRequest;
 import cn.com.ty.lift.batch.applet.dao.model.response.EmergencyTimeStatisticsResponse;
 import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -140,7 +141,8 @@ public class EmergencyRepairDataService {
             //将monthToUnitsRow月份对应台量的值放入monthToUnits中
             monthToUnitsRow.forEach((key, value) -> monthToUnits.put(key, value));
         }
-        return RestResponse.success(monthToUnits, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(monthToUnits),
+                ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
     /**

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/LiftDataService.java

@@ -9,6 +9,7 @@ import cn.com.ty.lift.batch.applet.dao.model.response.RegionLiftResponse;
 import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -160,7 +161,8 @@ public class LiftDataService {
             //设置电梯总览情况
             setLiftOverViewNum(liftDataRequest, liftStatusToNums, beforeLiftTotalNum, monthToNewLiftNums, monthToLostLiftNums);
         }
-        return RestResponse.success(liftStatusToNums, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(liftStatusToNums),
+                ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
     /**
@@ -232,7 +234,8 @@ public class LiftDataService {
                 topFive.put(key, value);
             }
         });
-        return RestResponse.success(topFive, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(topFive),
+                ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
     /**

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/MaintenanceDataService.java

@@ -8,6 +8,7 @@ import cn.com.ty.lift.batch.applet.dao.model.request.MaintenanceDataRequest;
 import cn.com.ty.lift.batch.applet.dao.model.response.MaintenanceOverViewResponse;
 import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -146,7 +147,7 @@ public class MaintenanceDataService {
                 }
             });
         }
-        return RestResponse.success(projectNameToBeyondNum, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(projectNameToBeyondNum), ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
     /**

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/PaymentDataService.java

@@ -9,6 +9,7 @@ import cn.com.ty.lift.batch.applet.dao.model.response.ProjectPaymentResponse;
 import cn.com.ty.lift.batch.applet.dao.model.response.RegionPaymentResponse;
 import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -122,7 +123,7 @@ public class PaymentDataService {
             paymentStatusToMoney.put(2, totalWorkMoney);
             paymentStatusToMoney.put(3, totalBeyondMoney);
         }
-        return RestResponse.success(paymentStatusToMoney, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(paymentStatusToMoney), ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
     /**

lift-common/src/main/java/cn.com.ty.lift.common/model/StatisticsKVModel.java

@@ -0,0 +1,23 @@
+package cn.com.ty.lift.common.model;
+
+import lombok.Data;
+
+/**
+ * @author huangyuan
+ * @date 2020/2/24
+ * @description 数据统计所有键值对象
+ */
+@Data
+public class StatisticsKVModel {
+
+    /**
+     * 键
+     */
+    private Object key;
+
+    /**
+     * 值
+     */
+    private Object value;
+
+}

lift-common/src/main/java/cn.com.ty.lift.common/utils/ProjectUtils.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.common.utils;
 
+import cn.com.ty.lift.common.model.StatisticsKVModel;
 import cn.hutool.core.util.StrUtil;
 
 import java.lang.reflect.Method;
@@ -66,21 +67,22 @@ public class ProjectUtils {
     }
 
     /**
-     *  将对象集合转化为attribute->Object的map
-     *@author huangy
-     *@date 2018年12月19日
-     *@param objList
-     *@param attrName:属性名称
-     *@param parameterTypes
-     *@return Map
-     *@throws
+     * 将对象集合转化为attribute->Object的map
+     *
+     * @param objList
+     * @param attrName:属性名称
+     * @param parameterTypes
+     * @return Map
+     * @throws
+     * @author huangy
+     * @date 2018年12月19日
      */
-    public static Map  attrToObjMap(List objList, String attrName, Class<?>... parameterTypes){
+    public static Map attrToObjMap(List objList, String attrName, Class<?>... parameterTypes) {
 
         Map<Object, Object> map = new HashMap<>();
         try {
-            if(objList != null && objList.size() > 0) {
-                for(Object o: objList) {
+            if (objList != null && objList.size() > 0) {
+                for (Object o : objList) {
                     Class<?> classObj = o.getClass();
                     Method method = classObj.getMethod(PojoUtils.attrGetMethodName(attrName), parameterTypes);
                     Object attr = method.invoke(o, parameterTypes);
@@ -123,14 +125,15 @@ public class ProjectUtils {
 
     /**
      * 列表去重
-     *@param list void
-     *@throws
+     *
+     * @param list void
+     * @throws
      */
     public static void removeDuplicateWithOrder(List list) {
         Set set = new HashSet<>();
         List newList = new ArrayList<>();
-        if(list != null && list.size() > 0) {
-            for (Iterator<Object> iter = list.iterator(); iter.hasNext();) {
+        if (list != null && list.size() > 0) {
+            for (Iterator<Object> iter = list.iterator(); iter.hasNext(); ) {
                 Object element = iter.next();
                 if (set.add(element)) {
                     newList.add(element);
@@ -141,4 +144,29 @@ public class ProjectUtils {
         }
     }
 
+    /**
+     * @param
+     * @return
+     * @description 将map值转化为 key -> key值 value -> value值
+     * @date 2020/2/24 7:37 下午
+     */
+    public static List<StatisticsKVModel> transReturnMapToStatisticsKVModel(Map dataMap) {
+        List<StatisticsKVModel> statisticsKVModelList = new ArrayList<>();
+        if (dataMap != null && dataMap.size() > 0) {
+            dataMap.forEach((key, value) -> {
+                StatisticsKVModel outStatisticsKVModel = new StatisticsKVModel();
+                //设置键
+                outStatisticsKVModel.setKey(key);
+                //判断值是否为也为map如果是就行封装 目前只涉及一层封装
+                if (value != null && value instanceof Map) {
+                    outStatisticsKVModel.setValue(transReturnMapToStatisticsKVModel((Map)value));
+                } else {
+                    outStatisticsKVModel.setValue(value);
+                }
+                statisticsKVModelList.add(outStatisticsKVModel);
+            });
+        }
+        return statisticsKVModelList;
+    }
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/LiftDataService.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.homepage.service;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.homepage.dao.dto.request.LiftDataRequest;
 import cn.com.ty.lift.system.homepage.dao.mapper.CommonDataMapper;
@@ -64,7 +65,8 @@ public class LiftDataService {
                 }
             }
         }
-        return RestResponse.success(liftStatusToNum, ApiConstants.RESULT_SUCCESS, "获取电梯统计数据成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(liftStatusToNum),
+                ApiConstants.RESULT_SUCCESS, "获取电梯统计数据成功");
     }
 
     /**

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/PlatformCalendarService.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.system.homepage.service;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.homepage.dao.dto.request.PlatformCalendarRequest;
 import cn.com.ty.lift.system.homepage.dao.mapper.CommonDataMapper;
@@ -51,7 +52,8 @@ public class PlatformCalendarService {
                 dayToLiftDataToNum.put(day, statusToLiftNum);
             }
         });
-        return RestResponse.success(dayToLiftDataToNum, ApiConstants.RESULT_SUCCESS, "获取任务数成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(dayToLiftDataToNum),
+                ApiConstants.RESULT_SUCCESS, "获取任务数成功");
     }
 
     /**

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/PlatformDataStatisticsService.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.homepage.service;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.homepage.dao.mapper.HomeLiftDataMapper;
 import cn.com.ty.lift.system.homepage.dao.mapper.StatisticsCountMapper;
@@ -59,27 +60,29 @@ public class PlatformDataStatisticsService {
             provinceCodeToMaintenanceCompany.forEach((provinceCode, maintenanceCompanyList) -> {
                 //获取省份名称
                 String provinceName = provinceCodeToName.get(provinceCode);
+                if(StringUtils.isNotBlank(provinceName)) {
+                    //vip标识->公司数量:初始化数据
+                    Map<Integer, Long> vipFlagToCompanyNum = CommonConstants.VIP_STATUS_TO_COMPANY_NUM;
+                    long allCompanyNum = maintenanceCompanyList.stream().count();
+                    //设置省份下所有公司数量
+                    vipFlagToCompanyNum.put(CommonConstants.PlatformDataStatisticsConstants.IS_VIP_ALL, allCompanyNum);
+                    //设置省份下是vip的公司数量
+                    long isNotVipCompanyNum = maintenanceCompanyList.stream()
+                            .filter(maintenanceCompany ->
+                                    CommonConstants.PlatformDataStatisticsConstants.IS_VIP_YES
+                                            == maintenanceCompany.getVipFlag())
+                            .count();
+                    vipFlagToCompanyNum.put(CommonConstants.PlatformDataStatisticsConstants.IS_VIP_YES, isNotVipCompanyNum);
+                    //设置省份下所有不是vip公司的数量
+                    vipFlagToCompanyNum.put(CommonConstants.PlatformDataStatisticsConstants.IS_VIP_NO,
+                            allCompanyNum - isNotVipCompanyNum);
 
-                //vip标识->公司数量:初始化数据
-                Map<Integer, Long> vipFlagToCompanyNum = CommonConstants.VIP_STATUS_TO_COMPANY_NUM;
-                long allCompanyNum = maintenanceCompanyList.stream().count();
-                //设置省份下所有公司数量
-                vipFlagToCompanyNum.put(CommonConstants.PlatformDataStatisticsConstants.IS_VIP_ALL, allCompanyNum);
-                //设置省份下是vip的公司数量
-                long isNotVipCompanyNum = maintenanceCompanyList.stream()
-                        .filter(maintenanceCompany ->
-                                CommonConstants.PlatformDataStatisticsConstants.IS_VIP_YES
-                                        == maintenanceCompany.getVipFlag())
-                        .count();
-                vipFlagToCompanyNum.put(CommonConstants.PlatformDataStatisticsConstants.IS_VIP_YES, isNotVipCompanyNum);
-                //设置省份下所有不是vip公司的数量
-                vipFlagToCompanyNum.put(CommonConstants.PlatformDataStatisticsConstants.IS_VIP_NO,
-                        allCompanyNum - isNotVipCompanyNum);
-
-                provinceCodeToCompanyNum.put(provinceName, vipFlagToCompanyNum);
+                    provinceCodeToCompanyNum.put(provinceName, vipFlagToCompanyNum);
+                }
             });
         }
-        return RestResponse.success(provinceCodeToCompanyNum, ApiConstants.RESULT_SUCCESS, "获取客户统计成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(provinceCodeToCompanyNum),
+                ApiConstants.RESULT_SUCCESS, "获取客户统计成功");
     }
 
     /**
@@ -122,7 +125,8 @@ public class PlatformDataStatisticsService {
                 provinceCodeToUnits.put(provinceName, unitsStatusToNum);
             });
         }
-        return RestResponse.success(provinceCodeToUnits, ApiConstants.RESULT_SUCCESS, "获取台量统计成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(provinceCodeToUnits),
+                ApiConstants.RESULT_SUCCESS, "获取台量统计成功");
     }
 
     /**
@@ -141,7 +145,8 @@ public class PlatformDataStatisticsService {
         recordCountMap.put(2, statisticsCountMapper.getMaintenanceRecordTotalCount());
         //急修次数
         recordCountMap.put(3, statisticsCountMapper.getEmergencyRecordTotalCount());
-        return RestResponse.success(recordCountMap, ApiConstants.RESULT_SUCCESS, "获取平台统计成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(recordCountMap),
+                ApiConstants.RESULT_SUCCESS, "获取平台统计成功");
     }
 
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/TodoService.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.system.homepage.service;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.homepage.dao.dto.request.TodoRequest;
 import cn.com.ty.lift.system.homepage.dao.dto.response.*;
@@ -73,7 +74,8 @@ public class TodoService {
         //5.设置年检待办数量
         long annualTodoCount = todoDataMapper.getAnnualTodoCount(todoRequest);
         todoTypeToNum.put(CommonConstants.TodoConstants.ANNUAL_INSPECTION_TODO, annualTodoCount);
-        return RestResponse.success(todoTypeToNum, ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
+        return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(todoTypeToNum),
+                ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
     }
 
     /**