Просмотр исходного кода

数据概况(基础运行数据)查询接口及相关数据录入已更改---基础运行数据basics
实体类更改---基础运行数据对象 plat_basics

zhanghao 3 месяцев назад
Родитель
Сommit
242040ef57

+ 0 - 14
project-zcustom/src/main/java/com/project/zcustom/domain/basics/PlatBasics.java

@@ -50,13 +50,6 @@ public class PlatBasics extends CustomBaseEntity {
     private Long registerNum;
 
     /**
-     * 基础运行数据--在线用户数
-     */
-    @Excel(name = "基础运行数据--在线用户数")
-    @ApiModelProperty("基础运行数据--在线用户数")
-    private Long onlineNum;
-
-    /**
      * 基础运行数据--订单数量
      */
     @Excel(name = "基础运行数据--订单数量")
@@ -64,13 +57,6 @@ public class PlatBasics extends CustomBaseEntity {
     private Long orderNum;
 
     /**
-     * 基础运行数据--在线率
-     */
-    @Excel(name = "基础运行数据--在线率")
-    @ApiModelProperty("基础运行数据--在线率")
-    private BigDecimal onlineRate;
-
-    /**
      * 系统运行报警信息--cpu过载
      */
     @Excel(name = "系统运行报警信息--cpu过载")

+ 4 - 10
project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsServiceImpl.java

@@ -217,11 +217,9 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
      * 设置数据
      */
     private void setPlatBasics(Map<String, Object> mapField, PlatBasics platBasics){
-        List<String> keyList = Arrays.asList("register","onLine","activeUsers","rate");
+        List<String> keyList = Arrays.asList("register","activeUsers");
         StringUtils.setFieldValue(platBasics,mapField,keyList,0, PlatBasics::setRegisterNum,Long.class);
-        StringUtils.setFieldValue(platBasics,mapField,keyList,1, PlatBasics::setOnlineNum,Long.class);
-        StringUtils.setFieldValue(platBasics,mapField,keyList,2, PlatBasics::setOrderNum,Long.class);
-        StringUtils.setFieldValue(platBasics,mapField,keyList,3, PlatBasics::setOnlineRate,BigDecimal.class);
+        StringUtils.setFieldValue(platBasics,mapField,keyList,1, PlatBasics::setOrderNum,Long.class);
 //
 //
 //        platBasics.setRegisterNum((Long) mapField.get("register"));
@@ -333,22 +331,18 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
      */
     @Override
     public Map<String, Object> getOverviewData(String appOrg){
-        String fieldString = "register_num,online_num,order_num";
+        String fieldString = "register_num,order_num";
         if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(register_num) as register_num,sum(online_num) as online_num,sum(order_num) as order_num";
+            fieldString = "sum(register_num) as register_num,sum(order_num) as order_num";
         }
         PlatBasics platBasics = this.getPlatBasicsByField("app_org", appOrg,fieldString);
         Map<String, Object> tempMap = new HashMap<>();
         if (StringUtils.isNull(platBasics)) {
             StringUtils.getMapData("注册用户数", "registerNum", 0, tempMap);
-            StringUtils.getMapData("在线用户数", "onlineNum", 0, tempMap);
             StringUtils.getMapData("日活跃人数", "orderNum", 0, tempMap);
-            StringUtils.getMapData("在线率", "onlineRate", 0, tempMap);
         }else{
             StringUtils.getMapData("注册用户数", "registerNum", platBasics.getRegisterNum(), tempMap);
-            StringUtils.getMapData("在线用户数", "onlineNum", platBasics.getOnlineNum(), tempMap);
             StringUtils.getMapData("日活跃人数", "orderNum", platBasics.getOrderNum(), tempMap);
-            StringUtils.getMapData("在线率", "onlineRate", StringUtils.sumPercentage(platBasics.getOnlineNum(), platBasics.getRegisterNum()), tempMap);
         }
         return tempMap;
     }