fix: 修复 Swagger 文档生成异常问题

app/build.gradle

@@ -36,7 +36,7 @@ dependencies {
 
 	// Optional: Doc
 	implementation project(":basic-common:doc")
-	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
+	implementation "com.github.xiaoymin:knife4j-spring-boot-starter:${knife4jVersion}"
 
 	// Optional: Auth
 	implementation project(":basic-auth")

app/src/main/java/com/yiring/app/param/alarm/AlarmConditionParam.java

@@ -14,11 +14,12 @@ import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Range;
 
 /**
+ * 报警类型的条件param
  * @author tml
  * @version 1.0
  * @date 2022/4/27 14:28
  */
-@ApiModel("AlarmConditionParam(报警类型的条件param)")
+@ApiModel("AlarmConditionParam")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/alarm/AlarmTypeAddParam.java

@@ -18,11 +18,12 @@ import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 
 /**
+ * 报警类型的添加param
  * @author tml
  * @version 1.0
  * @date 2022/4/27 11:28
  */
-@ApiModel("AlarmTypeAddParam(报警类型的添加param)")
+@ApiModel("AlarmTypeAddParam")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/alarm/AlarmTypeModifyParam.java

@@ -15,11 +15,12 @@ import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
 /**
+ * 报警类型修改param
  * @author tml
  * @version 1.0
  * @date 2022/4/27 11:28
  */
-@ApiModel("AlarmTypeModifyParam(报警类型修改param)")
+@ApiModel("AlarmTypeModifyParam")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/analysis/history/HistoryRouteConditionParam.java

@@ -14,11 +14,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
+ * 历史轨迹的条件param
  * @author tml
  * @version 1.0
  * @date 2022/5/6 10:53
  */
-@ApiModel("HistoryRoute(历史轨迹的条件param)")
+@ApiModel("HistoryRoute")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/district/DistrictAddParam.java

@@ -18,7 +18,7 @@ import org.locationtech.jts.geom.Geometry;
  * @version 1.0
  * @date 2022/4/26 10:40
  */
-@ApiModel("DistrictAddParam(添加区域param)")
+@ApiModel("DistrictAddParam")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/district/DistrictModifyParam.java

@@ -20,7 +20,7 @@ import org.locationtech.jts.geom.Geometry;
  * @version 1.0
  * @date 2022/4/26 10:40
  */
-@ApiModel("DistrictAddParam(添加区域param)")
+@ApiModel("DistrictAddParam")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/location/fence/LocationFenceAddParam.java

@@ -17,11 +17,12 @@ import org.hibernate.validator.constraints.Range;
 import org.locationtech.jts.geom.Geometry;
 
 /**
+ * 添加围栏信息的param
  * @author tml
  * @version 1.0
  * @date 2022/4/28 10:52
  */
-@ApiModel("LocationFenceAddParam(添加围栏信息的param)")
+@ApiModel("LocationFenceAddParam")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/location/fence/LocationFenceConditionParam.java

@@ -11,11 +11,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
+ * 查询围栏信息的条件param
  * @author tml
  * @version 1.0
  * @date 2022/4/28 13:35
  */
-@ApiModel("LocationFenceConditionParam(查询围栏信息的条件param)")
+@ApiModel("LocationFenceConditionParam")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/location/fence/LocationFenceModifyParam.java

@@ -16,11 +16,12 @@ import org.hibernate.validator.constraints.Range;
 import org.locationtech.jts.geom.Geometry;
 
 /**
+ * 修改围栏信息的param
  * @author tml
  * @version 1.0
  * @date 2022/4/28 10:52
  */
-@ApiModel("LocationFenceModifyParam(修改围栏信息的param)")
+@ApiModel("LocationFenceModifyParam")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/location/rule/LocationFenceRuleAddParam.java

@@ -18,11 +18,12 @@ import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Range;
 
 /**
+ * 添加配置报警类别的报警规则,根据不同类型传入不同参数
  * @author tml
  * @version 1.0
  * @date 2022/4/28 16:16
  */
-@ApiModel("添加配置报警类别的报警规则,根据不同类型传入不同参数")
+@ApiModel("LocationFenceRuleAddParam")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/param/location/rule/LocationFenceRuleModifyParam.java

@@ -10,12 +10,13 @@ import javax.validation.constraints.NotNull;
 import lombok.*;
 
 /**
+ * 修改配置报警类别的报警规则,根据不同类型传入不同参数
  * @author tml
  * @version 1.0
  * @date 2022/4/28 16:16
  */
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("修改配置报警类别的报警规则,根据不同类型传入不同参数")
+@ApiModel("LocationFenceRuleModifyParam")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

app/src/main/java/com/yiring/app/param/location/rule/RuleParam.java

@@ -12,11 +12,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
+ * 报警规则,根据不同类型传入不同参数
  * @author tml
  * @version 1.0
  * @date 2022/4/29 14:12
  */
-@ApiModel("报警规则,根据不同类型传入不同参数")
+@ApiModel("RuleParam")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/vo/alarm/AlarmTypeVo.java

@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @version 1.0
  * @date 2022/4/27 11:55
  */
-@ApiModel("AlarmTypeVo(报警信息)")
+@ApiModel("报警信息")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/vo/district/DistrictVo.java

@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
  * @version 1.0
  * @date 2022/4/27 9:10
  */
-@ApiModel("DistrictVo(区域信息)")
+@ApiModel("DistrictVo")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/vo/location/rule/LocationFenceRuleVo.java

@@ -19,11 +19,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
+ * 修改配置报警类别的报警规则,根据不同类型传入不同参数
  * @author tml
  * @version 1.0
  * @date 2022/4/28 16:16
  */
-@ApiModel("修改配置报警类别的报警规则,根据不同类型传入不同参数")
+@ApiModel("LocationFenceRuleVo")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/vo/location/rule/RuleVo.java

@@ -14,11 +14,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
+ * 报警规则,根据不同类型传入不同参数
  * @author tml
  * @version 1.0
  * @date 2022/4/29 14:12
  */
-@ApiModel("报警规则,根据不同类型传入不同参数")
+@ApiModel("RuleVo")
 @Data
 @Builder
 @NoArgsConstructor

app/src/main/java/com/yiring/app/web/HelloController.java → app/src/main/java/com/yiring/app/web/ExampleController.java

 /* (C) 2021 YiRing, Inc. */
 package com.yiring.app.web;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.yiring.app.constant.Code;
 import com.yiring.app.exception.CodeException;
 import com.yiring.app.util.zy.ZyUtil;
@@ -23,10 +24,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @Validated
-@Api(tags = "Hello")
-@RequestMapping("/hello/")
+@SuppressWarnings({ "deprecation" })
+@ApiSupport(order = 0)
+@Api(tags = "示例", description = "Example")
+@RequestMapping("/example/")
 @RestController
-public class HelloController {
+public class ExampleController {
 
     String text = "😎 Hello World";
 

app/src/main/java/com/yiring/app/web/alarm/AlarmTypeController.java

@@ -20,7 +20,6 @@ import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
@@ -35,9 +34,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @version 1.0
  * @date 2022/4/27 14:18
  */
-@Slf4j
+
 @Validated
-@Api(tags = "AlarmType(报警类型)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "报警类型", description = "AlarmType")
 @RestController
 @RequestMapping("/alarm/type")
 public class AlarmTypeController {

app/src/main/java/com/yiring/app/web/analysis/history/HistoryRouteController.java

@@ -22,8 +22,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @version 1.0
  * @date 2022/5/6 10:36
  */
-@Api(tags = "HistoryRoute(历史轨迹)")
+
 @Validated
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "历史轨迹", description = "HistoryRoute")
 @RestController
 @RequestMapping("/history/route")
 public class HistoryRouteController {

app/src/main/java/com/yiring/app/web/appUser/AppletUserController.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,9 +21,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @description:
  * @date 2022/4/28 13:48
  */
-@Slf4j
+
 @Validated
-@Api(tags = "小程序用户")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "小程序用户", description = "AppletUser")
 @RestController
 @RequestMapping("/appUser/")
 public class AppletUserController {

app/src/main/java/com/yiring/app/web/broadcast/BroadcastAudioController.java

@@ -16,7 +16,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,9 +26,9 @@ import org.springframework.web.bind.annotation.*;
  * @date 2022/5/7
  */
 
-@Slf4j
-@Api(tags = "播报音频")
 @Validated
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "播报音频", description = "BroadcastAudio")
 @RestController
 @RequestMapping("/broadcast/audio")
 public class BroadcastAudioController {

app/src/main/java/com/yiring/app/web/broadcast/BroadcastController.java

@@ -17,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.locationtech.jts.geom.Point;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
@@ -33,9 +32,10 @@ import org.springframework.web.multipart.MultipartFile;
  * @description:
  * @date 2022/5/6 10:15
  */
-@Slf4j
+
 @Validated
-@Api(tags = "Broadcast(播报设备管理)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "播报设备管理", description = "Broadcast")
 @RestController
 @RequestMapping("/broadcast/")
 public class BroadcastController {

app/src/main/java/com/yiring/app/web/dept/DepartmentController.java

@@ -17,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -28,9 +27,9 @@ import org.springframework.web.multipart.MultipartFile;
  * @date 2022/4/19
  */
 
-@Slf4j
 @Validated
-@Api(tags = "部门信息")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "部门信息", description = "Department")
 @RestController
 @RequestMapping("/dept/")
 public class DepartmentController {

app/src/main/java/com/yiring/app/web/dict/DictController.java

@@ -15,7 +15,6 @@ import io.swagger.annotations.ApiOperation;
 import java.util.ArrayList;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,9 +27,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @author tzl
  * 2022/4/13 17:10
  */
-@Slf4j
+
 @Validated
-@Api(tags = "Dict")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "数据字典", description = "Dict")
 @RestController
 @RequestMapping("/Dict/")
 public class DictController {

app/src/main/java/com/yiring/app/web/dict/DictTypeController.java

@@ -2,7 +2,6 @@
 package com.yiring.app.web.dict;
 
 import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,9 +13,9 @@ import org.springframework.web.bind.annotation.RestController;
  * 2022/4/14 15:14
  */
 
-@Slf4j
 @Validated
-@Api(tags = "DictType")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "数据字典类型", description = "DictType")
 @RestController
 @RequestMapping("/DictType/")
 public class DictTypeController {

app/src/main/java/com/yiring/app/web/district/DistrictController.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,9 +22,10 @@ import org.springframework.web.bind.annotation.*;
  * @version 1.0
  * @date 2022/4/26 10:15
  */
-@Slf4j
+
 @Validated
-@Api(tags = "District(区域管理)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "区域管理", description = "District")
 @RestController
 @RequestMapping("/district/")
 public class DistrictController {

app/src/main/java/com/yiring/app/web/icon/IconController.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,9 +24,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @description:
  * @date 2022/5/5 15:18
  */
-@Slf4j
+
 @Validated
-@Api(tags = "Icon(图标管理)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "图标管理", description = "Icon")
 @RestController
 @RequestMapping("/icon/")
 public class IconController {

app/src/main/java/com/yiring/app/web/key/KeyAlarmController.java

@@ -10,7 +10,6 @@ import com.yiring.common.vo.PageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,9 +22,9 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2022/5/10
  */
 
-@Slf4j
 @Validated
-@Api(tags = "按键报警")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "按键报警", description = "KeyAlarm")
 @RestController
 @RequestMapping("/key/alarm")
 public class KeyAlarmController {

app/src/main/java/com/yiring/app/web/key/KeyAlarmRulesController.java

@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,9 +25,9 @@ import org.springframework.web.bind.annotation.*;
  * @date 2022/5/6
  */
 
-@Slf4j
 @Validated
-@Api(tags = "按键报警规则")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "按键报警规则", description = "KeyAlarmRules")
 @RestController
 @RequestMapping("/key/alarm/rules")
 public class KeyAlarmRulesController {

app/src/main/java/com/yiring/app/web/location/beacon/LocationBeaconController.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,9 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2022/4/27
  */
 
-@Slf4j
 @Validated
-@Api(tags = "定位信标")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "定位信标", description = "LocationBeacon")
 @RestController
 @RequestMapping("/location/beacon/")
 public class LocationBeaconController {

app/src/main/java/com/yiring/app/web/location/fence/LocationFenceController.java

@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiOperation;
 import java.util.Objects;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,11 +31,12 @@ import org.springframework.web.bind.annotation.RestController;
  * @version 1.0
  * @date 2022/4/28 11:50
  */
-@RestController
-@Api(tags = "Fence(围栏信息)")
+
 @Validated
-@Slf4j
-@RequestMapping("location/fence")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "围栏信息", description = "LocationFence")
+@RestController
+@RequestMapping("/location/fence")
 public class LocationFenceController {
 
     @Resource

app/src/main/java/com/yiring/app/web/location/rule/LocationAlarmRuleController.java

@@ -22,7 +22,6 @@ import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
@@ -36,9 +35,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @version 1.0
  * @date 2022/5/5 14:19
  */
-@Slf4j
+
 @Validated
-@Api(tags = "AlarmRule(电子围栏报警规则,配置报警给谁)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "电子围栏报警规则,配置报警给谁", description = "AlarmRule")
 @RestController
 @RequestMapping("/alarm/rule")
 public class LocationAlarmRuleController {

app/src/main/java/com/yiring/app/web/location/rule/LocationFenceRuleController.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,9 +24,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @version 1.0
  * @date 2022/4/29 9:05
  */
-@Slf4j
+
 @Validated
-@Api(tags = "FenceRule(电子围栏报警规则,什么情况下会报警)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "电子围栏报警规则,什么情况下会报警", description = "FenceRule")
 @RestController
 @RequestMapping("/location/rule")
 public class LocationFenceRuleController {

app/src/main/java/com/yiring/app/web/location/tag/LocationTagController.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -25,9 +24,9 @@ import org.springframework.web.multipart.MultipartFile;
  * @date 2022/4/13
  */
 
-@Slf4j
 @Validated
-@Api(tags = "定位标签")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "定位标签", description = "LocationTag")
 @RestController
 @RequestMapping("/location/tag/")
 public class LocationTagController {

app/src/main/java/com/yiring/app/web/location/tag/LocationTagTypeController.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -26,9 +25,9 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2022/4/27
  */
 
-@Slf4j
 @Validated
-@Api(tags = "标签分配")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "标签分配", description = "LocationTagType")
 @RestController
 @RequestMapping("/location/tag/type")
 public class LocationTagTypeController {

app/src/main/java/com/yiring/app/web/map/MapController.java

@@ -12,10 +12,8 @@ import com.yiring.common.core.Status;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import java.io.Serializable;
 import java.util.List;
 import javax.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,9 +26,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @version 1.0
  * @date 2022/4/24 13:48
  */
-@Slf4j
+
 @Validated
-@Api(tags = "Map(地图)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "地图", description = "Map")
 @RestController
 @RequestMapping("/map/")
 public class MapController {
@@ -40,7 +39,7 @@ public class MapController {
 
     @GetMapping("/mapSelect")
     @ApiImplicitParams({ @ApiImplicitParam(value = "orgId", required = true, name = "orgId") })
-    public Result<Serializable> fail(String orgId) {
+    public Result<MapVo> select(String orgId) {
         String login = ZyUtil.openLogin();
         JSONObject jsonObject = mapClient.selectMap(orgId, "bearer " + login);
         //        if (ObjectUtil.isNotNull(jsonObject.getJSONArray("data"))) {

app/src/main/java/com/yiring/app/web/post/PostController.java

@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,9 +28,9 @@ import org.springframework.web.bind.annotation.*;
  * @date 2022/4/12
  */
 
-@Slf4j
 @Validated
-@Api(tags = "职位信息")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "职位信息", description = "Post")
 @RestController
 @RequestMapping("/post/")
 public class PostController {

app/src/main/java/com/yiring/app/web/rehearsal/AccidentSpotController.java

@@ -31,8 +31,9 @@ import org.springframework.web.bind.annotation.*;
  */
 @Slf4j
 @Validated
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "事故点管理", description = "AccidentSpot")
 @RestController
-@Api(tags = "AccidentSpot(事故点管理)")
 @RequestMapping("/accident/spot")
 public class AccidentSpotController {
 

app/src/main/java/com/yiring/app/web/rehearsal/EvacuationZoneController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -23,7 +24,10 @@ import org.springframework.web.bind.annotation.*;
  * @version 1.0
  * @date 2022/5/9 10:19
  */
-@Api(tags = "EvacuationZone(撤离区)")
+
+@Validated
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "撤离区", description = "EvacuationZone")
 @RestController
 @RequestMapping("/evacuation/zone")
 public class EvacuationZoneController {

app/src/main/java/com/yiring/app/web/user/UserAppController.java

@@ -31,7 +31,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 @Slf4j
 @Validated
-@Api(tags = "人员管理")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "人员管理", description = "user")
 @RestController
 @RequestMapping("/user/app/")
 public class UserAppController {

app/src/main/java/com/yiring/app/web/video/VideoController.java

@@ -35,7 +35,8 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @Slf4j
 @Validated
-@Api(tags = "Video(监控设备)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "监控设备", description = "Video")
 @RestController
 @RequestMapping("/video/")
 public class VideoController {

app/src/main/java/com/yiring/app/web/visitor/CarController.java

@@ -28,10 +28,11 @@ import org.springframework.web.bind.annotation.RestController;
  * 2022/4/11 17:02
  */
 @Slf4j
-@Api(tags = "Car(车辆)")
 @Validated
-@RestController
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "车辆", description = "Car")
 @RequestMapping("/Car/")
+@RestController
 public class CarController {
 
     @Resource

app/src/main/java/com/yiring/app/web/visitor/InvitationController.java

@@ -30,7 +30,8 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Slf4j
 @Validated
-@Api(tags = "Invitation(邀请)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "邀请", description = "Invitation")
 @RestController
 @RequestMapping("/invitation/")
 public class InvitationController {

app/src/main/java/com/yiring/app/web/visitor/VisitorController.java

@@ -31,7 +31,8 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Slf4j
 @Validated
-@Api(tags = "Visitor(访客)")
+@SuppressWarnings({ "deprecation" })
+@Api(tags = "访客", description = "Visitor")
 @RestController
 @RequestMapping("/visitor/")
 public class VisitorController {

basic-auth/build.gradle

@@ -9,8 +9,8 @@ dependencies {
 	// 本地依赖
 	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
 
-	// swagger annotations
-	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
+	// swagger(knife4j)
+	implementation "com.github.xiaoymin:knife4j-spring-boot-starter:${knife4jVersion}"
 
 	// sa-token
 	implementation "cn.dev33:sa-token-spring-boot-starter:${saTokenVersion}"

basic-auth/src/main/java/com/yiring/auth/web/auth/AuthController.java

@@ -4,6 +4,7 @@ package com.yiring.auth.web.auth;
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.yiring.auth.domain.user.User;
 import com.yiring.auth.domain.user.UserRepository;
 import com.yiring.auth.param.auth.LoginParam;
@@ -36,7 +37,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @Validated
-@Api(tags = "Auth")
+@SuppressWarnings({ "deprecation" })
+@ApiSupport(order = -99)
+@Api(tags = "身份认证", description = "Auth")
 @RestController
 @RequestMapping("/auth/")
 public class AuthController {

basic-auth/src/main/java/com/yiring/auth/web/permission/PermissionController.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.auth.web.permission;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.yiring.auth.domain.permission.Permission;
 import com.yiring.auth.domain.permission.PermissionRepository;
 import com.yiring.auth.param.permission.PermissionParam;
@@ -38,7 +39,9 @@ import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @Validated
-@Api(tags = "Permission")
+@SuppressWarnings({ "deprecation" })
+@ApiSupport(order = -97)
+@Api(tags = "权限管理", description = "Permission")
 @RestController
 @RequestMapping("/manage/permission/")
 public class PermissionController {

basic-auth/src/main/java/com/yiring/auth/web/role/RoleController.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.auth.web.role;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.yiring.auth.domain.permission.Permission;
 import com.yiring.auth.domain.permission.PermissionRepository;
 import com.yiring.auth.domain.role.Role;
@@ -40,7 +41,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @Validated
-@Api(tags = "Role")
+@SuppressWarnings({ "deprecation" })
+@ApiSupport(order = -96)
+@Api(tags = "角色管理", description = "Role")
 @RestController
 @RequestMapping("/manage/role/")
 public class RoleController {

basic-auth/src/main/java/com/yiring/auth/web/user/UserController.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.auth.web.user;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.yiring.auth.domain.permission.Permission;
 import com.yiring.auth.domain.role.Role;
 import com.yiring.auth.domain.role.RoleRepository;
@@ -46,7 +47,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @Validated
-@Api(tags = "User")
+@SuppressWarnings({ "deprecation" })
+@ApiSupport(order = -95)
+@Api(tags = "用户管理", description = "User")
 @RestController
 @RequestMapping("/user/")
 public class UserController {

basic-common/minio/build.gradle

@@ -3,8 +3,8 @@ dependencies {
 
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 
-	// swagger
-	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
+	// swagger(knife4j)
+	implementation "com.github.xiaoymin:knife4j-spring-boot-starter:${knife4jVersion}"
 
 	// minio
 	implementation "io.minio:minio:${minioVersion}"

basic-common/minio/src/main/java/com/yiring/common/web/MinioController.java

@@ -3,6 +3,7 @@ package com.yiring.common.web;
 
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.yiring.common.core.Minio;
 import com.yiring.common.core.Result;
 import com.yiring.common.core.Status;
@@ -27,7 +28,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 @Slf4j
 @Validated
-@Api(tags = "Minio")
+@SuppressWarnings({ "deprecation" })
+@ApiSupport(order = -98)
+@Api(tags = "文件管理", description = "file")
 @RestController
 @RequestMapping("/common/minio/")
 public class MinioController {