优化代码

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

@@ -47,24 +47,26 @@ public class CtWingFactoryImpl implements SimInfoFactory {
         if (!"0".equals(telephonePlusVo.getResultCode())) {
             return R.fail("三码查询错误！");
         }
+        SimInfoDto.InfoVo vo = new SimInfoDto.InfoVo();
+        vo.setIccid(telephonePlusVo.getIccid())
+                .setImsi(telephonePlusVo.getImsi())
+                .setAccessNumber(telephonePlusVo.getAccessNumber());
         //卡主状态查询
-        FunctionUtils.NoParamsResult<CtWingVo.CardMainStatusVo> queryCardMainStatus = () -> {
+        FunctionUtils.NoParamsNoResult queryCardMainStatus = () -> {
             CtWingDto.CardMainStatusDto cardMainStatusDto = new CtWingDto.CardMainStatusDto();
             cardMainStatusDto.setAccessNumber(telephonePlusVo.getAccessNumber());
-            return CtWingUtils.queryCardMainStatus(cardMainStatusDto);
+            CtWingVo.CardMainStatusVo cardMainStatusVo = CtWingUtils.queryCardMainStatus(cardMainStatusDto);
+            vo.setCreateDate(cardMainStatusVo.getServCreateDate())
+                    .setActiveDate(cardMainStatusVo.getServActiveDate())
+                    .setNetBlockStatus(cardMainStatusVo.getNetBlockStatusName())
+                    .setSimStatus(cardMainStatusVo.getOperatorDefinitionStatusName());
         };
-
-        CtWingVo.CardMainStatusVo cardMainStatusVo = queryCardMainStatus.run();
-
-        SimInfoDto.InfoVo vo = new SimInfoDto.InfoVo()
-                .setIccid(telephonePlusVo.getIccid())
-                .setImsi(telephonePlusVo.getImsi())
-                .setAccessNumber(telephonePlusVo.getAccessNumber())
-                .setCreateDate(cardMainStatusVo.getServCreateDate())
-                .setActiveDate(cardMainStatusVo.getServActiveDate())
-                .setNetStatus(cardMainStatusVo.getNetBlockStatusName())
-                .setSimStatus(cardMainStatusVo.getOperatorDefinitionStatusName())
-                ;
+        //网络状态
+        FunctionUtils.NoParamsNoResult queryNetStatus = () -> {
+            CtWingDto.AccessNumberOrIccid accessNumberOrIccid = new CtWingDto.AccessNumberOrIccid().setIccid(telephonePlusVo.getAccessNumber());
+            CtWingVo.NetStatusVo netStatusVo = CtWingUtils.queryNetStatus(accessNumberOrIccid);
+        };
+        queryCardMainStatus.run();
         return R.ok(vo);
     }
 

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

@@ -35,10 +35,15 @@ public class SimInfoDto {
         @ApiModelProperty("开卡时间")
         private String createDate;
 
-        @ApiModelProperty("在线状态")
-        private String netStatus;
+        @ApiModelProperty("断网状态")
+        private String netBlockStatus;
 
         @ApiModelProperty("卡状态")
         private String simStatus;
+
+        @ApiModelProperty("网络状态")
+        private String netStatus;
+
+        //上线掉线时间，流量套餐，使用情况
     }
 }