瀏覽代碼

Merge branch 'master' into test

李进 2 年之前
父節點
當前提交
b5ee7a573c

+ 2 - 2
device-api-service/src/main/java/com/xy/service/factory/cmd/impl/TaskCmdServiceImpl.java

@@ -2,7 +2,7 @@ package com.xy.service.factory.cmd.impl;
 
 import cn.hutool.json.JSONObject;
 import com.xy.annotate.Factory;
-import com.xy.device.EnumDeviceVersionUpStatus;
+import com.xy.device.EnumAppUpdateStatus;
 import com.xy.device.EnumMqttCmdTempletTask;
 import com.xy.dto.ActivityInfoDto;
 import com.xy.dto.DeviceVersionUpDto;
@@ -38,7 +38,7 @@ public class TaskCmdServiceImpl implements CmdService {
             }
             //版本升级
             if (type.equals(EnumMqttCmdTempletTask.APPUPDATE.getCode())) {
-                Integer value = SysDictUtils.getValue(EnumDeviceVersionUpStatus.Code.CODE.getCode(), EnumDeviceVersionUpStatus.N_1.getCode(), Integer.class);
+                Integer value = SysDictUtils.getValue(EnumAppUpdateStatus.Code.CODE.getCode(), EnumAppUpdateStatus.CMD.getCode(), Integer.class);
                 DeviceVersionUpDto.SaveOrUpdate saveOrUpdate = new DeviceVersionUpDto.SaveOrUpdate()
                         .setDeviceId(mqttDto.getDeviceId())
                         .setDeviceVersion(data.getStr("version"))