query=new QueryWrapper<>();
- if(!sendUdpLog.getMessageId().isEmpty()){
- query.eq("message_id", sendUdpLog.getMessageId());
- }
- if(sendUdpLog.getStartDate()!=null){
- query.ge("request_time", sendUdpLog.getStartDate());
- }
- if(sendUdpLog.getEndDate()!=null){
- query.lt("request_time", sendUdpLog.getEndDate());
- }
- sendUdpLogs = sendUdpLogService.list(query);
- }else{
- sendUdpLogs = sendUdpLogService.listByIds(list);
- }
- EasyExcelUtil.writeExcel(res,sendUdpLogs,SendUdpLogXslx.class,"UDP日志");
- }
-
-}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/BallheadPT.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/BallheadPT.java
deleted file mode 100644
index 73d3d85..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/BallheadPT.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xr.device_car.modules.analysis.entity;
-
-import lombok.Data;
-
-@Data
-public class BallheadPT {
- private String id;
-
- private String name;
-
- private String x;
-
- private String y;
-
- private String z;
-
-}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DeviceCamera.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DeviceCamera.java
index 32577bc..e42d303 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DeviceCamera.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DeviceCamera.java
@@ -37,7 +37,7 @@ public class DeviceCamera implements Serializable {
private String deviceNo;
/**
- * 类型(1 usb 2 mipi 3 球机 4 枪机)
+ * 类型(1 usb 2 mipi)
*/
@ExcelProperty(value = "类型")
private String deviceType;
@@ -54,22 +54,6 @@ public class DeviceCamera implements Serializable {
@ExcelProperty(value = "端口")
private String devicePort;
- /**
- * 账号
- */
- private String account;
-
- /**
- * 密码
- */
- private String password;
-
- private String x;
-
- private String y;
-
- private String z;
-
/**
* 摄像头型号
*/
@@ -140,9 +124,4 @@ public class DeviceCamera implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
- /**
- * 算法类型
- */
- @TableField(exist = false)
- private String algorithmType;
}
\ No newline at end of file
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DigestBean.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DigestBean.java
deleted file mode 100644
index 411e30b..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DigestBean.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.xr.device_car.modules.analysis.entity;
-
-import com.xr.device_car.config.common.Const;
-import com.xr.device_car.config.utils.DigestsUtils;
-import lombok.Data;
-import org.springframework.util.StringUtils;
-
-import java.util.regex.Pattern;
-
-@Data
-public class DigestBean {
- /**
- * 用户名
- */
- private String username;
- /**
- * 服务端401返回的 名称
- */
- private String realm;
- /**
- * auth
- */
- private String qop;
- /**
- * 加密方式 一般情况下是MD5
- */
- private String algorithm="MD5";
- /**
- *路径
- */
- private String uri="/onvif/media_service";
- /***
- * 服务端401返回的
- */
- private String nonce;
- /**
- * 16进制请求认证计数器,第一次 00000001
- */
- private String nc="00000001";
- /**
- * 客户端密码随机数
- */
- private String cnonce;
- /**
- * 默认为空
- */
- private String opaque="";
- /**
- * http_da_calc_HA1 获取的
- */
- private String response;
-
-
-
-
- /**
- * 获取DigestBean对象
- * @param onvifBean
- * @param value
- * @return
- */
- public DigestBean getDigestBean(String authType,OnvifBean onvifBean, String value){
- this.setUsername(onvifBean.getUserName());
- // Digest realm="Login to a81d6710d0de6749fcdba591802e3864",qop="auth",nonce="b252aWYtZGlnZXN0OjQzNDIyNTEwNTQw", opaque="", stale="false"
- //正则匹配
- this.setRealm(DigestsUtils.getStr(Pattern.compile("realm=\"(.*?)\""),value));
- this.setQop(DigestsUtils.getStr(Pattern.compile("qop=\"(.*?)\""),value));
- this.setNonce(DigestsUtils.getStr(Pattern.compile("nonce=\"(.*?)\""),value));
- this.setCnonce(DigestsUtils.getNonce(32));
- if("None".equalsIgnoreCase(authType)) {
- this.setResponse(getResponseHA1NoAuth(this, onvifBean.getPassWord()));
- }else {
- this.setResponse(getResponseHA1Auth(this, onvifBean.getPassWord()));
- }
- return this;
- }
-
-
- /**
- * 获取Response
- * @param pwd
- * @return
- */
- private static String getResponseHA1Auth(DigestBean digestBean,String pwd){
- return getResponseHA1(digestBean,pwd,"","POST");
- }
-
- /**
- * 获取Response
- * @param pwd
- * @return
- */
- private static String getResponseHA1NoAuth(DigestBean digestBean,String pwd){
- return getResponseHA1(digestBean,pwd,"","GET");
- }
- /**
- * 获取Response
- * @param pwd
- * @return
- */
- private static String getResponseHA1(DigestBean digestBean,String pwd,String uri,String method){
- return DigestsUtils.http_da_calc_HA1(digestBean.getUsername(), digestBean.getRealm(), pwd,
- digestBean.getNonce(), String.valueOf(digestBean.getNc()), digestBean.getCnonce(), digestBean.getQop(),
- method, StringUtils.hasLength(uri)?uri:digestBean.getUri(), "MD5");
- }
-
-
- /**
- * 获取token
- * @return
- */
- public String getToken(){
- return String.format(Const.EQUEST_ONVIF_TOKEN,this.username, this.realm,
- this.qop,this.algorithm,this.uri,this.nonce, String.valueOf(this.nc),
- this.cnonce,this.opaque,this.response);
- }
-
-
-}
-
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java
index 5c8b1a4..fc6b77c 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java
@@ -84,9 +84,9 @@ public class MeterConfig implements Serializable {
private Date firstTime;
/**
- * 算法类型 1usb2mipi 3内部算法
+ * 焦距类型 1定焦2变焦
*/
- private String algorithmType;
+ private String focalLength;
/**
* 执行间隔时间
@@ -123,11 +123,6 @@ public class MeterConfig implements Serializable {
*/
private String remarks;
- /**
- * 初始化状态
- */
- private String initStatus;
-
/**
* 创建人
*/
@@ -181,7 +176,7 @@ public class MeterConfig implements Serializable {
&& (this.getTypeId() == null ? other.getTypeId() == null : this.getTypeId().equals(other.getTypeId()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getFirstTime() == null ? other.getFirstTime() == null : this.getFirstTime().equals(other.getFirstTime()))
- && (this.getAlgorithmType() == null ? other.getAlgorithmType() == null : this.getAlgorithmType().equals(other.getAlgorithmType()))
+ && (this.getFocalLength() == null ? other.getFocalLength() == null : this.getFocalLength().equals(other.getFocalLength()))
&& (this.getIntervalTime() == null ? other.getIntervalTime() == null : this.getIntervalTime().equals(other.getIntervalTime()))
&& (this.getFocalNumber() == null ? other.getFocalNumber() == null : this.getFocalNumber().equals(other.getFocalNumber()))
&& (this.getParameterConfig() == null ? other.getParameterConfig() == null : this.getParameterConfig().equals(other.getParameterConfig()))
@@ -208,7 +203,7 @@ public class MeterConfig implements Serializable {
result = prime * result + ((getTypeId() == null) ? 0 : getTypeId().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getFirstTime() == null) ? 0 : getFirstTime().hashCode());
- result = prime * result + ((getAlgorithmType() == null) ? 0 : getAlgorithmType().hashCode());
+ result = prime * result + ((getFocalLength() == null) ? 0 : getFocalLength().hashCode());
result = prime * result + ((getIntervalTime() == null) ? 0 : getIntervalTime().hashCode());
result = prime * result + ((getFocalNumber() == null) ? 0 : getFocalNumber().hashCode());
result = prime * result + ((getParameterConfig() == null) ? 0 : getParameterConfig().hashCode());
@@ -238,7 +233,7 @@ public class MeterConfig implements Serializable {
sb.append(", typeId=").append(typeId);
sb.append(", status=").append(status);
sb.append(", firstTime=").append(firstTime);
- sb.append(", algorithmType=").append(algorithmType);
+ sb.append(", focalLength=").append(focalLength);
sb.append(", intervalTime=").append(intervalTime);
sb.append(", focalNumber=").append(focalNumber);
sb.append(", parameterConfig=").append(parameterConfig);
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterInitialization.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterInitialization.java
deleted file mode 100644
index 1a2527b..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterInitialization.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.xr.device_car.modules.analysis.entity;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- * 表计算法初始化
- *
- *
- * @author gaoby
- * @since 2023-11-20
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeterInitialization implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 请求图片路径
- */
- private String img;
-
- /**
- * 盘符路径
- */
- private String imgAddress;
-
- /**
- * 常量值
- */
- private String value;
-
- /**
- * 表计id
- */
- private Integer meterId;
-
- private Integer Serial;
-
-
-}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
index 727fd88..a8956b8 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
@@ -34,8 +34,6 @@ public class MeterReadingRecord implements Serializable {
private String readingType;
-
- private String dataType;
/**
* 表计类型id
*/
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/OnvifAuthBean.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/OnvifAuthBean.java
deleted file mode 100644
index d503b0d..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/OnvifAuthBean.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.xr.device_car.modules.analysis.entity;
-
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-public class OnvifAuthBean extends OnvifBean {
-
- /**
- * 自定义参数
- */
- private String auth;
-
- public OnvifAuthBean(String ip, Integer port, String userName, String passWord, String profileToken, String auth) {
- super(ip, port, userName, passWord);
-
- this.auth = auth;
- }
-
- public OnvifAuthBean(String ip, Integer port, String userName, String passWord) {
- super(ip, port, userName, passWord);
-
- }
-
- public void setAuth(String auth){
- this.auth=auth;
- }
-
- public String getAuth(){
- return this.auth;
- }
-
-}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/OnvifBean.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/OnvifBean.java
deleted file mode 100644
index 9e9901c..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/OnvifBean.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.xr.device_car.modules.analysis.entity;
-
-import com.xr.device_car.config.common.Const;
-import lombok.Data;
-
-@Data
-public class OnvifBean {
-
-
- private String ip;
-
- private Integer port;
-
- private String userName;
-
- private String passWord;
-
- private String x;
-
- private String y;
-
- private String z;
-
-
-
- public static String getRequestUrl(OnvifBean requestOnvifBean) {
- return String.format(Const.REQUEST_ONVIF_URL,requestOnvifBean.getIp(),requestOnvifBean.getPort());
- }
-
- public static String getPTZUrl(OnvifBean requestOnvifBean){
- return String.format(Const.ABSOLUTE_MOVE,requestOnvifBean.getIp(),requestOnvifBean.getPort());
- }
-
- public static String getPTZ(OnvifBean requestOnvifBean){
- return String.format(Const.PTZ_MOVE,requestOnvifBean.getIp(),requestOnvifBean.getPort());
- }
-
-
- public OnvifBean(String ip, Integer port) {
- this.ip = ip;
- this.port = port;
- }
-
- public OnvifBean(String ip, Integer port,String userName,String passWord) {
- this.ip = ip;
- this.port = port;
- this.userName=userName;
- this.passWord=passWord;
- }
-
-
-}
-
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/OnvifCredentials.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/OnvifCredentials.java
deleted file mode 100644
index 0c0eb91..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/OnvifCredentials.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.xr.device_car.modules.analysis.entity;
-
-import lombok.Data;
-
-/**
- * onvif 连接信息
- * @author zf
- */
-@Data
-public class OnvifCredentials {
- /**
- * 92.168.xx.yy, or http://host[:port]
- */
- private String host;
- /**
- * admin
- */
- private String user;
- /**
- * secret
- */
- private String password;
- /**
- * "MediaProfile000" If empty, will use first profile.
- */
- private String profile;
-
- public OnvifCredentials(String host, String user, String password, String profile) {
- this.host = host;
- this.user = user;
- this.password = password;
- this.profile = profile;
- }
-
- public String details() {
- return host + "," + user + "," + password + "," + profile;
- }
-}
\ No newline at end of file
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/SendUdpLog.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/SendUdpLog.java
deleted file mode 100644
index 544c5ff..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/SendUdpLog.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.xr.device_car.modules.analysis.entity;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xr.device_car.config.common.LocalDateTimeConverter;
-import lombok.Data;
-
-/**
- * udb消息日志表
- * @TableName send_udb_log
- */
-@TableName(value ="send_udp_log")
-@Data
-public class SendUdpLog implements Serializable {
- /**
- * 主键
- */
- @TableId(type = IdType.AUTO)
- private Integer id;
-
- /**
- * 消息主键
- */
- private String messageId;
-
- /**
- * 发送状态(0成功1失败)
- */
- private String requestStatus;
-
- /**
- * 发送报文
- */
- private String requestMsg;
-
- /**
- * 发送时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date requestTime;
-
- /**
- * 接收报文
- */
- private String resMsg;
-
- /**
- * 返回时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date resTime;
-
- @TableField(exist = false)
- private Date startDate;
-
- @TableField(exist = false)
- private Date endDate;
-
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/xslx/SendUdpLogXslx.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/xslx/SendUdpLogXslx.java
deleted file mode 100644
index 28ccec9..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/xslx/SendUdpLogXslx.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.xr.device_car.modules.analysis.entity.xslx;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xr.device_car.modules.analysis.entity.SendUdpLog;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * udb消息日志表
- * @TableName send_udb_log
- */
-@TableName(value ="send_udp_log")
-@Data
-public class SendUdpLogXslx implements Serializable {
-
- /**
- * 消息主键
- */
- @ExcelProperty(value = "消息主键")
- private String messageId;
-
- /**
- * 发送状态(0成功1失败)
- */
- @ExcelProperty(value="发送状态")
- private String requestStatus;
-
- /**
- * 发送报文
- */
- @ExcelProperty(value="发送报文")
- private String requestMsg;
-
- /**
- * 发送时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelProperty(value="发送时间")
- private String requestTime;
-
- /**
- * 接收报文
- */
- @ExcelProperty(value="接收报文")
- private String resMsg;
-
- /**
- * 返回时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelProperty(value="返回时间")
- private String resTime;
-
- public String getRequestStatus(){
- if(this.requestStatus.equals("0")){
- return "成功";
- }
- return "失败";
- }
-}
\ No newline at end of file
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterInitializationMapper.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterInitializationMapper.java
deleted file mode 100644
index 7773536..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterInitializationMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.xr.device_car.modules.analysis.mapper;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.xr.device_car.modules.analysis.entity.MeterInitialization;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- *
- * 表计算法初始化 Mapper 接口
- *
- *
- * @author gaoby
- * @since 2023-11-20
- */
-@DS("db2")
-@Mapper
-public interface MeterInitializationMapper extends BaseMapper {
-
-}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/SendUdpLogMapper.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/SendUdpLogMapper.java
deleted file mode 100644
index 1e439eb..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/SendUdpLogMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.xr.device_car.modules.analysis.mapper;
-
-import com.xr.device_car.modules.analysis.entity.SendUdpLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @author 范亚杰
-* @description 针对表【send_udb_log(udb消息日志表)】的数据库操作Mapper
-* @createDate 2023-11-29 13:41:51
-* @Entity com.xr.device_car.modules.analysis.entity.SendUdbLog
-*/
-@Mapper
-public interface SendUdpLogMapper extends BaseMapper {
-
-}
-
-
-
-
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/IMeterInitializationService.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/IMeterInitializationService.java
deleted file mode 100644
index 2ee53aa..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/IMeterInitializationService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.xr.device_car.modules.analysis.service;
-
-import com.xr.device_car.modules.analysis.entity.MeterInitialization;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- *
- * 表计算法初始化 服务类
- *
- *
- * @author gaoby
- * @since 2023-11-20
- */
-public interface IMeterInitializationService extends IService {
-
-}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/SendUdpLogService.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/SendUdpLogService.java
deleted file mode 100644
index 16e67c4..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/SendUdpLogService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.xr.device_car.modules.analysis.service;
-
-import com.xr.device_car.modules.analysis.entity.SendUdpLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
-* @author 范亚杰
-* @description 针对表【send_udb_log(udb消息日志表)】的数据库操作Service
-* @createDate 2023-11-29 13:41:51
-*/
-public interface SendUdpLogService extends IService {
-
-}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/UdpClientService.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/UdpClientService.java
deleted file mode 100644
index 2019a7b..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/UdpClientService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.xr.device_car.modules.analysis.service;
-
-public interface UdpClientService {
-
- void sendData(String data);
-
-}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterInitializationServiceImpl.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterInitializationServiceImpl.java
deleted file mode 100644
index 5600d05..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterInitializationServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.xr.device_car.modules.analysis.service.impl;
-
-import com.xr.device_car.modules.analysis.entity.MeterInitialization;
-import com.xr.device_car.modules.analysis.mapper.MeterInitializationMapper;
-import com.xr.device_car.modules.analysis.service.IMeterInitializationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 表计算法初始化 服务实现类
- *
- *
- * @author gaoby
- * @since 2023-11-20
- */
-@Service
-public class MeterInitializationServiceImpl extends ServiceImpl implements IMeterInitializationService {
-
-}
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/SendUdpLogServiceImpl.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/SendUdpLogServiceImpl.java
deleted file mode 100644
index cfd072e..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/SendUdpLogServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.xr.device_car.modules.analysis.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xr.device_car.modules.analysis.entity.SendUdpLog;
-import com.xr.device_car.modules.analysis.service.SendUdpLogService;
-import com.xr.device_car.modules.analysis.mapper.SendUdpLogMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author 范亚杰
-* @description 针对表【send_udb_log(udb消息日志表)】的数据库操作Service实现
-* @createDate 2023-11-29 13:41:51
-*/
-@Service
-@DS("db2")
-public class SendUdpLogServiceImpl extends ServiceImpl
- implements SendUdpLogService {
-
-}
-
-
-
-
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/UdpClientServiceImpl.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/UdpClientServiceImpl.java
deleted file mode 100644
index 3a99836..0000000
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/UdpClientServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.xr.device_car.modules.analysis.service.impl;
-
-import com.xr.device_car.modules.analysis.entity.SendUdpLog;
-import com.xr.device_car.modules.analysis.service.SendUdpLogService;
-import com.xr.device_car.modules.analysis.service.UdpClientService;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.socket.DatagramChannel;
-import io.netty.channel.socket.DatagramPacket;
-import io.netty.util.CharsetUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.net.InetSocketAddress;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Service
-public class UdpClientServiceImpl implements UdpClientService {
-
- @Autowired
- private DatagramChannel udpChannel;
-
- @Autowired
- private InetSocketAddress udpServerAddress;
-
- @Autowired
- private SendUdpLogService sendUdpLogService;
-
-
- @Override
- public void sendData(String data) {
- SendUdpLog sendUdpLog =new SendUdpLog();
- sendUdpLog.setRequestMsg(data);
- sendUdpLog.setRequestTime(new Date());
- sendUdpLog.setMessageId(data.split("\t")[0]);
- try {
- udpChannel.writeAndFlush(new DatagramPacket(
- Unpooled.copiedBuffer(data, CharsetUtil.UTF_8), udpServerAddress)).sync();
- sendUdpLog.setRequestStatus("0");
- } catch (Exception e) {
- sendUdpLog.setRequestStatus("1");
- sendUdpLog.setResMsg(e.getMessage());
- sendUdpLog.setResTime(new Date());
- e.printStackTrace();
- }
- sendUdpLogService.save(sendUdpLog);
- }
-}
diff --git a/device_cars/src/main/resources/application-dev.yml b/device_cars/src/main/resources/application-dev.yml
index 6788324..132618f 100644
--- a/device_cars/src/main/resources/application-dev.yml
+++ b/device_cars/src/main/resources/application-dev.yml
@@ -19,7 +19,7 @@ spring:
db2:
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.zaxxer.hikari.HikariDataSource
- url: jdbc:mysql://116.196.120.81:3306/image_analysis_zs?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+ url: jdbc:mysql://116.196.120.81:3306/image_analysis_jc?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
username: root
password: 5ea47c0bdd7146ebbd53020eca@672307
#Hikari连接池配置
@@ -63,12 +63,9 @@ analysis:
url: http://192.168.1.123:9000/vi/syncrec
upLoad:
- path: D:\\images\\images\\
+ path: D:\\device_car\\analysis\\upload\\
url: http://localhost:85/upload/
- file: D:\\images\\images\\
-python:
- path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
- modelPath: D:\\smartGrid\\smartGrid\\models
+
netty:
address: 192.168.3.20
port: 2404
@@ -83,12 +80,4 @@ eureka:
healthcheck:
enabled: true
service-url:
- defaultZone: http://localhost:8084/eureka
-minio:
- url: http://192.168.1.210:9000
- accessKey: minioadmin
- secretKey: minioadmin
-udp:
- server:
- host: localhost
- port: 9300
\ No newline at end of file
+ defaultZone: http://localhost:8084/eureka
\ No newline at end of file
diff --git a/device_cars/src/main/resources/application-prod.yml b/device_cars/src/main/resources/application-prod.yml
index c805c60..ccdc40d 100644
--- a/device_cars/src/main/resources/application-prod.yml
+++ b/device_cars/src/main/resources/application-prod.yml
@@ -19,7 +19,7 @@ spring:
db2:
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.zaxxer.hikari.HikariDataSource
- url: jdbc:mysql://192.168.1.252:3306/image_analysis_zs?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+ url: jdbc:mysql://192.168.1.252:3306/image_analysis_jc?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
username: root
password: 123456
#Hikari连接池配置
@@ -65,22 +65,12 @@ analysis:
upLoad:
path: /home/project/upload
url: http://192.168.1.252:85/upload/
-python:
- path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
- modelPath: D:\\smartGrid\\smartGrid\\models
+
netty:
address: 192.168.1.252
port: 2405
data:
pathUrl: http://192.168.1.252:8081/api/dataAnalysisCamera/getComer
-udp:
- server:
- host: localhost
- port: 9300
-minio:
- url: http://192.168.1.210:9000
- accessKey: minioadmin
- secretKey: minioadmin
eureka:
instance:
instance-id: ${spring.cloud.client.ip-address}:${server.port}
diff --git a/device_cars/src/main/resources/application-test.yml b/device_cars/src/main/resources/application-test.yml
index 95a1939..443b502 100644
--- a/device_cars/src/main/resources/application-test.yml
+++ b/device_cars/src/main/resources/application-test.yml
@@ -19,7 +19,7 @@ spring:
db2:
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.zaxxer.hikari.HikariDataSource
- url: jdbc:mysql://localhost:3306/image_analysis_zs?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+ url: jdbc:mysql://localhost:3306/image_analysis_jc?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
username: root
password: 123456
#Hikari连接池配置
@@ -65,20 +65,10 @@ analysis:
upLoad:
path: D:\\device_car\\analysis\\upload\\
url: http://localhost:85/upload/
-python:
- path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
- modelPath: D:\\smartGrid\\smartGrid\\models
+
netty:
address: 192.168.3.20
port: 2404
-minio:
- url: http://192.168.1.210:9000
- accessKey: minioadmin
- secretKey: minioadmin
-udp:
- server:
- host: localhost
- port: 9300
data:
pathUrl: http://192.168.1.82:8081/api/dataAnalysisCamera/getComer
#pathUrl: http://192.168.1.44:8081/api/dataAnalysisCamera/getComer
diff --git a/device_cars/src/main/resources/application.yml b/device_cars/src/main/resources/application.yml
index 8d7945b..1bfd782 100644
--- a/device_cars/src/main/resources/application.yml
+++ b/device_cars/src/main/resources/application.yml
@@ -2,7 +2,7 @@ spring:
profiles:
#active: dev #开发环境
# active: test #测试环境5
- active: dev #生产环境
+ active: prod #生产环境
# active: prod #生产环境
application:
name: deviceCars
@@ -79,4 +79,3 @@ hystrix:
# 熔断器超时时间，默认：1000/毫秒
timeoutInMilliseconds: 20000
-
diff --git a/device_cars/src/main/resources/digest/AbsoluteMove.wsdl b/device_cars/src/main/resources/digest/AbsoluteMove.wsdl
deleted file mode 100644
index 7bb64b3..0000000
--- a/device_cars/src/main/resources/digest/AbsoluteMove.wsdl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- %s
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/device_cars/src/main/resources/digest/GetDeviceInformation.wsdl b/device_cars/src/main/resources/digest/GetDeviceInformation.wsdl
deleted file mode 100644
index 9b65996..0000000
--- a/device_cars/src/main/resources/digest/GetDeviceInformation.wsdl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/device_cars/src/main/resources/digest/GetPTZ.wsdl b/device_cars/src/main/resources/digest/GetPTZ.wsdl
deleted file mode 100644
index 5de3704..0000000
--- a/device_cars/src/main/resources/digest/GetPTZ.wsdl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/device_cars/src/main/resources/digest/GetPresets.wsdl b/device_cars/src/main/resources/digest/GetPresets.wsdl
deleted file mode 100644
index de30d8c..0000000
--- a/device_cars/src/main/resources/digest/GetPresets.wsdl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- %s
-
-
-
\ No newline at end of file
diff --git a/device_cars/src/main/resources/digest/GetProfiles.wsdl b/device_cars/src/main/resources/digest/GetProfiles.wsdl
deleted file mode 100644
index 92dc2cd..0000000
--- a/device_cars/src/main/resources/digest/GetProfiles.wsdl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/device_cars/src/main/resources/digest/GetSnapshotUrl.wsdl b/device_cars/src/main/resources/digest/GetSnapshotUrl.wsdl
deleted file mode 100644
index 3b6f76a..0000000
--- a/device_cars/src/main/resources/digest/GetSnapshotUrl.wsdl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- %s
-
-
-
\ No newline at end of file
diff --git a/device_cars/src/main/resources/digest/GetStatus.wsdl b/device_cars/src/main/resources/digest/GetStatus.wsdl
deleted file mode 100644
index 15f1e73..0000000
--- a/device_cars/src/main/resources/digest/GetStatus.wsdl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- %s
-
-
-
\ No newline at end of file
diff --git a/device_cars/src/main/resources/digest/GetStreamUri.wsdl b/device_cars/src/main/resources/digest/GetStreamUri.wsdl
deleted file mode 100644
index b8fae91..0000000
--- a/device_cars/src/main/resources/digest/GetStreamUri.wsdl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- %s
- %s
- %s
- %s
-
-
-
-
-
-
-
- RTP-Unicast
-
- %s
-
-
- %s
-
-
-
\ No newline at end of file
diff --git a/device_cars/src/main/resources/digest/GotoPreset.wsdl b/device_cars/src/main/resources/digest/GotoPreset.wsdl
deleted file mode 100644
index 330014e..0000000
--- a/device_cars/src/main/resources/digest/GotoPreset.wsdl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- %s
- %s
-
-
-
\ No newline at end of file
diff --git a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml
index 8dc1a49..678e454 100644
--- a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml
+++ b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml
@@ -17,13 +17,12 @@
-
+
-
@@ -39,14 +38,14 @@
a.identification_interval,a.device_name,a.device_type,
a.meter_code,a.meter_name,a.camera_id,
a.type_id,a.status,a.first_time,
- a.algorithm_type,a.interval_time,a.focal_number,
- a.parameter_config,a.remarks,a.init_status,a.create_user,
+ a.focal_length,a.interval_time,a.focal_number,
+ a.parameter_config,a.remarks,a.create_user,
a.create_time,a.update_user,a.update_time,
-