diff --git a/shapelight-admin/src/main/java/net/shapelight/common/config/MybatisPlusConfig.java b/shapelight-admin/src/main/java/net/shapelight/common/config/MybatisPlusConfig.java index 5a0eea4..45de5e8 100644 --- a/shapelight-admin/src/main/java/net/shapelight/common/config/MybatisPlusConfig.java +++ b/shapelight-admin/src/main/java/net/shapelight/common/config/MybatisPlusConfig.java @@ -40,7 +40,7 @@ public class MybatisPlusConfig { DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor = new DynamicTableNameInnerInterceptor(); dynamicTableNameInnerInterceptor.setTableNameHandler( //可以传多个表名参数,指定哪些表使用MonthTableNameHandler处理表名称 - new CustomizeTableNameHandler("ten_person_extract,mobile_device,mobile_package_order,mobile_call_logs,mobile_contact") + new CustomizeTableNameHandler("ten_person_extract","mobile_device","mobile_package_order","mobile_call_logs","mobile_contact") ); //以拦截器的方式处理表名称 diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/DeviceController.java b/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/DeviceController.java index 7dfd978..b721647 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/DeviceController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/DeviceController.java @@ -23,7 +23,7 @@ import java.util.Map; @RestController @RequestMapping("mobile/device/") -@Api(value="区域管理",tags="区域管理接口") +@Api(value="话务设备管理",tags="话务设备管理") public class DeviceController extends AbstractController { @Autowired @@ -59,6 +59,7 @@ public class DeviceController extends AbstractController { mobileDeviceQueryDto.setGroupId(groupId); mobileDeviceQueryDto.setApkVersion(apkVersion); + return R.ok().put("data", mobileDeviceService.list(mobileDeviceQueryDto)); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/DeviceGroupController.java b/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/DeviceGroupController.java index d1adfee..4fae63f 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/DeviceGroupController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/DeviceGroupController.java @@ -23,7 +23,7 @@ import java.util.List; @RestController @RequestMapping("mobile/device/group/") -@Api("话机设备组管理") +@Api(value = "话机设备组管理",tags = "话机设备组管理") @RequiredArgsConstructor public class DeviceGroupController { diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/MobilePackageController.java b/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/MobilePackageController.java index 9599886..009ff2f 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/MobilePackageController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/mobile/controler/MobilePackageController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("mobile/package/") @RequiredArgsConstructor -@Api("公话套餐管理") +@Api(value = "公话套餐管理",tags = "公话套餐管理") public class MobilePackageController extends AbstractController { diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPersonEntity.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPersonEntity.java index 2ae7cb8..6e647c6 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPersonEntity.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPersonEntity.java @@ -370,6 +370,7 @@ public class TenPersonEntity extends BaseEntity implements Serializable { private Integer featureType; @TableField(exist = false) + @ApiModelProperty("联系人信息") private List mobileContactList; } diff --git a/shapelight-admin/src/main/resources/application.yml b/shapelight-admin/src/main/resources/application.yml index d046762..fde7af2 100644 --- a/shapelight-admin/src/main/resources/application.yml +++ b/shapelight-admin/src/main/resources/application.yml @@ -141,7 +141,8 @@ config: version: 4.1 app-id: SUQLGn78W5o7StEEbm6WTTfaMgAxSsN8HwJziApVyNN sdk-key: 7dJ9RqEhc3mPCatuUceKjgYwZXfX83n3QHz4xb6biPiG - active-key: 86L1-11TK-313B-Y8KG + #active-key: 86L1-11TK-313B-Y8KG + active-key: 86L1-11TK-312W-R246 #active-key: 82K1-11TT-K11Y-BHQE active-file: detect-pool-size: 16 diff --git a/shapelight-admin/src/main/resources/mapper/ten/TenCellDao.xml b/shapelight-admin/src/main/resources/mapper/ten/TenCellDao.xml index 217b6fe..7f041fb 100644 --- a/shapelight-admin/src/main/resources/mapper/ten/TenCellDao.xml +++ b/shapelight-admin/src/main/resources/mapper/ten/TenCellDao.xml @@ -88,7 +88,7 @@ - create table if not exists `mobile_device_${teantId}` like `mobile_device`; + create table if not exists `mobile_device_${tenantId}` like `mobile_device`;