名称调整

src/main/java/com/project/zcustom/controller/core/Constants.java

@@ -48,70 +48,8 @@ public class Constants {
      */
     public static final String LOGIN_SUCCESS = "Success";
 
-    /**
-     * 注销
-     */
-    public static final String LOGOUT = "Logout";
-
-    /**
-     * 注册
-     */
-    public static final String REGISTER = "Register";
-
-    /**
-     * 登录失败
-     */
-    public static final String LOGIN_FAIL = "Error";
-
-    /**
-     * 验证码有效期（分钟）
-     */
-    public static final Integer CAPTCHA_EXPIRATION = 2;
-
-    /**
-     * 令牌
-     */
-    public static final String TOKEN = "token";
-
-    /**
-     * 令牌前缀
-     */
-    public static final String TOKEN_PREFIX = "Bearer ";
-
-    /**
-     * 令牌前缀
-     */
-    public static final String LOGIN_USER_KEY = "login_user_key";
-
-    /**
-     * 用户ID
-     */
-    public static final String JWT_USERID = "userid";
-
-    /**
-     * 用户名称
-     */
-    public static final String JWT_USERNAME = Claims.SUBJECT;
-
-    /**
-     * 用户头像
-     */
-    public static final String JWT_AVATAR = "avatar";
-
-    /**
-     * 创建时间
-     */
-    public static final String JWT_CREATED = "created";
-
-    /**
-     * 用户权限
-     */
-    public static final String JWT_AUTHORITIES = "authorities";
-
-    /**
-     * 资源映射路径 前缀
-     */
-    public static final String RESOURCE_PREFIX = "/profile";
+    public static final String SGS = "国网山西省公司";
+    public static final String SGS_BB = "山西省公司(本部)";
 
 
 }

src/main/java/com/project/zcustom/service/logistics/impl/LargePlatAssetServiceImpl.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.service.logistics.impl;
 
+import com.project.zcustom.controller.core.Constants;
 import com.project.zcustom.domain.addional.LargeAssetDirs;
 import com.project.zcustom.domain.addional.LargeLogistics;
 import com.project.zcustom.mapper.logistics.PlatAssetMapper;
@@ -174,14 +175,18 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
         if (flag == 0){
             list = platAssetMapper.getSceneRateX();
             for (LargeLogistics it : list){
-                it.setAppName(it.getAppName().substring(6, 8));
+                it.setAppName(it.getAppName().substring(2, 4));
             }
         }
         else {
             list = platAssetMapper.getSceneRateY();
         }
         for (LargeLogistics it : list){
-            list1.add(it.getAppName());
+            if (Constants.SGS.equals(it.getAppName())) {
+                list1.add(Constants.SGS_BB);
+            }else {
+                list1.add(it.getAppName());
+            }
             if (it.getSceneRate() == null){
                 list2.add(BigDecimal.valueOf(0));
             }
@@ -212,7 +217,11 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
         List<String> list1 = new ArrayList<>();
         List<Long> list2 = new ArrayList<>();
         for (LargeLogistics it : list){
-            list1.add(it.getAppName().substring(6, 8));
+            if (Constants.SGS.equals(it.getAppName())) {
+                list1.add(Constants.SGS_BB);
+            }else {
+                list1.add(it.getAppName());
+            }
             if (it.getInspectionSchemeNum() == null){
                 list2.add(0L);
             }
@@ -231,7 +240,11 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
         List<String> list1 = new ArrayList<>();
         List<Long> list2 = new ArrayList<>();
         for (LargeLogistics it : list){
-            list1.add(it.getAppName());
+            if (Constants.SGS.equals(it.getAppName())) {
+                list1.add(Constants.SGS_BB);
+            }else {
+                list1.add(it.getAppName());
+            }
             if (it.getInspectionSchemeNum() == null){
                 list2.add(0L);
             }

src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeTypeServiceImpl.java

@@ -268,14 +268,14 @@ public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMap
             StringUtils.getMapData("外协人员", "entryAssistNum", 0, tempMap);
             StringUtils.getMapData("物业人员", "entryPropertyNum", 0, tempMap);
             StringUtils.getMapData("访客", "visitorNum", 0, tempMap);
-            StringUtils.getMapData("共计人员", "grossNum", 0, tempMap);
+            StringUtils.getMapData("人员总数", "grossNum", 0, tempMap);
         } else {
             StringUtils.getMapData("内部员工", "entryInternalNum", employeeType.getEntryInternalNum(), tempMap);
             StringUtils.getMapData("借调人员", "entryToLoanNum", employeeType.getEntryToLoanNum(), tempMap);
             StringUtils.getMapData("外协人员", "entryAssistNum", employeeType.getEntryAssistNum(), tempMap);
             StringUtils.getMapData("物业人员", "entryPropertyNum", employeeType.getEntryPropertyNum(), tempMap);
             StringUtils.getMapData("访客", "visitorNum", employeeType.getVisitorNum(), tempMap);
-            StringUtils.getMapData("共计人员", "grossNum", employeeType.getGrossNum(), tempMap);
+            StringUtils.getMapData("人员总数", "grossNum", employeeType.getGrossNum(), tempMap);
         }
         return tempMap;
     }

src/main/java/com/project/zcustom/service/service/post/impl/PlatPostStationServiceImpl.java

@@ -289,13 +289,13 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
         PlatPostStation platPostStation = this.getPlatPostStationByField("app_org", appOrg,fieldString);
         Map<String, Object> tempMap = new HashMap<>();
         if (StringUtils.isNull(platPostStation)) {
-            StringUtils.getMapData("故障报修", "faultWarrantyNum", 0, tempMap);
+            StringUtils.getMapData("报修数量", "faultWarrantyNum", 0, tempMap);
             StringUtils.getMapData("报修派单", "dispatchedNum", 0, tempMap);
             StringUtils.getMapData("维修完成", "suggestedNum", 0, tempMap);
             StringUtils.getMapData("投诉建议", "repairOrdersNum", 0, tempMap);
             StringUtils.getMapData("调查问卷", "questionnairesNum", 0, tempMap);
         }else{
-            StringUtils.getMapData("故障报修", "faultWarrantyNum", platPostStation.getFaultWarrantyNum(), tempMap);
+            StringUtils.getMapData("报修数量", "faultWarrantyNum", platPostStation.getFaultWarrantyNum(), tempMap);
             StringUtils.getMapData("报修派单", "dispatchedNum", platPostStation.getDispatchedNum(), tempMap);
             StringUtils.getMapData("维修完成", "suggestedNum", platPostStation.getSuggestedNum(), tempMap);
             StringUtils.getMapData("投诉建议", "repairOrdersNum", platPostStation.getRepairOrdersNum(), tempMap);

src/main/java/com/project/zcustom/service/service/smart/impl/PlatGreenSmartRankServiceImpl.java

@@ -203,6 +203,7 @@ public class PlatGreenSmartRankServiceImpl extends ServiceImpl<PlatGreenSmartRan
         }
         lqw.groupBy("params_name");
         lqw.select("params_name,(sum(params_value) / count(id)) as params_value");
+        lqw.gt("params_value",0);
         lqw.orderByDesc("params_value");
         lqw.last("limit 5");
         List<PlatGreenSmartRank> list = this.list(lqw);