|
|
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.xy.annotation.Lock;
|
|
|
import com.xy.collections.list.JArrayList;
|
|
|
import com.xy.collections.list.JList;
|
|
|
import com.xy.collections.map.JMap;
|
|
|
@@ -23,7 +24,6 @@ import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
|
|
|
import static com.xy.utils.PlusBeans.*;
|
|
|
@@ -56,6 +56,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
|
|
|
@PostMapping("save")
|
|
|
@ApiOperation("添加")
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
+ @Lock(value = "save.deviceId", prefix = "device_register_")
|
|
|
public R save(@RequestBody @Validated DeviceRegisterDto.Save save) {
|
|
|
//重复校验
|
|
|
DeviceRegister deviceRegister = copy(DeviceRegister.class, save);
|
|
|
@@ -96,8 +97,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
|
|
|
);
|
|
|
//新增设备-状态
|
|
|
deviceStatusMapper.insert(new DeviceStatus().setDeviceId(deviceRegister.getDeviceId()));
|
|
|
- //新增设备-质检
|
|
|
- deviceQualityService.save(Arrays.asList(new DeviceQualityDto.Save().setDeviceId(deviceRegister.getDeviceId())));
|
|
|
//新增mqtt信息
|
|
|
String deviceId = deviceRegister.getDeviceId().toString();
|
|
|
mqttAclService.save(new MqttAclDto.Save().setClientid(deviceId).setUsername(deviceId));
|
