Merge branch 'SIM卡' into test

device-api-service/src/main/java/com/xy/service/factory/sim/impl/CtWingFactoryImpl.java

@@ -1,6 +1,5 @@
 package com.xy.service.factory.sim.impl;
 
-import cn.hutool.core.date.DateUtil;
 import com.xy.annotate.Factory;
 import com.xy.dto.CtWingDto;
 import com.xy.dto.CtWingVo;
@@ -57,15 +56,14 @@ public class CtWingFactoryImpl implements SimInfoFactory {
 
         CtWingVo.CardMainStatusVo cardMainStatusVo = queryCardMainStatus.run();
 
-
-
-
         SimInfoDto.InfoVo vo = new SimInfoDto.InfoVo()
                 .setIccid(telephonePlusVo.getIccid())
                 .setImsi(telephonePlusVo.getImsi())
                 .setAccessNumber(telephonePlusVo.getAccessNumber())
-                .setCreateDate(DateUtil.parse(cardMainStatusVo.getServCreateDate()).toLocalDateTime())
-                .setActiveDate(DateUtil.parse(cardMainStatusVo.getServActiveDate()).toLocalDateTime())
+                .setCreateDate(cardMainStatusVo.getServCreateDate())
+                .setActiveDate(cardMainStatusVo.getServActiveDate())
+                .setNetStatus(cardMainStatusVo.getNetBlockStatusName())
+                .setSimStatus(cardMainStatusVo.getOperatorDefinitionStatusName())
                 ;
         return R.ok(vo);
     }

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

@@ -5,7 +5,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 
 
 public class SimInfoDto {
@@ -21,10 +20,25 @@ public class SimInfoDto {
     @Data
     @Accessors(chain = true)
     public static class InfoVo {
+        @ApiModelProperty("iccid")
         private String iccid;
+
+        @ApiModelProperty("imsi")
         private String imsi;
+
+        @ApiModelProperty("号码")
         private String accessNumber;
-        private LocalDateTime activeDate;
-        private LocalDateTime createDate;
+
+        @ApiModelProperty("激活时间")
+        private String activeDate;
+
+        @ApiModelProperty("开卡时间")
+        private String createDate;
+
+        @ApiModelProperty("在线状态")
+        private String netStatus;
+
+        @ApiModelProperty("卡状态")
+        private String simStatus;
     }
 }