添加联网记录

device-api-service/src/main/java/com/xy/service/MqttUserServiceImpl.java

@@ -8,10 +8,8 @@ import com.xy.dto.MqttUserDto;
 import com.xy.entity.MqttUser;
 import com.xy.entity.SysDictRedis;
 import com.xy.mapper.MqttUserMapper;
-import com.xy.service.factory.TaskCmdServiceImpl;
 import com.xy.utils.*;
 import com.xy.utils.enums.DictEnum;
-import com.xy.utils.enums.DictSonEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -41,20 +39,18 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @Api(tags = "mqtt认证")
 public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> implements MqttUserService {
 
-    private RedisService<String> redisService;
-
     private SpringConfigs springConfigs;
 
     @PostMapping("obj")
     @ApiOperation("对象查询")
-    public R<MqttUserDto.Vo> obj(@RequestBody MqttUserDto.Vo vo) {
-        MqttUserDto.SelectList selectList = copy(MqttUserDto.SelectList.class, vo);
+    public R<MqttUserDto.Vo> obj(@RequestBody MqttUserDto.Obj obj) {
+        MqttUserDto.SelectList selectList = copy(MqttUserDto.SelectList.class, obj);
         List<MqttUserDto.Vo> list = list(selectList).getData();
         if (!Emptys.check(list)) {
             return R.ok();
         }
         MqttUserDto.Vo mqttUser = list.get(0);
-        String env = getEnv(new MqttUserDto.Env().setDeviceId(mqttUser.getDeviceId())).getData();
+        String env = !Emptys.check(obj.getEnv()) ? springConfigs.getProfiles().getActive() : obj.getEnv();
         Map<String, SysDictRedis> map = SysDictUtils.get(DictEnum.ENV_PARAMS.getKey());
         SysDictRedis mqttUrl = map.get(env + "_mqtt_url");
         SysDictRedis serverUrl = map.get(env + "_server_url");
@@ -64,18 +60,6 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> i
         return R.ok(mqttUser);
     }
 
-    @PostMapping("getEnv")
-    @ApiOperation("获取设备当前环境")
-    public R<String> getEnv(@RequestBody @Validated MqttUserDto.Env envInfo) {
-        String env = redisService.get(String.format(TaskCmdServiceImpl.deviceEnvKey, envInfo.getDeviceId()));
-        if (!Emptys.check(env)) {
-            SpringConfigs.Profiles profiles = springConfigs.getProfiles();
-            env = profiles == null || profiles.getActive() == null ?
-                    SysDictUtils.get(DictEnum.ENV.getKey(), DictSonEnum.ENV_UAT.getKey()).getValue() : profiles.getActive();
-        }
-        return R.ok(env);
-    }
-
     @PostMapping("list")
     @ApiOperation("集合查询")
     public R<List<MqttUserDto.Vo>> list(@RequestBody MqttUserDto.SelectList selectList) {

device-api-service/src/main/java/com/xy/service/factory/TaskCmdServiceImpl.java

@@ -6,7 +6,6 @@ import com.xy.dto.MqttDto;
 import com.xy.service.ActivityInfoService;
 import com.xy.utils.LambdaUtils;
 import com.xy.utils.R;
-import com.xy.utils.RedisService;
 import com.xy.utils.enums.TaskEnum;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -22,10 +21,6 @@ public class TaskCmdServiceImpl implements CmdService {
 
     private final ActivityInfoService activityInfoService;
 
-    private final RedisService<String> redisService;
-
-    public static String deviceEnvKey = "env:%d";
-
     @Override
     public R senCommand(List<MqttDto> mqttDtos) {
         for (MqttDto mqttDto : mqttDtos) {
@@ -35,10 +30,6 @@ public class TaskCmdServiceImpl implements CmdService {
             if (type.equals(TaskEnum.ABORT.getType())) {
                 activityInfoService.abort(new ActivityInfoDto.Abort().setDeviceId(mqttDto.getDeviceId()));
             }
-            //切换环境
-            if (type.equals(TaskEnum.ENV.getType())) {
-                redisService.set(String.format(deviceEnvKey, mqttDto.getDeviceId()), data.getStr("env"));
-            }
         }
         return R.ok();
     }

device-api/src/main/java/com/xy/dto/MqttUserDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
 
 /**
@@ -42,13 +42,17 @@ public class MqttUserDto {
 
     @Data
     @Accessors(chain = true)
-    public static class Env {
+    public static class Obj extends Vo {
 
-        @NotNull(message = "deviceId不能为空")
-        @ApiModelProperty("设备id")
-        private Long deviceId;
+        @NotBlank(message = "sn不能为空")
+        @ApiModelProperty("sn号")
+        private String sn;
+
+        @ApiModelProperty("环境标识")
+        private String env;
     }
 
+
     @Data
     @Accessors(chain = true)
     public static class Vo {
@@ -86,5 +90,6 @@ public class MqttUserDto {
 
         @ApiModelProperty("服务地址")
         private String serverUrl;
+
     }
 }