Merge branch 'master' into hcp

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

@@ -142,7 +142,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
     @ApiOperation("添加/累加")
     @PostMapping("saveOrAccum")
     public R saveOrAccum(@RequestBody DeviceDataDto.SaveOrAccum saveOrAccum) {
-        return new SaveOrAccum().saveOrAccum(this, saveOrAccum);
+        return new SaveOrAccum().saveOrAccum(saveOrAccum, this);
     }
 
     /**
@@ -287,16 +287,16 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
 
     public static class SaveOrAccum {
 
-        public R saveOrAccum(DeviceDataServiceImpl deviceDataService, DeviceDataDto.SaveOrAccum saveOrAccum) {
+        public R saveOrAccum(DeviceDataDto.SaveOrAccum saveOrAccum, DeviceDataServiceImpl deviceDataService) {
             return new LockUtils()
                     .name("saveOrAccum.deviceId")
                     .prefix("data_save_accum_")
                     .build(SaveOrAccum.class)
-                    .exec(deviceDataService, saveOrAccum);
+                    .exec(saveOrAccum, deviceDataService);
         }
 
         @SneakyThrows
-        public R exec(DeviceDataServiceImpl deviceDataService, DeviceDataDto.SaveOrAccum saveOrAccum) {
+        public R exec(DeviceDataDto.SaveOrAccum saveOrAccum, DeviceDataServiceImpl deviceDataService) {
             LocalDateTime now = LocalDateTime.now();
             String yyyyMMdd = DataTime.toString(now, "yyyyMMdd");
             //获取字典

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

@@ -12,6 +12,7 @@ import com.xy.utils.enums.DictEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +34,7 @@ import static com.xy.utils.PlusBeans.toPageBean;
  * @author lijin
  * @since 2023-02-17
  */
+@Slf4j
 @Service
 @AllArgsConstructor
 @Api(tags = "mqtt认证")
@@ -41,6 +43,7 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> i
     @PostMapping("obj")
     @ApiOperation("对象查询")
     public R<MqttUserDto.Vo> obj(@RequestBody MqttUserDto.Obj obj) {
+        log.info("mqtt认证查询，sn：{}", obj.getSn());
         MqttUserDto.SelectList selectList = copy(MqttUserDto.SelectList.class, obj);
         List<MqttUserDto.Vo> list = list(selectList).getData();
         if (!Emptys.check(list)) {