調整包結構

server-common/src/main/java/com/makeit/config/global/swagger/ModuleSwaggerApiListingReader.java

@@ -110,7 +110,7 @@ public class ModuleSwaggerApiListingReader implements ApiListingBuilderPlugin {
 
 
     private Function<Api, Set<String>> tags(Class<?> clazz, List<SwaggerModuleConfig> configList) {
     private Function<Api, Set<String>> tags(Class<?> clazz, List<SwaggerModuleConfig> configList) {
 
 
-        String moduleName = configList.stream().filter(e -> e.getPackageList().stream().anyMatch(ee -> clazz.getName().contains(ee))).map(SwaggerModuleConfig::getModuleName).findFirst().orElse("");
+        String moduleName = configList.stream().filter(e -> e.getPackageList().stream().anyMatch(ee -> clazz.getName().equals(ee))).map(SwaggerModuleConfig::getModuleName).findFirst().orElse("");
 
 
         return input -> {
         return input -> {
 
 

server-common/src/main/java/com/makeit/config/global/swagger/ModuleSwaggerOperationTagsReader.java

@@ -75,7 +75,7 @@ public class ModuleSwaggerOperationTagsReader implements OperationBuilderPlugin
 
 
     private Function<Api, Set<String>> tagsFromController(Class<?> clazz, List<SwaggerModuleConfig> configList) {
     private Function<Api, Set<String>> tagsFromController(Class<?> clazz, List<SwaggerModuleConfig> configList) {
 
 
-        String moduleName = configList.stream().filter(e -> e.getPackageList().stream().anyMatch(ee -> clazz.getName().contains(ee))).map(SwaggerModuleConfig::getModuleName).findFirst().orElse("");
+        String moduleName = configList.stream().filter(e -> e.getPackageList().stream().anyMatch(ee -> clazz.getName().equals(ee))).map(SwaggerModuleConfig::getModuleName).findFirst().orElse("");
 
 
         return input -> {
         return input -> {
 
 

server-module/src/main/java/com/makeit/config/SwaggerPlatformConfig.java

@@ -41,7 +41,16 @@ public class SwaggerPlatformConfig {
 
 
         SwaggerModuleConfig config = new SwaggerModuleConfig();
         SwaggerModuleConfig config = new SwaggerModuleConfig();
         config.setPackageList(Arrays.asList("com.makeit.module.controller.wechat"));
         config.setPackageList(Arrays.asList("com.makeit.module.controller.wechat"));
-        config.setModuleName("微信端");
+        config.setModuleName("平台端小程序");
+        return config;
+    }
+
+    @Bean
+    public SwaggerModuleConfig childrenModule() {
+
+        SwaggerModuleConfig config = new SwaggerModuleConfig();
+        config.setPackageList(Arrays.asList("com.makeit.module.controller.children"));
+        config.setModuleName("子女端小程序");
         return config;
         return config;
     }
     }
 
 
@@ -54,7 +63,7 @@ public class SwaggerPlatformConfig {
         ApiSelectorBuilder builder = docket.select();
         ApiSelectorBuilder builder = docket.select();
         //api过滤
         //api过滤
         builder = builder.apis(
         builder = builder.apis(
-                RequestHandlerSelectors.basePackage("com.makeit.module.controller")
+                RequestHandlerSelectors.basePackage("com.makeit.module.controller.wechat")
         );
         );
         return builder.build();
         return builder.build();
     }
     }
@@ -64,7 +73,7 @@ public class SwaggerPlatformConfig {
 
 
         Docket docket = new Docket(DocumentationType.SWAGGER_2)
         Docket docket = new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .apiInfo(apiInfo())
-                .groupName("04-微信端");
+                .groupName("04-平台端小程序");
         ApiSelectorBuilder builder = docket.select();
         ApiSelectorBuilder builder = docket.select();
         //api过滤
         //api过滤
         builder = builder.apis(
         builder = builder.apis(
@@ -73,6 +82,20 @@ public class SwaggerPlatformConfig {
         return builder.build();
         return builder.build();
     }
     }
 
 
+    @Bean
+    public Docket childrenApi() {
+
+        Docket docket = new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .groupName("04-子女端小程序");
+        ApiSelectorBuilder builder = docket.select();
+        //api过滤
+        builder = builder.apis(
+                RequestHandlerSelectors.basePackage("com.makeit.module.controller.children")
+        );
+        return builder.build();
+    }
+
 
 
     private ApiInfo apiInfo() {
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder().title("IOT文档")
         return new ApiInfoBuilder().title("IOT文档")

server-module/src/main/java/com/makeit/module/controller/wechat/alarm/PlatAlarmRecordChildrenController.java → server-module/src/main/java/com/makeit/module/controller/children/alarm/PlatAlarmRecordChildrenController.java

-package com.makeit.module.controller.wechat.alarm;
+package com.makeit.module.controller.children.alarm;
 
 
 
 
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.dto.BaseIdDTO;

server-module/src/main/java/com/makeit/module/controller/wechat/elder/PlatElderWechatController.java → server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenController.java

-package com.makeit.module.controller.wechat.elder;
+package com.makeit.module.controller.children.elder;
 
 
 
 
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.dto.BaseIdDTO;
@@ -25,10 +25,10 @@ import java.util.List;
  * @author eugene young
  * @author eugene young
  * @since 2023-08-29
  * @since 2023-08-29
  */
  */
-@Api(tags = "长者基本信息-子女端小程序")
+@Api(tags = "子女端小程序-长者基本信息")
 @RestController
 @RestController
 @RequestMapping("/children/elder")
 @RequestMapping("/children/elder")
-public class PlatElderWechatController {
+public class PlatElderChildrenController {
 
 
     @Autowired
     @Autowired
     private PlatElderService platElderService;
     private PlatElderService platElderService;

server-module/src/main/java/com/makeit/module/controller/wechat/elder/PlatElderChildrenInfoWechatController.java → server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenInfoChildrenController.java

-package com.makeit.module.controller.wechat.elder;
+package com.makeit.module.controller.children.elder;
 
 
 
 
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseEntity;
@@ -21,10 +21,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @author eugene young
  * @author eugene young
  * @since 2023-08-29
  * @since 2023-08-29
  */
  */
-@Api(tags = "长者子女账号-子女端小程序")
+@Api(tags = "子女端小程序-长者子女账号")
 @RestController
 @RestController
 @RequestMapping("/children/elder/children-info")
 @RequestMapping("/children/elder/children-info")
-public class PlatElderChildrenInfoWechatController {
+public class PlatElderChildrenInfoChildrenController {
 
 
     @Autowired
     @Autowired
     private PlatElderChildrenInfoService platElderChildrenInfoService;
     private PlatElderChildrenInfoService platElderChildrenInfoService;

server-module/src/main/java/com/makeit/module/controller/wechat/elder/PlatElderChildrenInfoUserLoginWechatController.java → server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenInfoUserLoginChildrenController.java

-package com.makeit.module.controller.wechat.elder;
+package com.makeit.module.controller.children.elder;
 
 
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.common.response.ApiResponseUtils;
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "子女端小程序-登录")
 @Api(tags = "子女端小程序-登录")
 @RestController
 @RestController
 @RequestMapping("/children/login")
 @RequestMapping("/children/login")
-public class PlatElderChildrenInfoUserLoginWechatController {
+public class PlatElderChildrenInfoUserLoginChildrenController {
 
 
     @Autowired
     @Autowired
     private PlatElderChildrenInfoUserLoginWechatService platElderChildrenInfoUserLoginWechatService;
     private PlatElderChildrenInfoUserLoginWechatService platElderChildrenInfoUserLoginWechatService;

server-module/src/main/java/com/makeit/module/controller/wechat/elder/PlatElderRealTimeWechatController.java → server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderRealTimeChildrenController.java

-package com.makeit.module.controller.wechat.elder;
+package com.makeit.module.controller.children.elder;
 
 
 
 
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseEntity;
@@ -27,10 +27,10 @@ import java.util.List;
  * @author eugene young
  * @author eugene young
  * @since 2023-08-29
  * @since 2023-08-29
  */
  */
-@Api(tags = "长者实时监测-子女端小程序")
+@Api(tags = "子女端小程序-长者实时监测")
 @RestController
 @RestController
 @RequestMapping("/children/elder/realTime")
 @RequestMapping("/children/elder/realTime")
-public class PlatElderRealTimeWechatController {
+public class PlatElderRealTimeChildrenController {
 
 
     @Autowired
     @Autowired
     private PlatElderRealTimeService platElderRealTimeService;
     private PlatElderRealTimeService platElderRealTimeService;

server-module/src/main/java/com/makeit/module/controller/wechat/alarm/PlatAlarmRecordWechatController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-@Api(tags = "小程序-告警记录")
+@Api(tags = "平台端小程序-告警记录")
 @RestController
 @RestController
 @RequestMapping("/wechat/plat/alarm-record")
 @RequestMapping("/wechat/plat/alarm-record")
 public class PlatAlarmRecordWechatController {
 public class PlatAlarmRecordWechatController {

server-module/src/main/java/com/makeit/module/controller/wechat/device/PlatDeviceWechatController.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author eugene young
  * @author eugene young
  * @since 2023-09-05
  * @since 2023-09-05
  */
  */
-@Api(tags = "设备-小程序")
+@Api(tags = "平台端小程序-设备")
 @RestController
 @RestController
 @RequestMapping("/wechat/plat/device")
 @RequestMapping("/wechat/plat/device")
 public class PlatDeviceWechatController {
 public class PlatDeviceWechatController {