Merge remote-tracking branch 'origin/tb-alipay' into test

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

@@ -13,16 +13,12 @@ import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JMap;
 import com.xy.config.DeviceThreadPoolConfig;
-import com.xy.dto.DeviceCreateIdsDto;
-import com.xy.dto.DeviceQualityDto;
-import com.xy.dto.DeviceRegisterDto;
-import com.xy.dto.MqttUserDto;
+import com.xy.dto.*;
 import com.xy.entity.*;
 import com.xy.mapper.*;
 import com.xy.utils.*;
 import com.xy.utils.consts.CommConsts;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -36,7 +32,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.NotBlank;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -73,6 +68,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
     private DeviceCreateIdsServiceImpl deviceCreateIdsService;
 
+    private AlipayDeviceService alipayDeviceService;
+
     @PostMapping("save")
     @ApiOperation("添加")
     @Transactional(rollbackFor = Exception.class)
@@ -266,7 +263,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 1)
                 .execute(() -> {
                     try {
-                        EasyExcel.read(file.getInputStream(), UploadSaveBySn.class, new UploadSaveBySnListener(deviceCreateIdsService, this, deviceType, devicePc, assetNo)).sheet().doRead();
+                        EasyExcel.read(file.getInputStream(), UploadSaveBySn.class, new UploadSaveBySnListener(deviceCreateIdsService, this, alipayDeviceService, deviceType, devicePc, assetNo)).sheet().doRead();
                     } catch (IOException e) {
                         log.error("", e);
                     }
@@ -282,6 +279,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
         private final DeviceRegisterServiceImpl deviceRegisterService;
 
+        private final AlipayDeviceService alipayDeviceService;
+
         private final Integer deviceType;
 
         private final String devicePc;
@@ -331,6 +330,16 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                     R r = deviceRegisterService.save(save);
                     if (r.getCode() == R.Enum.FAIL.getCode()) {
                         log.error("{},{}", sn.getSn(), r.getMsg());
+                    } else {
+                        //初始化支付宝设备
+                        if (deviceType == 5) {
+                            alipayDeviceService.deviceAssign(new DeviceAssignDTO()
+                                    .setTerminalId(String.valueOf(deviceId))
+                                    .setDeviceIdentifyType("DYNAMIC")
+                                    .setDeviceSn(sn.getSn())
+                                    .setDeviceName(String.valueOf(deviceId))
+                            );
+                        }
                     }
                 });
             }

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

@@ -2,6 +2,10 @@ package com.xy.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.xy.annotate.DictFormat;
 import com.xy.consts.DictConsts;
 import com.xy.convert.DictConvert;
@@ -307,7 +311,8 @@ public class DeviceInfoDto {
         @DictFormat(DictConsts.DEVICE_ACTIVE_STATUS)
         @ApiModelProperty("激活状态")
         private Integer activeState;
-
+        @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+        @JsonSerialize(using = LocalDateTimeSerializer.class)
         @ApiModelProperty("激活时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime activeTime;
@@ -335,11 +340,13 @@ public class DeviceInfoDto {
         @DictFormat(DictConsts.DEVICE_FAULT_LEVEL)
         @ApiModelProperty("故障等级")
         private Integer faultLevel;
-
+        @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+        @JsonSerialize(using = LocalDateTimeSerializer.class)
         @ApiModelProperty("创建时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
-
+        @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+        @JsonSerialize(using = LocalDateTimeSerializer.class)
         @ApiModelProperty("更新时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;

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

@@ -1,6 +1,10 @@
 package com.xy.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -97,10 +101,14 @@ public class DeviceSysinfoDto {
         @ApiModelProperty("内存容量")
         private Integer memerySpace;
 
+        @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+        @JsonSerialize(using = LocalDateTimeSerializer.class)
         @ApiModelProperty("创建时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
 
+        @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+        @JsonSerialize(using = LocalDateTimeSerializer.class)
         @ApiModelProperty("更新时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;