修改sn号重复注册问题

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

@@ -13,9 +13,12 @@ import com.xy.dto.DeviceCreateIdsDto;
 import com.xy.dto.SysWorkUser.ListDto;
 import com.xy.dto.SysWorkUser.SysWorkVo;
 import com.xy.entity.DeviceCreateIds;
+import com.xy.entity.SysDictRedis;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceCreateIdsMapper;
 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.RequiredArgsConstructor;
@@ -134,12 +137,13 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
     @PostMapping("exportQrCode")
     @ApiOperation("导出二维码")
     public void exportQrCode(@RequestBody DeviceCreateIdsDto.ExportQrCode exportQrCode) {
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DEVICE_QR_CODE.getKey(), DictSonEnum.DEVICE_QR_CODE_URL.getKey());
         List<String> list = new ArrayList<>();
         Boolean isWhere = exportQrCode.getIsWhere() == null ? false : exportQrCode.getIsWhere();
         if (!isWhere) {
             List<Long> deviceIds = exportQrCode.getDeviceIds();
             if (Emptys.check(deviceIds)) {
-                deviceIds.forEach(aLong -> list.add(aLong.toString()));
+                deviceIds.forEach(deviceId -> list.add(sysDictRedis.getValue() + deviceId));
             }
         } else {
             LambdaQueryWrapper<DeviceCreateIds> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(exportQrCode, DeviceCreateIds.class)

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

@@ -242,16 +242,18 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
     @PostMapping("getQrCode")
     @ApiOperation("获取二维码")
     public R<String> getQrCode(@RequestBody DeviceQualityDto.Qrcode qrcode) {
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DEVICE_QR_CODE.getKey(), DictSonEnum.DEVICE_QR_CODE_URL.getKey());
         String deviceId = qrcode.getDeviceId().toString();
-        String base64 = QRCodeUtils.create(deviceId, 400, 400, "back1.png", deviceId).base64();
+        String base64 = QRCodeUtils.create(sysDictRedis.getValue() + deviceId, 400, 400, "back1.png", deviceId).base64();
         return R.ok(base64);
     }
 
     @PostMapping("exportQrCode")
     @ApiOperation("导出二维码")
     public void exportQrCode(@RequestBody DeviceQualityDto.Qrcode qrcode) {
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DEVICE_QR_CODE.getKey(), DictSonEnum.DEVICE_QR_CODE_URL.getKey());
         String deviceId = qrcode.getDeviceId().toString();
-        QRCodeUtils.create(deviceId, 400, 400, "back1.png", deviceId).download(deviceId);
+        QRCodeUtils.create(sysDictRedis.getValue() + deviceId, 400, 400, "back1.png", deviceId).download(deviceId);
     }
 
 }

device-api-service/src/main/java/com/xy/utils/enums/DictEnum.java

@@ -21,6 +21,8 @@ public enum DictEnum {
 
     DEVICE_FAULT_LEVEL_PAY_THRESHOLD("device_fault_level_pay_threshold", "设备-故障等级-阈值"),
 
+    DEVICE_QR_CODE("device_qr_code", "设备-二维码参数"),
+
     ;
 
     private String key;

device-api-service/src/main/java/com/xy/utils/enums/DictSonEnum.java

@@ -22,6 +22,8 @@ public enum DictSonEnum {
 
     DEVICE_FAULT_LEVEL_PAY_THRESHOLD_NOT_PAY("not_pay", "设备-故障等级-阈值-无法交易"),
 
+    DEVICE_QR_CODE_URL("url", "设备-二维码参数-url"),
+
     ;
 
     private String key;