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

[大屏][修改]:心跳接口返回值更改

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
ccb678ce11
2 измененных файлов: 11 добавлений и 5 удалений
  1. +7
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java

+ 7
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java Просмотреть файл

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -95,7 +96,12 @@ public class WxDeviceScreenAdController extends BaseController {
wxDevice.setLastHbTime(new Date());
wxDevice.setVersion(paramMap.get("version"));
wxDeviceService.saveOrUpdate(wxDevice);
return new ResultData(wxDevice.getConfig());

Map<String, String> result = new HashMap<>();
result.put("config",wxDevice.getConfig());
result.put("name", wxDevice.getName());
result.put("location", wxDevice.getLocation());
return new ResultData(result);
}

@ApiOperation("基础信息")


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java Просмотреть файл

@@ -29,8 +29,8 @@ public class WxDeviceServiceImpl implements WxDeviceService {
WxDeviceMapper wxDeviceMapper;

final String DEVICE_DEFAULT_CONFIG_SCREEN_AD = "{" +
"\"heartBeatIntervel\":300000," + //5MIN
"\"dataRefreshIntervel\":3600000," + //1HOUR
"\"heartbeatInterval\":300000," + //5MIN
"\"dataRefreshInterval\":3600000," + //1HOUR
"\"pageChangeInterval\":10000," + //10SEC
"\"animationTheme\":0" +
"}";
@@ -64,8 +64,8 @@ public class WxDeviceServiceImpl implements WxDeviceService {
}

if (type == EnumDeviceType.SCREEN.getCode()) {
Integer heartBeatIntervel = jConfig.getInteger("heartBeatIntervel");
Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshIntervel");
Integer heartBeatIntervel = jConfig.getInteger("heartbeatInterval");
Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshInterval");
Integer pageChangeInterval = jConfig.getInteger("pageChangeInterval");
Integer animationTheme = jConfig.getInteger("animationTheme");
if (heartBeatIntervel == null ||


Загрузка…
Отмена
Сохранить