|
@@ -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;
|
|
|
}
|