Browse Source

取除swagger

gao.qiang 1 year ago
parent
commit
9fea8da628
46 changed files with 2 additions and 372 deletions
  1. 0 1
      .idea/compiler.xml
  2. 0 2
      business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java
  3. 0 2
      business-service/src/main/java/com/ozs/entity/BaseDept.java
  4. 0 2
      business-service/src/main/java/com/ozs/entity/BaseDeviceDynamicManagement.java
  5. 0 2
      business-service/src/main/java/com/ozs/entity/BaseRailwayManagement.java
  6. 0 2
      business-service/src/main/java/com/ozs/entity/BaseUser.java
  7. 0 2
      business-service/src/main/java/com/ozs/entity/MonitorSystem.java
  8. 0 2
      business-service/src/main/java/com/ozs/entity/MsgAlarm.java
  9. 0 2
      business-service/src/main/java/com/ozs/entity/MsgAlarmExt.java
  10. 0 2
      business-service/src/main/java/com/ozs/entity/MsgAlarmFrequency.java
  11. 0 2
      business-service/src/main/java/com/ozs/entity/MsgAppPush.java
  12. 0 2
      business-service/src/main/java/com/ozs/entity/MsgHeartbeatAlarmMessage.java
  13. 0 2
      business-service/src/main/java/com/ozs/entity/MsgWebPush.java
  14. 0 2
      business-service/src/main/java/com/ozs/entity/SkynetHeartbeatLog.java
  15. 0 2
      business-service/src/main/java/com/ozs/entity/SvcAddress.java
  16. 0 2
      business-service/src/main/java/com/ozs/entity/TerminalIgnoreAlarm.java
  17. 0 2
      business-service/src/main/java/com/ozs/entity/UserRegistrationid.java
  18. 0 2
      business-service/src/main/java/com/ozs/entity/VehiclePosition.java
  19. 0 2
      business-service/src/main/java/com/ozs/entity/vo/AlarmHeartbeatLog.java
  20. 0 2
      business-service/src/main/java/com/ozs/entity/vo/BaseCameraManagementHomeVo.java
  21. 0 2
      business-service/src/main/java/com/ozs/entity/vo/BaseCameraManagementVos.java
  22. 0 2
      business-service/src/main/java/com/ozs/entity/vo/MsgAlarmTemporary.java
  23. 0 13
      vehicle-admin/pom.xml
  24. 1 34
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java
  25. 0 10
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java
  26. 0 10
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseTerminalController.java
  27. 0 20
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java
  28. 1 47
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/DataStatisticController.java
  29. 0 13
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java
  30. 0 5
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmTemporaryController.java
  31. 0 2
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgHeartbeatAlarmMessageController.java
  32. 0 4
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/TerminalIgnoreAlarmController.java
  33. 0 5
      vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/VehiclePositionController.java
  34. 0 2
      vehicle-admin/src/main/java/com/ozs/web/controller/home/HomeController.java
  35. 0 3
      vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysLoginInfoController.java
  36. 0 3
      vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysOperlogController.java
  37. 0 10
      vehicle-admin/src/main/java/com/ozs/web/controller/system/MonitorSystemController.java
  38. 0 3
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java
  39. 0 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java
  40. 0 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDictTypeController.java
  41. 0 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysMenuController.java
  42. 0 2
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java
  43. 0 4
      vehicle-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java
  44. 0 121
      vehicle-admin/src/main/java/com/ozs/web/core/config/SwaggerConfig.java
  45. 0 6
      vehicle-admin/src/main/resources/application.yml
  46. 0 6
      vehicle-sdk/src/main/resources/application.yml

+ 0 - 1
.idea/compiler.xml

@@ -17,7 +17,6 @@
     <bytecodeTargetLevel>
       <module name="admin" target="1.8" />
       <module name="hazard-sdk" target="1.8" />
-      <module name="vehicle-sdk" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>

+ 0 - 2
business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,7 +25,6 @@ import java.math.BigDecimal;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("相机台账管理表")
 public class BaseCameraManagement extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/BaseDept.java

@@ -1,6 +1,5 @@
 package com.ozs.entity;
 
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,7 +14,6 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("Base部门表")
 public class BaseDept implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/BaseDeviceDynamicManagement.java

@@ -3,7 +3,6 @@ package com.ozs.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -24,7 +23,6 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("设备动态管理表")
 public class BaseDeviceDynamicManagement extends BaseEntity implements Serializable{
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/BaseRailwayManagement.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,7 +25,6 @@ import java.math.BigDecimal;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("线路管理表")
 public class BaseRailwayManagement extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/BaseUser.java

@@ -1,6 +1,5 @@
 package com.ozs.entity;
 
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,7 +14,6 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("Base用户表")
 public class BaseUser implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/MonitorSystem.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -23,7 +22,6 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("监测系统管理")
 public class MonitorSystem extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 0 - 2
business-service/src/main/java/com/ozs/entity/MsgAlarm.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -28,7 +27,6 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("报警信息表")
 public class MsgAlarm extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/MsgAlarmExt.java

@@ -4,7 +4,6 @@ import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -23,7 +22,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("报警扩展表")
 public class MsgAlarmExt implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/MsgAlarmFrequency.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,7 +25,6 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("预报警频次表")
 public class MsgAlarmFrequency extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/MsgAppPush.java

@@ -3,7 +3,6 @@ package com.ozs.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,7 +20,6 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("app推送报警信息记录表")
 public class MsgAppPush extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 0 - 2
business-service/src/main/java/com/ozs/entity/MsgHeartbeatAlarmMessage.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,7 +20,6 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("心跳报警信息记录表")
 public class MsgHeartbeatAlarmMessage implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/MsgWebPush.java

@@ -3,7 +3,6 @@ package com.ozs.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -19,7 +18,6 @@ import java.util.Date;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel("Web推送报警信息记录表")
 public class MsgWebPush extends BaseEntity {
 
     /**

+ 0 - 2
business-service/src/main/java/com/ozs/entity/SkynetHeartbeatLog.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,7 +25,6 @@ import java.math.BigDecimal;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("天网相机心跳监测日志表")
 public class SkynetHeartbeatLog extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/SvcAddress.java

@@ -2,7 +2,6 @@ package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -22,7 +21,6 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("报警消息访问令牌参数验证表")
 public class SvcAddress implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/TerminalIgnoreAlarm.java

@@ -13,7 +13,6 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.*;
 
 /**
@@ -28,7 +27,6 @@ import lombok.*;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("终端忽略报警信息记录表")
 public class TerminalIgnoreAlarm extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/UserRegistrationid.java

@@ -1,6 +1,5 @@
 package com.ozs.entity;
 
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -14,7 +13,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("用户RegistrationID表")
 public class UserRegistrationid {
     private String userId;
     private String registrationId;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/VehiclePosition.java

@@ -9,7 +9,6 @@ import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
 import lombok.*;
 
 /**
@@ -24,7 +23,6 @@ import lombok.*;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("机车行驶日志表")
 public class VehiclePosition implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/vo/AlarmHeartbeatLog.java

@@ -1,7 +1,6 @@
 package com.ozs.entity.vo;
 
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,7 +20,6 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("第三方报警系统心跳监测日志表")
 public class AlarmHeartbeatLog extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/vo/BaseCameraManagementHomeVo.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -25,7 +24,6 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("相机台账管理表")
 public class BaseCameraManagementHomeVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/vo/BaseCameraManagementVos.java

@@ -1,7 +1,6 @@
 package com.ozs.entity.vo;
 
 import com.ozs.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,7 +20,6 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("相机台账管理表")
 public class BaseCameraManagementVos implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 2
business-service/src/main/java/com/ozs/entity/vo/MsgAlarmTemporary.java

@@ -8,7 +8,6 @@ import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.MsgAlarmExt;
-import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,7 +29,6 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("报警信息临时表")
 public class MsgAlarmTemporary  implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 0 - 13
vehicle-admin/pom.xml

@@ -36,19 +36,6 @@
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
 
-        <!-- swagger3-->
-        <!--        <dependency>-->
-        <!--            <groupId>io.springfox</groupId>-->
-        <!--            <artifactId>springfox-boot-starter</artifactId>-->
-        <!--        </dependency>-->
-
-        <!-- 防止进入swagger页面报类型转换错误,排除3.0.0中的引用,手动增加1.6.2版本 -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
         <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>

+ 1 - 34
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -29,7 +29,6 @@ import com.ozs.utils.CameraUtil;
 import com.ozs.utils.CaneraConfig;
 import com.ozs.utils.RtspToMP4;
 import com.ozs.web.core.config.GetCameraPreviewURL;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,7 +88,6 @@ public class BaseCameraManagementController extends BaseController {
     /**
      * 所有相机列表+权限
      */
-    @ApiOperation(value = "相机台账管理")
     @GetMapping("/selectCameraAll")
     @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult selectCameraAll() {
@@ -101,7 +99,6 @@ public class BaseCameraManagementController extends BaseController {
     /**
      * 相机状态修改
      */
-    @ApiOperation(value = "相机台账管理")
     @GetMapping("/updateEnableOrNot")
     @Log(title = "相机台账管理", businessType = BusinessType.UPDATE)
     public AjaxResult updateEnableOrNot(String id, Integer enableOrNot) {
@@ -122,7 +119,6 @@ public class BaseCameraManagementController extends BaseController {
     /**
      * 根据相机编码获取视频url
      */
-    @ApiOperation(value = "相机台账管理")
     @GetMapping("/getCameraCode")
     @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult getCameraCode(String cameraCode) {
@@ -133,7 +129,6 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @PostMapping(value = "/homeGetInfo")
-    @ApiOperation("根据相机ID、是否解除 获取相机信息、未解除信息")
     @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult homeGetInfo(@RequestBody BaseCameraManagementHomeVo baseCameraManagementHomeVo) {
         Integer isRelease = baseCameraManagementHomeVo.getIsRelease();
@@ -200,7 +195,6 @@ public class BaseCameraManagementController extends BaseController {
      * @param baseCameraManagementVo
      * @return
      */
-    @ApiOperation(value = "相机台账管理分页")
     @PostMapping("/list")
     @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
@@ -280,7 +274,6 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @RequestMapping("/remove/{accountManagementIds}")
-    @ApiOperation("删除相机台账管理信息")
     @Log(title = "相机台账管理", businessType = BusinessType.DELETE)
     @Transactional
     public AjaxResult removeAccountManagement(@PathVariable List<Long> accountManagementIds) {
@@ -304,7 +297,6 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @GetMapping("/streamConversion")
-    @ApiOperation("HTTP流转RTSP流")
     @Transactional
     @Log(title = "相机台账管理", businessType = BusinessType.INSERT)
     public AjaxResult streamConversion(String code) {
@@ -319,7 +311,6 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @PostMapping("/saveAccountManagement")
-    @ApiOperation("新增相机台账管理信息")
     @Transactional
     @Log(title = "相机台账管理", businessType = BusinessType.INSERT)
     public AjaxResult saveAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
@@ -412,7 +403,6 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @PostMapping("/editAccountManagement")
-    @ApiOperation("修改相机台账管理信息")
     @Log(title = "相机台账管理", businessType = BusinessType.UPDATE)
     public AjaxResult editAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -485,7 +475,6 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping(value = "/{id}")
-    @ApiOperation("根据相机ID获取相机台账管理信息")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) throws InterruptedException {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
@@ -547,7 +536,6 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @GetMapping("/getDate/{cameraCode}")
-    @ApiOperation("视频上方显示的数据")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult getDate(@PathVariable String cameraCode) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -600,7 +588,6 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      * @throws Exception
      */
-    @ApiOperation("相机台账管理信息导入")
     @PostMapping("/importBaseAccountManagement")
     @Log(title = "相机台账管理", businessType = BusinessType.IMPORT)
     public AjaxResult importBaseAccountManagement(MultipartFile file, boolean updateSupport) throws Exception {
@@ -615,7 +602,6 @@ public class BaseCameraManagementController extends BaseController {
      *
      * @param response
      */
-    @ApiOperation("导出相机台账管理信息")
     @PostMapping("/exportBaseAccountManagement")
     @Log(title = "相机台账管理", businessType = BusinessType.EXPORT)
     public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseCameraManagementVo) {
@@ -656,7 +642,6 @@ public class BaseCameraManagementController extends BaseController {
     }
 
 
-    @ApiOperation("相机台账管理信息模板下载")
     @GetMapping("/downloaExcel")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
@@ -670,7 +655,6 @@ public class BaseCameraManagementController extends BaseController {
         }
     }
 
-    @ApiOperation("查询录像")
     @GetMapping("/api/records/{cameraCode}")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult apiRecords(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode) {
@@ -683,7 +667,6 @@ public class BaseCameraManagementController extends BaseController {
         return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel()));
     }
 
-    @ApiOperation("视频邀约")
     @GetMapping("/api/invite/{cameraCode}")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult invite(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode) {
@@ -697,7 +680,6 @@ public class BaseCameraManagementController extends BaseController {
     }
 
 
-    @ApiOperation("查询录像")
     @GetMapping("/api/records/{cameraCode}/{flay}")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult apiRecords(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode,
@@ -711,7 +693,6 @@ public class BaseCameraManagementController extends BaseController {
         return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel(), flay));
     }
 
-    @ApiOperation("查询回放视频根据报警ID")
     @GetMapping("/api/getRecordByAlarmId")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult getRecordByAlarmId(@RequestParam("alarmId") String alarmId) {
@@ -747,7 +728,6 @@ public class BaseCameraManagementController extends BaseController {
         }
     }
 
-    @ApiOperation("播放回放-new")
     @PostMapping("/api/record")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult record(@Validated @RequestBody BaseCameraResVo vo) {
@@ -760,7 +740,6 @@ public class BaseCameraManagementController extends BaseController {
         return new AjaxResult(200, "ok", CameraUtil.getRecordList(one.getCameraCode(), vo.getStartTime(), vo.getEntTime(),one.getChannel()));
     }
 
-    @ApiOperation("批量查询录像")
     @GetMapping("/api/recordsList")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult apiRecordsList(@RequestBody
@@ -787,7 +766,6 @@ public class BaseCameraManagementController extends BaseController {
     }
 
 
-    @ApiOperation("播放回放-废弃")
     @PostMapping("/api/invite")
     public AjaxResult apiInvite(@Validated @RequestBody BaseCameraResVo vo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -800,7 +778,6 @@ public class BaseCameraManagementController extends BaseController {
         return success();
     }
 
-//    @ApiOperation("播放回放")
 //    @PostMapping("/api/play")
 //    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
 //    public AjaxResult play(@Validated @RequestBody BaseCameraResVo vo) {
@@ -818,7 +795,6 @@ public class BaseCameraManagementController extends BaseController {
 ////        return success(CameraUtil.historyPlayList(one.getChannel(), vo.getStartTime(), vo.getEntTime()));
 //    }
 
-    @ApiOperation("视频服务设备数量")
     @GetMapping("/totalNumberOfDevices")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult totalNumberOfDevices() {
@@ -834,7 +810,6 @@ public class BaseCameraManagementController extends BaseController {
      * @param
      * @return
      */
-    @ApiOperation("视频服务树形结构")
     @PostMapping("/cameraTree")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult cameraTree(@RequestBody CameraTreeVo cameraTreeVo) {
@@ -888,8 +863,7 @@ public class BaseCameraManagementController extends BaseController {
         }
         return success(cameraTree);
     }
-
-    @ApiOperation("关闭视频录制")
+    
     @GetMapping("/endRecording/{id}")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult endRecording(@PathVariable Long id) {
@@ -916,7 +890,6 @@ public class BaseCameraManagementController extends BaseController {
         return error();
     }
 
-    @ApiOperation("开启视频录制")
     @GetMapping("/startRecording/{id}")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult startRecording(@PathVariable Long id) {
@@ -941,7 +914,6 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping(value = "/getAlarm/{cameraCode}")
-    @ApiOperation("根据视频ID获取详细信息")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getAlarm(@PathVariable String cameraCode) {
         LambdaQueryWrapper<BaseCameraManagement> queryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -1016,7 +988,6 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping(value = "/getCameraPreviewURL")
-    @ApiOperation("天网接口测试")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getCameraPreviewURL() {
         String cameraPreviewURL = GetCameraPreviewURL.getCameraPreviewURL();
@@ -1024,14 +995,12 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping(value = "/testURL")
-    @ApiOperation("流媒体动态流测试")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult testURL() {
         return AjaxResult.success(CameraUtil.getPlayFlv("live", "42010001541320000025"));
     }
 
     @GetMapping(value = "/getAlarmRecord")
-    @ApiOperation("报警回放本地测试")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getAlarmRecord() {
         List<BaseCameraManagement> list = baseCameraManagementService.list(new QueryWrapper<BaseCameraManagement>().eq("line_dir",2));
@@ -1041,14 +1010,12 @@ public class BaseCameraManagementController extends BaseController {
     }
 
 
-    @ApiOperation(value = "结束录制")
     @GetMapping(value = "/stop")
     public AjaxResult stop(String id) {
       return cameraUtil.stop(id);
     }
 
 
-    @ApiOperation(value = "视频压缩")
     @GetMapping(value = "/videoCompression")
     public AjaxResult videoCompression(String code) {
         cameraUtil.videoCompression(code);

+ 0 - 10
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -19,7 +19,6 @@ import com.ozs.entity.vo.BaseRailwayManagementVo;
 import com.ozs.service.BaseCameraManagementService;
 import com.ozs.service.BaseRailwayManagementService;
 import com.ozs.system.service.ISysDictTypeService;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -63,7 +62,6 @@ public class BaseRailwayManagementController extends BaseController {
      * @param baseRailwayManagementVo
      * @return
      */
-    @ApiOperation(value = "线路管理表分页")
     @PostMapping("/list")
     @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseLineManagement(@RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
@@ -146,7 +144,6 @@ public class BaseRailwayManagementController extends BaseController {
      * @return
      */
     @RequestMapping("/remove/{lineIds}")
-    @ApiOperation("删除线路管理表信息")
     @Log(title = "线路台账管理", businessType = BusinessType.DELETE)
     public AjaxResult removeLineManagement(@PathVariable List<Long> lineIds) {
         for (Long lineId : lineIds) {
@@ -174,7 +171,6 @@ public class BaseRailwayManagementController extends BaseController {
      * @return
      */
     @PostMapping("/saveRailwayManagement")
-    @ApiOperation("新增线路管理表信息")
     @Log(title = "线路台账管理", businessType = BusinessType.INSERT)
     public AjaxResult saveLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         String idempotence = idempotenceUtils.getIdempotence(baseRailwayManagement.getRailwayCode());
@@ -227,7 +223,6 @@ public class BaseRailwayManagementController extends BaseController {
      * @return
      */
     @RequestMapping("/editRailwayManagement")
-    @ApiOperation("修改线路管理表信息")
     @Log(title = "线路台账管理", businessType = BusinessType.UPDATE)
     public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         BaseRailwayManagement baseRailwayManagement1 = baseRailwayManagementService.getById(baseRailwayManagement.getId());
@@ -273,7 +268,6 @@ public class BaseRailwayManagementController extends BaseController {
     }
 
     @GetMapping(value = "/{id}")
-    @ApiOperation("根据台账ID获取线路管理表详细信息")
     @Log(title = "线路台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getById(id);
@@ -306,7 +300,6 @@ public class BaseRailwayManagementController extends BaseController {
      * @return
      * @throws Exception
      */
-    @ApiOperation("线路管理表信息导入")
     @PostMapping("/importBaseLineManagement")
     @Log(title = "线路台账管理", businessType = BusinessType.IMPORT)
     public AjaxResult importBaseLineManagement(MultipartFile file, boolean updateSupport) throws Exception {
@@ -324,7 +317,6 @@ public class BaseRailwayManagementController extends BaseController {
      *
      * @param response
      */
-    @ApiOperation("导出线路管理表信息")
     @PostMapping("/exportBaseLineManagement")
     @Log(title = "线路台账管理", businessType = BusinessType.EXPORT)
     public void exportBaseLineManagement(HttpServletResponse response, @RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
@@ -343,7 +335,6 @@ public class BaseRailwayManagementController extends BaseController {
         util.exportExcel(response, list, "线路台账数据");
     }
 
-    @ApiOperation("线路管理表信息模板下载")
     @GetMapping("/downloaExcel")
     @Log(title = "线路台账管理", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
@@ -360,7 +351,6 @@ public class BaseRailwayManagementController extends BaseController {
     /**
      * 线路下拉
      */
-    @ApiOperation(value = "线路下拉")
     @GetMapping("/query")
     @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
     public AjaxResult query() {

+ 0 - 10
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseTerminalController.java

@@ -12,7 +12,6 @@ import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.service.BaseTerminalService;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -45,7 +44,6 @@ public class BaseTerminalController extends BaseController {
      * @param baseVehicleTerminalVo
      * @return
      */
-    @ApiOperation(value = "终端信息表 分页查询")
     @PostMapping("/vehicleTerminalList")
     @Log(title = "车载终端管理", businessType = BusinessType.SELECT)
     public AjaxResult vehicleTerminalList(@RequestBody BaseVehicleTerminalVo baseVehicleTerminalVo) {
@@ -59,7 +57,6 @@ public class BaseTerminalController extends BaseController {
      * @param baseVehicleTerminalVo
      * @return
      */
-    @ApiOperation(value = "车载终端信息表 详情")
     @PostMapping("/baseVehicleTerminalDetails")
     @Log(title = "车载终端管理", businessType = BusinessType.SELECT)
     public AjaxResult baseVehicleTerminalDetails(@RequestBody BaseVehicleTerminalVo baseVehicleTerminalVo) {
@@ -75,7 +72,6 @@ public class BaseTerminalController extends BaseController {
      * @param baseVehicleTerminal
      * @return
      */
-    @ApiOperation(value = "车载终端信息表 新增")
     @PostMapping("/vehicleTerminalAdd")
     @Log(title = "车载终端管理", businessType = BusinessType.INSERT)
     public AjaxResult vehicleTerminalAdd(@RequestBody BaseTerminal baseVehicleTerminal) {
@@ -92,7 +88,6 @@ public class BaseTerminalController extends BaseController {
      * @param baseVehicleTerminal
      * @return
      */
-    @ApiOperation(value = "车载终端信息表 修改")
     @PostMapping("/vehicleTerminalUpdate")
     @Log(title = "车载终端管理", businessType = BusinessType.UPDATE)
     public AjaxResult vehicleTerminalUpdate(@RequestBody BaseTerminal baseVehicleTerminal) {
@@ -108,7 +103,6 @@ public class BaseTerminalController extends BaseController {
      * @param ids
      * @return
      */
-    @ApiOperation(value = "车载终端信息表 删除")
     @RequestMapping("/vehicleTerminaleDelete/{ids}")
     @Log(title = "车载终端管理", businessType = BusinessType.DELETE)
     public AjaxResult vehicleDelete(@PathVariable List<Long> ids) {
@@ -131,7 +125,6 @@ public class BaseTerminalController extends BaseController {
      * @return
      * @throws Exception
      */
-    @ApiOperation("车载终端信息导入")
     @PostMapping("/importBaseVehicleTerminal")
     @Log(title = "车载终端管理", businessType = BusinessType.IMPORT)
     public AjaxResult importBaseVehicleTerminal(MultipartFile file, boolean updateSupport) throws Exception {
@@ -146,7 +139,6 @@ public class BaseTerminalController extends BaseController {
      *
      * @param response
      */
-    @ApiOperation("车载终端信息导出")
     @PostMapping("/exportBaseVehicleTerminal")
     @Log(title = "车载终端管理", businessType = BusinessType.EXPORT)
     public void exportBaseVehicleTerminal(HttpServletResponse response, @RequestBody BaseTerminal baseVehicleTerminal) {
@@ -160,7 +152,6 @@ public class BaseTerminalController extends BaseController {
      *
      * @param response
      */
-    @ApiOperation("车载终端信息模板下载")
     @GetMapping("/downloaExcel")
     @Log(title = "车载终端管理", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
@@ -179,7 +170,6 @@ public class BaseTerminalController extends BaseController {
      *
      * @return
      */
-    @ApiOperation(value = "终端信息表 查询")
     @PostMapping("/terminalAll")
     @Log(title = "终端信息表 查询", businessType = BusinessType.SELECT)
     public AjaxResult terminalAll() {

+ 0 - 20
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -26,7 +26,6 @@ import com.ozs.service.BaseVehicleService;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.utils.CameraUtil;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -78,7 +77,6 @@ public class BaseVehicleController extends BaseController {
      * @param baseVehicleVo
      * @return
      */
-    @ApiOperation(value = "车载终端挂载列表")
     @PostMapping("/vehicleTerminal")
     @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult vehicleTerminal(@RequestBody BaseVehicleVo baseVehicleVo) {
@@ -95,7 +93,6 @@ public class BaseVehicleController extends BaseController {
      * @param baseVehicleVo
      * @return
      */
-    @ApiOperation(value = "机车是否挂载终端")
     @PostMapping("/isMount")
     @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult isMount(@RequestBody BaseVehicleVo baseVehicleVo) {
@@ -112,7 +109,6 @@ public class BaseVehicleController extends BaseController {
      * @param baseTerminal
      * @return
      */
-    @ApiOperation(value = "车载终端挂载 取消挂载")
     @PostMapping("/vehicleTerminalUnmount")
     @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
     public AjaxResult vehicleTerminalUnmount(@RequestBody BaseVehicleTerminal baseTerminal) {
@@ -128,7 +124,6 @@ public class BaseVehicleController extends BaseController {
      * @param baseTerminal
      * @return
      */
-    @ApiOperation(value = "车载终端挂载 保存")
     @PostMapping("/vehicleTerminalAdd")
     @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
     public AjaxResult vehicleTerminalAdd(@RequestBody BaseVehicleTerminal baseTerminal) {
@@ -145,7 +140,6 @@ public class BaseVehicleController extends BaseController {
      * @param baseVehicle
      * @return
      */
-    @ApiOperation(value = "机车信息表 分页查询")
     @PostMapping("/vehicleList")
     @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult vehicleList(@RequestBody BaseVehicleVo baseVehicle) {
@@ -159,7 +153,6 @@ public class BaseVehicleController extends BaseController {
      * @param 
      * @return
      */
-    @ApiOperation(value = "未解除报警的相机")
     @GetMapping("/vehicleList/nonContactAlarmCamera")
     @Log(title = "相机信息管理", businessType = BusinessType.SELECT)
     public AjaxResult nonContactAlarmCamera(String cameraCode) {
@@ -172,7 +165,6 @@ public class BaseVehicleController extends BaseController {
      * @param baseVehicle
      * @return
      */
-    @ApiOperation(value = "机车信息表 详情")
     @PostMapping("/vehicleDetails")
     @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult vehicleDetails(@RequestBody BaseVehicle baseVehicle) {
@@ -188,7 +180,6 @@ public class BaseVehicleController extends BaseController {
      * @param baseVehicle
      * @return
      */
-    @ApiOperation(value = "机车信息表 新增")
     @PostMapping("/vehicleAdd")
     @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
     public AjaxResult vehicleAdd(@RequestBody BaseVehicle baseVehicle) {
@@ -204,7 +195,6 @@ public class BaseVehicleController extends BaseController {
      * @param baseVehicle
      * @return
      */
-    @ApiOperation(value = "机车信息表 修改")
     @PostMapping("/vehicleUpdate")
     @Log(title = "机车信息管理", businessType = BusinessType.UPDATE)
     public AjaxResult vehicleUpdate(@RequestBody BaseVehicle baseVehicle) {
@@ -223,7 +213,6 @@ public class BaseVehicleController extends BaseController {
      * @param ids
      * @return
      */
-    @ApiOperation(value = "机车信息表 删除")
     @RequestMapping("/vehicleDelete/{ids}")
     @Log(title = "机车信息管理", businessType = BusinessType.DELETE)
     public AjaxResult vehicleDelete(@PathVariable List<Long> ids) {
@@ -241,7 +230,6 @@ public class BaseVehicleController extends BaseController {
      * @return
      * @throws Exception
      */
-    @ApiOperation("机车信息导入")
     @PostMapping("/importBaseVehicle")
     @Log(title = "机车信息管理", businessType = BusinessType.IMPORT)
     public AjaxResult importBaseVehicle(MultipartFile file, boolean updateSupport) throws Exception {
@@ -256,7 +244,6 @@ public class BaseVehicleController extends BaseController {
      *
      * @param response
      */
-    @ApiOperation("机车信息导出")
     @PostMapping("/exportBaseVehicle")
     @Log(title = "机车信息管理", businessType = BusinessType.EXPORT)
     public void exportBaseVehicle(HttpServletResponse response, @RequestBody BaseVehicle baseVehicle) {
@@ -270,7 +257,6 @@ public class BaseVehicleController extends BaseController {
      *
      * @param response
      */
-    @ApiOperation("机车信息模板下载")
     @GetMapping("/downloaExcel")
     @Log(title = "机车信息管理", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
@@ -291,7 +277,6 @@ public class BaseVehicleController extends BaseController {
      * <p>
      * 获取机车列表和线路编码,组成树结构
      */
-    @ApiOperation("机车树形结构")
     @PostMapping("/vehicleTree")
     @Log(title = "首页机车列表", businessType = BusinessType.SELECT)
     public AjaxResult vehicleTree(@RequestBody VehicleTreeVo vehicleTreeVo) {
@@ -314,7 +299,6 @@ public class BaseVehicleController extends BaseController {
     }
 
     @GetMapping("/getDate/{terminalCode}")
-    @ApiOperation("视频上方显示的数据")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult getDate(@PathVariable String terminalCode) {
 
@@ -326,7 +310,6 @@ public class BaseVehicleController extends BaseController {
      * 1、根据终端码  查询  行驶记录表  获取最新的机车位置  \ 司机的目视距离;
      * 2、根据 机车的位置  和线路 查询  机车前方1路视频 ( 10KM  是否有报警 )
      */
-    @ApiOperation(value = "通过终端编码获取流")
     @PostMapping("/vehicleCurrentStream")
     @Log(title = "通过终端编码获取流", businessType = BusinessType.SELECT)
     public AjaxResult vehicleCurrentStream(BaseVehicleTerminalDto vehicleTerminalDto) {
@@ -389,7 +372,6 @@ public class BaseVehicleController extends BaseController {
      *
      * @return
      */
-    @ApiOperation(value = "机车信息表 列表查询")
     @PostMapping("/homeVehicleList")
     @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult homeVehicleList(@RequestBody BaseVehicleVo baseVehicle) {
@@ -401,7 +383,6 @@ public class BaseVehicleController extends BaseController {
      *
      * @return
      */
-    @ApiOperation(value = "机车信息表 列表查询")
     @PostMapping("/videoCaptureUrl")
     @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult videoCaptureUrl(@RequestBody BaseVehicleTerminalDto baseVehicleTerminalDto) {
@@ -414,7 +395,6 @@ public class BaseVehicleController extends BaseController {
      * @param baseRailwayManagementVo
      * @return
      */
-    @ApiOperation(value = "查询线路信息集合")
     @PostMapping("/railwayList")
     @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseLineManagement(@RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {

+ 1 - 47
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/DataStatisticController.java

@@ -14,9 +14,6 @@ import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.vo.*;
 import com.ozs.service.*;
 import com.ozs.system.service.ISysDictDataService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +57,6 @@ public class DataStatisticController extends BaseController {
      * @param
      * @return
      */
-    @ApiOperation(value = "查询相机总数,在线离线数量;车载终端总数,在线离线数量")
     @PostMapping("/getMessageStatistics")
     @Log(title = "首页-信息统计", businessType = BusinessType.SELECT)
     public AjaxResult getMessageStatistics() {
@@ -80,12 +76,6 @@ public class DataStatisticController extends BaseController {
      */
     @Log(title = "报警数据详情", businessType = BusinessType.SELECT)
     @PostMapping("/dataStatistic")
-    @ApiOperation(value = "web数据统计 报警数据详情")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
-            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份")
-    })
     public AjaxResult dataStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         Integer pageNum = alarmStatisticResVo.getPageNum().intValue();
         Integer pageSize = alarmStatisticResVo.getPageSize().intValue();
@@ -124,12 +114,7 @@ public class DataStatisticController extends BaseController {
      */
     @Log(title = "报警月统计", businessType = BusinessType.SELECT)
     @PostMapping("/alarmMonthStatistic")
-    @ApiOperation(value = "web数据统计 报警月统计数据")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
-            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份")
-    })
+   
     public AjaxResult alarmMonthStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         List<Integer> numbs = new ArrayList<>();
         Integer listSize;
@@ -189,12 +174,6 @@ public class DataStatisticController extends BaseController {
      */
     @Log(title = "灾害类型统计", businessType = BusinessType.SELECT)
     @PostMapping("/alarmTypeStatistic")
-    @ApiOperation(value = "web数据统计 灾害类型统计数据")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
-            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份")
-    })
     public AjaxResult alarmTypeStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         List<AlarmStatisticMonthDto> list = msgAlarmService.getAlarmTypeCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
                 alarmStatisticResVo.getCurrentMonth());
@@ -220,12 +199,6 @@ public class DataStatisticController extends BaseController {
      */
     @Log(title = "频繁出现灾害地点排名", businessType = BusinessType.SELECT)
     @PostMapping("/alarmTypeAreaCount")
-    @ApiOperation(value = "web数据统计 频繁出现灾害地点排名")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
-            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份")
-    })
     public AjaxResult alarmTypeAreaCount(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         Integer pageNum = alarmStatisticResVo.getPageNum().intValue();
         Integer pageSize = alarmStatisticResVo.getPageSize().intValue();
@@ -256,12 +229,6 @@ public class DataStatisticController extends BaseController {
      */
     @Log(title = "频繁出现灾害地点排导出", businessType = BusinessType.EXPORT)
     @PostMapping("/alarmTypeAreaCountExport")
-    @ApiOperation(value = "web数据统计 频繁出现灾害地点排名导出")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
-            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份")
-    })
     public void alarmTypeAreaCountExport(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         List<AlarmFreqArea> list = msgAlarmService.alarmTypeAreaCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
                 alarmStatisticResVo.getCurrentMonth());
@@ -287,12 +254,6 @@ public class DataStatisticController extends BaseController {
      */
     @Log(title = "报警详情导出管理", businessType = BusinessType.EXPORT)
     @PostMapping("/exportDataStatistic")
-    @ApiOperation(value = "报警详情导出管理")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
-            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份")
-    })
     public void exportDataStatistic(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         try {
             List<AlarmStatisticDto> list = msgAlarmService.exportExcel(alarmStatisticResVo);
@@ -342,12 +303,6 @@ public class DataStatisticController extends BaseController {
      */
     @Log(title = "报警月统计数据导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportDataStatisticMonth")
-    @ApiOperation(value = "报警月统计数据导出")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
-            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份")
-    })
     public void exportDataStatisticMonth(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         List<AlarmStatisticMonthDto> list = null;
         if (ObjectUtils.isEmpty(alarmStatisticResVo.getCurrentMonth())) {
@@ -367,7 +322,6 @@ public class DataStatisticController extends BaseController {
      * @param
      * @return
      */
-    @ApiOperation(value = "查询终端数、机车数、相机数、预警数")
     @PostMapping("/getNum")
     @Log(title = "查询终端数、机车数、相机数、预警数", businessType = BusinessType.SELECT)
     public AjaxResult getNum() {

+ 0 - 13
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -21,7 +21,6 @@ import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -80,7 +79,6 @@ public class MsgAlarmController extends BaseController {
      * web更多消息-总数,已读数
      */
     @GetMapping("/messageMoreNum")
-    @ApiOperation("更多消息--总数,已读数")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult messageMoreNum() {
         // MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
@@ -92,7 +90,6 @@ public class MsgAlarmController extends BaseController {
      * web更多消息
      */
     @PostMapping("/messageMore")
-    @ApiOperation("更多消息")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult messageMore(@RequestBody MsgAlarmVo msgAlarmVo) {
         // MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
@@ -108,7 +105,6 @@ public class MsgAlarmController extends BaseController {
      * web报警未读消息个数+未读消息列表
      */
     @GetMapping("/webAlarm")
-    @ApiOperation("app报警推送次数")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult webAlarmNum() {
         // MsgAlarmVo msgAlarm = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
@@ -120,7 +116,6 @@ public class MsgAlarmController extends BaseController {
      * web消息全部已读
      */
     @PostMapping("/readAll")
-    @ApiOperation(value = "web消息全部已读")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult readAll() {
         return toAjax(msgWebPushService.readAll(getUserId()));
@@ -130,7 +125,6 @@ public class MsgAlarmController extends BaseController {
      * web消息已读
      */
     @PostMapping("/read")
-    @ApiOperation(value = "web消息已读")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult read(@RequestBody MsgWebPush msgWebPush) {
 //        if (StringUtils.isEmpty(msgWebPush) || ObjectUtils.isEmpty(msgWebPush.getPushId())) {
@@ -145,7 +139,6 @@ public class MsgAlarmController extends BaseController {
      * @param msgAlarmVo
      * @return
      */
-    @ApiOperation(value = "报警信息分页")
     @PostMapping("/list")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
@@ -224,7 +217,6 @@ public class MsgAlarmController extends BaseController {
      *
      * @param response
      */
-    @ApiOperation("导出报警消息")
     @PostMapping("/exportMsgAlarm")
     @Log(title = "报警信息管理", businessType = BusinessType.EXPORT)
     public void exportMsgAlarm(HttpServletResponse response, @RequestBody MsgAlarmVo msgAlarmVo) {
@@ -302,7 +294,6 @@ public class MsgAlarmController extends BaseController {
     }
 
     @GetMapping(value = "/{id}")
-    @ApiOperation("根据报警信息ID获取详细信息")
     @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
@@ -386,7 +377,6 @@ public class MsgAlarmController extends BaseController {
      * @return
      */
     @PostMapping("/getDate")
-    @ApiOperation("视频上方显示的数据")
     @Log(title = "报警信息管理", businessType = BusinessType.OTHER)
     public AjaxResult getDate(@RequestBody MsgAlarmVo msgAlarmVo) {
         if (StringUtils.isEmptySunhh(msgAlarmVo) || StringUtils.isEmptySunhh(msgAlarmVo.getId())) {
@@ -403,7 +393,6 @@ public class MsgAlarmController extends BaseController {
     }
 
     @RequestMapping(value = "/updateIsRelease")
-    @ApiOperation("根据报警信息ID解除报警")
     @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
     public AjaxResult updateIsRelease(@RequestParam(value = "id") Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
@@ -415,7 +404,6 @@ public class MsgAlarmController extends BaseController {
     }
 
     @GetMapping(value = "/alarmHistoricalAlarm/{alarmId}")
-    @ApiOperation("报警消息详情历史报警次数信息")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult alarmHistoricalAlarm(@PathVariable String alarmId) {
         QueryWrapper<MsgAlarm> queryWrapper = new QueryWrapper<>();
@@ -449,7 +437,6 @@ public class MsgAlarmController extends BaseController {
     }
 
     @GetMapping(value = "/videoHistoricalAlarm/{cameraCode}")
-    @ApiOperation("视频服务历史报警信息")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult videoHistoricalAlarm(@PathVariable String cameraCode) {
         QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();

+ 0 - 5
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmTemporaryController.java

@@ -39,7 +39,6 @@ import com.ozs.service.SvcAddressService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.web.controller.monitor.SysUserOnlineController;
 import com.ozs.web.controller.websocket.WebSocketCommon;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -103,7 +102,6 @@ public class MsgAlarmTemporaryController extends BaseController {
      * @param msgAlarmVo
      * @return
      */
-    @ApiOperation(value = "报警信息临时表分页")
     @PostMapping("/list")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
@@ -138,7 +136,6 @@ public class MsgAlarmTemporaryController extends BaseController {
 
 
     @PostMapping("/saveMsgAlarmTemporary")
-    @ApiOperation("新增报警信息临时表信息")
     @Log(title = "报警信息临时表管理", businessType = BusinessType.INSERT)
     public AjaxResult saveMsgAlarmTemporary(@RequestBody MsgAlarmTemporary msgAlarmTemporary) {
         String idempotence = idempotenceUtils.getIdempotence(msgAlarmTemporary.getAlarmId());
@@ -179,7 +176,6 @@ public class MsgAlarmTemporaryController extends BaseController {
      * @return
      */
     @RequestMapping("/editMsgAlarmTemporary")
-    @ApiOperation("修改报警信息临时表信息")
     @Log(title = "报警信息临时表管理", businessType = BusinessType.UPDATE)
     public AjaxResult editMsgAlarmTemporary(@RequestBody MsgAlarmTemporary msgAlarmTemporary) {
         MsgAlarmTemporary msgAlarmTemporary1 = msgAlarmTemporaryService.getById(msgAlarmTemporary.getId());
@@ -207,7 +203,6 @@ public class MsgAlarmTemporaryController extends BaseController {
 
 
     @GetMapping("/alarm/{id}")
-    @ApiOperation("报警推送假数据")
     public AjaxResult alarm(@PathVariable Long id) {
         MsgAlarmTemporary msgAlarmTemporary = msgAlarmTemporaryService.getById(id);
         if (msgAlarmTemporary.getStare() == 2) {

+ 0 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgHeartbeatAlarmMessageController.java

@@ -19,7 +19,6 @@ import com.ozs.service.BaseTerminalService;
 import com.ozs.service.BaseVehicleService;
 import com.ozs.service.BaseVehicleTerminalService;
 import com.ozs.service.MsgHeartbeatAlarmMessageService;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -49,7 +48,6 @@ public class MsgHeartbeatAlarmMessageController extends BaseController {
      * @param
      * @return
      */
-    @ApiOperation(value = "心跳报警信息记录表分页")
     @PostMapping("/list")
     @Log(title = "报警和心跳交互信息表", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseLineManagement(@RequestBody MsgAlarmVo msgAlarmVo) {

+ 0 - 4
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/TerminalIgnoreAlarmController.java

@@ -17,7 +17,6 @@ import com.ozs.entity.vo.TerminalIgnoreVo;
 import com.ozs.service.BaseTerminalService;
 import com.ozs.service.TerminalIgnoreAlarmService;
 import com.ozs.system.service.ISysDictDataService;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -53,7 +52,6 @@ public class TerminalIgnoreAlarmController extends BaseController {
      * @param terminalIgnoreVo
      * @return
      */
-    @ApiOperation(value = "查询终端忽略报警信息列表")
     @PostMapping("/list")
     @Log(title = "终端忽略报警信息列表", businessType = BusinessType.SELECT)
     public AjaxResult list(@RequestBody TerminalIgnoreVo terminalIgnoreVo) {
@@ -84,7 +82,6 @@ public class TerminalIgnoreAlarmController extends BaseController {
      * @param
      * @return
      */
-    @ApiOperation(value = "终端忽略报警信息详情")
     @PostMapping("/detail")
     @Log(title = "终端忽略报警信息详情", businessType = BusinessType.SELECT)
     public AjaxResult detail(@RequestBody TerminalIgnoreVo terminalIgnoreVo) {
@@ -104,7 +101,6 @@ public class TerminalIgnoreAlarmController extends BaseController {
         return AjaxResult.success(msgAlarmDTO);
     }
 
-    @ApiOperation(value = "终端忽略报警信息导出")
     @Log(title = "终端忽略报警信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody TerminalIgnoreVo terminalIgnoreVo) {

+ 0 - 5
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/VehiclePositionController.java

@@ -13,7 +13,6 @@ import com.ozs.entity.vo.VehiclePositionResp;
 import com.ozs.framework.manager.factory.AsyncFactory;
 import com.ozs.service.BaseVehicleService;
 import com.ozs.service.VehiclePositionService;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -44,7 +43,6 @@ public class VehiclePositionController extends BaseController {
      * @param vehiclePositionResp
      * @return
      */
-    @ApiOperation(value = "获取机车日志分页列表")
     @PostMapping("/list")
     @Log(title = "机车行驶日志", businessType = BusinessType.SELECT)
     public AjaxResult list(@RequestBody VehiclePositionResp vehiclePositionResp) {
@@ -69,7 +67,6 @@ public class VehiclePositionController extends BaseController {
      * 获取机车行驶日志列表
      * @return
      */
-    @ApiOperation(value = "获取机车日志列表")
     @PostMapping("/listNoPage")
     @Log(title = "机车行驶日志", businessType = BusinessType.SELECT)
     public AjaxResult listNoPage() {
@@ -81,7 +78,6 @@ public class VehiclePositionController extends BaseController {
      * 车载终端监控列表
      * @return
      */
-    @ApiOperation(value = "车载终端监控列表")
     @PostMapping("/vehiclePositionPage")
     @Log(title = "车载终端监控列表", businessType = BusinessType.SELECT)
     public AjaxResult vehiclePositionPage(@RequestBody VehiclePositionResp vehiclePositionResp) {
@@ -94,7 +90,6 @@ public class VehiclePositionController extends BaseController {
 
     @Log(title = "机车行驶日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    @ApiOperation(value = "机车行驶日志导出")
     public void export(HttpServletResponse response, @RequestBody VehiclePositionResp vehiclePositionResp) {
         List<VehiclePosition> list = vehiclePositionService.selectVehiclePositionList(vehiclePositionResp);
         if(!ObjectUtils.isEmpty(list)){

+ 0 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/home/HomeController.java

@@ -5,7 +5,6 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.entity.vo.MsgAlarmVo;
 import com.ozs.service.MsgAlarmService;
 import com.ozs.system.service.DataScoreUtil;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,7 +29,6 @@ public class HomeController extends BaseController {
     /**
      * 统计数量
      */
-    @ApiOperation(value = "统计数量")
     @GetMapping("/statisticsNum")
     public AjaxResult statisticsNum() {
         MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());

+ 0 - 3
vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysLoginInfoController.java

@@ -12,7 +12,6 @@ import com.github.pagehelper.PageHelper;
 import com.ozs.common.core.domain.vo.SysLoginInfoResq;
 import com.ozs.common.core.domain.vo.SysLoginInfoVo;
 import com.ozs.common.utils.StringUtils;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
@@ -55,7 +54,6 @@ public class SysLoginInfoController extends BaseController {
      * @param sysLoginInfoVo
      * @return
      */
-    @ApiOperation(value = "获取登录日志分页列表")
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
     public AjaxResult list(@RequestBody SysLoginInfoVo sysLoginInfoVo) throws ParseException {
@@ -83,7 +81,6 @@ public class SysLoginInfoController extends BaseController {
         return AjaxResult.success(page);
     }
 
-    @ApiOperation(value = "获取登录日志详细")
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:detail')")
     @PostMapping("/detail")
     public AjaxResult remove(Long infoId) {

+ 0 - 3
vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysOperlogController.java

@@ -12,7 +12,6 @@ import com.ozs.common.core.domain.vo.SysOperlogVo;
 import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.system.domain.SysLoginInfo;
-import io.swagger.annotations.ApiOperation;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,7 +53,6 @@ public class SysOperlogController extends BaseController {
      * @return
      */
     @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
-    @ApiOperation(value = "获取操作日志分页列表")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody SysOperlogVo sysOperlogVo) {
         LambdaQueryWrapper<SysOperLog> wrapper = new LambdaQueryWrapper<SysOperLog>();
@@ -83,7 +81,6 @@ public class SysOperlogController extends BaseController {
         return AjaxResult.success(page);
     }
 
-    @ApiOperation(value = "获取操作日志详细")
     @PostMapping("/detail")
     @PreAuthorize("@ss.hasPermi('monitor:operlog:detail')")
     public AjaxResult detail(Long operId) {

+ 0 - 10
vehicle-admin/src/main/java/com/ozs/web/controller/system/MonitorSystemController.java

@@ -11,7 +11,6 @@ import com.ozs.entity.MonitorSystem;
 import com.ozs.entity.VehiclePosition;
 import com.ozs.entity.vo.MonitorSystemVo;
 import com.ozs.service.MonitorSystemService;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -41,7 +40,6 @@ public class MonitorSystemController extends BaseController {
      */
     @Log(title = "首页-监测系统信息", businessType = BusinessType.SELECT)
     @PostMapping("/monitorSystem")
-    @ApiOperation(value = "首页-监测系统信息")
     public AjaxResult monitorSystem() {
         Map<String, Object> monitorSystem = monitorSystemService.monitorSystem();
         return AjaxResult.success(monitorSystem);
@@ -55,7 +53,6 @@ public class MonitorSystemController extends BaseController {
      */
     @Log(title = "监测系统监控分页", businessType = BusinessType.SELECT)
     @PostMapping("/monitorSystemPage")
-    @ApiOperation(value = "监测系统分页查询")
     public AjaxResult monitorSystemPage(@RequestBody MonitorSystemVo monitorSystemVo) {
         Integer pageNum = monitorSystemVo.getPageNum().intValue();
         Integer pageSize = monitorSystemVo.getPageSize().intValue();
@@ -73,7 +70,6 @@ public class MonitorSystemController extends BaseController {
      */
     @Log(title = "监测系统-分页查询", businessType = BusinessType.SELECT)
     @PostMapping("/pageList")
-    @ApiOperation(value = "监测系统分页查询")
     public AjaxResult pageList(@RequestBody MonitorSystemVo monitorSystemVo) {
         IPage<MonitorSystemVo> page = monitorSystemService.pageList(monitorSystemVo);
         return AjaxResult.success(page);
@@ -87,7 +83,6 @@ public class MonitorSystemController extends BaseController {
      */
     @Log(title = "监测系统-监测系统名称查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
-    @ApiOperation(value = "监测系统-监测系统名称查询")
     public AjaxResult list() {
         LambdaQueryWrapper<MonitorSystem> wrapper = new LambdaQueryWrapper<MonitorSystem>();
 //        wrapper.eq(MonitorSystem::getStatus, 1);
@@ -103,7 +98,6 @@ public class MonitorSystemController extends BaseController {
      */
     @Log(title = "监测系统-详情查看", businessType = BusinessType.SELECT)
     @GetMapping("/{id}")
-    @ApiOperation(value = "监测系统-详情查看")
     public AjaxResult detail(@PathVariable Long id) {
         MonitorSystem monitorSystem = monitorSystemService.getMonitorSystem(id);
         return AjaxResult.success(monitorSystem);
@@ -117,7 +111,6 @@ public class MonitorSystemController extends BaseController {
      */
     @Log(title = "监测系统-新增", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    @ApiOperation(value = "监测系统-新增")
     public AjaxResult add(@RequestBody MonitorSystem monitorSystem) {
         if (UserConstants.NOT_UNIQUE.equals(monitorSystemService.checkClientIdUnique(monitorSystem))) {
             return error("监测系统新增'" + monitorSystem.getClientId() + "'失败,客户端编码已存在");
@@ -134,7 +127,6 @@ public class MonitorSystemController extends BaseController {
      */
     @Log(title = "监测系统-删除", businessType = BusinessType.DELETE)
     @RequestMapping("/delete/{ids}")
-    @ApiOperation(value = "监测系统-删除")
     public AjaxResult delete(@PathVariable Long[] ids) {
          MonitorSystem monitorSystem = new MonitorSystem();
         for (Long id : ids) {
@@ -155,7 +147,6 @@ public class MonitorSystemController extends BaseController {
      */
     @Log(title = "监测系统-修改", businessType = BusinessType.UPDATE)
     @RequestMapping("/update")
-    @ApiOperation(value = "监测系统-修改")
     public AjaxResult update(@RequestBody MonitorSystem monitorSystem) {
         if (UserConstants.EXCEPTION.equals(monitorSystemService.checkSystemOnline(monitorSystem))) {
             return error("监测系统修改'" + monitorSystem.getClientId() + "'失败,该系统正在使用中,无法修改");
@@ -173,7 +164,6 @@ public class MonitorSystemController extends BaseController {
      */
     @Log(title = "监测系统-生成密钥", businessType = BusinessType.SELECT)
     @GetMapping("/getSecret")
-    @ApiOperation(value = "监测系统-生成密钥")
     public AjaxResult getSecret() {
         UUID id = UUID.randomUUID();
         String[] idd = id.toString().split("-");

+ 0 - 3
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java

@@ -11,7 +11,6 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.service.ISysDeptService;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +72,6 @@ public class SysDeptController extends BaseController {
      * 获取部门树列表
      */
     @GetMapping("/deptTree")
-    @ApiOperation("获取部门树列表")
     public AjaxResult deptTree(SysDeptVo dept) {
         return success(deptService.selectDeptTreeList(dept));
     }
@@ -172,7 +170,6 @@ public class SysDeptController extends BaseController {
 
     @Log(title = "部门导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
-    @ApiOperation("部门管理")
     @PostMapping("/export")
     public void export(@RequestBody SysDept dept, HttpServletResponse response) {
         List<SysDept> list = forDeptList(dept);

+ 0 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java

@@ -13,7 +13,6 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
@@ -53,7 +52,6 @@ public class SysDictDataController extends BaseController {
      * @param sysDictDataVo
      * @return
      */
-    @ApiOperation(value = "获取字典类型列表")
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     public AjaxResult list(@RequestBody SysDictDataVo sysDictDataVo) {

+ 0 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDictTypeController.java

@@ -12,7 +12,6 @@ import com.ozs.common.core.domain.vo.SysDictTypeVo;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.service.ISysDictTypeService;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
@@ -48,7 +47,6 @@ public class SysDictTypeController extends BaseController {
      * @param sysDictTypeVo
      * @return
      */
-    @ApiOperation(value = "获取字典类型列表")
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     public AjaxResult list(@RequestBody SysDictTypeVo sysDictTypeVo) {

+ 0 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysMenuController.java

@@ -10,7 +10,6 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.service.ISysMenuService;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -131,7 +130,6 @@ public class SysMenuController extends BaseController {
     @Log(title = "菜单管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:menu:export')")
     @PostMapping("/export")
-    @ApiOperation("菜单管理")
     public void export(HttpServletResponse response, SysMenu menu) {
         LoginUser loginUser = getLoginUser();
         List<SysMenu> list = menuService.selectMenuList(menu, loginUser.getId());

+ 0 - 2
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -20,7 +20,6 @@ import com.ozs.framework.web.service.SysPermissionService;
 import com.ozs.framework.web.service.TokenService;
 import com.ozs.system.domain.SysUserRole;
 import com.ozs.system.service.*;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
@@ -72,7 +71,6 @@ public class SysRoleController extends BaseController {
 
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @PostMapping("/list")
-    @ApiOperation("根据条件分页查询角色数据")
     @Log(title = "角色管理", businessType = BusinessType.SELECT)
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody SysRoleRequestVo vo) {

+ 0 - 4
vehicle-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -21,7 +21,6 @@ import com.ozs.framework.web.service.TokenService;
 //import com.ozs.service.service.BaseUserService;
 import com.ozs.service.BaseUserService;
 import com.ozs.system.service.*;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,7 +92,6 @@ public class SysUserController extends BaseController {
      * @param sysUserVo
      * @return
      */
-    @ApiOperation(value = "获取用户列表")
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @Log(title = "用户管理", businessType = BusinessType.SELECT)
@@ -189,7 +187,6 @@ public class SysUserController extends BaseController {
         util.importTemplateExcel(response, "用户数据");
     }
 
-    @ApiOperation("用户管理信息模板下载")
     @GetMapping("/downloaExcel")
     @Log(title = "用户管理", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
@@ -445,7 +442,6 @@ public class SysUserController extends BaseController {
      * 数据权限分配
      */
     @GetMapping("/dataPermission/{id}/{dataPermission}")
-    @ApiOperation("数据权限分配")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     public AjaxResult dataPermission(@PathVariable("id") Long id, @PathVariable("dataPermission") Integer dataPermission) {
         BaseUser baseUser = baseUserService.getUserById(id);

+ 0 - 121
vehicle-admin/src/main/java/com/ozs/web/core/config/SwaggerConfig.java

@@ -1,121 +0,0 @@
-package com.ozs.web.core.config;
-
-import com.ozs.common.config.BaseConfig;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Swagger2的接口配置
- *
- * @author hx
- */
-@Configuration
-public class SwaggerConfig
-{
-    /** 系统基础配置 */
-    @Autowired
-    private BaseConfig ruoyiConfig;
-
-    /** 是否开启swagger */
-    @Value("${swagger.enabled}")
-    private boolean enabled;
-
-    /** 设置请求的统一前缀 */
-    @Value("${swagger.pathMapping}")
-    private String pathMapping;
-
-    /**
-     * 创建API
-     */
-    @Bean
-    public Docket createRestApi()
-    {
-        return new Docket(DocumentationType.OAS_30)
-                // 是否启用Swagger
-                .enable(enabled)
-                // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息)
-                .apiInfo(apiInfo())
-                // 设置哪些接口暴露给Swagger展示
-                .select()
-                // 扫描所有有注解的api,用这种方式更灵活
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                // 扫描指定包中的swagger注解
-                // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
-                // 扫描所有 .apis(RequestHandlerSelectors.any())
-                .paths(PathSelectors.any())
-                .build()
-                /* 设置安全模式,swagger可以设置访问token */
-                .securitySchemes(securitySchemes())
-                .securityContexts(securityContexts())
-                .pathMapping(pathMapping);
-    }
-
-    /**
-     * 安全模式,这里指定token通过Authorization头请求头传递
-     */
-    private List<SecurityScheme> securitySchemes()
-    {
-        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
-        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
-        return apiKeyList;
-    }
-
-    /**
-     * 安全上下文
-     */
-    private List<SecurityContext> securityContexts()
-    {
-        List<SecurityContext> securityContexts = new ArrayList<>();
-        securityContexts.add(
-                SecurityContext.builder()
-                        .securityReferences(defaultAuth())
-                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
-                        .build());
-        return securityContexts;
-    }
-
-    /**
-     * 默认的安全上引用
-     */
-    private List<SecurityReference> defaultAuth()
-    {
-        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
-        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
-        authorizationScopes[0] = authorizationScope;
-        List<SecurityReference> securityReferences = new ArrayList<>();
-        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
-        return securityReferences;
-    }
-
-    /**
-     * 添加摘要信息
-     */
-    private ApiInfo apiInfo()
-    {
-        // 用ApiInfoBuilder进行定制
-        return new ApiInfoBuilder()
-                // 设置标题
-                .title("标题:若依管理系统_接口文档")
-                // 描述
-                .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
-                // 作者信息
-                .contact(new Contact(ruoyiConfig.getName(), null, null))
-                // 版本
-                .version("版本号:" + ruoyiConfig.getVersion())
-                .build();
-    }
-}

+ 0 - 6
vehicle-admin/src/main/resources/application.yml

@@ -145,12 +145,6 @@ pagehelper:
   supportMethodsArguments: true
   params: count=countSql
 
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-  # 请求前缀
-  pathMapping: /dev-api
 
 # 防止XSS攻击
 xss:

+ 0 - 6
vehicle-sdk/src/main/resources/application.yml

@@ -144,12 +144,6 @@ pagehelper:
   supportMethodsArguments: true
   params: count=countSql
 
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-  # 请求前缀
-  pathMapping: /dev-api
 
 # 防止XSS攻击
 xss: