Merge branch 'master' into test

device-api-service/src/main/java/com/xy/entity/DeviceCreateIds.java

@@ -69,5 +69,9 @@ public class DeviceCreateIds implements Serializable {
      */
     private LocalDateTime createTime;
 
+    /**
+     * 最后导出二维码时间
+     */
+    private LocalDateTime lastExportQrCodeTime;
 
 }

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

@@ -191,9 +191,16 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
             throw new CommRuntimeException("没有导出的数据");
         }
         List<String> infos = new ArrayList<>();
+        LocalDateTime now = LocalDateTime.now();
+        List<DeviceCreateIds> updateDeviceCreateIds = new ArrayList<>(list.size());
         for (String deviceId : list) {
             infos.add(sysDictRedis.getValue() + deviceId);
+            DeviceCreateIds deviceCreateIds = new DeviceCreateIds()
+                    .setDeviceId(Long.valueOf(deviceId))
+                    .setLastExportQrCodeTime(now);
+            updateDeviceCreateIds.add(deviceCreateIds);
         }
+        updateBatchById(updateDeviceCreateIds);
         QRCodeUtils.create(infos, 400, 400, "back1.png", list).download(list);
     }
 

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

@@ -190,6 +190,10 @@ public class DeviceCreateIdsDto {
         @ApiModelProperty("创建时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
+
+        @ApiModelProperty("最后导出二维码时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime lastExportQrCodeTime;
     }
 
 }