diff --git a/pom.xml b/pom.xml
index d12b650..bfc114d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,9 @@
1.5.21
1.5.21
1.2.79
+ 1.2.8
+ 2.2.0
+ 1.4.0
@@ -39,6 +42,27 @@
import
+
+
+ com.alibaba
+ druid-spring-boot-starter
+ ${druid.version}
+
+
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ ${mybatis-spring-boot.version}
+
+
+
+
+ com.github.pagehelper
+ pagehelper-spring-boot-starter
+ ${pagehelper.boot.version}
+
+
io.springfox
@@ -100,7 +124,11 @@
xymanager_service
${xymanager.version}
-
+
+ com.shxy
+ xymanager_dao
+ ${xymanager.version}
+
@@ -122,6 +150,12 @@
1.8
+
+
+ org.mybatis.generator
+ mybatis-generator-maven-plugin
+ 1.3.5
+
diff --git a/xymanager_admin/pom.xml b/xymanager_admin/pom.xml
index 1e89c68..d95a9c1 100644
--- a/xymanager_admin/pom.xml
+++ b/xymanager_admin/pom.xml
@@ -16,6 +16,27 @@
1.8
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ org.springframework.boot
+ spring-boot-starter-logging
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ test
+ 2.5.6
+
com.shxy
xymanager_framework
diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java
index 1239fc6..0010db4 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java
@@ -1,14 +1,16 @@
package com.shxy.xymanager_admin;
import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.Environment;
-import springfox.documentation.oas.annotations.EnableOpenApi;
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@MapperScan("com.shxy.**.dao")
@Slf4j
@EnableConfigurationProperties
public class XymanagerAdminApplication {
diff --git a/xymanager_admin/src/main/resources/application-test.yml b/xymanager_admin/src/main/resources/application-test.yml
index 47d8dfb..e41e989 100644
--- a/xymanager_admin/src/main/resources/application-test.yml
+++ b/xymanager_admin/src/main/resources/application-test.yml
@@ -1,29 +1,100 @@
# Spring配置
spring:
- # # 资源信息
- # messages:
- # # 国际化资源文件路径
- # basename: i18n/messages
- # # 文件上传
- # servlet:
- # multipart:
- # # 单个文件大小
- # max-file-size: 20MB
- # # 设置总上传的文件大小
- # max-request-size: 20MB
- # # 服务模块
- # devtools:
- # restart:
- # # 热部署开关
- # enabled: true
- mvc:
- view:
- suffix: .html
- # redis 配置
- servlet:
- multipart:
- max-file-size: 10MB #单个数据大小
- max-request-size: 50MB #总数据大小
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.200.63:3306/xymp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: xymp
+ password: xymp@123
+ type: com.alibaba.druid.pool.DruidDataSource
+#spring:
+# # 数据源配置
+# datasource:
+# type: com.alibaba.druid.pool.DruidDataSource
+# driverClassName: com.mysql.cj.jdbc.Driver
+# druid:
+# # 主库数据源
+# master:
+# url: jdbc:mysql://192.168.200.63:3306/xymp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: xymp
+# password: xymp@123
+# # 从库数据源
+# slave:
+# # 从数据源开关/默认关闭
+# enabled: false
+# url:
+# username:
+# password:
+# # 初始连接数
+# initialSize: 5
+# # 最小连接池数量
+# minIdle: 10
+# # 最大连接池数量
+# maxActive: 20
+# # 配置获取连接等待超时的时间
+# maxWait: 60000
+# # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+# timeBetweenEvictionRunsMillis: 60000
+# # 配置一个连接在池中最小生存的时间，单位是毫秒
+# minEvictableIdleTimeMillis: 300000
+# # 配置一个连接在池中最大生存的时间，单位是毫秒
+# maxEvictableIdleTimeMillis: 900000
+# # 配置检测连接是否有效
+# validationQuery: SELECT 1 FROM DUAL
+# testWhileIdle: true
+# testOnBorrow: false
+# testOnReturn: false
+# webStatFilter:
+# enabled: true
+# statViewServlet:
+# enabled: true
+# # 设置白名单，不填则允许所有访问
+# allow:
+# url-pattern: /druid/*
+# # 控制台管理用户名和密码
+# login-username: root
+# login-password: 123456
+# filter:
+# stat:
+# enabled: true
+# # 慢SQL记录
+# log-slow-sql: true
+# slow-sql-millis: 1000
+# merge-sql: true
+# wall:
+# config:
+# multi-statement-allow: true
+# # # 资源信息
+# # messages:
+# # # 国际化资源文件路径
+# # basename: i18n/messages
+# # # 文件上传
+# # servlet:
+# # multipart:
+# # # 单个文件大小
+# # max-file-size: 20MB
+# # # 设置总上传的文件大小
+# # max-request-size: 20MB
+# # # 服务模块
+# # devtools:
+# # restart:
+# # # 热部署开关
+# # enabled: true
+# mvc:
+# view:
+# suffix: .html
+# # redis 配置
+# servlet:
+# multipart:
+# max-file-size: 10MB #单个数据大小
+# max-request-size: 50MB #总数据大小
+# MyBatis配置
+mybatis:
+ # 搜索指定包别名
+ type-aliases-package: com.shxy.**.model
+ # 配置mapper的扫描，找到所有的mapper.xml映射文件
+ mapper-locations: classpath*:mappers/**/*Dao.xml
+ # 加载全局的配置文件
+ configLocation: classpath:mybatis/mybatis-config.xml
# 项目相关配置
xymanager:
# 名称
diff --git a/xymanager_admin/src/main/resources/mybatis/mybatis-config.xml b/xymanager_admin/src/main/resources/mybatis/mybatis-config.xml
new file mode 100644
index 0000000..297b2c7
--- /dev/null
+++ b/xymanager_admin/src/main/resources/mybatis/mybatis-config.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java
index 958ab3c..9e56cc7 100644
--- a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java
+++ b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java
@@ -1,13 +1,43 @@
-//package com.shxy.xymanager_admin;
-//
-//import org.junit.jupiter.api.Test;
-//import org.springframework.boot.test.context.SpringBootTest;
-//
-//@SpringBootTest
-//class XymanagerAdminApplicationTests {
-//
-// @Test
-// void contextLoads() {
-// }
-//
-//}
+package com.shxy.xymanager_admin;
+
+import com.shxy.xymanager_common.entity.TerminalChannels;
+import com.shxy.xymanager_common.entity.Terminals;
+import com.shxy.xymanager_dao.dao.TerminalsDao;
+import jdk.nashorn.internal.ir.Terminal;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.Date;
+
+@SpringBootTest
+class XymanagerAdminApplicationTests {
+
+ @Autowired
+ TerminalsDao terminalsDao;
+ @Test
+ void contextLoads() {
+
+ Terminals terminals = new Terminals();
+ terminals.setBsIdentifier("dfsad");
+ terminals.setBsManufacturer("dfsad");
+ terminals.setBsProductionDate(new Date());
+ terminals.setCmdid("38383993");
+ terminals.setCreateTime(new Date());
+ terminals.setUpdateTime(new Date());
+ terminals.setDisplayName("uejejje");
+ terminals.setEquipName("eisfsk");
+ terminals.setEssentialInfoVersion("sfddjhfdshhsfd");
+ terminals.setHasPan((byte) 0x01);
+ terminals.setLatitude((double) 200);
+ terminals.setModel("ewwrwe");
+ terminals.setLongitude((double) 3003);
+ terminals.setOrgId((short) 1);
+
+ int i = terminalsDao.insertSelective(terminals);
+ System.out.println(i +"");
+ }
+
+}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java
new file mode 100644
index 0000000..97471ce
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java
@@ -0,0 +1,67 @@
+package com.shxy.xymanager_common.entity;
+
+import java.io.Serializable;
+
+public class TerminalChannels implements Serializable {
+ private Integer id;
+
+ private Integer termId;
+
+ private Byte channelNo;
+
+ private String channelName;
+
+ private Integer maxResolutionWidth;
+
+ private Integer maxResolutionHeight;
+
+ private static final long serialVersionUID = 1L;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getTermId() {
+ return termId;
+ }
+
+ public void setTermId(Integer termId) {
+ this.termId = termId;
+ }
+
+ public Byte getChannelNo() {
+ return channelNo;
+ }
+
+ public void setChannelNo(Byte channelNo) {
+ this.channelNo = channelNo;
+ }
+
+ public String getChannelName() {
+ return channelName;
+ }
+
+ public void setChannelName(String channelName) {
+ this.channelName = channelName == null ? null : channelName.trim();
+ }
+
+ public Integer getMaxResolutionWidth() {
+ return maxResolutionWidth;
+ }
+
+ public void setMaxResolutionWidth(Integer maxResolutionWidth) {
+ this.maxResolutionWidth = maxResolutionWidth;
+ }
+
+ public Integer getMaxResolutionHeight() {
+ return maxResolutionHeight;
+ }
+
+ public void setMaxResolutionHeight(Integer maxResolutionHeight) {
+ this.maxResolutionHeight = maxResolutionHeight;
+ }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalParams.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalParams.java
new file mode 100644
index 0000000..1bd6ad9
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalParams.java
@@ -0,0 +1,138 @@
+package com.shxy.xymanager_common.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TerminalParams implements Serializable {
+ private Integer termId;
+
+ private Integer mainTime;
+
+ private Integer sampleCount;
+
+ private Integer sampleFrequency;
+
+ private Integer heartbeatTime;
+
+ private Integer cmaIpAddress;
+
+ private Short cmaPort;
+
+ private String cmaDomainName;
+
+ private Date refTevivalTime;
+
+ private Short revivalCycle;
+
+ private Short revivalDuration;
+
+ private Date createTime;
+
+ private Date updateTime;
+
+ private static final long serialVersionUID = 1L;
+
+ public Integer getTermId() {
+ return termId;
+ }
+
+ public void setTermId(Integer termId) {
+ this.termId = termId;
+ }
+
+ public Integer getMainTime() {
+ return mainTime;
+ }
+
+ public void setMainTime(Integer mainTime) {
+ this.mainTime = mainTime;
+ }
+
+ public Integer getSampleCount() {
+ return sampleCount;
+ }
+
+ public void setSampleCount(Integer sampleCount) {
+ this.sampleCount = sampleCount;
+ }
+
+ public Integer getSampleFrequency() {
+ return sampleFrequency;
+ }
+
+ public void setSampleFrequency(Integer sampleFrequency) {
+ this.sampleFrequency = sampleFrequency;
+ }
+
+ public Integer getHeartbeatTime() {
+ return heartbeatTime;
+ }
+
+ public void setHeartbeatTime(Integer heartbeatTime) {
+ this.heartbeatTime = heartbeatTime;
+ }
+
+ public Integer getCmaIpAddress() {
+ return cmaIpAddress;
+ }
+
+ public void setCmaIpAddress(Integer cmaIpAddress) {
+ this.cmaIpAddress = cmaIpAddress;
+ }
+
+ public Short getCmaPort() {
+ return cmaPort;
+ }
+
+ public void setCmaPort(Short cmaPort) {
+ this.cmaPort = cmaPort;
+ }
+
+ public String getCmaDomainName() {
+ return cmaDomainName;
+ }
+
+ public void setCmaDomainName(String cmaDomainName) {
+ this.cmaDomainName = cmaDomainName == null ? null : cmaDomainName.trim();
+ }
+
+ public Date getRefTevivalTime() {
+ return refTevivalTime;
+ }
+
+ public void setRefTevivalTime(Date refTevivalTime) {
+ this.refTevivalTime = refTevivalTime;
+ }
+
+ public Short getRevivalCycle() {
+ return revivalCycle;
+ }
+
+ public void setRevivalCycle(Short revivalCycle) {
+ this.revivalCycle = revivalCycle;
+ }
+
+ public Short getRevivalDuration() {
+ return revivalDuration;
+ }
+
+ public void setRevivalDuration(Short revivalDuration) {
+ this.revivalDuration = revivalDuration;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
new file mode 100644
index 0000000..d715a51
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
@@ -0,0 +1,128 @@
+package com.shxy.xymanager_common.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TerminalPhoto implements Serializable {
+ private Long id;
+
+ private Integer termId;
+
+ private Integer channelId;
+
+ private Byte presetId;
+
+ private Integer width;
+
+ private Integer height;
+
+ private Integer fileSize;
+
+ private Date photoTime;
+
+ private Date recvTime;
+
+ private String path;
+
+ private Byte manualRequest;
+
+ private Integer createTime;
+
+ private static final long serialVersionUID = 1L;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Integer getTermId() {
+ return termId;
+ }
+
+ public void setTermId(Integer termId) {
+ this.termId = termId;
+ }
+
+ public Integer getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(Integer channelId) {
+ this.channelId = channelId;
+ }
+
+ public Byte getPresetId() {
+ return presetId;
+ }
+
+ public void setPresetId(Byte presetId) {
+ this.presetId = presetId;
+ }
+
+ public Integer getWidth() {
+ return width;
+ }
+
+ public void setWidth(Integer width) {
+ this.width = width;
+ }
+
+ public Integer getHeight() {
+ return height;
+ }
+
+ public void setHeight(Integer height) {
+ this.height = height;
+ }
+
+ public Integer getFileSize() {
+ return fileSize;
+ }
+
+ public void setFileSize(Integer fileSize) {
+ this.fileSize = fileSize;
+ }
+
+ public Date getPhotoTime() {
+ return photoTime;
+ }
+
+ public void setPhotoTime(Date photoTime) {
+ this.photoTime = photoTime;
+ }
+
+ public Date getRecvTime() {
+ return recvTime;
+ }
+
+ public void setRecvTime(Date recvTime) {
+ this.recvTime = recvTime;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path == null ? null : path.trim();
+ }
+
+ public Byte getManualRequest() {
+ return manualRequest;
+ }
+
+ public void setManualRequest(Byte manualRequest) {
+ this.manualRequest = manualRequest;
+ }
+
+ public Integer getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Integer createTime) {
+ this.createTime = createTime;
+ }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresets.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresets.java
new file mode 100644
index 0000000..5dd0ec3
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresets.java
@@ -0,0 +1,77 @@
+package com.shxy.xymanager_common.entity;
+
+import java.io.Serializable;
+
+public class TerminalPresets implements Serializable {
+ private Integer id;
+
+ private Integer termId;
+
+ private Byte presetNo;
+
+ private Byte name;
+
+ private Float angleX;
+
+ private Float angleY;
+
+ private Float velocity;
+
+ private static final long serialVersionUID = 1L;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getTermId() {
+ return termId;
+ }
+
+ public void setTermId(Integer termId) {
+ this.termId = termId;
+ }
+
+ public Byte getPresetNo() {
+ return presetNo;
+ }
+
+ public void setPresetNo(Byte presetNo) {
+ this.presetNo = presetNo;
+ }
+
+ public Byte getName() {
+ return name;
+ }
+
+ public void setName(Byte name) {
+ this.name = name;
+ }
+
+ public Float getAngleX() {
+ return angleX;
+ }
+
+ public void setAngleX(Float angleX) {
+ this.angleX = angleX;
+ }
+
+ public Float getAngleY() {
+ return angleY;
+ }
+
+ public void setAngleY(Float angleY) {
+ this.angleY = angleY;
+ }
+
+ public Float getVelocity() {
+ return velocity;
+ }
+
+ public void setVelocity(Float velocity) {
+ this.velocity = velocity;
+ }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java
new file mode 100644
index 0000000..cdbcb83
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java
@@ -0,0 +1,88 @@
+package com.shxy.xymanager_common.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TerminalSchedule implements Serializable {
+ private Integer id;
+
+ private Integer termId;
+
+ private Byte channelId;
+
+ private Byte hour;
+
+ private Byte minute;
+
+ private Integer presetId;
+
+ private Date createTime;
+
+ private Date updateTime;
+
+ private static final long serialVersionUID = 1L;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getTermId() {
+ return termId;
+ }
+
+ public void setTermId(Integer termId) {
+ this.termId = termId;
+ }
+
+ public Byte getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(Byte channelId) {
+ this.channelId = channelId;
+ }
+
+ public Byte getHour() {
+ return hour;
+ }
+
+ public void setHour(Byte hour) {
+ this.hour = hour;
+ }
+
+ public Byte getMinute() {
+ return minute;
+ }
+
+ public void setMinute(Byte minute) {
+ this.minute = minute;
+ }
+
+ public Integer getPresetId() {
+ return presetId;
+ }
+
+ public void setPresetId(Integer presetId) {
+ this.presetId = presetId;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatus.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatus.java
new file mode 100644
index 0000000..5e979aa
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatus.java
@@ -0,0 +1,168 @@
+package com.shxy.xymanager_common.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TerminalStatus implements Serializable {
+ private Integer termId;
+
+ private Date lastHeartbeat;
+
+ private Short lastFrameNo;
+
+ private Float batteryVoltage;
+
+ private Float opTemperature;
+
+ private Float batteryCapacity;
+
+ private Byte floatingCharge;
+
+ private Integer totalWorkingTime;
+
+ private Integer workingTime;
+
+ private Byte connectionState;
+
+ private Byte signalStrength4g;
+
+ private Byte signalStrength2g;
+
+ private Byte remainingRam;
+
+ private Byte remainingRom;
+
+ private Date startTime;
+
+ private Date updateTime;
+
+ private static final long serialVersionUID = 1L;
+
+ public Integer getTermId() {
+ return termId;
+ }
+
+ public void setTermId(Integer termId) {
+ this.termId = termId;
+ }
+
+ public Date getLastHeartbeat() {
+ return lastHeartbeat;
+ }
+
+ public void setLastHeartbeat(Date lastHeartbeat) {
+ this.lastHeartbeat = lastHeartbeat;
+ }
+
+ public Short getLastFrameNo() {
+ return lastFrameNo;
+ }
+
+ public void setLastFrameNo(Short lastFrameNo) {
+ this.lastFrameNo = lastFrameNo;
+ }
+
+ public Float getBatteryVoltage() {
+ return batteryVoltage;
+ }
+
+ public void setBatteryVoltage(Float batteryVoltage) {
+ this.batteryVoltage = batteryVoltage;
+ }
+
+ public Float getOpTemperature() {
+ return opTemperature;
+ }
+
+ public void setOpTemperature(Float opTemperature) {
+ this.opTemperature = opTemperature;
+ }
+
+ public Float getBatteryCapacity() {
+ return batteryCapacity;
+ }
+
+ public void setBatteryCapacity(Float batteryCapacity) {
+ this.batteryCapacity = batteryCapacity;
+ }
+
+ public Byte getFloatingCharge() {
+ return floatingCharge;
+ }
+
+ public void setFloatingCharge(Byte floatingCharge) {
+ this.floatingCharge = floatingCharge;
+ }
+
+ public Integer getTotalWorkingTime() {
+ return totalWorkingTime;
+ }
+
+ public void setTotalWorkingTime(Integer totalWorkingTime) {
+ this.totalWorkingTime = totalWorkingTime;
+ }
+
+ public Integer getWorkingTime() {
+ return workingTime;
+ }
+
+ public void setWorkingTime(Integer workingTime) {
+ this.workingTime = workingTime;
+ }
+
+ public Byte getConnectionState() {
+ return connectionState;
+ }
+
+ public void setConnectionState(Byte connectionState) {
+ this.connectionState = connectionState;
+ }
+
+ public Byte getSignalStrength4g() {
+ return signalStrength4g;
+ }
+
+ public void setSignalStrength4g(Byte signalStrength4g) {
+ this.signalStrength4g = signalStrength4g;
+ }
+
+ public Byte getSignalStrength2g() {
+ return signalStrength2g;
+ }
+
+ public void setSignalStrength2g(Byte signalStrength2g) {
+ this.signalStrength2g = signalStrength2g;
+ }
+
+ public Byte getRemainingRam() {
+ return remainingRam;
+ }
+
+ public void setRemainingRam(Byte remainingRam) {
+ this.remainingRam = remainingRam;
+ }
+
+ public Byte getRemainingRom() {
+ return remainingRom;
+ }
+
+ public void setRemainingRom(Byte remainingRom) {
+ this.remainingRom = remainingRom;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java
new file mode 100644
index 0000000..255af21
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java
@@ -0,0 +1,158 @@
+package com.shxy.xymanager_common.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Terminals implements Serializable {
+ private Integer id;
+
+ private String cmdid;
+
+ private Short orgId;
+
+ private String equipName;
+
+ private String displayName;
+
+ private String model;
+
+ private String essentialInfoVersion;
+
+ private Byte hasPan;
+
+ private String bsManufacturer;
+
+ private Date bsProductionDate;
+
+ private String bsIdentifier;
+
+ private Double latitude;
+
+ private Double longitude;
+
+ private Date createTime;
+
+ private Date updateTime;
+
+ private static final long serialVersionUID = 1L;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getCmdid() {
+ return cmdid;
+ }
+
+ public void setCmdid(String cmdid) {
+ this.cmdid = cmdid == null ? null : cmdid.trim();
+ }
+
+ public Short getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(Short orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getEquipName() {
+ return equipName;
+ }
+
+ public void setEquipName(String equipName) {
+ this.equipName = equipName == null ? null : equipName.trim();
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName == null ? null : displayName.trim();
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public void setModel(String model) {
+ this.model = model == null ? null : model.trim();
+ }
+
+ public String getEssentialInfoVersion() {
+ return essentialInfoVersion;
+ }
+
+ public void setEssentialInfoVersion(String essentialInfoVersion) {
+ this.essentialInfoVersion = essentialInfoVersion == null ? null : essentialInfoVersion.trim();
+ }
+
+ public Byte getHasPan() {
+ return hasPan;
+ }
+
+ public void setHasPan(Byte hasPan) {
+ this.hasPan = hasPan;
+ }
+
+ public String getBsManufacturer() {
+ return bsManufacturer;
+ }
+
+ public void setBsManufacturer(String bsManufacturer) {
+ this.bsManufacturer = bsManufacturer == null ? null : bsManufacturer.trim();
+ }
+
+ public Date getBsProductionDate() {
+ return bsProductionDate;
+ }
+
+ public void setBsProductionDate(Date bsProductionDate) {
+ this.bsProductionDate = bsProductionDate;
+ }
+
+ public String getBsIdentifier() {
+ return bsIdentifier;
+ }
+
+ public void setBsIdentifier(String bsIdentifier) {
+ this.bsIdentifier = bsIdentifier == null ? null : bsIdentifier.trim();
+ }
+
+ public Double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(Double latitude) {
+ this.latitude = latitude;
+ }
+
+ public Double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(Double longitude) {
+ this.longitude = longitude;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+}
\ No newline at end of file
diff --git a/xymanager_dao/.gitignore b/xymanager_dao/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/xymanager_dao/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/xymanager_dao/.mvn/wrapper/maven-wrapper.jar b/xymanager_dao/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..bf82ff0
Binary files /dev/null and b/xymanager_dao/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/xymanager_dao/.mvn/wrapper/maven-wrapper.properties b/xymanager_dao/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..ca5ab4b
--- /dev/null
+++ b/xymanager_dao/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/xymanager_dao/mvnw b/xymanager_dao/mvnw
new file mode 100644
index 0000000..8a8fb22
--- /dev/null
+++ b/xymanager_dao/mvnw
@@ -0,0 +1,316 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /usr/local/etc/mavenrc ] ; then
+ . /usr/local/etc/mavenrc
+ fi
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`\\unset -f command; \\command -v java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ $MAVEN_DEBUG_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" \
+ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/xymanager_dao/mvnw.cmd b/xymanager_dao/mvnw.cmd
new file mode 100644
index 0000000..1d8ab01
--- /dev/null
+++ b/xymanager_dao/mvnw.cmd
@@ -0,0 +1,188 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+ %JVM_CONFIG_MAVEN_PROPS% ^
+ %MAVEN_OPTS% ^
+ %MAVEN_DEBUG_OPTS% ^
+ -classpath %WRAPPER_JAR% ^
+ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+ %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%
diff --git a/xymanager_dao/pom.xml b/xymanager_dao/pom.xml
new file mode 100644
index 0000000..8c292b0
--- /dev/null
+++ b/xymanager_dao/pom.xml
@@ -0,0 +1,33 @@
+
+
+
+ xymanager
+ com.shxy
+ 1.0.0
+
+ 4.0.0
+ com.shxy
+ xymanager_dao
+ xymanager_dao
+ xymanager_dao
+
+ 1.8
+
+
+
+ com.shxy
+ xymanager_common
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java
new file mode 100644
index 0000000..cfa8cdb
--- /dev/null
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java
@@ -0,0 +1,17 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.TerminalChannels;
+
+public interface TerminalChannelsDao {
+ int deleteByPrimaryKey(Integer id);
+
+ int insert(TerminalChannels record);
+
+ int insertSelective(TerminalChannels record);
+
+ TerminalChannels selectByPrimaryKey(Integer id);
+
+ int updateByPrimaryKeySelective(TerminalChannels record);
+
+ int updateByPrimaryKey(TerminalChannels record);
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalParamsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalParamsDao.java
new file mode 100644
index 0000000..12a2211
--- /dev/null
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalParamsDao.java
@@ -0,0 +1,17 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.TerminalParams;
+
+public interface TerminalParamsDao {
+ int deleteByPrimaryKey(Integer termId);
+
+ int insert(TerminalParams record);
+
+ int insertSelective(TerminalParams record);
+
+ TerminalParams selectByPrimaryKey(Integer termId);
+
+ int updateByPrimaryKeySelective(TerminalParams record);
+
+ int updateByPrimaryKey(TerminalParams record);
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
new file mode 100644
index 0000000..61d7ecc
--- /dev/null
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
@@ -0,0 +1,17 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.TerminalPhoto;
+
+public interface TerminalPhotoDao {
+ int deleteByPrimaryKey(Long id);
+
+ int insert(TerminalPhoto record);
+
+ int insertSelective(TerminalPhoto record);
+
+ TerminalPhoto selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(TerminalPhoto record);
+
+ int updateByPrimaryKey(TerminalPhoto record);
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsDao.java
new file mode 100644
index 0000000..a40c17c
--- /dev/null
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsDao.java
@@ -0,0 +1,17 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.TerminalPresets;
+
+public interface TerminalPresetsDao {
+ int deleteByPrimaryKey(Integer id);
+
+ int insert(TerminalPresets record);
+
+ int insertSelective(TerminalPresets record);
+
+ TerminalPresets selectByPrimaryKey(Integer id);
+
+ int updateByPrimaryKeySelective(TerminalPresets record);
+
+ int updateByPrimaryKey(TerminalPresets record);
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDao.java
new file mode 100644
index 0000000..5322d9b
--- /dev/null
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDao.java
@@ -0,0 +1,17 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.TerminalSchedule;
+
+public interface TerminalScheduleDao {
+ int deleteByPrimaryKey(Integer id);
+
+ int insert(TerminalSchedule record);
+
+ int insertSelective(TerminalSchedule record);
+
+ TerminalSchedule selectByPrimaryKey(Integer id);
+
+ int updateByPrimaryKeySelective(TerminalSchedule record);
+
+ int updateByPrimaryKey(TerminalSchedule record);
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java
new file mode 100644
index 0000000..44456e2
--- /dev/null
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java
@@ -0,0 +1,17 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.TerminalStatus;
+
+public interface TerminalStatusDao {
+ int deleteByPrimaryKey(Integer termId);
+
+ int insert(TerminalStatus record);
+
+ int insertSelective(TerminalStatus record);
+
+ TerminalStatus selectByPrimaryKey(Integer termId);
+
+ int updateByPrimaryKeySelective(TerminalStatus record);
+
+ int updateByPrimaryKey(TerminalStatus record);
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java
new file mode 100644
index 0000000..8babd63
--- /dev/null
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java
@@ -0,0 +1,14 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.Terminals;
+
+public interface TerminalsDao {
+
+ int insertSelective(Terminals record);
+
+ Terminals selectByPrimaryKey(Integer id);
+
+ int updateByPrimaryKeySelective(Terminals record);
+
+ int updateByPrimaryKey(Terminals record);
+}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml
new file mode 100644
index 0000000..0ba1763
--- /dev/null
+++ b/xymanager_dao/src/main/resources/generatorConfig.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
new file mode 100644
index 0000000..6111eeb
--- /dev/null
+++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ id, term_id, channel_no, channel_name, max_resolution_width, max_resolution_height
+
+
+
+ delete from terminal_channels
+ where id = #{id,jdbcType=INTEGER}
+
+
+ insert into terminal_channels (id, term_id, channel_no,
+ channel_name, max_resolution_width, max_resolution_height
+ )
+ values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelNo,jdbcType=TINYINT},
+ #{channelName,jdbcType=VARCHAR}, #{maxResolutionWidth,jdbcType=INTEGER}, #{maxResolutionHeight,jdbcType=INTEGER}
+ )
+
+
+ insert into terminal_channels
+
+
+ id,
+
+
+ term_id,
+
+
+ channel_no,
+
+
+ channel_name,
+
+
+ max_resolution_width,
+
+
+ max_resolution_height,
+
+
+
+
+ #{id,jdbcType=INTEGER},
+
+
+ #{termId,jdbcType=INTEGER},
+
+
+ #{channelNo,jdbcType=TINYINT},
+
+
+ #{channelName,jdbcType=VARCHAR},
+
+
+ #{maxResolutionWidth,jdbcType=INTEGER},
+
+
+ #{maxResolutionHeight,jdbcType=INTEGER},
+
+
+
+
+ update terminal_channels
+
+
+ term_id = #{termId,jdbcType=INTEGER},
+
+
+ channel_no = #{channelNo,jdbcType=TINYINT},
+
+
+ channel_name = #{channelName,jdbcType=VARCHAR},
+
+
+ max_resolution_width = #{maxResolutionWidth,jdbcType=INTEGER},
+
+
+ max_resolution_height = #{maxResolutionHeight,jdbcType=INTEGER},
+
+
+ where id = #{id,jdbcType=INTEGER}
+
+
+ update terminal_channels
+ set term_id = #{termId,jdbcType=INTEGER},
+ channel_no = #{channelNo,jdbcType=TINYINT},
+ channel_name = #{channelName,jdbcType=VARCHAR},
+ max_resolution_width = #{maxResolutionWidth,jdbcType=INTEGER},
+ max_resolution_height = #{maxResolutionHeight,jdbcType=INTEGER}
+ where id = #{id,jdbcType=INTEGER}
+
+
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalParamsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalParamsDao.xml
new file mode 100644
index 0000000..fcd182a
--- /dev/null
+++ b/xymanager_dao/src/main/resources/mappers/TerminalParamsDao.xml
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ term_id, main_time, sample_count, sample_frequency, heartbeat_time, cma_ip_address,
+ cma_port, cma_domain_name, ref_tevival_time, revival_cycle, revival_duration, create_time,
+ update_time
+
+
+
+ delete from terminal_params
+ where term_id = #{termId,jdbcType=INTEGER}
+
+
+ insert into terminal_params (term_id, main_time, sample_count,
+ sample_frequency, heartbeat_time, cma_ip_address,
+ cma_port, cma_domain_name, ref_tevival_time,
+ revival_cycle, revival_duration, create_time,
+ update_time)
+ values (#{termId,jdbcType=INTEGER}, #{mainTime,jdbcType=INTEGER}, #{sampleCount,jdbcType=INTEGER},
+ #{sampleFrequency,jdbcType=INTEGER}, #{heartbeatTime,jdbcType=INTEGER}, #{cmaIpAddress,jdbcType=INTEGER},
+ #{cmaPort,jdbcType=SMALLINT}, #{cmaDomainName,jdbcType=VARCHAR}, #{refTevivalTime,jdbcType=TIMESTAMP},
+ #{revivalCycle,jdbcType=SMALLINT}, #{revivalDuration,jdbcType=SMALLINT}, #{createTime,jdbcType=TIMESTAMP},
+ #{updateTime,jdbcType=TIMESTAMP})
+
+
+ insert into terminal_params
+
+
+ term_id,
+
+
+ main_time,
+
+
+ sample_count,
+
+
+ sample_frequency,
+
+
+ heartbeat_time,
+
+
+ cma_ip_address,
+
+
+ cma_port,
+
+
+ cma_domain_name,
+
+
+ ref_tevival_time,
+
+
+ revival_cycle,
+
+
+ revival_duration,
+
+
+ create_time,
+
+
+ update_time,
+
+
+
+
+ #{termId,jdbcType=INTEGER},
+
+
+ #{mainTime,jdbcType=INTEGER},
+
+
+ #{sampleCount,jdbcType=INTEGER},
+
+
+ #{sampleFrequency,jdbcType=INTEGER},
+
+
+ #{heartbeatTime,jdbcType=INTEGER},
+
+
+ #{cmaIpAddress,jdbcType=INTEGER},
+
+
+ #{cmaPort,jdbcType=SMALLINT},
+
+
+ #{cmaDomainName,jdbcType=VARCHAR},
+
+
+ #{refTevivalTime,jdbcType=TIMESTAMP},
+
+
+ #{revivalCycle,jdbcType=SMALLINT},
+
+
+ #{revivalDuration,jdbcType=SMALLINT},
+
+
+ #{createTime,jdbcType=TIMESTAMP},
+
+
+ #{updateTime,jdbcType=TIMESTAMP},
+
+
+
+
+ update terminal_params
+
+
+ main_time = #{mainTime,jdbcType=INTEGER},
+
+
+ sample_count = #{sampleCount,jdbcType=INTEGER},
+
+
+ sample_frequency = #{sampleFrequency,jdbcType=INTEGER},
+
+
+ heartbeat_time = #{heartbeatTime,jdbcType=INTEGER},
+
+
+ cma_ip_address = #{cmaIpAddress,jdbcType=INTEGER},
+
+
+ cma_port = #{cmaPort,jdbcType=SMALLINT},
+
+
+ cma_domain_name = #{cmaDomainName,jdbcType=VARCHAR},
+
+
+ ref_tevival_time = #{refTevivalTime,jdbcType=TIMESTAMP},
+
+
+ revival_cycle = #{revivalCycle,jdbcType=SMALLINT},
+
+
+ revival_duration = #{revivalDuration,jdbcType=SMALLINT},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
+
+
+ where term_id = #{termId,jdbcType=INTEGER}
+
+
+ update terminal_params
+ set main_time = #{mainTime,jdbcType=INTEGER},
+ sample_count = #{sampleCount,jdbcType=INTEGER},
+ sample_frequency = #{sampleFrequency,jdbcType=INTEGER},
+ heartbeat_time = #{heartbeatTime,jdbcType=INTEGER},
+ cma_ip_address = #{cmaIpAddress,jdbcType=INTEGER},
+ cma_port = #{cmaPort,jdbcType=SMALLINT},
+ cma_domain_name = #{cmaDomainName,jdbcType=VARCHAR},
+ ref_tevival_time = #{refTevivalTime,jdbcType=TIMESTAMP},
+ revival_cycle = #{revivalCycle,jdbcType=SMALLINT},
+ revival_duration = #{revivalDuration,jdbcType=SMALLINT},
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+ update_time = #{updateTime,jdbcType=TIMESTAMP}
+ where term_id = #{termId,jdbcType=INTEGER}
+
+
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
new file mode 100644
index 0000000..f49a4c0
--- /dev/null
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, term_id, channel_id, preset_id, width, height, file_size, photo_time, recv_time,
+ path, manual_request, create_time
+
+
+
+ delete from terminal_photos
+ where id = #{id,jdbcType=BIGINT}
+
+
+ insert into terminal_photos (id, term_id, channel_id,
+ preset_id, width, height,
+ file_size, photo_time, recv_time,
+ path, manual_request, create_time
+ )
+ values (#{id,jdbcType=BIGINT}, #{termId,jdbcType=INTEGER}, #{channelId,jdbcType=INTEGER},
+ #{presetId,jdbcType=TINYINT}, #{width,jdbcType=INTEGER}, #{height,jdbcType=INTEGER},
+ #{fileSize,jdbcType=INTEGER}, #{photoTime,jdbcType=TIMESTAMP}, #{recvTime,jdbcType=TIMESTAMP},
+ #{path,jdbcType=VARCHAR}, #{manualRequest,jdbcType=TINYINT}, #{createTime,jdbcType=INTEGER}
+ )
+
+
+ insert into terminal_photos
+
+
+ id,
+
+
+ term_id,
+
+
+ channel_id,
+
+
+ preset_id,
+
+
+ width,
+
+
+ height,
+
+
+ file_size,
+
+
+ photo_time,
+
+
+ recv_time,
+
+
+ path,
+
+
+ manual_request,
+
+
+ create_time,
+
+
+
+
+ #{id,jdbcType=BIGINT},
+
+
+ #{termId,jdbcType=INTEGER},
+
+
+ #{channelId,jdbcType=INTEGER},
+
+
+ #{presetId,jdbcType=TINYINT},
+
+
+ #{width,jdbcType=INTEGER},
+
+
+ #{height,jdbcType=INTEGER},
+
+
+ #{fileSize,jdbcType=INTEGER},
+
+
+ #{photoTime,jdbcType=TIMESTAMP},
+
+
+ #{recvTime,jdbcType=TIMESTAMP},
+
+
+ #{path,jdbcType=VARCHAR},
+
+
+ #{manualRequest,jdbcType=TINYINT},
+
+
+ #{createTime,jdbcType=INTEGER},
+
+
+
+
+ update terminal_photos
+
+
+ term_id = #{termId,jdbcType=INTEGER},
+
+
+ channel_id = #{channelId,jdbcType=INTEGER},
+
+
+ preset_id = #{presetId,jdbcType=TINYINT},
+
+
+ width = #{width,jdbcType=INTEGER},
+
+
+ height = #{height,jdbcType=INTEGER},
+
+
+ file_size = #{fileSize,jdbcType=INTEGER},
+
+
+ photo_time = #{photoTime,jdbcType=TIMESTAMP},
+
+
+ recv_time = #{recvTime,jdbcType=TIMESTAMP},
+
+
+ path = #{path,jdbcType=VARCHAR},
+
+
+ manual_request = #{manualRequest,jdbcType=TINYINT},
+
+
+ create_time = #{createTime,jdbcType=INTEGER},
+
+
+ where id = #{id,jdbcType=BIGINT}
+
+
+ update terminal_photos
+ set term_id = #{termId,jdbcType=INTEGER},
+ channel_id = #{channelId,jdbcType=INTEGER},
+ preset_id = #{presetId,jdbcType=TINYINT},
+ width = #{width,jdbcType=INTEGER},
+ height = #{height,jdbcType=INTEGER},
+ file_size = #{fileSize,jdbcType=INTEGER},
+ photo_time = #{photoTime,jdbcType=TIMESTAMP},
+ recv_time = #{recvTime,jdbcType=TIMESTAMP},
+ path = #{path,jdbcType=VARCHAR},
+ manual_request = #{manualRequest,jdbcType=TINYINT},
+ create_time = #{createTime,jdbcType=INTEGER}
+ where id = #{id,jdbcType=BIGINT}
+
+
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPresetsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPresetsDao.xml
new file mode 100644
index 0000000..99afd06
--- /dev/null
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPresetsDao.xml
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, term_id, preset_no, name, angle_x, angle_y, velocity
+
+
+
+ delete from terminal_presets
+ where id = #{id,jdbcType=INTEGER}
+
+
+ insert into terminal_presets (id, term_id, preset_no,
+ name, angle_x, angle_y, velocity
+ )
+ values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{presetNo,jdbcType=TINYINT},
+ #{name,jdbcType=TINYINT}, #{angleX,jdbcType=REAL}, #{angleY,jdbcType=REAL}, #{velocity,jdbcType=REAL}
+ )
+
+
+ insert into terminal_presets
+
+
+ id,
+
+
+ term_id,
+
+
+ preset_no,
+
+
+ name,
+
+
+ angle_x,
+
+
+ angle_y,
+
+
+ velocity,
+
+
+
+
+ #{id,jdbcType=INTEGER},
+
+
+ #{termId,jdbcType=INTEGER},
+
+
+ #{presetNo,jdbcType=TINYINT},
+
+
+ #{name,jdbcType=TINYINT},
+
+
+ #{angleX,jdbcType=REAL},
+
+
+ #{angleY,jdbcType=REAL},
+
+
+ #{velocity,jdbcType=REAL},
+
+
+
+
+ update terminal_presets
+
+
+ term_id = #{termId,jdbcType=INTEGER},
+
+
+ preset_no = #{presetNo,jdbcType=TINYINT},
+
+
+ name = #{name,jdbcType=TINYINT},
+
+
+ angle_x = #{angleX,jdbcType=REAL},
+
+
+ angle_y = #{angleY,jdbcType=REAL},
+
+
+ velocity = #{velocity,jdbcType=REAL},
+
+
+ where id = #{id,jdbcType=INTEGER}
+
+
+ update terminal_presets
+ set term_id = #{termId,jdbcType=INTEGER},
+ preset_no = #{presetNo,jdbcType=TINYINT},
+ name = #{name,jdbcType=TINYINT},
+ angle_x = #{angleX,jdbcType=REAL},
+ angle_y = #{angleY,jdbcType=REAL},
+ velocity = #{velocity,jdbcType=REAL}
+ where id = #{id,jdbcType=INTEGER}
+
+
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml
new file mode 100644
index 0000000..288785d
--- /dev/null
+++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, term_id, channel_id, hour, minute, preset_id, create_time, update_time
+
+
+
+ delete from terminal_schedule
+ where id = #{id,jdbcType=INTEGER}
+
+
+ insert into terminal_schedule (id, term_id, channel_id,
+ hour, minute, preset_id,
+ create_time, update_time)
+ values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelId,jdbcType=TINYINT},
+ #{hour,jdbcType=TINYINT}, #{minute,jdbcType=TINYINT}, #{presetId,jdbcType=INTEGER},
+ #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+
+
+ insert into terminal_schedule
+
+
+ id,
+
+
+ term_id,
+
+
+ channel_id,
+
+
+ hour,
+
+
+ minute,
+
+
+ preset_id,
+
+
+ create_time,
+
+
+ update_time,
+
+
+
+
+ #{id,jdbcType=INTEGER},
+
+
+ #{termId,jdbcType=INTEGER},
+
+
+ #{channelId,jdbcType=TINYINT},
+
+
+ #{hour,jdbcType=TINYINT},
+
+
+ #{minute,jdbcType=TINYINT},
+
+
+ #{presetId,jdbcType=INTEGER},
+
+
+ #{createTime,jdbcType=TIMESTAMP},
+
+
+ #{updateTime,jdbcType=TIMESTAMP},
+
+
+
+
+ update terminal_schedule
+
+
+ term_id = #{termId,jdbcType=INTEGER},
+
+
+ channel_id = #{channelId,jdbcType=TINYINT},
+
+
+ hour = #{hour,jdbcType=TINYINT},
+
+
+ minute = #{minute,jdbcType=TINYINT},
+
+
+ preset_id = #{presetId,jdbcType=INTEGER},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
+
+
+ where id = #{id,jdbcType=INTEGER}
+
+
+ update terminal_schedule
+ set term_id = #{termId,jdbcType=INTEGER},
+ channel_id = #{channelId,jdbcType=TINYINT},
+ hour = #{hour,jdbcType=TINYINT},
+ minute = #{minute,jdbcType=TINYINT},
+ preset_id = #{presetId,jdbcType=INTEGER},
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+ update_time = #{updateTime,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=INTEGER}
+
+
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml
new file mode 100644
index 0000000..c1a3c19
--- /dev/null
+++ b/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ term_id, last_heartbeat, last_frame_no, battery_voltage, op_temperature, battery_capacity,
+ floating_charge, total_working_time, working_time, connection_state, signal_strength_4g,
+ signal_strength_2g, remaining_ram, remaining_rom, start_time, update_time
+
+
+
+ delete from terminal_status
+ where term_id = #{termId,jdbcType=INTEGER}
+
+
+ insert into terminal_status (term_id, last_heartbeat, last_frame_no,
+ battery_voltage, op_temperature, battery_capacity,
+ floating_charge, total_working_time, working_time,
+ connection_state, signal_strength_4g, signal_strength_2g,
+ remaining_ram, remaining_rom, start_time,
+ update_time)
+ values (#{termId,jdbcType=INTEGER}, #{lastHeartbeat,jdbcType=TIMESTAMP}, #{lastFrameNo,jdbcType=SMALLINT},
+ #{batteryVoltage,jdbcType=REAL}, #{opTemperature,jdbcType=REAL}, #{batteryCapacity,jdbcType=REAL},
+ #{floatingCharge,jdbcType=TINYINT}, #{totalWorkingTime,jdbcType=INTEGER}, #{workingTime,jdbcType=INTEGER},
+ #{connectionState,jdbcType=TINYINT}, #{signalStrength4g,jdbcType=TINYINT}, #{signalStrength2g,jdbcType=TINYINT},
+ #{remainingRam,jdbcType=TINYINT}, #{remainingRom,jdbcType=TINYINT}, #{startTime,jdbcType=TIMESTAMP},
+ #{updateTime,jdbcType=TIMESTAMP})
+
+
+ insert into terminal_status
+
+
+ term_id,
+
+
+ last_heartbeat,
+
+
+ last_frame_no,
+
+
+ battery_voltage,
+
+
+ op_temperature,
+
+
+ battery_capacity,
+
+
+ floating_charge,
+
+
+ total_working_time,
+
+
+ working_time,
+
+
+ connection_state,
+
+
+ signal_strength_4g,
+
+
+ signal_strength_2g,
+
+
+ remaining_ram,
+
+
+ remaining_rom,
+
+
+ start_time,
+
+
+ update_time,
+
+
+
+
+ #{termId,jdbcType=INTEGER},
+
+
+ #{lastHeartbeat,jdbcType=TIMESTAMP},
+
+
+ #{lastFrameNo,jdbcType=SMALLINT},
+
+
+ #{batteryVoltage,jdbcType=REAL},
+
+
+ #{opTemperature,jdbcType=REAL},
+
+
+ #{batteryCapacity,jdbcType=REAL},
+
+
+ #{floatingCharge,jdbcType=TINYINT},
+
+
+ #{totalWorkingTime,jdbcType=INTEGER},
+
+
+ #{workingTime,jdbcType=INTEGER},
+
+
+ #{connectionState,jdbcType=TINYINT},
+
+
+ #{signalStrength4g,jdbcType=TINYINT},
+
+
+ #{signalStrength2g,jdbcType=TINYINT},
+
+
+ #{remainingRam,jdbcType=TINYINT},
+
+
+ #{remainingRom,jdbcType=TINYINT},
+
+
+ #{startTime,jdbcType=TIMESTAMP},
+
+
+ #{updateTime,jdbcType=TIMESTAMP},
+
+
+
+
+ update terminal_status
+
+
+ last_heartbeat = #{lastHeartbeat,jdbcType=TIMESTAMP},
+
+
+ last_frame_no = #{lastFrameNo,jdbcType=SMALLINT},
+
+
+ battery_voltage = #{batteryVoltage,jdbcType=REAL},
+
+
+ op_temperature = #{opTemperature,jdbcType=REAL},
+
+
+ battery_capacity = #{batteryCapacity,jdbcType=REAL},
+
+
+ floating_charge = #{floatingCharge,jdbcType=TINYINT},
+
+
+ total_working_time = #{totalWorkingTime,jdbcType=INTEGER},
+
+
+ working_time = #{workingTime,jdbcType=INTEGER},
+
+
+ connection_state = #{connectionState,jdbcType=TINYINT},
+
+
+ signal_strength_4g = #{signalStrength4g,jdbcType=TINYINT},
+
+
+ signal_strength_2g = #{signalStrength2g,jdbcType=TINYINT},
+
+
+ remaining_ram = #{remainingRam,jdbcType=TINYINT},
+
+
+ remaining_rom = #{remainingRom,jdbcType=TINYINT},
+
+
+ start_time = #{startTime,jdbcType=TIMESTAMP},
+
+
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
+
+
+ where term_id = #{termId,jdbcType=INTEGER}
+
+
+ update terminal_status
+ set last_heartbeat = #{lastHeartbeat,jdbcType=TIMESTAMP},
+ last_frame_no = #{lastFrameNo,jdbcType=SMALLINT},
+ battery_voltage = #{batteryVoltage,jdbcType=REAL},
+ op_temperature = #{opTemperature,jdbcType=REAL},
+ battery_capacity = #{batteryCapacity,jdbcType=REAL},
+ floating_charge = #{floatingCharge,jdbcType=TINYINT},
+ total_working_time = #{totalWorkingTime,jdbcType=INTEGER},
+ working_time = #{workingTime,jdbcType=INTEGER},
+ connection_state = #{connectionState,jdbcType=TINYINT},
+ signal_strength_4g = #{signalStrength4g,jdbcType=TINYINT},
+ signal_strength_2g = #{signalStrength2g,jdbcType=TINYINT},
+ remaining_ram = #{remainingRam,jdbcType=TINYINT},
+ remaining_rom = #{remainingRom,jdbcType=TINYINT},
+ start_time = #{startTime,jdbcType=TIMESTAMP},
+ update_time = #{updateTime,jdbcType=TIMESTAMP}
+ where term_id = #{termId,jdbcType=INTEGER}
+
+
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
new file mode 100644
index 0000000..e6ee157
--- /dev/null
+++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, cmdid, org_id, equip_name, display_name, model, essential_info_version, has_pan,
+ bs_manufacturer, bs_production_date, bs_identifier, latitude, longitude, create_time,
+ update_time
+
+
+
+ insert into terminals
+
+
+ id,
+
+
+ cmdid,
+
+
+ org_id,
+
+
+ equip_name,
+
+
+ display_name,
+
+
+ model,
+
+
+ essential_info_version,
+
+
+ has_pan,
+
+
+ bs_manufacturer,
+
+
+ bs_production_date,
+
+
+ bs_identifier,
+
+
+ latitude,
+
+
+ longitude,
+
+
+ create_time,
+
+
+ update_time,
+
+
+
+
+ #{id,jdbcType=INTEGER},
+
+
+ #{cmdid,jdbcType=VARCHAR},
+
+
+ #{orgId,jdbcType=SMALLINT},
+
+
+ #{equipName,jdbcType=VARCHAR},
+
+
+ #{displayName,jdbcType=VARCHAR},
+
+
+ #{model,jdbcType=VARCHAR},
+
+
+ #{essentialInfoVersion,jdbcType=VARCHAR},
+
+
+ #{hasPan,jdbcType=TINYINT},
+
+
+ #{bsManufacturer,jdbcType=VARCHAR},
+
+
+ #{bsProductionDate,jdbcType=DATE},
+
+
+ #{bsIdentifier,jdbcType=VARCHAR},
+
+
+ #{latitude,jdbcType=DOUBLE},
+
+
+ #{longitude,jdbcType=DOUBLE},
+
+
+ #{createTime,jdbcType=TIMESTAMP},
+
+
+ #{updateTime,jdbcType=TIMESTAMP},
+
+
+
+
+ update terminals
+
+
+ cmdid = #{cmdid,jdbcType=VARCHAR},
+
+
+ org_id = #{orgId,jdbcType=SMALLINT},
+
+
+ equip_name = #{equipName,jdbcType=VARCHAR},
+
+
+ display_name = #{displayName,jdbcType=VARCHAR},
+
+
+ model = #{model,jdbcType=VARCHAR},
+
+
+ essential_info_version = #{essentialInfoVersion,jdbcType=VARCHAR},
+
+
+ has_pan = #{hasPan,jdbcType=TINYINT},
+
+
+ bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR},
+
+
+ bs_production_date = #{bsProductionDate,jdbcType=DATE},
+
+
+ bs_identifier = #{bsIdentifier,jdbcType=VARCHAR},
+
+
+ latitude = #{latitude,jdbcType=DOUBLE},
+
+
+ longitude = #{longitude,jdbcType=DOUBLE},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
+
+
+ where id = #{id,jdbcType=INTEGER}
+
+
+ update terminals
+ set cmdid = #{cmdid,jdbcType=VARCHAR},
+ org_id = #{orgId,jdbcType=SMALLINT},
+ equip_name = #{equipName,jdbcType=VARCHAR},
+ display_name = #{displayName,jdbcType=VARCHAR},
+ model = #{model,jdbcType=VARCHAR},
+ essential_info_version = #{essentialInfoVersion,jdbcType=VARCHAR},
+ has_pan = #{hasPan,jdbcType=TINYINT},
+ bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR},
+ bs_production_date = #{bsProductionDate,jdbcType=DATE},
+ bs_identifier = #{bsIdentifier,jdbcType=VARCHAR},
+ latitude = #{latitude,jdbcType=DOUBLE},
+ longitude = #{longitude,jdbcType=DOUBLE},
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+ update_time = #{updateTime,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=INTEGER}
+
+
\ No newline at end of file
diff --git a/xymanager_framework/pom.xml b/xymanager_framework/pom.xml
index 63b7589..162a22c 100644
--- a/xymanager_framework/pom.xml
+++ b/xymanager_framework/pom.xml
@@ -49,6 +49,30 @@
spring-boot-starter-aop
+
+
+ com.alibaba
+ druid-spring-boot-starter
+
+
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ true
+
+
+
com.shxy
xymanager_common
diff --git a/xymanager_service/pom.xml b/xymanager_service/pom.xml
index 90edb65..64e28a6 100644
--- a/xymanager_service/pom.xml
+++ b/xymanager_service/pom.xml
@@ -22,6 +22,10 @@
org.springframework
spring-context
+
+ com.shxy
+ xymanager_dao
+