|
|
@@ -1,6 +1,7 @@
|
|
|
package com.imcs.admin.business.service.impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
@@ -46,6 +47,12 @@ public class BigScreenDetailServiceImpl implements BigScreenDetailService {
|
|
|
String deviceInfo = json.get("deviceInfo").toString();
|
|
|
cn.hutool.json.JSONObject jsonObject=new cn.hutool.json.JSONObject(deviceInfo);
|
|
|
json.putAll(jsonObject);
|
|
|
+ if(ObjectUtil.isNotEmpty(json.get("mainProg"))){
|
|
|
+ String mainProg = json.get("mainProg").toString();
|
|
|
+ int lastBackslashIndex = mainProg.lastIndexOf('\\');
|
|
|
+ String result = mainProg.substring(lastBackslashIndex + 1);
|
|
|
+ json.put("mainProg",result);
|
|
|
+ }
|
|
|
String ip = json.get("ip").toString();
|
|
|
List<String> pastDaysDates = DateUtils.getPastDaysDates(new Date(), 5);
|
|
|
String collect = pastDaysDates.stream()
|
