Browse Source

去除api依赖

master
liupopo 2 years ago
parent
commit
03333f0c26
  1. 109773
      docs/databases/db_backup/yxt_supervise_monitor-20231023174524.sql
  2. 44
      docs/databases/db_backup/yxt_supervise_monitor-20231023174859.sql
  3. 1
      pom.xml
  4. 13
      yxt-supervise-monitor-biz/pom.xml
  5. 5
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java
  6. 21
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demobaseentity/DemoBaseentity.java
  7. 16
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demobaseentity/DemoBaseentityDto.java
  8. 14
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demobaseentity/DemoBaseentityQuery.java
  9. 13
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demobaseentity/DemoBaseentityVo.java
  10. 28
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demoidentity/DemoIdentity.java
  11. 67
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/CallPolice.java
  12. 99
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java
  13. 96
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java
  14. 54
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceLog.java
  15. 67
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/MessageInfo.java
  16. 71
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/PushPoliceInfo.java
  17. 94
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java
  18. 50
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/YInfo.java
  19. 68
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/YTask.java
  20. 4
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/package-info.java
  21. 28
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/DeviceVo.java
  22. 26
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/MessageVo.java
  23. 27
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/PageVo.java
  24. 25
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/PushPoliceAllVo.java
  25. 23
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/PushPoliceImageAllVo.java
  26. 42
      yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/PushPoliceVo.java
  27. 21
      yxt-supervise-monitor-biz/src/main/resources/application-devv.yml
  28. 7
      yxt-supervise-monitor-biz/src/main/resources/application-pro.yml
  29. 27
      yxt-supervise-monitor-biz/src/main/resources/application-test.yml
  30. 2
      yxt-supervise-monitor-biz/src/main/resources/application.yml

109773
docs/databases/db_backup/yxt_supervise_monitor-20231023174524.sql

File diff suppressed because it is too large

44
docs/databases/db_backup/yxt_supervise_monitor-20231023174859.sql

@ -0,0 +1,44 @@
-- --------------------------------------------------------
-- 主机: 39.104.100.138
-- 服务器版本: 8.0.30 - MySQL Community Server - GPL
-- 服务器操作系统: Linux
-- HeidiSQL 版本: 12.5.0.6677
-- --------------------------------------------------------
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET NAMES utf8 */;
/*!50503 SET NAMES utf8mb4 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-- 导出 表 yxt_supervise_monitor.y_push_police_info 结构
DROP TABLE IF EXISTS `y_push_police_info`;
CREATE TABLE IF NOT EXISTS `y_push_police_info` (
`id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
`state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isSuccess` int DEFAULT '1' COMMENT '记录是否可用,1:推送成功,0:推送失败',
`isDelete` int DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
`remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注信息',
`createBySid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建者',
`updateBySid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新者',
`deviceId` bigint DEFAULT NULL COMMENT '设备ID',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`modifyTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`output` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '返回参数',
`input` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '推送参数',
`ckId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '仓库ID',
`imageOrPolice` tinyint(1) DEFAULT NULL COMMENT '0设备状态报警1图片对比报警',
`sendTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发送时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=371674 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='推送报警信息表';
-- 数据导出被取消选择。
/*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;
/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */;

1
pom.xml

@ -7,7 +7,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>yxt-supervise-monitor</artifactId>
<modules>
<module>yxt-supervise-monitor-api</module>
<module>yxt-supervise-monitor-biz</module>
</modules>
<groupId>com.yxt.supervise.monitor</groupId>

13
yxt-supervise-monitor-biz/pom.xml

@ -16,16 +16,19 @@
<version>0.0.1</version>
<dependencies>
<dependency>
<groupId>com.yxt.supervise.monitor</groupId>
<artifactId>yxt-supervise-monitor-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yxt</groupId>
<artifactId>yxt-common-base</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<!--mysql-->
<dependency>
<groupId>mysql</groupId>

5
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/YxtSuperviseMonitorApplication.java

@ -3,7 +3,8 @@ package com.yxt.supervise.monitor;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
@ -14,6 +15,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
"com.yxt.supervise.monitor",
"demo.rocketmq"
})
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yxt.supervise.*"})
// 启用自带定时任务
@EnableScheduling
public class YxtSuperviseMonitorApplication {

21
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demobaseentity/DemoBaseentity.java

@ -0,0 +1,21 @@
package com.yxt.supervise.monitor.api.demobaseentity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "有公共字段的实体", description = "有公共字段的实体")
@TableName("demo_baseentity")
public class DemoBaseentity extends BaseEntity {
// 公共字段从父类继承
@ApiModelProperty("名称")
private String name; // 名称
@ApiModelProperty("密码")
private String passwd; // 密码
}

16
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demobaseentity/DemoBaseentityDto.java

@ -0,0 +1,16 @@
package com.yxt.supervise.monitor.api.demobaseentity;
import com.yxt.common.core.dto.Dto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DemoBaseentityDto implements Dto {
private String id;
private String sid;
@ApiModelProperty("名称")
private String name; // 名称
@ApiModelProperty("密码")
private String passwd; // 密码
}

14
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demobaseentity/DemoBaseentityQuery.java

@ -0,0 +1,14 @@
package com.yxt.supervise.monitor.api.demobaseentity;
import com.yxt.common.core.query.Query;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DemoBaseentityQuery implements Query {
@ApiModelProperty("名称")
private String name; // 名称
}

13
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demobaseentity/DemoBaseentityVo.java

@ -0,0 +1,13 @@
package com.yxt.supervise.monitor.api.demobaseentity;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class DemoBaseentityVo implements Vo {
private String id;
private String sid;
@ApiModelProperty("名称")
private String name; // 名称
}

28
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/demoidentity/DemoIdentity.java

@ -0,0 +1,28 @@
package com.yxt.supervise.monitor.api.demoidentity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("demo_identity")
public class DemoIdentity extends EntityWithId {
// `id`使用继承的
@ApiModelProperty("记录创建时间")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
)
private Date createTime = new Date(); // 记录创建时间
@ApiModelProperty("备注说明")
private String remarks; // 备注说明
@ApiModelProperty("名称")
private String name; // 名称
}

67
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/CallPolice.java

@ -0,0 +1,67 @@
package com.yxt.supervise.monitor.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("y_call_police")
public class CallPolice extends EntityWithId {
// `id`使用继承的
@ApiModelProperty("记录创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime = new Date(); // 记录创建时间
@ApiModelProperty("备注说明")
private String remarks; // 备注说明
@ApiModelProperty("信息状态")
private String state;
@ApiModelProperty("是否删除")
private String isDelete;
@ApiModelProperty("修改时间")
private String modifyTime;
@ApiModelProperty("是否可用")
private String isEnable;
@ApiModelProperty("创建人")
private String createBySid;
@ApiModelProperty("更新人")
private String updateBySid;
@ApiModelProperty("设备ID")
private String deviceId;
@ApiModelProperty("信息ID")
private String msgId;
@ApiModelProperty("信息类型")
private String msgType;
@ApiModelProperty("信息内容")
private String content;
@TableField(exist = false)
@ApiModelProperty("设备名称")
private String name;
@TableField(exist = false)
@ApiModelProperty("设备位置")
private String position;
@TableField(exist = false)
@ApiModelProperty("报警类型")
private String callType;
}

99
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java

@ -0,0 +1,99 @@
package com.yxt.supervise.monitor.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("y_device")
public class Device extends EntityWithId {
// `id`使用继承的
@ApiModelProperty("记录创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime = new Date(); // 记录创建时间
@ApiModelProperty("备注说明")
private String remarks; // 备注说明
@ApiModelProperty("名称")
private String name; // 名称
@ApiModelProperty("设备类型(1摄像头 2电子围栏 3门禁 4报警主机 5nvr)")
private String type;
@ApiModelProperty("状态0:离线,1:在线,-1:设备未上报。")
private String status;
@ApiModelProperty("信息状态")
private String state;
@ApiModelProperty("是否删除")
private String isDelete;
@ApiModelProperty("修改时间")
private String modifyTime;
@ApiModelProperty("是否可用")
private String isEnable;
@ApiModelProperty("创建人")
private String createBySid;
@ApiModelProperty("更新人")
private String updateBySid;
@ApiModelProperty("验证码")
private String vCode;
@ApiModelProperty("位置")
private String position;
@ApiModelProperty("序列号")
private String serialNumber;
@ApiModelProperty("左偏移")
private String leftPosition;
@ApiModelProperty("上偏移")
private String topPosition;
@ApiModelProperty("组号")
private String channelNo;
@ApiModelProperty("nvr序列号")
private String nvrSerial;
@ApiModelProperty("nvr验证码")
private String nvrCode;
@ApiModelProperty("nvrID")
private Integer nvrId;
@ApiModelProperty("仓库ID")
private String ckId;
@ApiModelProperty("子系统ID 电子围栏")
private Integer sysId;
@ApiModelProperty("报警主机ID")
private Integer bjzjId;
@ApiModelProperty("维修状态")
private String maintenance;
@TableField(exist = false)
@ApiModelProperty("维修状态")
private String maintenanceCount;
@TableField(exist = false)
@ApiModelProperty("统计数量")
private String total;
}

96
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java

@ -0,0 +1,96 @@
package com.yxt.supervise.monitor.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("y_device_image")
public class DeviceImage extends EntityWithId {
// `id`使用继承的
@ApiModelProperty("记录创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime = new Date(); // 记录创建时间
@ApiModelProperty("备注说明")
private String remarks; // 备注说明
@ApiModelProperty("名称")
private String name; // 名称
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("信息状态")
private String state;
@ApiModelProperty("是否删除")
private String isDelete;
@ApiModelProperty("修改时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
@ApiModelProperty("是否可用")
private String isEnable;
@ApiModelProperty("创建人")
private String createBySid;
@ApiModelProperty("更新人")
private String updateBySid;
@ApiModelProperty("验证码")
private String vCode;
@ApiModelProperty("位置")
private String position;
@ApiModelProperty("序列号")
private String deviceSerial;
@ApiModelProperty("拍照前")
private String imgBefore;
@ApiModelProperty("拍照后")
private String imgAfter;
@ApiModelProperty("组号(第几个摄像头)")
private String channelNo;
@ApiModelProperty("是否展示(只展示最新数据)")
private String isShow;
@ApiModelProperty("相似度")
private String similarity;
@ApiModelProperty("仓库ID")
private String ckId;
@ApiModelProperty("仓库名称")
@TableField(exist = false)
private String wareHouseName;
@ApiModelProperty("仓库地址")
@TableField(exist = false)
private String wareHouseAddress;
@ApiModelProperty("仓库联系人")
@TableField(exist = false)
private String linkerName;
@ApiModelProperty("仓库联系人电话")
@TableField(exist = false)
private String linkerPhone;
}

54
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceLog.java

@ -0,0 +1,54 @@
package com.yxt.supervise.monitor.api.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("y_device_log")
public class DeviceLog extends EntityWithId {
// `id`使用继承的
@ApiModelProperty("记录创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime = new Date(); // 记录创建时间
@ApiModelProperty("备注说明")
private String remarks; // 备注说明
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("信息状态")
private String state;
@ApiModelProperty("是否删除")
private String isDelete;
@ApiModelProperty("修改时间")
private String modifyTime;
@ApiModelProperty("是否可用")
private String isEnable;
@ApiModelProperty("创建人")
private String createBySid;
@ApiModelProperty("更新人")
private String updateBySid;
@ApiModelProperty("设备ID")
private String deviceId;
@ApiModelProperty("日志内容")
private String content;
@ApiModelProperty("消息ID")
private String msgId;
}

67
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/MessageInfo.java

@ -0,0 +1,67 @@
package com.yxt.supervise.monitor.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("y_message_info")
public class MessageInfo extends EntityWithId {
// `id`使用继承的
@ApiModelProperty("记录创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime = new Date(); // 记录创建时间
@ApiModelProperty("备注说明")
private String remarks; // 备注说明
@ApiModelProperty("信息状态")
private String state;
@ApiModelProperty("是否删除")
private String isDelete;
@ApiModelProperty("修改时间")
private String modifyTime;
@ApiModelProperty("是否可用")
private String isEnable;
@ApiModelProperty("创建人")
private String createBySid;
@ApiModelProperty("更新人")
private String updateBySid;
@ApiModelProperty("设备ID")
private String deviceId;
@ApiModelProperty("信息ID")
private String msgId;
@ApiModelProperty("信息类型")
private String msgType;
@ApiModelProperty("信息内容")
private String content;
@TableField(exist = false)
@ApiModelProperty("消息类型")
private String callType;
@TableField(exist = false)
@ApiModelProperty("设备名称")
private String name;
@TableField(exist = false)
@ApiModelProperty("设备位置")
private String position;
}

71
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/PushPoliceInfo.java

@ -0,0 +1,71 @@
package com.yxt.supervise.monitor.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("y_push_police_info")
public class PushPoliceInfo extends EntityWithId {
// `id`使用继承的
@ApiModelProperty("记录创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime = new Date(); // 记录创建时间
@ApiModelProperty("备注说明")
private String remarks; // 备注说明
@ApiModelProperty("信息状态")
private String state;
@ApiModelProperty("是否成功 (0成功 1失败)")
private String isSuccess;
@ApiModelProperty("是否删除")
private String isDelete;
@ApiModelProperty("修改时间")
private String modifyTime;
@ApiModelProperty("创建人")
private String createBySid;
@ApiModelProperty("更新人")
private String updateBySid;
@ApiModelProperty("设备ID")
private String deviceId;
@ApiModelProperty("信息类型")
private String msgType;
@ApiModelProperty("推送参数")
private String input;
@ApiModelProperty("返回参数")
private String output;
@ApiModelProperty("仓库ID")
private String ckId;
@ApiModelProperty("发送时间")
private String sendTime;
@ApiModelProperty("0设备状态报警1图片对比报警")
private Integer imageOrPolice;
@TableField(exist = false)
@ApiModelProperty("设备名称")
private String name;
@TableField(exist = false)
@ApiModelProperty("设备位置")
private String position;
}

94
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java

@ -0,0 +1,94 @@
package com.yxt.supervise.monitor.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("y_warehouse")
public class WareHouse {
@ApiModelProperty("ID,唯一编号")
private String sid;
private String custerSid; // 名称
private String custerName; // 河北欣汇星网络科技有限公司
@ApiModelProperty("仓库名称")
private String name;
private String simpleName; // 中通
private String code; // xhx01
@ApiModelProperty("省号")
private String provinceCode;
@ApiModelProperty("省名称")
private String provinceName;
@ApiModelProperty("市号")
private String cityCode;
@ApiModelProperty("市名称")
private String cityName;
@ApiModelProperty("区县号")
private String countyCode;
@ApiModelProperty("区县名称")
private String countyName;
@ApiModelProperty("地址拼接")
private String regionName;
@ApiModelProperty("地址")
private String address;
private String acreage; // 1350
private String storeyHeight; // 10m
private String monthlyPrice; // 27000
private String attributeCodes;
private String attributeNames; // 自营
private String housingResource; // 无
@ApiModelProperty("联系人名称")
private String linkerName;
@ApiModelProperty("联系人电话")
private String linkerPhone;
@ApiModelProperty("仓库图片")
private String picUrl;
@ApiModelProperty("经度")
private String lon;
@ApiModelProperty("纬度")
private String lat;
private String shSid;
private String projectSid;
@ApiModelProperty("是否隐藏")
private boolean showStatus;
@ApiModelProperty("仓库统计")
@TableField(exist = false)
private String wareHouseCount;
}

50
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/YInfo.java

@ -0,0 +1,50 @@
package com.yxt.supervise.monitor.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("y_info")
public class YInfo extends EntityWithId {
// `id`使用继承的
@ApiModelProperty("记录创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime = new Date(); // 记录创建时间
@ApiModelProperty("备注说明")
private String remarks; // 备注说明
@ApiModelProperty("信息状态")
private String state;
@ApiModelProperty("是否删除")
private String isDelete;
@ApiModelProperty("修改时间")
private String modifyTime;
@ApiModelProperty("是否可用")
private String isEnable;
@ApiModelProperty("创建人")
private String createBySid;
@ApiModelProperty("更新人")
private String updateBySid;
@ApiModelProperty("信息内容")
private String content;
@ApiModelProperty("消息标题")
private String title;
}

68
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/entity/YTask.java

@ -0,0 +1,68 @@
package com.yxt.supervise.monitor.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "有ID的实体", description = "有ID的实体")
@TableName("y_task")
public class YTask extends EntityWithId {
// `id`使用继承的
@ApiModelProperty("记录创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime = new Date(); // 记录创建时间
@ApiModelProperty("备注说明")
private String remarks; // 备注说明
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("信息状态")
private String state;
@ApiModelProperty("是否删除")
private String isDelete;
@ApiModelProperty("修改时间")
private String modifyTime;
@ApiModelProperty("是否可用")
private String isEnable;
@ApiModelProperty("创建人")
private String createBySid;
@ApiModelProperty("更新人")
private String updateBySid;
@ApiModelProperty("秒")
private String second;
@ApiModelProperty("分")
private String divide;
@ApiModelProperty("时")
private String hour;
@ApiModelProperty("天")
private String day;
@ApiModelProperty("月")
private String month;
@ApiModelProperty("年")
private String year;
@TableField(exist = false)
@ApiModelProperty("多少秒")
private String seconds;
}

4
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/package-info.java

@ -0,0 +1,4 @@
/**
* 宇信通监管项目-环境监控库房监控项目后台逻辑和接口-接口声明
*/
package com.yxt.supervise.monitor.api;

28
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/DeviceVo.java

@ -0,0 +1,28 @@
package com.yxt.supervise.monitor.api.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Exrickx
*/
@Data
public class DeviceVo {
private String name;
private String serialNumber;
private String status;
private String similarity;
private String startImage;
private String endImage;
private String startTime;
private String endTime;
}

26
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/MessageVo.java

@ -0,0 +1,26 @@
package com.yxt.supervise.monitor.api.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @author Exrickx
*/
@Data
public class MessageVo {
@ApiModelProperty(value = "消息ID,每条消息的唯一ID,消费者可根据此ID进行去重处理")
private String msgId;
@ApiModelProperty(value = "消息类型")
private String msgType;
@ApiModelProperty(value = "消息内容")
private String content;
@ApiModelProperty(value = "消息发送到消息通道时的时间戳")
private String timestamp;
}

27
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/PageVo.java

@ -0,0 +1,27 @@
package com.yxt.supervise.monitor.api.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @author Exrickx
*/
@Data
public class PageVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "页号")
private int current;
@ApiModelProperty(value = "页面大小")
private int size;
@ApiModelProperty(value = "排序字段")
private String sort;
@ApiModelProperty(value = "排序方式 asc/desc")
private String order;
}

25
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/PushPoliceAllVo.java

@ -0,0 +1,25 @@
package com.yxt.supervise.monitor.api.vo;
import com.yxt.supervise.monitor.api.entity.Device;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @author Exrickx
*/
@Data
public class PushPoliceAllVo {
private String sid;
private String name;
private List<DeviceVo> devices;
private Integer errorCount;
private String sendTime;
}

23
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/PushPoliceImageAllVo.java

@ -0,0 +1,23 @@
package com.yxt.supervise.monitor.api.vo;
import com.yxt.supervise.monitor.api.entity.Device;
import com.yxt.supervise.monitor.api.entity.DeviceImage;
import lombok.Data;
import java.util.List;
/**
* @author Exrickx
*/
@Data
public class PushPoliceImageAllVo {
private String sid;
private String name;
private List<DeviceVo> deviceImages;
private String sendTime;
}

42
yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/api/vo/PushPoliceVo.java

@ -0,0 +1,42 @@
package com.yxt.supervise.monitor.api.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Exrickx
*/
@Data
public class PushPoliceVo {
private String id;
private String sid;
private String remarks;
private String reportTarget;
private String code;
private String name;
private String content;
private String levelSid;
private String levelCode;
private String levelName;
private String typeSid;
private String typeCode;
private String typeName;
private String bigTypeName;
private String list;
}

21
yxt-supervise-monitor-biz/src/main/resources/application-devv.yml

@ -3,16 +3,18 @@ spring:
hikari:
max-lifetime: 500000
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/yxt_supervise_monitor?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
username: root
password: root
url: jdbc:mysql://39.104.100.138:3306/yxt_supervise_monitor_test?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
username: monitor
password: monitor
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
namespace: supervise
server-addr: 39.104.100.138:8848
register-enabled: false
redis:
database: 3 # Redis数据库索引(默认为0)
host: 127.0.0.1
host: 39.104.100.138
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
@ -24,8 +26,13 @@ spring:
timeout: 0 # 连接超时时间(毫秒)
image:
xlsxtmpl: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/
# xlsxtmpl: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/
upload:
path: D:\supervise\upload\
path: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/
# path: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/
url:
prefix: http://127.0.0.1:8112/upload/
prefix: http://127.0.0.1:7003/upload/
login:
path: D:/images/pic-click

7
yxt-supervise-monitor-biz/src/main/resources/application-pro.yml

@ -20,11 +20,12 @@ spring:
password: 123456
port: 6379
timeout: 0 # 连接超时时间(毫秒)
image:
upload:
path: D:/supervise/upload/
path: D:/webapps/supervise/static/upload/
url:
prefix: http://127.0.0.1/api/upload/
prefix: https://supervise.yxtsoft.com/downfile/
scheduleTime:
cron: 0/30 * * * * ?
@ -38,8 +39,6 @@ policeMessage:
haiKangConsumer:
clientId: 67642adbaa8a469d9c40437ede719ee5
clientSecret: a997f867b6ee442b8bb717da58c8981d
# clientId: 836fdd3ae6af4be385801c86d127e5ca
# clientSecret: 193e139a1e6f43e28aa0851219b34a25
websocket:
port: 19800
boss:

27
yxt-supervise-monitor-biz/src/main/resources/application-test.yml

@ -1,16 +1,20 @@
server:
port: 17103
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://39.104.100.138:3306/yxt_supervise_monitor?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://172.18.0.4:3306/yxt_supervise_monitor_test?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: monitor
password: monitor
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
namespace: supervise
server-addr: 172.18.0.5:8848
redis:
database: 3 # Redis数据库索引(默认为0)
host: 127.0.0.1
host: 172.18.0.7
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
@ -21,22 +25,21 @@ spring:
port: 6379
timeout: 0 # 连接超时时间(毫秒)
image:
upload:
path: D:/webapps/supervise/static/upload/
path: /home/lzh/docker_data/nginx/html/supervise/supervise-portal-ui/upload/
url:
prefix: http://122.14.222.186:7003/upload/
prefix: http://jg.yyundong.com/upload/
scheduleTime:
cron: 0/1 * * * * ?
folder: D:\resources\download
# folder: /root/huirong/monitor-java/imagesDownload
cron: 0/30 * * * * ?
folder: /home/lzh/docker_data/nginx/html/supervise/supervise-portal-ui/upload_monitor
policeMessage:
sxtUrl: http://192.168.1.193:8112/rms/v1/riskAlarm/saveRisk
imageUrl: http://192.168.1.193:8112/rms/v1/riskAlarm/contrast
getCodeUrl: http://192.168.1.193:8112/rms/v1/riskIndicators/listAll
sxtUrl: http://172.18.0.1:8112/rms/v1/riskAlarm/saveRisk
imageUrl: http://172.18.0.1:8112/rms/v1/riskAlarm/contrast
getCodeUrl: http://172.18.0.1:8112/rms/v1/riskIndicators/listAll
haiKangConsumer:
clientId: 67642adbaa8a469d9c40437ede719ee5
clientSecret: a997f867b6ee442b8bb717da58c8981d

2
yxt-supervise-monitor-biz/src/main/resources/application.yml

@ -1,6 +1,6 @@
spring:
application:
name: yxt-supervise-monitor
name: supervise-monitor
profiles:
# active: devv
# active: test

Loading…
Cancel
Save