Kaynağa Gözat

[大屏][修改]:调整参数单位,心跳更新语句

release_toaliyun_real
hupeng 7 yıl önce
ebeveyn
işleme
a499ea6169
3 değiştirilmiş dosya ile 10 ekleme ve 8 silme
  1. +6
    -4
      mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxDeviceMapper.xml

+ 6
- 4
mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java Dosyayı Görüntüle

@@ -92,11 +92,13 @@ public class WxDeviceScreenAdController extends BaseController {
WxDevice wxDevice = findDevice(deviceId); WxDevice wxDevice = findDevice(deviceId);
if (wxDevice == null) if (wxDevice == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND); return new ResultData(ErrorCode.DEVICE_NOT_FOUND);
WxDevice record = new WxDevice();
record.setId(wxDevice.getId());
if (wxDevice.getFirstHbTime() == null) if (wxDevice.getFirstHbTime() == null)
wxDevice.setFirstHbTime(new Date());
wxDevice.setLastHbTime(new Date());
wxDevice.setVersion(paramMap.get("version"));
wxDeviceService.saveOrUpdate(wxDevice);
record.setFirstHbTime(new Date());
record.setLastHbTime(new Date());
record.setVersion(paramMap.get("version"));
wxDeviceService.saveOrUpdate(record);


Map<String, String> result = new HashMap<>(); Map<String, String> result = new HashMap<>();
result.put("config",wxDevice.getConfig()); result.put("config",wxDevice.getConfig());


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java Dosyayı Görüntüle

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


final String DEVICE_DEFAULT_CONFIG_SCREEN_AD = "{" + final String DEVICE_DEFAULT_CONFIG_SCREEN_AD = "{" +
"\"heartbeatInterval\":300000," + //5MIN
"\"dataRefreshInterval\":3600000," + //1HOUR
"\"pageChangeInterval\":10000," + //10SEC
"\"heartbeatInterval\":300," + //5MIN
"\"dataRefreshInterval\":3600," + //1HOUR
"\"pageChangeInterval\":10," + //10SEC
"\"animationTheme\":0" + "\"animationTheme\":0" +
"}"; "}";




+ 1
- 1
mallinkService/src/main/resources/mapper/WxDeviceMapper.xml Dosyayı Görüntüle

@@ -35,7 +35,7 @@
</if> </if>


<if test=" null != deviceId "> <if test=" null != deviceId ">
and `device_id` like concat('%', #{deviceId},'%')
and `device_id` = #{deviceId}


</if> </if>
<if test=" null != version "> <if test=" null != version ">


Yükleniyor…
İptal
Kaydet