Parcourir la source

定时任务时间修改

gao.qiang il y a 4 jours
Parent
commit
3496dd67a8
100 fichiers modifiés avec 12 ajouts et 4901 suppressions
  1. 4 2
      .idea/compiler.xml
  2. 5 0
      .idea/misc.xml
  3. 0 88
      business-service/src/main/java/com/ozs/service/entity/BaseCameraVersion.java
  4. 0 63
      business-service/src/main/java/com/ozs/service/entity/BaseDept.java
  5. 0 82
      business-service/src/main/java/com/ozs/service/entity/BaseDeviceDynamicManagement.java
  6. 0 53
      business-service/src/main/java/com/ozs/service/entity/BaseDeviceResume.java
  7. 0 53
      business-service/src/main/java/com/ozs/service/entity/BaseElectricityResume.java
  8. 0 49
      business-service/src/main/java/com/ozs/service/entity/BaseVersionCameraParam.java
  9. 0 88
      business-service/src/main/java/com/ozs/service/entity/CameraLogDetail.java
  10. 0 37
      business-service/src/main/java/com/ozs/service/entity/CameraTree.java
  11. 0 78
      business-service/src/main/java/com/ozs/service/entity/CameraUpdateLog.java
  12. 0 23
      business-service/src/main/java/com/ozs/service/entity/CloudState.java
  13. 0 40
      business-service/src/main/java/com/ozs/service/entity/MqLog.java
  14. 0 286
      business-service/src/main/java/com/ozs/service/entity/MsgAlarm.java
  15. 0 263
      business-service/src/main/java/com/ozs/service/entity/MsgAlarmCloud.java
  16. 0 107
      business-service/src/main/java/com/ozs/service/entity/MsgAlarmFrequency.java
  17. 0 96
      business-service/src/main/java/com/ozs/service/entity/MsgAlarmFrequencyCloud.java
  18. 0 87
      business-service/src/main/java/com/ozs/service/entity/MsgAppPush.java
  19. 0 78
      business-service/src/main/java/com/ozs/service/entity/MsgWebPush.java
  20. 0 19
      business-service/src/main/java/com/ozs/service/entity/UserRegistrationid.java
  21. 0 62
      business-service/src/main/java/com/ozs/service/entity/UserStateStatistics.java
  22. 0 13
      business-service/src/main/java/com/ozs/service/entity/vo/AlarmCountSortVo.java
  23. 0 156
      business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticDto.java
  24. 0 60
      business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticMonthDto.java
  25. 0 39
      business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticResVo.java
  26. 0 139
      business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticVo.java
  27. 0 60
      business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementDto.java
  28. 0 156
      business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementHomeVo.java
  29. 0 69
      business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementVo.java
  30. 0 111
      business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementVos.java
  31. 0 53
      business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraResVo.java
  32. 0 56
      business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraVO.java
  33. 0 91
      business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraVersionVo.java
  34. 0 49
      business-service/src/main/java/com/ozs/service/entity/vo/BaseDeviceResumeVo.java
  35. 0 46
      business-service/src/main/java/com/ozs/service/entity/vo/BaseElectricityResumeVo.java
  36. 0 36
      business-service/src/main/java/com/ozs/service/entity/vo/BaseRailwayManagementVo.java
  37. 0 14
      business-service/src/main/java/com/ozs/service/entity/vo/CameraStateList.java
  38. 0 34
      business-service/src/main/java/com/ozs/service/entity/vo/CameraTreeVo.java
  39. 0 56
      business-service/src/main/java/com/ozs/service/entity/vo/CameraUpdateLogResVo.java
  40. 0 51
      business-service/src/main/java/com/ozs/service/entity/vo/CameraUpdateLogResp.java
  41. 0 14
      business-service/src/main/java/com/ozs/service/entity/vo/Codec.java
  42. 0 31
      business-service/src/main/java/com/ozs/service/entity/vo/Data.java
  43. 0 14
      business-service/src/main/java/com/ozs/service/entity/vo/Day2night.java
  44. 0 47
      business-service/src/main/java/com/ozs/service/entity/vo/DeviceResumeResp.java
  45. 0 53
      business-service/src/main/java/com/ozs/service/entity/vo/DeviceStateResp.java
  46. 0 46
      business-service/src/main/java/com/ozs/service/entity/vo/ElectricityResumeResp.java
  47. 0 56
      business-service/src/main/java/com/ozs/service/entity/vo/Heartbeat.java
  48. 0 30
      business-service/src/main/java/com/ozs/service/entity/vo/HistoricalAlarmVo.java
  49. 0 129
      business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmMatterVo.java
  50. 0 194
      business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java
  51. 0 100
      business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmVo.java
  52. 0 108
      business-service/src/main/java/com/ozs/service/entity/vo/MsgAppPushVo.java
  53. 0 11
      business-service/src/main/java/com/ozs/service/entity/vo/Svp.java
  54. 0 27
      business-service/src/main/java/com/ozs/service/entity/vo/UpdateDeviceSn.java
  55. 0 36
      business-service/src/main/java/com/ozs/service/entity/vo/UserStateStatisticsResp.java
  56. 0 20
      business-service/src/main/java/com/ozs/service/entity/vo/Venc.java
  57. 0 13
      business-service/src/main/java/com/ozs/service/mapper/BaseCameraManagementMapper.java
  58. 0 14
      business-service/src/main/java/com/ozs/service/mapper/BaseCameraVersionMapper.java
  59. 1 6
      business-service/src/main/java/com/ozs/service/mapper/BaseDeptMapper.java
  60. 0 24
      business-service/src/main/java/com/ozs/service/mapper/BaseDeviceDynamicManagementMapper.java
  61. 0 18
      business-service/src/main/java/com/ozs/service/mapper/BaseDeviceResumeMapper.java
  62. 0 98
      business-service/src/main/java/com/ozs/service/mapper/BaseDictDataMapper.java
  63. 0 17
      business-service/src/main/java/com/ozs/service/mapper/BaseElectricityResumeMapper.java
  64. 0 7
      business-service/src/main/java/com/ozs/service/mapper/BaseRailwayManagementMapper.java
  65. 0 29
      business-service/src/main/java/com/ozs/service/mapper/BaseUserMapper.java
  66. 0 14
      business-service/src/main/java/com/ozs/service/mapper/BaseVersionCameraParamMapper.java
  67. 0 19
      business-service/src/main/java/com/ozs/service/mapper/CameraLogDetailMapper.java
  68. 0 18
      business-service/src/main/java/com/ozs/service/mapper/CameraUpdateLogMapper.java
  69. 0 9
      business-service/src/main/java/com/ozs/service/mapper/CloudStateMapper.java
  70. 0 18
      business-service/src/main/java/com/ozs/service/mapper/MqLogMapper.java
  71. 0 50
      business-service/src/main/java/com/ozs/service/mapper/MsgAlarmCloudMapper.java
  72. 0 19
      business-service/src/main/java/com/ozs/service/mapper/MsgAlarmFrequencyCloudMapper.java
  73. 0 18
      business-service/src/main/java/com/ozs/service/mapper/MsgAlarmFrequencyMapper.java
  74. 0 56
      business-service/src/main/java/com/ozs/service/mapper/MsgAlarmMapper.java
  75. 1 1
      business-service/src/main/java/com/ozs/service/mapper/MsgAlarmMatterMapper.java
  76. 0 42
      business-service/src/main/java/com/ozs/service/mapper/MsgAppPushMapper.java
  77. 0 32
      business-service/src/main/java/com/ozs/service/mapper/MsgWebPushMapper.java
  78. 0 22
      business-service/src/main/java/com/ozs/service/mapper/UserRegistrationidMapper.java
  79. 0 27
      business-service/src/main/java/com/ozs/service/mapper/UserStateStatisticsMapper.java
  80. 0 24
      business-service/src/main/java/com/ozs/service/params/UserLoginParams.java
  81. 1 41
      business-service/src/main/java/com/ozs/service/service/BaseCameraManagementService.java
  82. 0 19
      business-service/src/main/java/com/ozs/service/service/BaseCameraVersionService.java
  83. 0 21
      business-service/src/main/java/com/ozs/service/service/BaseDeviceDynamicManagementService.java
  84. 0 14
      business-service/src/main/java/com/ozs/service/service/BaseDeviceResumeService.java
  85. 0 14
      business-service/src/main/java/com/ozs/service/service/BaseElectricityResumeService.java
  86. 0 11
      business-service/src/main/java/com/ozs/service/service/BaseRailwayManagementService.java
  87. 0 9
      business-service/src/main/java/com/ozs/service/service/BaseUserService.java
  88. 0 12
      business-service/src/main/java/com/ozs/service/service/BaseVersionCameraParamService.java
  89. 0 20
      business-service/src/main/java/com/ozs/service/service/CameraLogDetailService.java
  90. 0 20
      business-service/src/main/java/com/ozs/service/service/CameraUpdateLogService.java
  91. 0 7
      business-service/src/main/java/com/ozs/service/service/CloudStateService.java
  92. 0 19
      business-service/src/main/java/com/ozs/service/service/MqLogService.java
  93. 0 67
      business-service/src/main/java/com/ozs/service/service/MsgAlarmCloudService.java
  94. 0 17
      business-service/src/main/java/com/ozs/service/service/MsgAlarmFrequencyCloudService.java
  95. 0 16
      business-service/src/main/java/com/ozs/service/service/MsgAlarmFrequencyService.java
  96. 0 4
      business-service/src/main/java/com/ozs/service/service/MsgAlarmMatterService.java
  97. 0 68
      business-service/src/main/java/com/ozs/service/service/MsgAlarmService.java
  98. 0 39
      business-service/src/main/java/com/ozs/service/service/MsgAppPushService.java
  99. 0 29
      business-service/src/main/java/com/ozs/service/service/MsgWebPushService.java
  100. 0 0
      business-service/src/main/java/com/ozs/service/service/RedisService.java

+ 4 - 2
.idea/compiler.xml

@@ -7,11 +7,13 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="hazard-admin" />
         <module name="hazard-sdk" />
-        <module name="base-admin" />
         <module name="business-service" />
+        <module name="base-admin" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="hazard-admin" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

+ 5 - 0
.idea/misc.xml

@@ -10,6 +10,11 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/hazard-admin/pom.xml" />
+      </set>
+    </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
   <component name="SuppressionsComponent">

+ 0 - 88
business-service/src/main/java/com/ozs/service/entity/BaseCameraVersion.java

@@ -1,88 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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 lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author : sunhh
- * @create 2023/4/24 11:02
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class BaseCameraVersion {
-    /**
-     * 摄像头系统参数
-     */
-    @TableField(exist = false)
-    private List<BaseVersionCameraParam> baseVersionCameraParamList;
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 版本号
-     */
-    private String versionNum;
-
-    /**
-     * 版本名称
-     */
-    private String versionName;
-
-    /**
-     * 升级类型 0.固件 1.算法 2:算法及硬件升级 3:摄像头系统参数
-     */
-    private String upgradeType;
-
-    /**
-     * 版本地址
-     */
-    private String versionAddress;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * md5值
-     */
-    private String md5;
-}

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

@@ -1,63 +0,0 @@
-package com.ozs.service.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author Administrator
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class BaseDept implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-
-    /**
-     * 父部门ID
-     */
-    private Long parentId;
-
-    /**
-     * 祖级列表
-     */
-    private String ancestors;
-
-    private String deptName;
-
-    private Integer orderNum;
-
-    /**
-     * 负责人
-     */
-    private String leader;
-
-    private String phone;
-
-    private String email;
-
-    /**
-     * 部门状态:0正常,1停用
-     */
-    private String status;
-
-    /**
-     * 删除标志(0代表存在 2代表删除)
-     */
-    private String delFlag;
-
-    /**
-     * 父部门名称
-     */
-    private String parentName;
-}

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

@@ -1,82 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * <p>
- * 设备动态管理表
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class BaseDeviceDynamicManagement extends BaseEntity implements Serializable{
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 剩余电量
-     */
-    private Integer electricity;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 相机状态(1在线2离线)
-     */
-    private Integer isDisable;
-    /**
-     * 最后一次心跳时间
-     */
-    private Date heartTime;
-
-}

+ 0 - 53
business-service/src/main/java/com/ozs/service/entity/BaseDeviceResume.java

@@ -1,53 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 设备状态履历表
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class BaseDeviceResume  implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 相机状态(1在线2离线)
-     */
-    private Integer isDisable;
-    
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-}

+ 0 - 53
business-service/src/main/java/com/ozs/service/entity/BaseElectricityResume.java

@@ -1,53 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 电池电量履历表
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class BaseElectricityResume  implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 剩余电量
-     */
-    private Integer electricity;
-
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-}

+ 0 - 49
business-service/src/main/java/com/ozs/service/entity/BaseVersionCameraParam.java

@@ -1,49 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-/**
- * @Author : sunhh
- * @create 2023/4/26 14:43
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class BaseVersionCameraParam {
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-    /**
-     * 版本ID
-     */
-    private Long versionId;
-    /**
-     * key
-     */
-    private String paramKey;
-    /**
-     * value
-     */
-    private String paramValue;
-    /**
-     * 创建人
-     */
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-}

+ 0 - 88
business-service/src/main/java/com/ozs/service/entity/CameraLogDetail.java

@@ -1,88 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/4/25
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class CameraLogDetail implements Serializable {
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 关联升级日志id
-     */
-    private Long logId;
-
-    /**
-     * 相机编码
-     */
-    @Excel(name = "相机编码", width = 30)
-    private String cameraCode;
-
-    /**
-     * 序列号
-     */
-    @Excel(name = "序列号")
-    @TableField(exist = false)
-    private String cameraSn;
-
-    /**
-     * 升级状态
-     */
-    @Excel(name = "状态", readConverterExp = "1=升级成功,2=升级中,3=升级失败")
-    private Integer status;
-
-    /**
-     * 上一版本号
-     */
-    @TableField(exist = false)
-    @Excel(name = "上一版本号")
-    private String lastVersionNum;
-
-    /**
-     * 当前版本号
-     */
-    @TableField(exist = false)
-    @Excel(name = "当前版本号")
-    private String currentVersionNum;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 升级失败原因failure_reason
-     */
-    @Excel(name = "升级失败原因")
-    private String failureReason;
-}

+ 0 - 37
business-service/src/main/java/com/ozs/service/entity/CameraTree.java

@@ -1,37 +0,0 @@
-package com.ozs.service.entity;
-
-import com.ozs.common.annotation.Excel;
-import lombok.Builder;
-import lombok.Data;
-import sun.reflect.generics.tree.Tree;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 视频服务树形结构表 @author Administrator
- */
-@Data
-@Builder
-public class CameraTree implements Serializable,Comparable<CameraTree> {
-
-    private static final long serialVersionUID = 1L;
-    String code;
-    String name;
-    String railwayName;
-    boolean flay;
-    Integer mileage;
-    Integer number;
-    /**
-     * 所属工务段
-     */
-    @Excel(name = "所属工务段")
-    private String publicWorksSection;
-    List<CameraTree> children;
-
-    @Override
-    public int compareTo(CameraTree o) {
-        int i =o.getName().compareTo(o.name);
-        return i;
-    }
-}

+ 0 - 78
business-service/src/main/java/com/ozs/service/entity/CameraUpdateLog.java

@@ -1,78 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-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 com.ozs.common.core.domain.BaseEntityExp;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/4/24
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class CameraUpdateLog implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 版本ID
-     */
-    private Long versionId;
-
-    /**
-     * 版本号
-     */
-    private String versionNum;
-
-    /**
-     * 版本名称
-     */
-    private String versionName;
-
-    /**
-     * 升级类型
-     */
-    private String upgradeType;
-
-    /**
-     * 升级类型字符串
-     */
-    @TableField(exist = false)
-    private String upgradeTypeName;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建人名称
-     */
-    @TableField(exist = false)
-    private String createByName;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-}

+ 0 - 23
business-service/src/main/java/com/ozs/service/entity/CloudState.java

@@ -1,23 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class CloudState implements Serializable {
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-}

+ 0 - 40
business-service/src/main/java/com/ozs/service/entity/MqLog.java

@@ -1,40 +0,0 @@
-package com.ozs.service.entity;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author ozs
- * @since 2023-04-26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MqLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-      private Long id;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-
-}

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

@@ -1,286 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * <p>
- * 报警信息表
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class MsgAlarm extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 报警唯一标识
-     */
-    @Excel(name = "报警唯一标识")
-    private String alarmId;
-
-    /**
-     * 相机编码
-     */
-    @Excel(name = "相机编码")
-    private String cameraCode;
-
-    /**
-     * 报警时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 报警里程位置
-     */
-    private Integer alarmMile;
-
-    /**
-     * 报警内容
-     */
-    @Excel(name = "报警内容")
-    private String content;
-
-    /**
-     * 报警置信度(百分比)
-     */
-    private Integer alarmConfidence;
-
-    /**
-     * 报警行别(1上行2下行3上下行)
-     */
-    private Integer lineDir;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)
-     */
-    @Excel(name = "报警病害属性")
-    private String alarmAttr;
-    
-    /**
-     * 报警病害属性文档格式
-     */
-    @TableField(exist = false)
-    private String alarmAttrName;
-
-    /**
-     * 报警图片地址
-     */
-    @Excel(name = "报警图片地址")
-    private String imageUrl;
-
-    /**
-     * 处置人
-     */
-    private String releasedBy;
-
-    /**
-     * 处置时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "处置时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date releasedTime;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private Integer isLock;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String remark;
-
-    /**
-     * 处置报警类型1实报2误报
-     */
-    private Integer releasedType;
-
-    /**
-     * 处置原因
-     */
-    @Excel(name = "处置原因")
-    private String releasedReason;
-
-    /**
-     * 处置报警类型名称   1实报2误报
-     */
-    @TableField(exist = false)
-    @Excel(name = "处置报警类型")
-    private String releasedTypeName;
-
-    /**
-     * 线路名称
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警线路")
-    private String railwayName;
-
-    /**
-     * 监控范围开始里程位置
-     */
-    @TableField(exist = false)
-    private String beginMile;
-
-    /**
-     * 监控范围结束里程位置
-     */
-    @TableField(exist = false)
-    private String endMile;
-
-    /**
-     * 报警里程位置字符串形式
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警里程位置")
-    private String alarmMiles;
-
-    /**
-     * 报警次数
-     */
-    @TableField(exist = false)
-    private Integer alarmCount;
-
-    /**
-     * 报警图片地址网络路径
-     */
-    @TableField(exist = false)
-    private List<String> imageUrls;
-
-    /**
-     * 处置人真实姓名
-     */
-    @TableField(exist = false)
-    @Excel(name = "处置人")
-    private String releasedByName;
-
-    /**
-     * 状态:1未读;2已读
-     */
-    @TableField(exist = false)
-    private Integer status;
-
-    /**
-     * 推送消息ID
-     */
-    @TableField(exist = false)
-    private String msgId;
-
-    /**
-     * 报警行别字符串(1上行2下行3上下行)
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警行别")
-    private String lineDirName;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警病害类型")
-    private String alarmTypeName;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    @Excel(name = "报警是否处置")
-    @TableField(exist = false)
-    private String  isLockName;
-    
-    private String releasedUrl;
-
-    /**
-     * 1已报警2未报警
-     */
-    @TableField(exist = false)
-    private Integer failureToAlarm;
-
-    /**
-     *所属工务段名称
-     */
-    @Excel(name = "所属工务段")
-    @TableField(exist = false)
-    private String deptName;
-
-    /**
-     * 版本号
-     */
-    @Excel(name = "版本号")
-    @TableField(exist = false)
-    private String versionNum;
-
-    /**
-     * 版本名称
-     */
-    @Excel(name = "版本名称")
-    @TableField(exist = false)
-    private String versionName;
-
-    /**
-     * 相机序列号
-     */
-    @Excel(name = "设备序列号")
-    @TableField(exist = false)
-    private String cameraSn;
-
-
-    @TableField(exist = false)
-    private Integer unlockNum;
-
-}

+ 0 - 263
business-service/src/main/java/com/ozs/service/entity/MsgAlarmCloud.java

@@ -1,263 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-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 lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class MsgAlarmCloud extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 报警唯一标识
-     */
-    @Excel(name = "报警唯一标识")
-    private String alarmId;
-
-    /**
-     * 相机编码
-     */
-    @Excel(name = "相机编码")
-    private String cameraCode;
-
-    /**
-     * 报警时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 报警里程位置
-     */
-    private Integer alarmMile;
-
-    /**
-     * 报警内容
-     */
-    @Excel(name = "报警内容")
-    private String content;
-
-    /**
-     * 报警置信度(百分比)
-     */
-    private Integer alarmConfidence;
-
-    /**
-     * 报警行别(1上行2下行3上下行)
-     */
-    private Integer lineDir;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)
-     */
-    @Excel(name = "报警病害属性")
-    private String alarmAttr;
-
-    /**
-     * 报警病害属性文档格式
-     */
-    @TableField(exist = false)
-    private String alarmAttrName;
-
-    /**
-     * 报警图片地址
-     */
-    @Excel(name = "报警图片地址")
-    private String imageUrl;
-
-    /**
-     * 处置人
-     */
-    private String releasedBy;
-
-    /**
-     * 处置时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "处置时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date releasedTime;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private Integer isLock;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String remark;
-
-    /**
-     * 处置报警类型1实报2误报
-     */
-    private Integer releasedType;
-
-    /**
-     * 处置原因
-     */
-    @Excel(name = "处置原因")
-    private String releasedReason;
-
-    /**
-     * 处置报警类型名称   1实报2误报
-     */
-    @TableField(exist = false)
-    @Excel(name = "处置报警类型")
-    private String releasedTypeName;
-
-    /**
-     * 线路名称
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警线路")
-    private String railwayName;
-
-    /**
-     * 监控范围开始里程位置
-     */
-    @TableField(exist = false)
-    private String beginMile;
-
-    /**
-     * 监控范围结束里程位置
-     */
-    @TableField(exist = false)
-    private String endMile;
-
-    /**
-     * 报警里程位置字符串形式
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警里程位置")
-    private String alarmMiles;
-
-    /**
-     * 报警次数
-     */
-    @TableField(exist = false)
-    private Integer alarmCount;
-
-    /**
-     * 报警图片地址网络路径
-     */
-    @TableField(exist = false)
-    private List<String> imageUrls;
-
-    /**
-     * 处置人真实姓名
-     */
-    @TableField(exist = false)
-    @Excel(name = "处置人")
-    private String releasedByName;
-
-    /**
-     * 状态:1未读;2已读
-     */
-    @TableField(exist = false)
-    private Integer status;
-
-    /**
-     * 推送消息ID
-     */
-    @TableField(exist = false)
-    private String msgId;
-
-    /**
-     * 报警行别字符串(1上行2下行3上下行)
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警行别")
-    private String lineDirName;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警病害类型")
-    private String alarmTypeName;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    @Excel(name = "报警是否处置")
-    @TableField(exist = false)
-    private String  isLockName;
-
-    private String releasedUrl;
-
-    /**
-     * 1已报警2未报警
-     */
-    @TableField(exist = false)
-    private Integer failureToAlarm;
-
-    /**
-     *所属工务段名称
-     */
-    @TableField(exist = false)
-    private String deptName;
-
-    /**
-     * 版本号
-     */
-    @Excel(name = "版本号")
-    @TableField(exist = false)
-    private String versionNum;
-
-    /**
-     * 版本名称
-     */
-    @Excel(name = "版本名称")
-    @TableField(exist = false)
-    private String versionName;
-}

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

@@ -1,107 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * <p>
- * 预报警频次表
- * </p>
- *
- * @author ozs
- * @since 2023-02-23
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class MsgAlarmFrequency extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 报警唯一标识
-     */
-    private String alarmId;
-
-    /**
-     * 报警时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 报警内容
-     */
-    private String content;
-
-    /**
-     * 报警置信度(百分比)
-     */
-    private Integer alarmConfidence;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)
-     */
-    private String alarmAttr;
-
-    /**
-     * 报警图片地址
-     */
-    private String imageUrl;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    @TableField(exist = false)
-    private Integer isLock;
-}

+ 0 - 96
business-service/src/main/java/com/ozs/service/entity/MsgAlarmFrequencyCloud.java

@@ -1,96 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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 lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class MsgAlarmFrequencyCloud extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 报警唯一标识
-     */
-    private String alarmId;
-
-    /**
-     * 报警时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 报警内容
-     */
-    private String content;
-
-    /**
-     * 报警置信度(百分比)
-     */
-    private Integer alarmConfidence;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)
-     */
-    private String alarmAttr;
-
-    /**
-     * 报警图片地址
-     */
-    private String imageUrl;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    @TableField(exist = false)
-    private Integer isLock;
-}

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

@@ -1,87 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/3/6
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class MsgAppPush extends BaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 唯一标识- uuid
-     */
-    private String pushId;
-
-    /**
-     * 报警唯一标识
-     */
-    private String alarmId;
-
-    /**
-     * 接收人
-     */
-    private String receiveBy;
-
-    /**
-     * 状态:0未读;1已读
-     */
-    private Integer status;
-
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * app标识ID registration_id
-     */
-    private String registrationId;
-
-    /**
-     * 是否推送,1:推送,2:未推
-     */
-    private String online;
-}

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

@@ -1,78 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-/**
- * @Author : sunhh
- * @create 2023/3/15 14:31
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class MsgWebPush extends BaseEntity {
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 唯一标识- uuid
-     */
-    private String pushId;
-
-    /**
-     * 报警唯一标识
-     */
-    private String alarmId;
-
-    /**
-     * 接收人
-     */
-    private String receiveBy;
-
-    /**
-     * 状态:0未读;1已读
-     */
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 是否推送,1:推送,2:未推
-     */
-    private String online;
-}

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

@@ -1,19 +0,0 @@
-package com.ozs.service.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @Author : sunhh
- * @create 2023/3/14 17:02
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class UserRegistrationid {
-    private String userId;
-    private String registrationId;
-}

+ 0 - 62
business-service/src/main/java/com/ozs/service/entity/UserStateStatistics.java

@@ -1,62 +0,0 @@
-package com.ozs.service.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 用户状态统计表
- * </p>
- *
- * @author ozs
- * @since 2023-02-17
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class UserStateStatistics extends BaseEntity implements Serializable{
-
-    private static final long serialVersionUID = 1L;
-
-    
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
-
-    /**
-     * 昵称
-     */
-    private String nikeName;
-
-
-    /**
-     * 账号
-     */
-    private String userName;
-
-
-    /**
-     * 用户状态(1在线2离线)
-     */
-    private Integer isDisable;
-
-
-
-
-}

+ 0 - 13
business-service/src/main/java/com/ozs/service/entity/vo/AlarmCountSortVo.java

@@ -1,13 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import lombok.Data;
-
-/**
- * @author Administrator
- */
-@Data
-public class AlarmCountSortVo {
-    private Integer cameraCount;
-    private String cameraCode;
-    private String measurePointName;
-}

+ 0 - 156
business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticDto.java

@@ -1,156 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/3/15
- */
-@Data
-public class AlarmStatisticDto {
-    /**
-     * 报警唯一标识
-     */
-    @Excel(name = "报警唯一标识")
-    private String alarmId;
-
-    /**
-     * 相机编码
-     */
-    @Excel(name = "相机编码")
-    private String cameraCode;
-
-    /**
-     * 报警时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /**
-     * 报警里程位置
-     */
-    private String alarmMile;
-
-    /**
-     * 报警内容
-     */
-    @Excel(name = "报警内容")
-    private String content;
-
-    /**
-     * 报警置信度(百分比)
-     */
-    private Integer alarmConfidence;
-
-    /**
-     * 行别编码
-     */
-    private String lineDir;
-
-    /**
-     * 行别
-     */
-    @Excel(name = "行别")
-    private String lineDirValue;
-
-    /**
-     * 报警类型编码
-     */
-    private String alarmType;
-
-    /**
-     * 报警类型
-     */
-    @Excel(name = "报警类型")
-    private String alarmTypeValue;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)
-     */
-    private String alarmAttr;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)字符串
-     */
-    @Excel(name = "报警病害属性")
-    private String alarmAttrString;
-
-    /**
-     * 报警图片地址
-     */
-    @Excel(name = "报警图片地址")
-    private String imageUrl;
-
-    /**
-     * 处置人
-     */
-    private String releasedBy;
-
-    /**
-     * 处置人真实姓名
-     */
-    @Excel(name = "处置人")
-    private String releasedByName;
-
-    /**
-     * 处置时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "处置时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date releasedTime;
-
-    /**
-     * 处置原因
-     */
-    @Excel(name = "处置原因")
-    private String releasedReason;
-
-    /**
-     * 处置报警类型1实报2误报
-     */
-    private Integer releasedType;
-
-    /**
-     * 处置报警类型名称   1实报2误报
-     */
-    @Excel(name = "处置报警类型")
-    private String releasedTypeName;
-
-    /**
-     * 线路名称
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警线路")
-    private String railwayName;
-
-    /**
-     * 报警里程位置字符串形式
-     */
-    @TableField(exist = false)
-    @Excel(name = "报警里程位置")
-    private String alarmMiles;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private Integer isLock;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    @Excel(name = "报警是否处置")
-    private String isLockName;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String remark;
-}

+ 0 - 60
business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticMonthDto.java

@@ -1,60 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/3/15
- */
-@Data
-public class AlarmStatisticMonthDto {
-    /**
-     * 报警唯一标识
-     */
-    private String alarmId;
-
-    /**
-     * 线路名称
-     */
-    //@Excel(name = "线路名称")
-    private String railwayName;
-
-    /**
-     * 报警类型编码
-     */
-    private String alarmType;
-
-    /**
-     * 报警类型
-     */
-    //@Excel(name = "报警类型")
-    private String alarmTypeValue;
-
-    /**
-     * 报警月份
-     */
-    private Integer monthsta;
-    /**
-     * 报警月份字符串
-     */
-    @Excel(name = "报警日期")
-    private String monthstaString;
-
-    /**
-     * 报警次数
-     */
-    @Excel(name = "报警次数")
-    private Integer frequency;
-
-    /**
-     * 报警时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    //@Excel(name = "报警时间")
-    private Date alarmTime;
-}

+ 0 - 39
business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticResVo.java

@@ -1,39 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.ozs.common.vo.PageVo;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 统计管理页面强求参数
- *
- * @author wyy
- * @subject
- * @creat 2023/3/6
- */
-@Data
-public class AlarmStatisticResVo extends PageVo implements Serializable {
-    /**
-     * 线路
-     */
-    private String railwayCode;
-
-    /**
-     * 当前年份
-     */
-    private Integer currentYear;
-
-    /**
-     * 当前月份
-     */
-    private Integer currentMonth;
-
-    /**
-     * 灾害类型
-     */
-    private String alarmType;
-
-    private List<Long> ids;
-}

+ 0 - 139
business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticVo.java

@@ -1,139 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 统计管理页面实体类
- *
- * @author wyy
- * @subject
- * @creat 2023/3/6
- */
-@Data
-public class AlarmStatisticVo {
-
-    /**
-     * 报警唯一标识
-     */
-    private String alarmId;
-
-    /**
-     * 线路名称
-     */
-    private String railwayName;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 报警时间
-     */
-    @JsonFormat(
-            pattern = "yyyy-MM-dd HH:mm:ss"
-    )
-    private Date alarmTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 处置原因
-     */
-    private String releasedReason;
-
-    /**
-     * 处置报警类型1实报2误报
-     */
-    private Integer releasedType;
-
-    /**
-     * 处置报警类型名称   1实报2误报
-     */
-    private String releasedTypeName;
-
-    /**
-     * 报警里程位置
-     */
-    private String alarmMile;
-
-    /**
-     * 报警内容
-     */
-    private String content;
-
-    /**
-     * 报警置信度(百分比)
-     */
-    private Integer alarmConfidence;
-
-    /**
-     * 报警行别(1上行2下行3上下行)
-     */
-    private Integer lineDir;
-
-    /**
-     * 报警行别字符串(1上行2下行3上下行)
-     */
-    private String lineDirName;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private String alarmTypeName;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)
-     */
-    private String alarmAttr;
-
-    /**
-     * 报警图片地址
-     */
-    private String imageUrl;
-
-    /**
-     * 处置人
-     */
-    private String releasedBy;
-
-    /**
-     * 处置人
-     */
-    private String releasedByName;
-
-    /**
-     * 处置时间
-     */
-    @JsonFormat(
-            pattern = "yyyy-MM-dd HH:mm:ss"
-    )
-    private Date releasedTime;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private Integer isLock;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private String isLockName;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)字符串
-     */
-    private String alarmAttrString;
-}

+ 0 - 60
business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementDto.java

@@ -1,60 +0,0 @@
-package com.ozs.service.entity.vo;
-
-
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.Data;
-import java.io.Serializable;
-
-/**
- * <p>
- * 线路和相机台账联合表
- * </p>
- *
- * @author ozs
- * @since 2023-02-17
- */
-@Data
-public class BaseCameraManagementDto extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-     
-    /**
-     * 相机编码
-     */
-    @Excel(name = "相机编码")
-    private String cameraCode;
-    /**
-     * 所属工务段
-     */
-    @Excel(name = "所属工务段")
-    private String publicWorksSection;
-
-    /**
-     * 行别
-     */
-    @Excel(name = "行别")
-    private String lineDir;
-
-    /**
-     * 监控相机安装里程位置
-     */
-    @Excel(name = "监控相机安装里程位置")
-    private Integer installMile;
-    /**
-     * 线路名称
-     */
-    @Excel(name = "线路名称")
-    private String railwayName;
-    /**
-     * 线路编码(四位数字)
-     */
-    @Excel(name = "线路编码")
-    private String railwayCode;
-
-
-    private String lineNumber;
-
-}

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

@@ -1,156 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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 lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 相机台账管理表
- * </p>
- *
- * @author ozs
- * @since 2023-02-17
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class BaseCameraManagementHomeVo extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 相机编码
-     */
-    @Excel(name = "相机编码")
-    private String cameraCode;
-
-    /**
-     * 通道编号
-     */
-    @Excel(name = "通道编号")
-    private String channel;
-
-    /**
-     * 所属工务段编码(单位id)
-     */
-    @Excel(name = "所属工务段编码(单位id)")
-    private Long deptId;
-
-    /**
-     * 行别(1上行2下行3上下行)
-     */
-    @Excel(name = "行别")
-    private Integer lineDir;
-
-    /**
-     * 监控相机安装里程位置
-     */
-    @Excel(name = "监控相机安装里程位置")
-    private Integer installMile;
-
-    /**
-     * 监控范围开始里程位置
-     */
-    @Excel(name = "监控范围开始里程位置")
-    private Integer beginMile;
-
-    /**
-     * 监控范围结束里程位置
-     */
-    @Excel(name = "监控范围结束里程位置")
-    private Integer endMile;
-
-    /**
-     * 监视相机经度
-     */
-    @Excel(name = "监视相机经度")
-    private String installLongitude;
-
-    /**
-     * 监视相机纬度
-     */
-    @Excel(name = "监视相机纬度")
-    private String installLatitude;
-
-    /**
-     * 线路编码
-     */
-    @Excel(name = "线路编码")
-    private String railwayCode;
-
-    /**
-     * 物联网卡号
-     */
-    @Excel(name = "物联网卡号")
-    private String cardNum;
-
-    /**
-     * 是否开启录像(1开启2不开启)
-     */
-    @Excel(name = "是否开启录像")
-    private Integer startRecording;
-
-    /**
-     * 录像接口返回的任务ID
-     */
-    @Excel(name = "录像接口返回的任务ID")
-    private String taskId;
-
-
-    /**
-     * 监控相机安装里程位置字符串形式
-     */
-    @TableField(exist = false)
-    private String installMiles;
-
-    /**
-     * 监控范围开始里程位置字符串形式
-     */
-    @TableField(exist = false)
-    private String beginMiles;
-
-    /**
-     * 监控范围结束里程位置字符串形式
-     */
-    @TableField(exist = false)
-    private String endMiles;
-
-    /**
-     *线路名称
-     */
-    @TableField(exist = false)
-    private String railwayName;
-
-    /**
-     *所属工务段名称
-     */
-    @TableField(exist = false)
-    private String deptName;
-
-    @TableField(exist = false)
-    private Integer railwayType;
-
-    @TableField(exist = false)
-    private Integer isDisable;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private Integer isLock;
-}

+ 0 - 69
business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementVo.java

@@ -1,69 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.vo.PageVo;
-import lombok.Data;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 相机台账管理请求参数表
- * </p>
- *
- * @author ozs
- * @since 2023-02-17
- */
-@Data
-public class BaseCameraManagementVo extends PageVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 所属工务段
-     */
-    private Long deptId;
-
-    /**
-     * 行别
-     */
-    private Integer lineDir;
-
-
-    /**
-     * 线路编码
-     */
-    private String railwayCode;
-
-    private Integer railwayType;
-
-    /**
-     * 监控范围开始里程位置
-     */
-    private Double beginMile;
-
-    /**
-     * 监控范围结束里程位置
-     */
-    private Double endMile;
-    
-    private Double installMile;
-
-    /**
-     * 监控范围开始里程位置字符串形式
-     */
-    private String beginMiles;
-
-    /**
-     * 监控范围结束里程位置字符串形式
-     */
-    private String endMiles;
-
-    private List<Long> ids;
-    private String cameraCode;
-    /**
-     * 相机状态(1在线2离线)
-     */
-    private Integer isDisable;
-}

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

@@ -1,111 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.ozs.common.annotation.Excel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 相机台账管理表
- * </p>
- *
- * @author ozs
- * @since 2023-02-17
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class BaseCameraManagementVos implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 相机编码
-     */
-    @Excel(name = "相机编码")
-    private String cameraCode;
-
-    /**
-     * 通道编号
-     */
-    @Excel(name = "通道编号")
-    private String channel;
-
-
-    /**
-     * 行别(1上行2下行3上下行)
-     */
-    @Excel(name = "行别",readConverterExp = "1=上行,2=下行,3=上下行")
-    private Integer lineDir;
-
-    /**
-     * 监视相机经度
-     */
-    @Excel(name = "监视相机经度")
-    private String installLongitude;
-
-    /**
-     * 监视相机纬度
-     */
-    @Excel(name = "监视相机纬度")
-    private String installLatitude;
-
-    /**
-     * 物联网卡号
-     */
-    @Excel(name = "物联网卡号")
-    private String cardNum;
-
-    /**
-     *所属工务段名称
-     */
-    @Excel(name = "所属工务段名称")
-    private String deptName;
-
-    /**
-     * 监控相机安装里程位置
-     */
-    @Excel(name = "监控相机安装里程位置(单位KM)")
-    private String installMiles;
-
-    /**
-     * 监控范围开始里程位置
-     */
-    @Excel(name = "监控范围开始里程位置(单位KM)")
-    private String beginMiles;
-
-    /**
-     * 监控范围结束里程位置
-     */
-    @Excel(name = "监控范围结束里程位置(单位KM)")
-    private String endMiles;
-
-    /**
-     *线路名称
-     */
-    @Excel(name = "线路名称")
-    private String railwayName;
-
-
-    @Excel(name = "备注")
-    private String remark;
-
-    /**
-     * 相机序列号
-     */
-    @Excel(name = "序列号")
-    private String cameraSn;
-
-    /**
-     * 测点名称
-     */
-    @Excel(name = "测点名称")
-    private String measurePointName;
-
-}

+ 0 - 53
business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraResVo.java

@@ -1,53 +0,0 @@
-package com.ozs.service.entity.vo;
-
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 线路和相机台账联合表
- * </p>
- *
- * @author ozs
- * @since 2023-02-17
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class BaseCameraResVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 相机编码
-     */
-    @NotBlank(message = "相机编码不能为空")
-    private String cameraCode;
-
-    /**
-     * 开始时间
-     */
-    @NotNull(message = "开始时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @NotNull(message = "结束时间不能为空")
-    private Date entTime;
-
-}

+ 0 - 56
business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraVO.java

@@ -1,56 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author wyy
- * @subject
- * @creat 2024/3/7
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class BaseCameraVO implements Serializable{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 通道编号
-     */
-    private String channel;
-
-    /**
-     *线路名称
-     */
-    private String railwayName;
-
-    /**
-     * 监控相机安装里程位置
-     */
-    private String installMiles;
-
-    /**
-     * 下次执行时间
-     */
-    private String nextExecuteTime;
-
-    /**
-     * 是否为预警摄像头
-     */
-    private Boolean isAlarm;
-
-    /**
-     * 状态
-     */
-    private String status;
-}

+ 0 - 91
business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraVersionVo.java

@@ -1,91 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.vo.PageVo;
-import com.ozs.service.entity.BaseVersionCameraParam;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author : sunhh
- * @create 2023/4/24 11:58
- */
-@Data
-public class BaseCameraVersionVo {
-    private Long pageNum;
-    private Long pageSize;
-
-    /**
-     * 摄像头系统参数
-     */
-    private List<BaseVersionCameraParam> baseVersionCameraParamList;
-
-    /**
-     * 相机编码
-     */
-    private List<String> cameraCodeList;
-
-    /**
-     * 主键ID
-     */
-    private Long id;
-
-    /**
-     * 版本号
-     */
-    private String versionNum;
-
-    /**
-     * 版本名称
-     */
-    private String versionName;
-
-    /**
-     * 升级类型 0.固件 1.算法 2:算法及硬件升级 3:摄像头系统参数
-     */
-    private String upgradeType;
-    private String upgradeTypename;
-
-    /**
-     * 版本地址
-     */
-    private String versionAddress;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * md5值
-     */
-    private String md5;
-}

+ 0 - 49
business-service/src/main/java/com/ozs/service/entity/vo/BaseDeviceResumeVo.java

@@ -1,49 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author Administrator
- */
-@Data
-public class BaseDeviceResumeVo {
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 相机状态(1正常2故障)
-     */
-    private String isDisable;
-    /**
-     * 里程位置
-     */
-    private Integer installMile;
-    /**
-     * 里程位置
-     */
-    private String installMiles;
-    /**
-     * 测点名称
-     */
-    private String measurePointName;
-
-    /**
-     * 线路类型名称(1=高铁,2=普铁)
-     */
-    private String railwayType;
-
-    /**
-     * 线路名称
-     */
-    private String railwayName;
-
-    /**
-     * 故障条数
-     */
-    private Integer faultNum;
-}

+ 0 - 46
business-service/src/main/java/com/ozs/service/entity/vo/BaseElectricityResumeVo.java

@@ -1,46 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author Administrator
- */
-@Data
-public class BaseElectricityResumeVo {
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 剩余电量
-     */
-    private Integer electricity;
-    /**
-     * 里程位置
-     */
-    private Integer installMile;
-    /**
-     * 里程位置
-     */
-    private String installMiles;
-    /**
-     * 测点名称
-     */
-    private String measurePointName;
-
-    /**
-     * 线路类型名称(1=高铁,2=普铁)
-     */
-    private String railwayType;
-
-    /**
-     * 线路名称
-     */
-    private String railwayName;
-
-}

+ 0 - 36
business-service/src/main/java/com/ozs/service/entity/vo/BaseRailwayManagementVo.java

@@ -1,36 +0,0 @@
-package com.ozs.service.entity.vo;
-
-
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.vo.PageVo;
-import lombok.Data;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 线路管理请求参数表
- * </p>
- *
- * @author ozs
- * @since 2023-02-17
- */
-@Data
-public class BaseRailwayManagementVo extends PageVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    
-    /**
-     * 线路类型(普铁/高铁 )
-     */
-    private Integer railwayType;
-
-
-    /**
-     * 线路编码(四位数字)
-     */
-    @Excel(name = "编码")
-    private String railwayCode;
-
-    private List<Long> ids;
-}

+ 0 - 14
business-service/src/main/java/com/ozs/service/entity/vo/CameraStateList.java

@@ -1,14 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import lombok.Data;
-
-/**
- * @author Administrator
- */
-@Data
-public class CameraStateList {
-    private String deptName;
-    private String deptId;
-    private Integer totalCameraCount;
-    private Integer filteredCameraCount;
-}

+ 0 - 34
business-service/src/main/java/com/ozs/service/entity/vo/CameraTreeVo.java

@@ -1,34 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.ozs.common.vo.PageVo;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @Author : sunhh
- * @create 2023/3/31 16:06
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class CameraTreeVo extends PageVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    /**
-     * 线路
-     */
-    private String railwayCode;
-
-    /**
-     * 行别
-     */
-    private Integer lineDir;
-
-    /**
-     * 里程位置
-     */
-    private Double mils;
-}

+ 0 - 56
business-service/src/main/java/com/ozs/service/entity/vo/CameraUpdateLogResVo.java

@@ -1,56 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/5/29
- */
-@Data
-public class CameraUpdateLogResVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    /**
-     * 版本号
-     */
-    private String versionNum;
-
-    /**
-     * 版本名称
-     */
-    private String versionName;
-
-    /**
-     * 升级类型
-     */
-    private String upgradeType;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 升级状态
-     */
-    private Integer status;
-
-    /**
-     * 时间(年)
-     */
-    private Integer currentYear;
-
-    /**
-     * 关联升级日志id
-     */
-    private Long logId;
-
-    /**
-     * 复选框选中id
-     */
-    private List<Long> ids;
-}

+ 0 - 51
business-service/src/main/java/com/ozs/service/entity/vo/CameraUpdateLogResp.java

@@ -1,51 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.ozs.common.vo.PageVo;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/4/24
- */
-@Data
-public class CameraUpdateLogResp extends PageVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    /**
-     * 版本号
-     */
-    private String versionNum;
-
-    /**
-     * 版本名称
-     */
-    private String versionName;
-
-    /**
-     * 升级类型
-     */
-    private String upgradeType;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 升级状态
-     */
-    private Integer status;
-
-    /**
-     * 时间(年)
-     */
-    private Integer currentYear;
-
-    /**
-     * 关联升级日志id
-     */
-    private Long logId;
-
-}

+ 0 - 14
business-service/src/main/java/com/ozs/service/entity/vo/Codec.java

@@ -1,14 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Administrator
- */
-@Data
-public class Codec {
-    private List<Venc> venc;
-    private Day2night day2night;
-}

+ 0 - 31
business-service/src/main/java/com/ozs/service/entity/vo/Data.java

@@ -1,31 +0,0 @@
-package com.ozs.service.entity.vo;
-
-/**
- * @author Administrator
- */
-public class Data {
-    /**
-     * 推流状态 0 关闭, 1 开启
-     */
-    private Integer stream;
-    /**
-     * 告警状态 0 关闭, 1 开启
-     */
-    private Integer alarm;
-
-    public Integer getStream() {
-        return stream;
-    }
-
-    public void setStream(Integer stream) {
-        this.stream = stream;
-    }
-
-    public Integer getAlarm() {
-        return alarm;
-    }
-
-    public void setAlarm(Integer alarm) {
-        this.alarm = alarm;
-    }
-}

+ 0 - 14
business-service/src/main/java/com/ozs/service/entity/vo/Day2night.java

@@ -1,14 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import lombok.Data;
-
-@Data
-public class Day2night {
-    private  Integer mode;
-    private  Integer n2i_thr=16000;
-    private  Integer i2n_thr=250;
-    private  Integer light1=0;
-    private  Integer light2=0;
-    private  Integer btime=21600;
-    private  Integer etime=64800;
-}

+ 0 - 47
business-service/src/main/java/com/ozs/service/entity/vo/DeviceResumeResp.java

@@ -1,47 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.vo.PageVo;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author Administrator
- * 设备状态履历
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class DeviceResumeResp extends PageVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    private Integer installMile;
-    @Excel(name = "监控相机安装里程位置(单位KM)")
-    private String installMileName;
-    @Excel(name = "测点名称")
-    private String measurePointName;
-    @Excel(name = "线路名称")
-    private String railwayName;
-    @Excel(name = "所属工务段名称")
-    private String deptName;
-    @Excel(name = "行别")
-    private String lineDir;
-    @Excel(name = "相机编码")
-    private String cameraCode;
-    @Excel(name = "序列号")
-    private String cameraSn;
-    @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普铁")
-    private Integer railwayType;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime ;
-    @Excel(name = "相机状态",readConverterExp = "1=正常,2=故障")
-    private String isDisable;
-}

+ 0 - 53
business-service/src/main/java/com/ozs/service/entity/vo/DeviceStateResp.java

@@ -1,53 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.vo.PageVo;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author Administrator
- * 设备状态
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class DeviceStateResp extends PageVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    private Integer installMile;
-    @Excel(name = "监控相机安装里程位置(单位KM)")
-    private String installMileName;
-    @Excel(name = "测点名称")
-    private String measurePointName;
-    @Excel(name = "线路名称")
-    private String railwayName;
-    @Excel(name = "所属工务段名称")
-    private String deptName;
-    @Excel(name = "行别")
-    private String lineDir;
-    @Excel(name = "相机状态")
-    private String isDisable;
-    @Excel(name = "电量(%)")
-    private Integer electricity;
-    @Excel(name = "相机编码")
-    private String cameraCode;
-    @Excel(name = "序列号")
-    private String cameraSn;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "最新的心跳时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date heartTime;
-    @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普铁")
-    private Integer railwayType;
-    private String railwayCode;
-    private String deptId;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-}

+ 0 - 46
business-service/src/main/java/com/ozs/service/entity/vo/ElectricityResumeResp.java

@@ -1,46 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.vo.PageVo;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author Administrator
- * 设备状态履历
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ElectricityResumeResp extends PageVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    private Integer installMile;
-    @Excel(name = "监控相机安装里程位置(单位KM)")
-    private String installMileName;
-    @Excel(name = "测点名称")
-    private String measurePointName;
-    @Excel(name = "线路名称")
-    private String railwayName;
-    @Excel(name = "所属工务段名称")
-    private String deptName;
-    @Excel(name = "行别")
-    private String lineDir;
-    @Excel(name = "相机编码")
-    private String cameraCode;
-    @Excel(name = "序列号")
-    private String cameraSn;
-    @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普铁")
-    private Integer railwayType;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime ;
-    @Excel(name = "电量(%)")
-    private Integer electricity;
-}

+ 0 - 56
business-service/src/main/java/com/ozs/service/entity/vo/Heartbeat.java

@@ -1,56 +0,0 @@
-package com.ozs.service.entity.vo;
-
-
-/**
- * @author Administrator
- */
-public class Heartbeat {
-    /**
-     * 名称
-     */
-    private String Name;
-    /**
-     *
-     */
-    private Data data;
-    /**
-     * 状态码
-     */
-    private Integer code;
-    /**
-     * 数据上传的签名
-     */
-    private String sign;
-
-    public String getName() {
-        return Name;
-    }
-
-    public void setName(String name) {
-        Name = name;
-    }
-
-    public Data getData() {
-        return data;
-    }
-
-    public void setData(Data data) {
-        this.data = data;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getSign() {
-        return sign;
-    }
-
-    public void setSign(String sign) {
-        this.sign = sign;
-    }
-}

+ 0 - 30
business-service/src/main/java/com/ozs/service/entity/vo/HistoricalAlarmVo.java

@@ -1,30 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author Administrator
- */
-@Data
-public class HistoricalAlarmVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报警时间
-     */
-    private Long alarmTime;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private Integer isLock;
-}

+ 0 - 129
business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmMatterVo.java

@@ -1,129 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ozs.common.vo.PageVo;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 异物侵限报警信息请求参数表
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Data
-public class MsgAlarmMatterVo extends PageVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报警ID
-     */
-    private Long id;
-
-    /**
-     * 标识UUID
-     */
-    private String alarmId;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 剩余电量
-     */
-    private Integer electricity;
-
-    /**
-     * 线路编码
-     */
-    private String railwayCode;
-
-    /**
-     * 线路编码名称
-     */
-    private String railwayCodeName;
-
-    /**
-     * 报警行别
-     */
-    private Integer lineDir;
-    /**
-     * 报警行别 字符串
-     */
-    private String lineDirStr;
-    
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-
-    /**
-     * 报警里程位置
-     */
-    private Integer alarmMile;
-
-    @TableField(exist = false)
-    private BigDecimal alarmMileBD;
-
-    /**
-     * 监控范围开始里程位置
-     */
-    private Integer beginMile;
-
-    /**
-     * 监控范围结束里程位置
-     */
-    private Integer endMile;
-
-    /**
-     * 开始报警时间
-     */
-    private String beginAlarmTime;
-
-    /**
-     * 结束报警时间
-     */
-    private String endAlarmTime;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private Integer isRelease;
-    private String isReleaseName;
-
-    /**
-     * 用户userID
-     */
-    private String userId;
-
-    /**
-     * 状态:1未读;2已读
-     */
-    private Integer status;
-
-    /**
-     * 报警里程位置
-     */
-    private String alarmMiles;
-    /**
-     * 监控范围开始里程位置字符串形式
-     */
-    private String beginMiles;
-
-    /**
-     * 监控范围结束里程位置字符串形式
-     */
-    private String endMiles;
-
-    /**
-     * 来源
-     */
-    private String source;
-}

+ 0 - 194
business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -1,194 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-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 lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 报警信息表
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Data
-public class MsgAlarmResp implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private long id;
-
-    /**
-     * web,app 唯一标识-uuid
-     */
-    private String pushId;
-
-    /**
-     * 报警 唯一标识-uuid
-     */
-    private String alarmId;
-
-    /**
-     * 线路名称
-     */
-    private String railwayName;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-
-    /**
-     * 报警行别(1上行2下行3上下行)
-     */
-    private Integer lineDir;
-    private String lineDirStr;
-
-    /**
-     * 所属工务段编码(单位id)
-     */
-    private Long deptId;
-
-    /**
-     * 报警里程位置
-     */
-    private String alarmMile;
-
-    /**
-     * 报警里程位置
-     */
-    private String alarmMiles;
-    /**
-     * 通道编号
-     */
-    private String channel;
-
-
-    /**
-     * 里程范围
-     */
-    private String beginMile;
-
-    /**
-     * 监视相机经度纬度
-     */
-    private String installLongitude;
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private Integer isLock;
-
-    /**
-     * 处置时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date releasedTime;
-
-    /**
-     * 相机编码
-     */
-    private String cameraCode;
-
-    /**
-     * 报警时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /** 报警图片地址 */
-    private List<String> imageUrls;
-
-    /**
-     * 所属工务段编码(单位名称)
-     */
-    private String deptName;
-
-    /**
-     * 处置报警类型1实报2误报
-     */
-    private Integer releasedType;
-
-    /**
-     * 处置原因
-     */
-    private String releasedReason;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)
-     */
-    private String alarmAttr;
-
-    /**
-     * 报警内容
-     */
-    private String content;
-    /**
-     * 处置人真实姓名
-     */
-    private String releasedByName;
-
-    /**
-     * 处置报警类型名称   1实报2误报
-     */
-    private String releasedTypeName;
-
-    /**
-     * 报警置信度(百分比)
-     */
-    private Integer alarmConfidence;
-
-    private String alarmAttrName;
-    /**
-     * 1已报警2未报警
-     */
-    private Integer failureToAlarm;
-
-    /**
-     * 测点名称
-     */
-    private String measurePointName;
-
-    private String cardNum;
-
-    private String cameraSn;
-
-    private Integer isDisable;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date heartTime;
-
-    private String electricity;
-
-    /**
-     * 版本号
-     */
-    private String versionNum;
-
-    /**
-     * 版本名称
-     */
-    private String versionName;
-    /**
-     * 未处置报警总数
-     */
-    private  Long unlockNum;
-    /**
-     * 线路类型
-     */
-    private Integer railwayType;
-
-
-}

+ 0 - 100
business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmVo.java

@@ -1,100 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.ozs.common.vo.PageVo;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 报警信息请求参数表
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Data
-public class MsgAlarmVo extends PageVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 线路编码
-     */
-    private String railwayCode;
-
-    /**
-     * 报警行别
-     */
-    private Integer lineDir;
-    
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-
-    /**
-     * 报警里程位置
-     */
-    private Double alarmMile;
-
-    /**
-     * 监控范围开始里程位置
-     */
-    private Double beginMile;
-
-    /**
-     * 监控范围结束里程位置
-     */
-    private Double endMile;
-
-    /**
-     * 开始报警时间
-     */
-    private String beginAlarmTime;
-
-    /**
-     * 结束报警时间
-     */
-    private String endAlarmTime;
-
-
-    /**
-     * 报警是否处置 1已处置2未处置
-     */
-    private Integer isLock;
-
-    /**
-     * 用户userID
-     */
-    private String userId;
-
-    /**
-     * 状态:1未读;2已读
-     */
-    private Integer status;
-
-    /**
-     * 报警里程位置
-     */
-    private String alarmMiles;
-    /**
-     * 监控范围开始里程位置字符串形式
-     */
-    private String beginMiles;
-
-    /**
-     * 监控范围结束里程位置字符串形式
-     */
-    private String endMiles;
-
-    /**
-     * 处置报警类型1实报2误报
-     */
-    private Integer releasedType;
-
-    private Integer railwayType;
-
-    private List<Long> ids;
-}

+ 0 - 108
business-service/src/main/java/com/ozs/service/entity/vo/MsgAppPushVo.java

@@ -1,108 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.ozs.common.vo.PageVo;
-import com.ozs.service.entity.BaseCameraManagement;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/3/6
- */
-@Data
-public class MsgAppPushVo extends PageVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    /**
-     * 主键id
-     */
-    private String id;
-
-    /**
-     * 报警唯一标识
-     */
-    private String alarmId;
-    /**
-     * 线路名称
-     */
-    private String railwayName;
-    /**
-     * 线路类型
-     */
-    private Integer railwayType;
-
-    /**
-     * 报警行别(1上行2下行3上下行)
-     */
-    private Integer lineDir;
-
-    /**
-     * 报警里程位置
-     */
-    private String alarmMile;
-
-    /**
-     * 报警病害类型(目前只有1泥石流,后续可扩展使用)
-     */
-    private Integer alarmType;
-
-    /**
-     * 报警病害属性(可以给出泥石流的框定范围)
-     */
-    private String alarmAttr;
-
-    /**
-     * 报警图片地址
-     */
-    private String imageUrl;
-
-    /**
-     * 相机
-     */
-    private BaseCameraManagement baseCameraManagement;
-
-    public BaseCameraManagement getBaseCameraManagement() {
-        return baseCameraManagement;
-    }
-
-    public void setBaseCameraManagement(BaseCameraManagement baseCameraManagement) {
-        this.baseCameraManagement = baseCameraManagement;
-    }
-
-    /**
-     * 接收人
-     */
-    private String receiveBy;
-
-    /**
-     * 状态:1未读;2已读
-     */
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

+ 0 - 11
business-service/src/main/java/com/ozs/service/entity/vo/Svp.java

@@ -1,11 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import lombok.Data;
-
-/**
- * @author Administrator
- */
-@Data
-public class Svp {
-    private Param param;
-}

+ 0 - 27
business-service/src/main/java/com/ozs/service/entity/vo/UpdateDeviceSn.java

@@ -1,27 +0,0 @@
-package com.ozs.service.entity.vo;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * @author Administrator
- */
-@Data
-public class UpdateDeviceSn {
-    private String name;
-    private Integer type;
-    private String md5;
-    private String url;
-    private String sign;
-
-
-    @JsonProperty("Name")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

+ 0 - 36
business-service/src/main/java/com/ozs/service/entity/vo/UserStateStatisticsResp.java

@@ -1,36 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.vo.PageVo;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author Administrator
- * 设备状态履历
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class UserStateStatisticsResp extends PageVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    @Excel(name = "姓名")
-    private String nikeName;
-    @Excel(name = "账号")
-    private String userName;
-    @Excel(name = "用户状态名称")
-    private String isDisableName;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime ;
-    private String userId;
-    private Integer isDisable;
-    private Integer faultNum;
-}

+ 0 - 20
business-service/src/main/java/com/ozs/service/entity/vo/Venc.java

@@ -1,20 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import lombok.Data;
-
-/**
- * @author Administrator
- */
-@Data
-public class Venc {
-    private Integer index = 0;
-    private Integer type = 0;
-    private Integer width = 1920;
-    private Integer height = 1080;
-    private Integer gop = 1;
-    private Integer bitrate = 4096;
-    private Integer profile = 1;
-    private Integer rcmode = 1;
-    private Integer qfactor = 0;
-    private Double fps;
-}

+ 0 - 13
business-service/src/main/java/com/ozs/service/mapper/BaseCameraManagementMapper.java

@@ -20,17 +20,4 @@ import java.util.Map;
 @Mapper
 public interface BaseCameraManagementMapper extends BaseMapper<BaseCameraManagement> {
 
-    List<BaseCameraManagement> selectCameraManagementList(BaseCameraManagementVo baseCameraManagementVo);
-
-    Integer countCamera(MsgAlarmVo msgAlarmVo);
-
-    Map<String, Object> getCameraChannelByAlarmId(@Param("alarmId") String alarmId);
-
-    List<DeviceStateResp> deviceStatePage(DeviceStateResp deviceStateResp);
-
-    List<AlarmCountSortVo> alarmCountSort(MsgAlarmVo msgAlarmVo);
-
-    List<BaseCameraManagement> cameraManagementList(BaseCameraManagementVo baseCameraManagementVo);
-
-    List<DeviceStateResp> bellDeviceStatePage(DeviceStateResp deviceStateResp);
 }

+ 0 - 14
business-service/src/main/java/com/ozs/service/mapper/BaseCameraVersionMapper.java

@@ -1,14 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.BaseCameraVersion;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @Author : sunhh
- * @create 2023/4/24 11:24
- */
-@Mapper
-public interface BaseCameraVersionMapper extends BaseMapper<BaseCameraVersion> {
-}

+ 1 - 6
business-service/src/main/java/com/ozs/service/mapper/BaseDeptMapper.java

@@ -13,10 +13,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface BaseDeptMapper extends BaseMapper<SysDept> {
     
-    /**
-     * 根据部门名称查询信息
-     * @param deptName
-     * @return
-     */
-    Long selectDeptByDeptName(@Param("deptName") String deptName);
+
 }

+ 0 - 24
business-service/src/main/java/com/ozs/service/mapper/BaseDeviceDynamicManagementMapper.java

@@ -1,24 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.ozs.service.entity.BaseDeviceDynamicManagement;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.vo.BaseCameraManagementDto;
-import com.ozs.service.entity.vo.CameraTreeVo;
-import io.lettuce.core.dynamic.annotation.Param;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备动态管理表 Mapper 接口
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Mapper
-public interface BaseDeviceDynamicManagementMapper extends BaseMapper<BaseDeviceDynamicManagement> {
-
-    List<BaseCameraManagementDto> list(CameraTreeVo cameraTreeVo);
-}

+ 0 - 18
business-service/src/main/java/com/ozs/service/mapper/BaseDeviceResumeMapper.java

@@ -1,18 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.BaseDeviceResume;
-import com.ozs.service.entity.vo.BaseDeviceResumeVo;
-import com.ozs.service.entity.vo.DeviceResumeResp;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface BaseDeviceResumeMapper extends BaseMapper<BaseDeviceResume> {
-    List<BaseDeviceResumeVo> getBaseDeviceResume(@Param("cameraCode")String cameraCode, @Param("startTime")String startTime, @Param("endTime")String endTime);
-
-
-    List<DeviceResumeResp> exportDeviceResume(@Param("cameraCode")String cameraCode, @Param("startTime")String startTime, @Param("endTime")String endTime);
-}

+ 0 - 98
business-service/src/main/java/com/ozs/service/mapper/BaseDictDataMapper.java

@@ -1,98 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.ozs.common.core.domain.entity.SysDictData;
-import icu.mhb.mybatisplus.plugln.base.mapper.JoinBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 字典表 数据层
- *
- * @author hx
- */
-@Mapper
-public interface BaseDictDataMapper extends JoinBaseMapper<SysDictData> {
-    /**
-     * 根据条件分页查询字典数据
-     *
-     * @param dictData 字典数据信息
-     * @return 字典数据集合信息
-     */
-    public List<SysDictData> selectDictDataList(SysDictData dictData);
-
-    /**
-     * 根据字典类型查询字典数据
-     *
-     * @param dictType 字典类型
-     * @return 字典数据集合信息
-     */
-    public List<SysDictData> selectDictDataByType(String dictType);
-
-    /**
-     * 根据字典类型和字典键值查询字典数据信息
-     *
-     * @param dictType  字典类型
-     * @param dictValue 字典键值
-     * @return 字典标签
-     */
-    public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
-
-    /**
-     * 根据字典数据ID查询信息
-     *
-     * @param dictCode 字典数据ID
-     * @return 字典数据
-     */
-    public SysDictData selectDictDataById(Long dictCode);
-
-    /**
-     * 查询字典数据
-     *
-     * @param dictType 字典类型
-     * @return 字典数据
-     */
-    public int countDictDataByType(String dictType);
-
-    /**
-     * 通过字典ID删除字典数据信息
-     *
-     * @param dictCode 字典数据ID
-     * @return 结果
-     */
-    public int deleteDictDataById(Long dictCode);
-
-    /**
-     * 批量删除字典数据信息
-     *
-     * @param dictCodes 需要删除的字典数据ID
-     * @return 结果
-     */
-    public int deleteDictDataByIds(Long[] dictCodes);
-
-    /**
-     * 新增字典数据信息
-     *
-     * @param dictData 字典数据信息
-     * @return 结果
-     */
-    public int insertDictData(SysDictData dictData);
-
-    /**
-     * 修改字典数据信息
-     *
-     * @param dictData 字典数据信息
-     * @return 结果
-     */
-    public int updateDictData(SysDictData dictData);
-
-    /**
-     * 同步修改字典类型
-     *
-     * @param oldDictType 旧字典类型
-     * @param newDictType 新旧字典类型
-     * @return 结果
-     */
-    public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
-}

+ 0 - 17
business-service/src/main/java/com/ozs/service/mapper/BaseElectricityResumeMapper.java

@@ -1,17 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.BaseElectricityResume;
-import com.ozs.service.entity.vo.BaseElectricityResumeVo;
-import com.ozs.service.entity.vo.ElectricityResumeResp;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface BaseElectricityResumeMapper extends BaseMapper<BaseElectricityResume> {
-    List<BaseElectricityResumeVo> getBaseElectricityResume(@Param("cameraCode")String cameraCode, @Param("startTime")String startTime, @Param("endTime")String endTime);
-
-    List<ElectricityResumeResp> exportElectricityResume(@Param("cameraCode")String cameraCode, @Param("startTime")String startTime, @Param("endTime")String endTime);
-}

+ 0 - 7
business-service/src/main/java/com/ozs/service/mapper/BaseRailwayManagementMapper.java

@@ -2,10 +2,7 @@ package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.BaseRailwayManagement;
-import com.ozs.service.entity.vo.BaseCameraManagementVo;
-import com.ozs.service.entity.vo.CameraStateList;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,9 +17,5 @@ import java.util.List;
 @Mapper
 public interface BaseRailwayManagementMapper extends BaseMapper<BaseRailwayManagement> {
 
-    String getCameraNameByCameraCode(@Param("cameraCode") String cameraCode);
 
-    List<BaseRailwayManagement> listRailway();
-
-    List<CameraStateList> cameraStateList(BaseCameraManagementVo baseCameraManagementVo);
 }

+ 0 - 29
business-service/src/main/java/com/ozs/service/mapper/BaseUserMapper.java

@@ -15,37 +15,8 @@ import java.util.Set;
 @Mapper
 public interface BaseUserMapper extends BaseMapper<BaseUser> {
 
-    Set<String> getUserIdList(@Param("userId") String userId);
 
-    Set<String> getUserIdByDeptId(@Param("deptId") Long deptId);
-
-    List<Long> getDeptId(@Param("deptId") Long deptId);
-
-    Set<String> getUserIdByDeptIds(@Param("deptList") List<Long> deptList);
-
-    Set<String> getUserIdByDeptIdAndUserId(@Param("userId") String userId, @Param("deptId") Long deptId);
-
-    Set<String> getUserIdListBy5(@Param("userId") String userId);
-
-    Set<String> getUserIdByDeptIdsBy5(@Param("deptList") List<Long> deptList);
-
-    Set<String> getUserIdList6();
-
-    Set<String> getUserIdsList();
-
-    BaseUser getUser(@Param("userId") String userId);
-    
     BaseUser getUserName(@Param("userName") String userName);
-    
-    List<String> getRoleName(@Param("userId")String userId);
-
-    BaseUser getUserById(@Param("id")Long id);
-
-    List<String> getUserIdsLists();
-
-    List<BaseUser> getUsersByIds(@Param("userIds") List<String> userIds);
 
-    List<String> getUserIdsAll();
 
-    List<String> getUserLists();
 }

+ 0 - 14
business-service/src/main/java/com/ozs/service/mapper/BaseVersionCameraParamMapper.java

@@ -1,14 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.BaseCameraVersion;
-import com.ozs.service.entity.BaseVersionCameraParam;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @Author : sunhh
- * @create 2023/4/26 14:50
- */
-@Mapper
-public interface BaseVersionCameraParamMapper extends BaseMapper<BaseVersionCameraParam> {
-}

+ 0 - 19
business-service/src/main/java/com/ozs/service/mapper/CameraLogDetailMapper.java

@@ -1,19 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.CameraLogDetail;
-import com.ozs.service.entity.vo.CameraUpdateLogResVo;
-import com.ozs.service.entity.vo.CameraUpdateLogResp;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/4/25
- */
-@Mapper
-public interface CameraLogDetailMapper extends BaseMapper<CameraLogDetail> {
-    List<CameraLogDetail> selectDetail(CameraUpdateLogResVo cameraUpdateLogResVo);
-}

+ 0 - 18
business-service/src/main/java/com/ozs/service/mapper/CameraUpdateLogMapper.java

@@ -1,18 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.CameraUpdateLog;
-import com.ozs.service.entity.vo.CameraUpdateLogResp;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/4/24
- */
-@Mapper
-public interface CameraUpdateLogMapper extends BaseMapper<CameraUpdateLog> {
-    List<CameraUpdateLog> selectDetail(CameraUpdateLogResp cameraUpdateLogResp);
-}

+ 0 - 9
business-service/src/main/java/com/ozs/service/mapper/CloudStateMapper.java

@@ -1,9 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.CloudState;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface CloudStateMapper extends BaseMapper<CloudState> {
-}

+ 0 - 18
business-service/src/main/java/com/ozs/service/mapper/MqLogMapper.java

@@ -1,18 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.ozs.service.entity.MqLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author ozs
- * @since 2023-04-26
- */
-@Mapper
-public interface MqLogMapper extends BaseMapper<MqLog> {
-
-}

+ 0 - 50
business-service/src/main/java/com/ozs/service/mapper/MsgAlarmCloudMapper.java

@@ -1,50 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.MsgAlarmCloud;
-import com.ozs.service.entity.vo.*;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 报警信息表 Mapper 接口
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Mapper
-public interface MsgAlarmCloudMapper extends BaseMapper<MsgAlarmCloud> {
-    //报警数据详情
-    List<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
-
-    //报警数据详情导出数据集合
-    List<AlarmStatisticDto> listDto(AlarmStatisticResVo alarmStatisticResVo);
-
-    //报警月统计数据导出数据集合
-    List<AlarmStatisticMonthDto> listDtoMonth(AlarmStatisticResVo alarmStatisticResVo);
-
-    //报警月统计数据导出数据集合(天)
-    List<AlarmStatisticMonthDto> listDtoDay(AlarmStatisticResVo alarmStatisticResVo);
-
-    Integer selectCameraCode(@Param("cameraCode") String cameraCode);
-
-    MsgAlarmCloud selectByCameraCode(@Param("cameraCode") String cameraCode);
-
-    List<MsgAlarmCloud> selectMsgAlarmList(MsgAlarmVo msgAlarmVo);
-
-    MsgAlarmCloud getByAlarmId(@Param("alarmId") String alarmId);
-
-    Integer countMsg(MsgAlarmVo msgAlarmVo);
-
-    Integer countJC(MsgAlarmVo msgAlarmVo);
-
-    Integer countWJC(MsgAlarmVo msgAlarmVo);
-
-    List<MsgAlarmCloud> queryAlarmInfoByAfterTenMinute();
-
-    List<MsgAlarmCloud> selectMsgAlarmListHome(MsgAlarmVo msgAlarmVo);
-}

+ 0 - 19
business-service/src/main/java/com/ozs/service/mapper/MsgAlarmFrequencyCloudMapper.java

@@ -1,19 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.MsgAlarmFrequency;
-import com.ozs.service.entity.MsgAlarmFrequencyCloud;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 预报警频次表 Mapper 接口
- * </p>
- *
- * @author ozs
- * @since 2023-02-23
- */
-@Mapper
-public interface MsgAlarmFrequencyCloudMapper extends BaseMapper<MsgAlarmFrequencyCloud> {
-
-}

+ 0 - 18
business-service/src/main/java/com/ozs/service/mapper/MsgAlarmFrequencyMapper.java

@@ -1,18 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.ozs.service.entity.MsgAlarmFrequency;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 预报警频次表 Mapper 接口
- * </p>
- *
- * @author ozs
- * @since 2023-02-23
- */
-@Mapper
-public interface MsgAlarmFrequencyMapper extends BaseMapper<MsgAlarmFrequency> {
-
-}

+ 0 - 56
business-service/src/main/java/com/ozs/service/mapper/MsgAlarmMapper.java

@@ -1,56 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.ozs.common.core.domain.entity.SysUser;
-import com.ozs.service.entity.MsgAlarm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.vo.*;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 报警信息表 Mapper 接口
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-@Mapper
-public interface MsgAlarmMapper extends BaseMapper<MsgAlarm> {
-    //报警数据详情
-    List<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
-
-    //报警数据详情导出数据集合
-    List<AlarmStatisticDto> listDto(AlarmStatisticResVo alarmStatisticResVo);
-
-    //报警月统计数据导出数据集合
-    List<AlarmStatisticMonthDto> listDtoMonth(AlarmStatisticResVo alarmStatisticResVo);
-
-    //报警月统计数据导出数据集合(天)
-    List<AlarmStatisticMonthDto> listDtoDay(AlarmStatisticResVo alarmStatisticResVo);
-
-    Integer selectCameraCode(@Param("cameraCode") String cameraCode);
-
-    MsgAlarm selectByCameraCode(@Param("cameraCode") String cameraCode);
-
-    List<MsgAlarm> selectMsgAlarmList(MsgAlarmVo msgAlarmVo);
-
-    MsgAlarm getByAlarmId(@Param("alarmId") String alarmId);
-
-    Integer countMsg(MsgAlarmVo msgAlarmVo);
-
-    Integer countJC(MsgAlarmVo msgAlarmVo);
-
-    Integer countWJC(MsgAlarmVo msgAlarmVo);
-
-    List<MsgAlarm> queryAlarmInfoByAfterTenMinute();
-
-    List<MsgAlarm> selectMsgAlarmListHome(MsgAlarmVo msgAlarmVo);
-
-    // 新的方法,直接查询统计结果
-    Map<String, Integer> selectAlarmStatistics(MsgAlarmVo msgAlarmVo);
-}

+ 1 - 1
business-service/src/main/java/com/ozs/service/mapper/MsgAlarmMatterMapper.java

@@ -19,5 +19,5 @@ import java.util.Map;
 @Mapper
 public interface MsgAlarmMatterMapper extends BaseMapper<MsgAlarmMatter> {
 
-    List<MsgAlarmMatter>  selectMsgAlarmList(MsgAlarmMatterVo vo);
+
 }

+ 0 - 42
business-service/src/main/java/com/ozs/service/mapper/MsgAppPushMapper.java

@@ -1,42 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAlarmCloud;
-import com.ozs.service.entity.MsgAppPush;
-import com.ozs.service.entity.vo.MsgAlarmVo;
-import com.ozs.service.entity.vo.MsgAppPushVo;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/3/6
- */
-@Mapper
-public interface MsgAppPushMapper extends BaseMapper<MsgAppPush> {
-    /**
-     * app推送报警信息记录
-     *
-     * @param status
-     * @param
-     * @return
-     */
-    List<MsgAppPushVo> alarmPushMsg(MsgAppPushVo msgAppPushVo);
-
-    /**
-     * app推送报警信息记录修改状态
-     *
-     * @param status
-     * @param id
-     * @param updateBy
-     * @return
-     */
-    int updates(MsgAppPush msgAppPush);
-
-    List<MsgAlarm> messageMoreApp(MsgAlarmVo msgAlarmVo);
-
-    List<MsgAppPush> getByUserId(String userId);
-}

+ 0 - 32
business-service/src/main/java/com/ozs/service/mapper/MsgWebPushMapper.java

@@ -1,32 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgWebPush;
-import com.ozs.service.entity.vo.MsgAlarmVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author : sunhh
- * @create 2023/3/15 14:35
- */
-@Mapper
-public interface MsgWebPushMapper extends BaseMapper<MsgWebPush> {
-    Integer webAlarmNum(@Param("userId") String userId);
-
-    List<MsgAlarm> webAlarm(@Param("userId") String userId);
-
-    List<MsgAlarm> messageMore(MsgAlarmVo msgAlarmVo);
-
-    Map<String, Integer> messageMoreNum(@Param("userId") String userId);
-
-    int updateByPushId(MsgWebPush msgWebPush);
-
-    int readAll(@Param("userId") String userId);
-
-    List<MsgWebPush> getByUserId(@Param("userId") String userId);
-}

+ 0 - 22
business-service/src/main/java/com/ozs/service/mapper/UserRegistrationidMapper.java

@@ -1,22 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.SvcAddress;
-import com.ozs.service.entity.UserRegistrationid;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @Author : sunhh
- * @create 2023/3/14 17:10
- */
-@Mapper
-public interface UserRegistrationidMapper extends BaseMapper<UserRegistrationid> {
-    int updateRegistrationID(UserRegistrationid userRegistrationid);
-
-    int addRegistrationID(UserRegistrationid userRegistrationid);
-
-    List<UserRegistrationid> selectRegistrationID(@Param("userIdList") List<String> userIdList);
-}

+ 0 - 27
business-service/src/main/java/com/ozs/service/mapper/UserStateStatisticsMapper.java

@@ -1,27 +0,0 @@
-package com.ozs.service.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.UserStateStatistics;
-import com.ozs.service.entity.vo.DeviceStateResp;
-import com.ozs.service.entity.vo.UserStateStatisticsResp;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 相机台账管理表 Mapper 接口
- * </p>
- *
- * @author ozs
- * @since 2023-02-17
- */
-@Mapper
-public interface UserStateStatisticsMapper extends BaseMapper<UserStateStatistics> {
-
-    List<UserStateStatisticsResp> getUserStateStatistics(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("userId") String userId);
-
-    List<UserStateStatisticsResp> userStateStatisticsPage(UserStateStatisticsResp userStateStatisticsResp);
-}

+ 0 - 24
business-service/src/main/java/com/ozs/service/params/UserLoginParams.java

@@ -1,24 +0,0 @@
-package com.ozs.service.params;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class UserLoginParams {
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 密码
-     */
-    private String password;
-
-    /**
-     * 验证码
-     */
-    private String securityCode;
-}

+ 1 - 41
business-service/src/main/java/com/ozs/service/service/BaseCameraManagementService.java

@@ -1,16 +1,9 @@
 package com.ozs.service.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ozs.common.core.domain.AjaxResult;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
-import com.ozs.service.entity.vo.BaseCameraManagementVo;
-import com.ozs.service.entity.vo.BaseCameraManagementVos;
-import com.ozs.service.entity.vo.DeviceStateResp;
 
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -21,38 +14,5 @@ import java.util.Map;
  * @since 2023-02-17
  */
 public interface BaseCameraManagementService extends IService<BaseCameraManagement> {
-    /**
-     * 相机台账管理表导入
-     * @param accountManageList
-     * @param updateSupport
-     * @param userId
-     * @return
-     */
-    String importBaseAccountManagement(List<BaseCameraManagementVos> accountManageList, boolean updateSupport, String userId);
-
-    List<BaseCameraManagementHomeVo> selectCameraAll(BaseCameraManagementVo baseCameraManagementVo);
-
-//    List<String> getUserIds(String userId);
-
-    List<String> getUserIdList(String userId);
-
-    IPage<BaseCameraManagement> queryPage(BaseCameraManagementVo baseCameraManagementVo);
-
-    List<BaseCameraManagement> baseCameraManagementList(BaseCameraManagementVo baseCameraManagementVo);
-
-    Map<String, Object> getCameraChannelByAlarmId(String alarmId);
-
-    List<BaseCameraManagement> cameraAllList(BaseCameraManagement baseCameraManagement);
-
-    IPage<DeviceStateResp> deviceStatePage(DeviceStateResp deviceStateResp);
-
-    List<DeviceStateResp> deviceStateRespList(DeviceStateResp deviceStateResp);
-
-    AjaxResult cameraStateTotal(BaseCameraManagementVo baseCameraManagementVo);
-
-    AjaxResult cameraStateList(BaseCameraManagementVo baseCameraManagementVo);
-
-    AjaxResult updateStateAll(Integer state);
 
-    IPage<DeviceStateResp> bellDeviceStatePage(DeviceStateResp deviceStateResp);
 }

+ 0 - 19
business-service/src/main/java/com/ozs/service/service/BaseCameraVersionService.java

@@ -1,19 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.service.entity.BaseCameraVersion;
-import com.ozs.service.entity.vo.BaseCameraVersionVo;
-
-/**
- * @Author : sunhh
- * @create 2023/4/24 11:21
- */
-public interface BaseCameraVersionService extends IService<BaseCameraVersion> {
-    AjaxResult cameraVersionAdd(BaseCameraVersion baseCameraVersion, String userId);
-
-    com.github.pagehelper.Page<BaseCameraVersion> cameraVersionList(BaseCameraVersionVo baseCameraVersionVo);
-
-    AjaxResult cameraVersionUpgrade(BaseCameraVersionVo baseCameraVersion, String userId);
-}

+ 0 - 21
business-service/src/main/java/com/ozs/service/service/BaseDeviceDynamicManagementService.java

@@ -1,21 +0,0 @@
-package com.ozs.service.service;
-
-import com.ozs.service.entity.BaseDeviceDynamicManagement;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.CameraTree;
-import com.ozs.service.entity.vo.CameraTreeVo;
-
-import java.util.List;
-
-/**
- * <p>
- * 设备动态管理表 服务类
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-public interface BaseDeviceDynamicManagementService extends IService<BaseDeviceDynamicManagement> {
-
-    CameraTree cameraTree(CameraTreeVo cameraTreeVo);
-}

+ 0 - 14
business-service/src/main/java/com/ozs/service/service/BaseDeviceResumeService.java

@@ -1,14 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.BaseDeviceResume;
-import com.ozs.service.entity.vo.BaseDeviceResumeVo;
-import com.ozs.service.entity.vo.DeviceResumeResp;
-
-import java.util.List;
-
-public interface BaseDeviceResumeService extends IService<BaseDeviceResume> {
-    List<BaseDeviceResumeVo> getBaseDeviceResume(String cameraCode, String startTime, String endTime);
-
-    List<DeviceResumeResp> exportDeviceResume(String cameraCode, String startTime, String endTime);
-}

+ 0 - 14
business-service/src/main/java/com/ozs/service/service/BaseElectricityResumeService.java

@@ -1,14 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.BaseElectricityResume;
-import com.ozs.service.entity.vo.BaseElectricityResumeVo;
-import com.ozs.service.entity.vo.ElectricityResumeResp;
-
-import java.util.List;
-
-public interface BaseElectricityResumeService  extends IService<BaseElectricityResume> {
-    List<BaseElectricityResumeVo> getBaseElectricityResume(String cameraCode, String startTime, String endTime);
-
-    List<ElectricityResumeResp> exportElectricityResume(String cameraCode, String startTime, String endTime);
-}

+ 0 - 11
business-service/src/main/java/com/ozs/service/service/BaseRailwayManagementService.java

@@ -15,16 +15,5 @@ import java.util.List;
  * @since 2023-02-17
  */
 public interface BaseRailwayManagementService extends IService<BaseRailwayManagement> {
-    /**
-     * 线路管理表导入
-     * @param accountManageList
-     * @param updateSupport
-     * @param userId
-     * @return
-     */
-    String importBaseLineManagement(List<BaseRailwayManagement> accountManageList, boolean updateSupport,String userId);
 
-    String getCameraNameByCameraCode(String cameraCode);
-
-    List<BaseRailwayManagement> listRailway();
 }

+ 0 - 9
business-service/src/main/java/com/ozs/service/service/BaseUserService.java

@@ -12,14 +12,5 @@ import java.util.Set;
  * @author Administrator
  */
 public interface BaseUserService extends IService<BaseUser> {
-
-    Set<String> getUserIdList(String createBy, Long deptId);
-
-    BaseUser getUser(String userId);
-
-    BaseUser getUserById(Long id);
-
     BaseUser getUserName(@Param("userName") String userName);
-
-    List<String> getRoleName(@Param("userId")String userId);
 }

+ 0 - 12
business-service/src/main/java/com/ozs/service/service/BaseVersionCameraParamService.java

@@ -1,12 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.BaseCameraVersion;
-import com.ozs.service.entity.BaseVersionCameraParam;
-
-/**
- * @Author : sunhh
- * @create 2023/4/26 16:12
- */
-public interface BaseVersionCameraParamService extends IService<BaseVersionCameraParam> {
-}

+ 0 - 20
business-service/src/main/java/com/ozs/service/service/CameraLogDetailService.java

@@ -1,20 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.CameraLogDetail;
-import com.ozs.service.entity.vo.CameraUpdateLogResVo;
-import com.ozs.service.entity.vo.CameraUpdateLogResp;
-
-import java.util.List;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/4/25
- */
-public interface CameraLogDetailService extends IService<CameraLogDetail> {
-    void updateAccessories(String deviceSn, Integer code,String remark);
-    IPage listToPage(List list, int pageNum, int pageSize);
-    List<CameraLogDetail> selectDetail(CameraUpdateLogResVo cameraUpdateLogResVo);
-}

+ 0 - 20
business-service/src/main/java/com/ozs/service/service/CameraUpdateLogService.java

@@ -1,20 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.CameraUpdateLog;
-import com.ozs.service.entity.vo.CameraUpdateLogResp;
-
-import java.util.List;
-
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/4/24
- */
-public interface CameraUpdateLogService extends IService<CameraUpdateLog> {
-    List<CameraUpdateLog> selectDetail(CameraUpdateLogResp cameraUpdateLogResp);
-
-    IPage listToPage(List list, int pageNum, int pageSize);
-}

+ 0 - 7
business-service/src/main/java/com/ozs/service/service/CloudStateService.java

@@ -1,7 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.CloudState;
-
-public interface CloudStateService  extends IService<CloudState> {
-}

+ 0 - 19
business-service/src/main/java/com/ozs/service/service/MqLogService.java

@@ -1,19 +0,0 @@
-package com.ozs.service.service;
-
-import com.ozs.service.entity.MqLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author ozs
- * @since 2023-04-26
- */
-public interface MqLogService extends IService<MqLog> {
-  
-    void insetHeartLog(String cameraCode);
-    
-}

+ 0 - 67
business-service/src/main/java/com/ozs/service/service/MsgAlarmCloudService.java

@@ -1,67 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAlarmCloud;
-import com.ozs.service.entity.vo.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 报警信息表 服务类
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-public interface MsgAlarmCloudService extends IService<MsgAlarmCloud> {
-    IPage<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
-
-    IPage listToPage(List list, int pageNum, int pageSize);
-
-    //web数据统计 报警月统计数据
-    List<AlarmStatisticMonthDto> getCount(AlarmStatisticResVo alarmStatisticResVo);
-
-    //web数据统计 报警月统计数据(天)
-    List<AlarmStatisticMonthDto> getDayCount(AlarmStatisticResVo alarmStatisticResVo);
-
-    //报警数据详情导出数据集合
-    List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo);
-
-    /**
-     * 通过相机编码查询未处置预警信息
-     *
-     * @param cameraCode
-     * @return
-     */
-    MsgAlarmCloud selectByCameraCode(String cameraCode);
-
-    IPage<MsgAlarmCloud> queryPage(MsgAlarmVo msgAlarmVo);
-
-    MsgAlarmCloud getByAlarmId(String alarmId);
-
-    Map<String, Integer> statisticsNum(MsgAlarmVo msgAlarmVo);
-
-    Integer appAlarmNum(MsgAlarmVo msgAlarmVo);
-
-    List<MsgAlarmCloud> msgAlarmList(MsgAlarmVo msgAlarmVo);
-
-    List<MsgAlarmCloud> queryAlarmInfoByAfterTenMinute();
-
-    IPage<MsgAlarmCloud> queryPageHome(MsgAlarmVo msgAlarmVo);
-
-    void getNormalBaseCameraManagementsCache(String setType);
-
-    void initializationCameraCache();
-
-    BaseCameraManagement getBaseCameraManagementByCamereCode(String camereCode);
-
-    AjaxResult alarmStatistics(MsgAlarmVo msgAlarmVo1);
-
-    AjaxResult alarmCountSort(MsgAlarmVo msgAlarmVo);
-}

+ 0 - 17
business-service/src/main/java/com/ozs/service/service/MsgAlarmFrequencyCloudService.java

@@ -1,17 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.MsgAlarmFrequency;
-import com.ozs.service.entity.MsgAlarmFrequencyCloud;
-
-/**
- * <p>
- * 预报警频次表 服务类
- * </p>
- *
- * @author ozs
- * @since 2023-02-23
- */
-public interface MsgAlarmFrequencyCloudService extends IService<MsgAlarmFrequencyCloud> {
-
-}

+ 0 - 16
business-service/src/main/java/com/ozs/service/service/MsgAlarmFrequencyService.java

@@ -1,16 +0,0 @@
-package com.ozs.service.service;
-
-import com.ozs.service.entity.MsgAlarmFrequency;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 预报警频次表 服务类
- * </p>
- *
- * @author ozs
- * @since 2023-02-23
- */
-public interface MsgAlarmFrequencyService extends IService<MsgAlarmFrequency> {
-
-}

+ 0 - 4
business-service/src/main/java/com/ozs/service/service/MsgAlarmMatterService.java

@@ -3,8 +3,6 @@ package com.ozs.service.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.MsgAlarmMatter;
-import com.ozs.service.entity.vo.MsgAlarmMatterVo;
-import com.ozs.service.entity.vo.MsgAlarmVo;
 
 import java.util.List;
 
@@ -19,7 +17,5 @@ import java.util.List;
  */
 public interface MsgAlarmMatterService extends IService<MsgAlarmMatter> {
 
-    IPage<MsgAlarmMatter> queryPage(MsgAlarmMatterVo msgAlarmVo);
 
-    List<MsgAlarmMatter> msgAlarmList(MsgAlarmMatterVo msgAlarmVo);
 }

+ 0 - 68
business-service/src/main/java/com/ozs/service/service/MsgAlarmService.java

@@ -1,68 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.MsgAlarm;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.vo.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * <p>
- * 报警信息表 服务类
- * </p>
- *
- * @author ozs
- * @since 2023-02-22
- */
-public interface MsgAlarmService extends IService<MsgAlarm> {
-    IPage<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
-
-    IPage listToPage(List list, int pageNum, int pageSize);
-
-    //web数据统计 报警月统计数据
-    List<AlarmStatisticMonthDto> getCount(AlarmStatisticResVo alarmStatisticResVo);
-
-    //web数据统计 报警月统计数据(天)
-    List<AlarmStatisticMonthDto> getDayCount(AlarmStatisticResVo alarmStatisticResVo);
-
-    //报警数据详情导出数据集合
-    List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo);
-
-    /**
-     * 通过相机编码查询未处置预警信息
-     *
-     * @param cameraCode
-     * @return
-     */
-    MsgAlarm selectByCameraCode(String cameraCode);
-
-    IPage<MsgAlarm> queryPage(MsgAlarmVo msgAlarmVo);
-
-    MsgAlarm getByAlarmId(String alarmId);
-
-    Map<String, Integer> statisticsNum(MsgAlarmVo msgAlarmVo);
-
-    Integer appAlarmNum(MsgAlarmVo msgAlarmVo);
-
-    List<MsgAlarm> msgAlarmList(MsgAlarmVo msgAlarmVo);
-
-    List<MsgAlarm> queryAlarmInfoByAfterTenMinute();
-
-    IPage<MsgAlarm> queryPageHome(MsgAlarmVo msgAlarmVo);
-
-    void getNormalBaseCameraManagementsCache(String setType);
-
-    void initializationCameraCache();
-
-    BaseCameraManagement getBaseCameraManagementByCamereCode(String camereCode);
-
-    AjaxResult alarmStatistics(MsgAlarmVo msgAlarmVo1);
-
-    AjaxResult alarmCountSort(MsgAlarmVo msgAlarmVo);
-}

+ 0 - 39
business-service/src/main/java/com/ozs/service/service/MsgAppPushService.java

@@ -1,39 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAppPush;
-import com.ozs.service.entity.vo.MsgAlarmVo;
-import com.ozs.service.entity.vo.MsgAppPushVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/3/6
- */
-public interface MsgAppPushService extends IService<MsgAppPush> {
-    /**
-     * app推送报警信息记录
-     *
-     * @param msgAppPushVo
-     * @param
-     * @return
-     */
-    IPage<MsgAlarm> alarmPushMsg(MsgAlarmVo msgAlarmVo);
-
-    /**
-     * app推送报警信息记录修改状态
-     *
-     * @param status
-     * @param id
-     * @param updateBy
-     * @return
-     */
-    int updates(MsgAppPush msgAppPush);
-
-    List<MsgAppPush> getByUserId(String userId);
-}

+ 0 - 29
business-service/src/main/java/com/ozs/service/service/MsgWebPushService.java

@@ -1,29 +0,0 @@
-package com.ozs.service.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAppPush;
-import com.ozs.service.entity.MsgWebPush;
-import com.ozs.service.entity.vo.MsgAlarmVo;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author : sunhh
- * @create 2023/3/15 14:33
- */
-public interface MsgWebPushService extends IService<MsgWebPush> {
-    int read(MsgWebPush msgWebPush);
-
-    Map webAlarm(String userId);
-
-    IPage<MsgAlarm> messageMore(MsgAlarmVo msgAlarmVo);
-
-    Map<String, Integer> messageMoreNum(String userId);
-
-    int readAll(String userId);
-
-    List<MsgWebPush> getByUserId(String userId);
-}

+ 0 - 0
business-service/src/main/java/com/ozs/service/service/RedisService.java


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff