Merge branch 'SIM卡' into test

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

@@ -57,6 +57,9 @@ public class DeviceSimPickRecords implements Serializable {
     @ApiModelProperty(value = "支付状态")
     private String payStatus;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     @ApiModelProperty(value = "创建人")
     @TableField(fill = FieldFill.INSERT)
     private Long createUser;

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

@@ -1,6 +1,7 @@
 package com.xy.service.factory.sim.impl;
 
 import com.xy.annotate.FactoryRoute;
+import com.xy.error.CommRuntimeException;
 import com.xy.service.factory.sim.SimInfoFactory;
 import com.xy.utils.FactoryUtils;
 import lombok.AllArgsConstructor;
@@ -19,6 +20,16 @@ public class SimInfoFactoryRoute implements FactoryUtils.RouteService {
 
     @Override
     public String route(Object object) {
-        return "电信";
+        String isp = String.valueOf(object).trim();
+        String route = "";
+        switch (isp) {
+            case "电信":
+            case "中国电信":
+                route = "电信";
+                break;
+            default:
+                throw new CommRuntimeException("接口不支持！");
+        }
+        return route;
     }
 }

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

@@ -114,6 +114,8 @@ public class DeviceSimPickRecordsDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
+        @ApiModelProperty(value = "备注")
+        private String remark;
 
     }