Merge branch 'master' into test

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

@@ -73,12 +73,6 @@ public class DevicePartServiceImpl extends ServiceImpl<DevicePartMapper, DeviceP
                     .eq(DevicePart::getDeviceId, deviceId)
                     .eq(DevicePart::getCode, saveOrUpdate.getCode())
             );
-            //删除
-            if (saveOrUpdate.getIsRemove() && devicePart != null) {
-                removeById(devicePart.getId());
-                return;
-            }
-
             String code = saveOrUpdate.getCode();
             //nfc 系统信息表更新
             if (Emptys.check(code) && "zfbNfc".equals(code)) {
@@ -87,6 +81,14 @@ public class DevicePartServiceImpl extends ServiceImpl<DevicePartMapper, DeviceP
                 boolean haveNfc = BooleanUtil.isTrue(jsonObject.getBool("is"));
                 deviceSysinfoService.updateById(new DeviceSysinfo().setDeviceId(deviceId).setIsHaveAlipayNpad(haveNfc));
             }
+
+            //删除
+            if (saveOrUpdate.getIsRemove() && devicePart != null) {
+                removeById(devicePart.getId());
+                return;
+            }
+
+
             //新增
             if (devicePart == null) {
                 DevicePart info = copy(DevicePart.class, saveOrUpdate)

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yitter.idgen.YitIdHelper;
 import com.xy.annotation.Lock;
+import com.xy.annotation.LogOperate;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JHashMap;
@@ -19,6 +20,7 @@ import com.xy.dto.DeviceQualityDto;
 import com.xy.dto.DeviceRegisterDto;
 import com.xy.dto.be.MercDto;
 import com.xy.entity.*;
+import com.xy.enums.LogEnum;
 import com.xy.mapper.DeviceCreateIdsMapper;
 import com.xy.mapper.DeviceRegisterMapper;
 import com.xy.service.be.MercService;
@@ -207,12 +209,13 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
     @ApiOperation("修改sn")
     @PostMapping("updateSn")
     @Transactional(rollbackFor = Exception.class)
+    @LogOperate(logType = LogEnum.LogType.V2, optType = LogEnum.OptType.V2, logContent = "修改设备SN")
     public R updateSn(@RequestBody @Validated DeviceRegisterDto.UpdateSn updateSn) {
         //校验
         String deviceSn = updateSn.getDeviceSn();
         Long deviceId = updateSn.getDeviceId();
+        DeviceRegister deviceRegister = getById(deviceId);
         if (Emptys.check(deviceSn)) {
-            DeviceRegister deviceRegister = getById(deviceId);
             if (!deviceSn.equals(deviceRegister.getDeviceSn())) {
                 long count = count(new LambdaQueryWrapper<DeviceRegister>().eq(DeviceRegister::getDeviceSn, deviceSn));
                 if (count > 0) {
@@ -240,7 +243,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                     .eq(DeviceCreateIds::getDeviceId, deviceId)
             );
         }
-        return R.ok();
+        String log = !Emptys.check(deviceSn) ? String.format("设备ID：%d，解绑SN：%s", deviceId, deviceRegister.getDeviceSn()) : String.format("设备ID：%d，绑定SN：%s", deviceId, deviceSn);
+        return R.ok().setLogMsg(log);
     }
 
     @ApiOperation("上传sn注册设备")