Merge remote-tracking branch 'origin/master'

ebc-middle-platform/src/ipu-stomp.js

@@ -4,28 +4,64 @@ import {socketUrl} from '@/constants'
import EventBus from './bus'
var socket = null
var stompClient = null
var peronStompClient = null
var shipStompClient = null
export default function initWebSocket(params) {
  personStomp(params)
  shipStomp(params)
}
function personStomp(params) {
  if (socketUrl.startsWith('http') || socketUrl.startsWith('https')) {
    socket = new SockJS(socketUrl)// 连接服务端
    stompClient = Stomp.over(socket)
    peronStompClient = Stomp.over(socket)
  } else { // SockJS支持ws前缀
    stompClient = Stomp.client(socketUrl)
    peronStompClient = Stomp.client(socketUrl)
  }
  stompClient.connect(params, (frame) => {
  params.uuid = uuid()
  peronStompClient.connect(params, (frame) => {
    successCallback()
  }, () => {
    initWebSocket(params)
    personStomp(params)
  })
  return stompClient
}
function successCallback() {
  stompClient.subscribe('personnel', msg => {
    EventBus.$emit('person', msg)
function shipStomp(params) {
  if (socketUrl.startsWith('http') || socketUrl.startsWith('https')) {
    socket = new SockJS(socketUrl)// 连接服务端
    shipStompClient = Stomp.over(socket)
  } else { // SockJS支持ws前缀
    shipStompClient = Stomp.client(socketUrl)
  }
  params.uuid = uuid()
  shipStompClient.connect(params, (frame) => {
    successShipCallback()
  }, () => {
    shipStomp(params)
  })
  stompClient.subscribe('ship', msg => {
    EventBus.$emit('ship', msg)
}
function successShipCallback() {
  shipStompClient.subscribe('ship', msg => {
    EventBus.$emit('ship', msg.body)
  })
}
function successCallback() {
  peronStompClient.subscribe('personnel', msg => {
    EventBus.$emit('person', msg.body)
  })
}
function uuid() {
  var s = []
  var hexDigits = '0123456789abcdef'
  for (var i = 0; i < 36; i++) {
    s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1)
  }
  s[14] = '4' // bits 12-15 of the time_hi_and_version field to 0010
  s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1) // bits 6-7 of the clock_seq_hi_and_reserved to 01
  s[8] = s[13] = s[18] = s[23] = '-'
  var uuid = s.join('')
  return uuid
}

ebc-middle-platform/src/modules/layouts/BasicLayout.vue

@@ -67,10 +67,10 @@ export default {
  },
  mounted() {
    // 镜屏调用
    initWebSocket({name: 'zhangsan', passcode: '123456', uuid: this.uuid()})
    initWebSocket({name: 'zhangsan', passcode: '123456'})
    EventBus.$on('person', (msg) => { // 获取镜屏推送消息
      console.log(msg)
      var obj = JSON.parse(msg.body)
      var obj = JSON.parse(msg)
      if (obj.isNewAlarm == '1') {
        this.alarmObj.alarmType = obj.alarmType
        this.alarmObj.alarmLocation = obj.longitude + ' , ' + obj.latitude
@@ -82,19 +82,6 @@ export default {
  methods: {
    closeAlarmModal() {
      this.modal = false
    },
    uuid() {
      var s = []
      var hexDigits = '0123456789abcdef'
      for (var i = 0; i < 36; i++) {
        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1)
      }
      s[14] = '4' // bits 12-15 of the time_hi_and_version field to 0010
      s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1) // bits 6-7 of the clock_seq_hi_and_reserved to 01
      s[8] = s[13] = s[18] = s[23] = '-'
      var uuid = s.join('')
      return uuid
    }
  }
}

ebc-middle-platform/src/modules/orientation/orientation.vue

@@ -329,6 +329,7 @@ export default {
      this.nowDate = new Date()
    }, 1000)
    EventBus.$on('person', (msg) => { // 获取镜屏推送消息
      console.log(msg)
      this.changeLocation(msg)
    })
    EventBus.$on('ship', (msg) => { // 获取镜屏推送消息
@@ -348,7 +349,7 @@ export default {
        })
    },
    changeLocation(msg) { // 修改人员信息状态等
      var obj = JSON.parse(msg.body)
      var obj = JSON.parse(msg)
      console.log('person' + obj)
      var flag = false
      this.layer.personLayer.eachLayer((e) => {
@@ -374,7 +375,7 @@ export default {
      }
    },
    changeShip(msg) {
      var obj = JSON.parse(msg.body)
      var obj = JSON.parse(msg)
      console.log('ship' + obj)
      this.layer.equipmentLayer.eachLayer((point) => {
        if (point.getAttributes().DEVICE_NO == obj.deviceNo) {
@@ -693,6 +694,7 @@ export default {
          res.data.dataList.forEach((e) => {
            var icon, tips
            var callHelp = ''
            var other = ''
            if (e.locationStatus === '0') {
              icon = '/static/images/normalworker.png'
              layer = this.layer.normalLayer
@@ -712,10 +714,28 @@ export default {
              layer = this.layer.outLineLayer
              tips = '<div class="outline">违规</div>'
              this.personStatistics.outLine++
              if (e.locationStatus == '2') {
                other = '<div class="row outline">' +
                        '<div>定点停留超时</div>' +
                        '<div>已停留' + e.fixedLong + 'min</div>' +
                        '</div>'
              } else {
                other = '<div class="row outline">' +
                        '<div>进入时间</div>' +
                        '<div>' + e.inDate + '</div>' +
                        '</div>'
              }
            } else if (e.locationStatus === '4' || e.locationStatus === '5') {
              icon = '/static/images/sosworker.png'
              layer = this.layer.sosLayer
              tips = '<div class="sos">SOS</div>'
              other = '<div class="row sos">' +
                  '<div>求救时间</div>' +
                  '<div>' + e.alarmDate + '</div>' +
                  '</div>' + '<div class="row sos">' +
                  '<div>求救时长</div>' +
                  '<div>' + e.alarmLong + 'min</div>' +
                  '</div>'
              callHelp = '<div style="display:flex;">' +
                  '<button class="point-out" onClick="window.Vue.rescueModal=true"><i style="font-size: 20px;" class="aidicon aidicon-user-outline"></i>指派</button>' +
                  '<button class="close-confirm" onClick="window.Vue.close()"><i style="font-size: 20px;" class="aidicon aidicon-close"></i>关闭</button>' +
@@ -746,7 +766,7 @@ export default {
                  '<div class="row">' +
                  '<div>纬度</div>' +
                  '<div>' + e.latitude + '</div>' +
                  '</div>' +
                  '</div>' + other +
                  '<div class="row">' +
                  '<div>最新定位时间</div>' +
                  '<div>' + e.newDate + '</div>' +

ebc-sea-platform/pom.xml

@@ -194,123 +194,33 @@
					<encoding>${encoding}</encoding>
					<!-- 通过此方法添加本地jar -->
					<compilerArguments>
						<!--suppress UnresolvedMavenProperty -->
						<bootclasspath>${JAVA_HOME}/jre/lib/rt.jar</bootclasspath>
						<extdirs>${project.basedir}/libs</extdirs>
	 					<bootclasspath>${JAVA_HOME}/jre/lib/rt.jar</bootclasspath>
	 					<extdirs>${project.basedir}/libs</extdirs>
					</compilerArguments>
				</configuration>
			</plugin>
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-surefire-plugin</artifactId>
				<configuration>
					<skip>true</skip>
				</configuration>
			</plugin>
			<!-- ==========应用包和依赖包分离的打包方法================ -->
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skip>true</skip>
                </configuration>
            </plugin>
			<!-- 比spring-boot-dependencies中多了build-info -->
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-resources-plugin</artifactId>
				<executions>
					<execution>
						<id>copy-resources</id>
						<phase>compile</phase>
						<goals>
							<goal>copy-resources</goal>
						</goals>
						<configuration>
							<encoding>${encoding}</encoding>
							<resources>
								<resource>
									<directory>${project.build.directory}/classes</directory>
									<includes>
										<include>**/*.properties</include>
										<include>**/*.xml</include>
										<include>**/*.yaml</include>
										<include>**/*.yml</include>
										<include>**/*.txt</include>
									</includes>
								</resource>
							</resources>
							<!-- 表示把配置文件拷到和jar包同一个路径下 -->
							<outputDirectory>
								${project.build.directory}/config
							</outputDirectory>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<!-- 复制依赖包 -->
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-dependency-plugin</artifactId>
				<groupId>org.springframework.boot</groupId>
				<artifactId>spring-boot-maven-plugin</artifactId>
				<executions>
					<execution>
						<id>copy-dependencies</id>
						<phase>package</phase>
						<goals>
							<goal>copy-dependencies</goal>
							<goal>repackage</goal>
							<goal>build-info</goal>
						</goals>
						<configuration>
							<outputDirectory>${project.build.directory}/lib</outputDirectory>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-jar-plugin</artifactId>
				<configuration>
					<archive>
						<!--生成的jar中，不要包含pom.xml和pom.properties这两个文件-->
						<addMavenDescriptor>false</addMavenDescriptor>
						<manifest>
							<!--是否要把第三方jar放到manifest的classpath中-->
							<addClasspath>true</addClasspath>
							<!--生成的manifest中classpath的前缀，lib存放第三方jar-->
							<classpathPrefix>lib/</classpathPrefix>
							<!--应用的main class-->
							<mainClass>${start-class}</mainClass>
							<!-- 去掉jar后的时间戳 -->
							<useUniqueVersions>false</useUniqueVersions>
						</manifest>
						<!-- 自定义的MANIFEST.MF参数 -->
						<manifestEntries>
							<!-- 增加classpath目录config -->
							<Class-Path>./config/</Class-Path>
						</manifestEntries>
					</archive>
					<!--过滤掉不希望包含在jar中的文件-->
					<excludes>
						<exclude>**/*.properties</exclude>
						<exclude>**/*.xml</exclude>
						<exclude>**/*.yaml</exclude>
						<exclude>**/*.yml</exclude>
						<exclude>**/*.txt</exclude>
					</excludes>
				</configuration>
			</plugin>
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-assembly-plugin</artifactId>
				<version>2.4</version>
				<!-- The configuration of the plugin -->
				<configuration>
					<!-- Specifies the configuration file of the assembly plugin -->
					<descriptors>
						<descriptor>src/main/assembly-package.xml</descriptor>
					</descriptors>
					<mainClass>${start-class}</mainClass>
				</configuration>
				<executions>
					<execution>
						<id>make-assembly</id>
						<phase>package</phase>
						<goals>
							<goal>single</goal>
						</goals>
					</execution>
				</executions>
			</plugin>
		</plugins>
		<finalName>${project.artifactId}</finalName>

ebc-sea-platform/pom_full.xml

@@ -0,0 +1,228 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
	<modelVersion>4.0.0</modelVersion>
	<parent>
		<groupId>com.ai.ipu.server</groupId>
		<artifactId>ipu-rest-libs</artifactId>
		<version>3.1-SNAPSHOT</version>
	</parent>
	<artifactId>ebc-sea-platform</artifactId>
	<packaging>jar</packaging>
	<properties>
		<start-class>com.ai.ipu.server.EbcSeaPlatformStart</start-class>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<mongo.java.driver>3.11.2</mongo.java.driver>
		<ipu>3.1-SNAPSHOT</ipu>
		<jdk>1.8</jdk>
		<junit>4.12</junit>
		<spring-session.version>1.3.2.RELEASE</spring-session.version>
		<nacos.version>0.1.1</nacos.version>
		<poi.version>3.14</poi.version>
		<swagger.version>2.6.1</swagger.version>
	</properties>
	<repositories>
		<!-- 阿里私服 -->
		<repository>
			<id>ali</id>
			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
			<releases>
				<enabled>true</enabled>
			</releases>
			<snapshots>
				<enabled>true</enabled>
				<updatePolicy>always</updatePolicy>
				<checksumPolicy>fail</checksumPolicy>
			</snapshots>
		</repository>
		<!-- IPU仓库 -->
		<repository>
			<id>ipu</id>
			<name>ipu repository</name>
			<url>http://114.215.100.48/nexus/content/groups/public/</url>
			<releases>
				<enabled>true</enabled>
			</releases>
			<snapshots>
				<enabled>true</enabled>
				<updatePolicy>always</updatePolicy>
			</snapshots>
		</repository>
	</repositories>
	<dependencies>
		<dependency>
			<groupId>com.ai.ipu</groupId>
			<artifactId>ipu-sql-mgmt</artifactId>
			<version>${ipu}</version>
			<!-- 屏蔽以后Idea可能启动报错 -->
<!--			<scope>provided</scope>-->
		</dependency>
		<dependency>
			<groupId>com.ai.ipu.server</groupId>
			<artifactId>ipu-restful</artifactId>
		</dependency>
		<!--uspa start-->
		<dependency>
			<groupId>org.springframework</groupId>
			<artifactId>spring-orm</artifactId>
			<version>4.1.9.RELEASE</version>
		</dependency>
		<!-- apache start -->
		<dependency>
			<groupId>commons-configuration</groupId>
			<artifactId>commons-configuration</artifactId>
			<version>1.10</version>
		</dependency>
		<dependency>
			<groupId>commons-fileupload</groupId>
			<artifactId>commons-fileupload</artifactId>
			<version>1.3.2</version>
		</dependency>
		<dependency>
			<groupId>oro</groupId>
			<artifactId>oro</artifactId>
			<version>2.0.8</version>
		</dependency>
		<dependency>
			<groupId>commons-net</groupId>
			<artifactId>commons-net</artifactId>
			<version>3.6</version>
		</dependency>
		<!-- apache end -->
		<dependency>
			<groupId>org.hibernate</groupId>
			<artifactId>hibernate-core</artifactId>
			<version>4.2.5.Final</version>
		</dependency>
		<!-- swagger start -->
		<dependency>
			<groupId>io.springfox</groupId>
			<artifactId>springfox-swagger2</artifactId>
			<version>${swagger.version}</version>
		</dependency>
		<dependency>
			<groupId>io.springfox</groupId>
			<artifactId>springfox-swagger-ui</artifactId>
			<version>${swagger.version}</version>
		</dependency>
		<!-- swagger end -->
		<dependency>
			<groupId>com.thoughtworks.xstream</groupId>
			<artifactId>xstream</artifactId>
			<version>1.4.10</version>
		</dependency>
		<!--	poi start  -->
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-ooxml</artifactId>
			<version>${poi.version}</version>
		</dependency>
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-ooxml-schemas</artifactId>
			<version>${poi.version}</version>
		</dependency>
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-scratchpad</artifactId>
			<version>${poi.version}</version>
		</dependency>
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-excelant</artifactId>
			<version>${poi.version}</version>
		</dependency>
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-contrib</artifactId>
			<version>3.6</version>
		</dependency>
		<dependency>
			<groupId>commons-digester</groupId>
			<artifactId>commons-digester</artifactId>
			<version>2.1</version>
		</dependency>
		<!-- poi end -->
		<dependency>
			<groupId>commons-httpclient</groupId>
			<artifactId>commons-httpclient</artifactId>
			<version>3.1</version>
		</dependency>
		<dependency>
			<groupId>org.projectlombok</groupId>
			<artifactId>lombok</artifactId>
			<version>1.16.10</version>
			<scope>provided</scope>
		</dependency>
		<!--  IPU 镜屏 -->
		<dependency>
			<groupId>com.ai.ipu.server</groupId>
			<artifactId>iot-stomp-server</artifactId>
			<version>${ipu}</version>
			<exclusions>
				<exclusion>
					<groupId>org.apache.logging.log4j</groupId>
					<artifactId>log4j-slf4j-impl</artifactId>
				</exclusion>
			</exclusions>
		</dependency>
	</dependencies>
	<!--<build>
		<plugins>
			<plugin>
				<groupId>org.springframework.boot</groupId>
				<artifactId>spring-boot-maven-plugin</artifactId>
				<configuration>
					<fork>true</fork>
				</configuration>
			</plugin>
		</plugins>
	</build>-->
	<build>
		<plugins>
			<plugin>
				<artifactId>maven-compiler-plugin</artifactId>
				<configuration>
					<source>${compiler-version}</source>
					<target>${compiler-version}</target>
					<encoding>${encoding}</encoding>
					<!-- 通过此方法添加本地jar -->
					<compilerArguments>
	 					<bootclasspath>${JAVA_HOME}/jre/lib/rt.jar</bootclasspath>
	 					<extdirs>${project.basedir}/libs</extdirs>
					</compilerArguments>
				</configuration>
			</plugin>
			<plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skip>true</skip>
                </configuration>
            </plugin>
			<!-- 比spring-boot-dependencies中多了build-info -->
			<plugin>
				<groupId>org.springframework.boot</groupId>
				<artifactId>spring-boot-maven-plugin</artifactId>
				<executions>
					<execution>
						<goals>
							<goal>repackage</goal>
							<goal>build-info</goal>
						</goals>
					</execution>
				</executions>
				<configuration>
					<mainClass>${start-class}</mainClass>
				</configuration>
			</plugin>
		</plugins>
		<finalName>${project.artifactId}</finalName>
	</build>
</project>

ebc-sea-platform/pom_part.xml

@@ -0,0 +1,318 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
	<modelVersion>4.0.0</modelVersion>
	<parent>
		<groupId>com.ai.ipu.server</groupId>
		<artifactId>ipu-rest-libs</artifactId>
		<version>3.1-SNAPSHOT</version>
	</parent>
	<artifactId>ebc-sea-platform</artifactId>
	<packaging>jar</packaging>
	<properties>
		<start-class>com.ai.ipu.server.EbcSeaPlatformStart</start-class>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<mongo.java.driver>3.11.2</mongo.java.driver>
		<ipu>3.1-SNAPSHOT</ipu>
		<jdk>1.8</jdk>
		<junit>4.12</junit>
		<spring-session.version>1.3.2.RELEASE</spring-session.version>
		<nacos.version>0.1.1</nacos.version>
		<poi.version>3.14</poi.version>
		<swagger.version>2.6.1</swagger.version>
	</properties>
	<repositories>
		<!-- 阿里私服 -->
		<repository>
			<id>ali</id>
			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
			<releases>
				<enabled>true</enabled>
			</releases>
			<snapshots>
				<enabled>true</enabled>
				<updatePolicy>always</updatePolicy>
				<checksumPolicy>fail</checksumPolicy>
			</snapshots>
		</repository>
		<!-- IPU仓库 -->
		<repository>
			<id>ipu</id>
			<name>ipu repository</name>
			<url>http://114.215.100.48/nexus/content/groups/public/</url>
			<releases>
				<enabled>true</enabled>
			</releases>
			<snapshots>
				<enabled>true</enabled>
				<updatePolicy>always</updatePolicy>
			</snapshots>
		</repository>
	</repositories>
	<dependencies>
		<dependency>
			<groupId>com.ai.ipu</groupId>
			<artifactId>ipu-sql-mgmt</artifactId>
			<version>${ipu}</version>
			<!-- 屏蔽以后Idea可能启动报错 -->
<!--			<scope>provided</scope>-->
		</dependency>
		<dependency>
			<groupId>com.ai.ipu.server</groupId>
			<artifactId>ipu-restful</artifactId>
		</dependency>
		<!--uspa start-->
		<dependency>
			<groupId>org.springframework</groupId>
			<artifactId>spring-orm</artifactId>
			<version>4.1.9.RELEASE</version>
		</dependency>
		<!-- apache start -->
		<dependency>
			<groupId>commons-configuration</groupId>
			<artifactId>commons-configuration</artifactId>
			<version>1.10</version>
		</dependency>
		<dependency>
			<groupId>commons-fileupload</groupId>
			<artifactId>commons-fileupload</artifactId>
			<version>1.3.2</version>
		</dependency>
		<dependency>
			<groupId>oro</groupId>
			<artifactId>oro</artifactId>
			<version>2.0.8</version>
		</dependency>
		<dependency>
			<groupId>commons-net</groupId>
			<artifactId>commons-net</artifactId>
			<version>3.6</version>
		</dependency>
		<!-- apache end -->
		<dependency>
			<groupId>org.hibernate</groupId>
			<artifactId>hibernate-core</artifactId>
			<version>4.2.5.Final</version>
		</dependency>
		<!-- swagger start -->
		<dependency>
			<groupId>io.springfox</groupId>
			<artifactId>springfox-swagger2</artifactId>
			<version>${swagger.version}</version>
		</dependency>
		<dependency>
			<groupId>io.springfox</groupId>
			<artifactId>springfox-swagger-ui</artifactId>
			<version>${swagger.version}</version>
		</dependency>
		<!-- swagger end -->
		<dependency>
			<groupId>com.thoughtworks.xstream</groupId>
			<artifactId>xstream</artifactId>
			<version>1.4.10</version>
		</dependency>
		<!--	poi start  -->
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-ooxml</artifactId>
			<version>${poi.version}</version>
		</dependency>
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-ooxml-schemas</artifactId>
			<version>${poi.version}</version>
		</dependency>
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-scratchpad</artifactId>
			<version>${poi.version}</version>
		</dependency>
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-excelant</artifactId>
			<version>${poi.version}</version>
		</dependency>
		<dependency>
			<groupId>org.apache.poi</groupId>
			<artifactId>poi-contrib</artifactId>
			<version>3.6</version>
		</dependency>
		<dependency>
			<groupId>commons-digester</groupId>
			<artifactId>commons-digester</artifactId>
			<version>2.1</version>
		</dependency>
		<!-- poi end -->
		<dependency>
			<groupId>commons-httpclient</groupId>
			<artifactId>commons-httpclient</artifactId>
			<version>3.1</version>
		</dependency>
		<dependency>
			<groupId>org.projectlombok</groupId>
			<artifactId>lombok</artifactId>
			<version>1.16.10</version>
			<scope>provided</scope>
		</dependency>
		<!--  IPU 镜屏 -->
		<dependency>
			<groupId>com.ai.ipu.server</groupId>
			<artifactId>iot-stomp-server</artifactId>
			<version>${ipu}</version>
			<exclusions>
				<exclusion>
					<groupId>org.apache.logging.log4j</groupId>
					<artifactId>log4j-slf4j-impl</artifactId>
				</exclusion>
			</exclusions>
		</dependency>
	</dependencies>
	<!--<build>
		<plugins>
			<plugin>
				<groupId>org.springframework.boot</groupId>
				<artifactId>spring-boot-maven-plugin</artifactId>
				<configuration>
					<fork>true</fork>
				</configuration>
			</plugin>
		</plugins>
	</build>-->
	<build>
		<plugins>
			<plugin>
				<artifactId>maven-compiler-plugin</artifactId>
				<configuration>
					<source>${compiler-version}</source>
					<target>${compiler-version}</target>
					<encoding>${encoding}</encoding>
					<!-- 通过此方法添加本地jar -->
					<compilerArguments>
						<!--suppress UnresolvedMavenProperty -->
						<bootclasspath>${JAVA_HOME}/jre/lib/rt.jar</bootclasspath>
						<extdirs>${project.basedir}/libs</extdirs>
					</compilerArguments>
				</configuration>
			</plugin>
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-surefire-plugin</artifactId>
				<configuration>
					<skip>true</skip>
				</configuration>
			</plugin>
			<!-- ==========应用包和依赖包分离的打包方法================ -->
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-resources-plugin</artifactId>
				<executions>
					<execution>
						<id>copy-resources</id>
						<phase>compile</phase>
						<goals>
							<goal>copy-resources</goal>
						</goals>
						<configuration>
							<encoding>${encoding}</encoding>
							<resources>
								<resource>
									<directory>${project.build.directory}/classes</directory>
									<includes>
										<include>**/*.properties</include>
										<include>**/*.xml</include>
										<include>**/*.yaml</include>
										<include>**/*.yml</include>
										<include>**/*.txt</include>
									</includes>
								</resource>
							</resources>
							<!-- 表示把配置文件拷到和jar包同一个路径下 -->
							<outputDirectory>
								${project.build.directory}/config
							</outputDirectory>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<!-- 复制依赖包 -->
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-dependency-plugin</artifactId>
				<executions>
					<execution>
						<id>copy-dependencies</id>
						<phase>package</phase>
						<goals>
							<goal>copy-dependencies</goal>
						</goals>
						<configuration>
							<outputDirectory>${project.build.directory}/lib</outputDirectory>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-jar-plugin</artifactId>
				<configuration>
					<archive>
						<!--生成的jar中，不要包含pom.xml和pom.properties这两个文件-->
						<addMavenDescriptor>false</addMavenDescriptor>
						<manifest>
							<!--是否要把第三方jar放到manifest的classpath中-->
							<addClasspath>true</addClasspath>
							<!--生成的manifest中classpath的前缀，lib存放第三方jar-->
							<classpathPrefix>lib/</classpathPrefix>
							<!--应用的main class-->
							<mainClass>${start-class}</mainClass>
							<!-- 去掉jar后的时间戳 -->
							<useUniqueVersions>false</useUniqueVersions>
						</manifest>
						<!-- 自定义的MANIFEST.MF参数 -->
						<manifestEntries>
							<!-- 增加classpath目录config -->
							<Class-Path>./config/</Class-Path>
						</manifestEntries>
					</archive>
					<!--过滤掉不希望包含在jar中的文件-->
					<excludes>
						<exclude>**/*.properties</exclude>
						<exclude>**/*.xml</exclude>
						<exclude>**/*.yaml</exclude>
						<exclude>**/*.yml</exclude>
						<exclude>**/*.txt</exclude>
					</excludes>
				</configuration>
			</plugin>
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-assembly-plugin</artifactId>
				<version>2.4</version>
				<!-- The configuration of the plugin -->
				<configuration>
					<!-- Specifies the configuration file of the assembly plugin -->
					<descriptors>
						<descriptor>src/main/assembly-package.xml</descriptor>
					</descriptors>
				</configuration>
				<executions>
					<execution>
						<id>make-assembly</id>
						<phase>package</phase>
						<goals>
							<goal>single</goal>
						</goals>
					</execution>
				</executions>
			</plugin>
		</plugins>
		<finalName>${project.artifactId}</finalName>
	</build>
</project>

ebc-sea-platform/src/main/java/com/ai/ipu/server/controller/ReceiveSubscribeController.java

@@ -77,17 +77,20 @@ public class ReceiveSubscribeController {
		
		//报警类型
		switch (detailInfo.getJSONObject("alarmType").getIntValue("value")) {
		case 1: //自动报警
			dataMap.put("locationStatus",EbcConstant.location_status_autosos);//报警类型
			dataMap.put("alarmType",EbcConstant.alarm_type_autosos);//报警类型
		case EbcConstant.alarm_type_autosos_beidou: 
			//自动报警
			dataMap.put("locationStatus",EbcConstant.location_status_autosos);//定位状态
			dataMap.put("alarmType",EbcConstant.alarm_type_autosos_ZH);//报警类型
			break;
		case 2: //手动报警
			dataMap.put("locationStatus",EbcConstant.location_status_jogsos);//报警类型
			dataMap.put("alarmType",EbcConstant.alarm_type_jogsos);//报警类型
		case EbcConstant.alarm_type_jogsos_beidou: 
			//手动报警
			dataMap.put("locationStatus",EbcConstant.location_status_jogsos);//定位状态
			dataMap.put("alarmType",EbcConstant.alarm_type_jogsos_ZH);//报警类型
			break;
		case 4: //离线
			dataMap.put("locationStatus",EbcConstant.location_status_offline);//报警类型
			dataMap.put("alarmType",EbcConstant.alarm_type_offline);//报警类型
		case EbcConstant.alarm_type_offline_beidou: 
			//离线
			dataMap.put("locationStatus",EbcConstant.location_status_offline);//定位状态
			dataMap.put("alarmType",EbcConstant.alarm_type_offline_ZH);//报警类型
			break;
		default:
			logger.error("告警消息的内容错误，消息为：" +msg);

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/DeviceManageDaoImpl.java

@@ -231,6 +231,12 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
			detailInfoMap.put("longitude", detailInfo.getJSONObject("longitude").getString("value"));// 经度
			detailInfoMap.put("latitude", detailInfo.getJSONObject("latitude").getString("value"));// 纬度
			detailInfoMap.put("newDate", detailInfo.getJSONObject("msgDate").getString("value"));// 最新定位时间
			
			// 报警类型
			if (detailInfo.getJSONObject("alarmType")!=null) {
				detailInfoMap.put("alarmType", detailInfo.getJSONObject("alarmType").getString("value"));
			}
			
			list.add(detailInfoMap);
		}
		

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/RescueDaoImpl.java

@@ -34,7 +34,7 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
	public List<Map<String, Object>> queryNoCloseRescueLog(List<String> deviceIdsList) throws Exception {
		Map<String, Object> dataMap=new HashMap<String, Object>();
		dataMap.put("deviceIdsList", deviceIdsList);//设备ID
		dataMap.put("offlineType", EbcConstant.alarm_type_offline);//不属于离线告警
		dataMap.put("offlineType", EbcConstant.alarm_type_offline_ZH);//不属于离线告警
		
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		return mgmtDao.executeSelect("ipu.RescueDao",  "queryNoCloseRescueLog", dataMap);
@@ -52,21 +52,32 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
	 */
	@Override
	public boolean addRescueLog(Map<String, Object> dataMap) throws Exception {
		dataMap.put("dataStatus", "1");
		dataMap.put("DATA_STATUS", "1");
		//TODO 创建人和操作人的编号和部门
		dataMap.put("departmentId", 1);
		dataMap.put("createDate", TimeUtil.getSysTime());
		dataMap.put("createOpId", "");
		dataMap.put("createOrgId", "");
		dataMap.put("doneDate", TimeUtil.getSysTime());
		dataMap.put("opId", "");
		dataMap.put("orgId", "");
		dataMap.put("CREATE_DATE", TimeUtil.getSysTime());
		dataMap.put("CREATE_OP_ID", "");
		dataMap.put("CREATE_ORG_ID", "");
		dataMap.put("DONE_DATE", TimeUtil.getSysTime());
		dataMap.put("OP_ID", "");
		dataMap.put("ORG_ID", "");
		int num=dao.insert("LR_RESCUE_LOG", dataMap);
		
		return num > 0;
	}
	
	@Override
	public boolean modifyRescueLog(Map<String, Object> dataMap) throws Exception {
		//TODO 操作人的编号和部门
		dataMap.put("DONE_DATE", TimeUtil.getSysTime());
		dataMap.put("OP_ID", "");
		dataMap.put("ORG_ID", "");
		
		int num=dao.update("LR_RESCUE_LOG", dataMap);
		
		return num > 0;
	}
	
	@Override
	public boolean assignRescuer(JMap params) throws Exception {
		// TODO Auto-generated method stub
@@ -78,5 +89,7 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
		// TODO Auto-generated method stub
		return false;
	}
	
	
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/interfaces/RescueDao.java

@@ -42,6 +42,14 @@ public interface RescueDao {
	boolean addRescueLog(Map<String, Object> dataMap) throws Exception;
	/**
	 * 修改报警救援日志
	 * @param dataMap
	 * @return
	 * @throws Exception
	 */
	boolean modifyRescueLog(Map<String, Object> dataMap) throws Exception;
	
	/**
	 * 指派救援
	 * @return
	 * @throws Exception

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/DeviceManageServiceImpl.java

@@ -18,6 +18,7 @@ import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.enums.UserEnums;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.ai.ipu.server.util.DateUtil;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
import com.alibaba.fastjson.JSON;
@@ -189,83 +190,6 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		return num > 0;
	}
	
	public List<Map<String, String>> queryCurrentDeviceLocationInfo11(JMap params) throws Exception {
		List<Map<String, String>> list = new ArrayList<Map<String, String>>();
		Map<String, String> map1 = new HashMap<String, String>();
		map1.put("userName", "张三");// 人员姓名
		map1.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map1.put("deviceId", "999571");// 终端ID
		map1.put("deviceNo", "999571");// 终端编号
		map1.put("longitude", "123.7709439");// 经度
		map1.put("latitude", "31.5847745");// 纬度
		map1.put("newDate", "2020-10-27 13:14:15");// 最新定位时间
		list.add(map1);
		Map<String, String> map2 = new HashMap<String, String>();
		map2.put("userName", "李四");// 人员姓名
		map2.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map2.put("deviceId", "981489");// 终端ID
		map2.put("deviceNo", "981489");// 终端编号
		map2.put("longitude", "125.4221927");// 经度
		map2.put("latitude", "32.0453331");// 纬度
		map2.put("newDate", "2020-10-26 11:22:33");// 最新定位时间
		list.add(map2);
		Map<String, String> map3 = new HashMap<String, String>();
		map3.put("userName", "王五");// 人员姓名
		map3.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map3.put("deviceId", "981453");// 终端ID
		map3.put("deviceNo", "981453");// 终端编号
		map3.put("longitude", "122.0221926");// 经度
		map3.put("latitude", "33.5453331");// 纬度
		map3.put("newDate", "2020-10-27 12:31:45");// 最新定位时间
		list.add(map3);
		Map<String, String> map4 = new HashMap<String, String>();
		map4.put("userName", "赵六");// 人员姓名
		map4.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map4.put("deviceId", "23125");// 终端ID
		map4.put("deviceNo", "23125");// 终端编号
		map4.put("longitude", "125.3221927");// 经度
		map4.put("latitude", "33.3453331");// 纬度
		map4.put("newDate", "2020-10-27 13:40:40");// 最新定位时间
		list.add(map4);
		Map<String, String> map5 = new HashMap<String, String>();
		map5.put("userName", "田七");// 人员姓名
		map5.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map5.put("deviceId", "23126");// 终端ID
		map5.put("deviceNo", "23126");// 终端编号
		map5.put("longitude", "125.4221927");// 经度
		map5.put("latitude", "32.9453331");// 纬度
		map5.put("newDate", "2020-10-27 18:20:30");// 最新定位时间
		list.add(map5);
		Map<String, String> map6 = new HashMap<String, String>();
		map6.put("userName", "周八");// 人员姓名
		map6.put("locationStatus", EbcConstant.location_status_exclusion);// 状态:3违规(禁区)
		map6.put("deviceId", "23128");// 终端ID
		map6.put("deviceNo", "23128");// 终端编号
		map6.put("longitude", "124.5309335");// 经度
		map6.put("latitude", "33.7753425");// 纬度
		map6.put("newDate", "2020-10-27 14:28:38");// 最新定位时间
		list.add(map6);
		Map<String, String> map7 = new HashMap<String, String>();
		map7.put("userName", "吴九");// 人员姓名
		map7.put("locationStatus", EbcConstant.location_status_offline);// 状态:1离线
		map7.put("deviceId", "23129");// 终端ID
		map7.put("deviceNo", "23129");// 终端编号
		map7.put("longitude", "122.4221927");// 经度
		map7.put("latitude", "32.6453331");// 纬度
		map7.put("newDate", "2020-10-27 14:15:22");// 最新定位时间
		list.add(map7);
		return list;
	}
	
	@Override
	public List<Map<String, String>> queryCurrentDeviceLocationInfo(JMap params) throws Exception {
		// 获取已绑定的设备列表
@@ -300,34 +224,58 @@ public class DeviceManageServiceImpl implements DeviceManageService {
			map.put("locationStatus", EbcConstant.location_status_normal);// 定位状态
			
			boolean flag = true;
			// 设备绑定的信息
			
			// 人员名称
			for (Map<String, Object> bindDeviceMap : bindUserDeviceList) {
				if (deviceId.equals(String.valueOf(bindDeviceMap.get("DEVICE_ID")))) {
					map.put("userName", String.valueOf(bindDeviceMap.get("NAME")));
					break;
				}
			}
			
			//离线信息
			if (map.get("alarmType")!=null&&EbcConstant.alarm_type_offline_beidou==Integer.parseInt(String.valueOf(map.get("alarmType")))) {
				map.put("locationStatus",EbcConstant.location_status_offline);//定位状态
				map.put("alarmType",EbcConstant.alarm_type_offline_ZH);//报警类型
				flag = false;
			}
			
			// 求救信息
			if (alarmMapList != null && flag) {
				// 求救信息
				for (int i = 0; i < alarmMapList.size() && flag; i++) {
					Map<String, Object> alarmMap = alarmMapList.get(i);
					if (deviceId.equals(String.valueOf(alarmMap.get("DEVICE_ID")))) {
						// 求救时间
						String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));
						map.put("alarmDate", alarmDate);
						map.put("alarmDate", DateUtil.formatStrDate(alarmDate));
						// 计算求救时长
						int alarmLong = JingPingSendDateUtil.getBetweenMinuteValue(alarmDate, map.get("newDate"));
						int alarmLong = DateUtil.getDifferenceMinute(alarmDate, map.get("newDate"));
						map.put("alarmLong", String.valueOf(alarmLong));
						
						//定位状态
						switch (String.valueOf(alarmMap.get("ALARM_TYPE"))) {
						case EbcConstant.alarm_type_autosos_ZH:
							//自动报警
							map.put("locationStatus",EbcConstant.location_status_autosos);
							map.put("alarmType",EbcConstant.alarm_type_autosos_ZH);
							break;
						case EbcConstant.alarm_type_jogsos_ZH:
							//手动报警
							map.put("locationStatus",EbcConstant.location_status_jogsos);
							map.put("alarmType",EbcConstant.alarm_type_jogsos_ZH);
							break;
						default:
							break;
						}
						
						flag = false;
					}
				}
			}
			// 违规信息
			if (areaViolationMapList != null && flag) {
				// 违规信息
				int maxMapTagGrade = 0; // 围栏优先级(电子围栏5>定点3>考勤1、作业1)
				long minInAreaLong = System.currentTimeMillis();// 进入围栏最早的时间戳
				Map<String, Object> areaInfoMap = null;// 用于计算时间的围栏信息
@@ -365,15 +313,13 @@ public class DeviceManageServiceImpl implements DeviceManageService {
				// 判断是否在违规
				if (maxMapTagGrade == 5) {
					logger.info("镜屏推送进入电子围栏的信息");
					// 进入电子围栏(禁区)，需显示进入时间
					map.put("inDate", simpleDateFormat.format(areaInfoMap.get("IN_DATE"))); // 进入时间
					map.put("locationStatus", EbcConstant.location_status_exclusion); // 定位状态
				} else if (maxMapTagGrade == 3) {
					// 进入定点(限时)，需计算是否超时
					int fixedLong = JingPingSendDateUtil
							.getBetweenMinuteValue(String.valueOf(areaInfoMap.get("IN_DATE")), map.get("newDate"));
					int fixedLong = DateUtil.getDifferenceMinute(String.valueOf(areaInfoMap.get("IN_DATE")), map.get("newDate"));
					if (fixedLong > 0) {
						// 围栏要求定点时间

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/ReceiveSubscribeServiceImpl.java

@@ -22,6 +22,7 @@ import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.dao.interfaces.MapTagManageDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.service.interfaces.ReceiveSubscribeService;
import com.ai.ipu.server.util.DateUtil;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
import com.alibaba.fastjson.JSON;
@@ -51,6 +52,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
			public void run() {
				try {
					logger.debug("启动定位信息新线程：" + Thread.currentThread().getName());
					// 处理定位数据
					executeReceiveIotLocationData(dataMap);
					logger.debug("数据库连接全量提交");
@@ -75,6 +77,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
			public void run() {
				try {
					logger.debug("启动报警信息新线程：" + Thread.currentThread().getName());
					// 处理报警数据
					executeReceiveIotAlarmData(dataMap);
					logger.debug("数据库连接全量提交");
@@ -103,6 +106,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindUser(params.getString("deviceId"), null);
		if (bindInfoMap != null) {
			// 设备与人员绑定
			logger.debug("定位信息的对象为人员: " + bindInfoMap.get("NAME"));
			params.put("userName", bindInfoMap.get("NAME"));
			params.put("userCode", bindInfoMap.get("CODE"));
@@ -110,6 +114,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		} else {
			bindInfoMap = deviceManageDao.queryOneBindShip(params.getString("deviceId"), null);
			if (bindInfoMap != null) {
				// 设备与船舶绑定
				logger.info("定位信息的对象为船舶: " + bindInfoMap.get("NAME"));
				params.put("shipName", bindInfoMap.get("NAME"));
				params.put("shipCode", bindInfoMap.get("CODE"));
@@ -119,6 +124,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
				logger.debug("推送镜屏数据：" + jingpingData);
				JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_ship, jingpingData);
			} else {
				// 设备未绑定
				logger.error("定位设备未绑定");
			}
			return;
@@ -168,10 +174,10 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		// 求救时间
		String alarmDate = String.valueOf(alarmList.get(0).get("CALLER_DATE"));
		params.put("alarmDate", alarmDate);
		params.put("alarmDate", DateUtil.formatStrDate(alarmDate));
		// 计算求救时长
		params.put("alarmLong", JingPingSendDateUtil.getBetweenMinuteValue(alarmDate, params.getString("newDate")));
		params.put("alarmLong", DateUtil.getDifferenceMinute(alarmDate, params.getString("newDate")));
		params.put("isNewAlarm", "0");
@@ -180,6 +186,12 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		logger.debug("推送镜屏数据：" + jingpingData);
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, jingpingData);
		// 修改最后定位时间
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("LOG_ID", alarmList.get(0).get("LOG_ID")); // 日志ID
		dataMap.put("LAST_LOCATION_DATE", params.get("newDate")); // 最后定位时间
		rescueDao.modifyRescueLog(dataMap);
		return true;
	}
@@ -265,7 +277,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		if (!beforeAreaMapList.isEmpty()) {
			List<String> outAreaIdList = new ArrayList<String>();
			for (Map<String, Object> beforeAreaMap : beforeAreaMapList) {
				outAreaIdList.add(String.valueOf(beforeAreaMap.get("MAP_TAG_ID")));
				outAreaIdList.add(String.valueOf(beforeAreaMap.get("RECORD_ID")));
			}
			areaInOutRecordDao.updateSameOutTimeAreaOutRecord(params.getString("newDate"), outAreaIdList);
@@ -333,12 +345,12 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		if (maxMapTagGrade == 5) {
			logger.info("镜屏推送进入电子围栏的信息");
			// 进入电子围栏(禁区)，需显示进入时间
			params.put("inDate", simpleDateFormat.format(sendDataAreaInfo.get("inAreaDate"))); // 进入时间
			params.put("inDate", sendDataAreaInfo.get("inAreaDate")); // 进入时间
			params.put("locationStatus", EbcConstant.location_status_exclusion); // 定位状态
		} else if (maxMapTagGrade == 3) {
			// 进入定点(限时)，需计算是否超时
			int fixedLong = JingPingSendDateUtil.getBetweenMinuteValue(
			int fixedLong = DateUtil.getDifferenceMinute(
					String.valueOf(sendDataAreaInfo.get("inAreaDate")), params.getString("newDate"));
			if (fixedLong > 0) {
@@ -417,7 +429,8 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		dataMap.put("ALARM_TYPE", params.get("alarmType")); // 告警类型
		dataMap.put("LONGITUDE", params.get("longitude")); // 报警经度
		dataMap.put("LATITUDE", params.get("latitude")); // 报警纬度
		dataMap.put("CALLER_DATE", params.get("msgDate")); // 报警时间
		dataMap.put("CALLER_DATE", params.get("newDate")); // 报警时间
		dataMap.put("LAST_LOCATION_DATE", params.get("newDate")); // 最后定位时间
		// 报警位置
		if (currentAreaInfoJMap.getInt("mapTagNum") > 0) {

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/DateUtil.java

@@ -0,0 +1,193 @@
package com.ai.ipu.server.util;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.ai.ipu.common.date.TimeUtil;
/**
 * 时间工具类
 * @author konghl@asiainfo.com
 * 2020-11-2
 */
public class DateUtil {
	/**
	 * 比较日期大小
	 * @param dateStr0
	 * @param dateStr1
	 * @return
	 */
	public static int compareDate(String dateStr0, String dateStr1) {
		Date date1 = convertDate(dateStr0);
		Date date2 = convertDate(dateStr1);
		int result = date1.compareTo(date2);
		return result;
	}
	/**
	 * 格式化字符串时间
	 * @param date
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String formatStrDate(String dateStr) {
		Date date = convertDate(dateStr);
		return formatDate(date, "yyyy-MM-dd HH:mm:ss");
	}
	/**
	 * 时间转字符串 
	 * @param date
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String formatDate(Date date) {
		return formatDate(date, "yyyy-MM-dd HH:mm:ss");
	}
	/**
	 * 时间转字符串
	 * @param date
	 * @param pattern 时间格式
	 * @return
	 */
	public static String formatDate(Date date, String pattern) {
		if (date == null) {
			return "";
		}
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
		return formatter.format(date);
	}
	/**
	 * 字符串转时间
	 * @param dateStr
	 * @return
	 */
	public static Date convertDate(String dateStr) {
		if (dateStr == null || "".equals(dateStr)) {
			return null;
		}
		String pattern = TimeUtil.getTimestampFormat(dateStr);
		return convertDate(dateStr, pattern);
	}
	/**
	 * 字符串转时间
	 * @param dateStr
	 * @param pattern
	 * @return
	 */
	public static Date convertDate(String dateStr, String pattern) {
		if (dateStr == null || "".equals(dateStr)) {
			return null;
		}
		if (pattern == null || "".equals(pattern)) {
			pattern = TimeUtil.getTimestampFormat(dateStr);
		}
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
		Date date = null;
		try {
			date = formatter.parse(dateStr);
		} catch (ParseException e) {
			e.printStackTrace();
		}
		return date;
	}
	/**
	 * 计算两个时间差，返回毫秒数(endDate-beginDate)
	 * @param beginDate
	 * @param endDate
	 * @return 
	 * @throws ParseException
	 */
	public static long getDifferenceMillisecond(Date beginDate, Date endDate) throws ParseException {
		long beginDateLong = 0L;
		long endDateLong = 0L;
		if (beginDate != null) {
			beginDateLong = beginDate.getTime();
		}
		if (endDate != null) {
			endDateLong = endDate.getTime();
		}
		return endDateLong - beginDateLong;
	}
	/**
	 * 计算两个时间差，返回毫秒数(endDate-beginDate)
	 * @param beginDateStr
	 * @param endDateStr
	 * @return 
	 * @throws ParseException
	 */
	public static long getDifferenceMillisecond(String beginDateStr, String endDateStr) throws ParseException {
		Date beginDate = convertDate(beginDateStr);
		Date endDate = convertDate(endDateStr);
		return getDifferenceMillisecond(beginDate, endDate);
	}
	/**
	 * 计算两个时间差，返回分钟数(endDate-beginDate)
	 * @param beginDate
	 * @param endDate
	 * @return
	 * @throws ParseException 
	 */
	public static int getDifferenceMinute(String beginDateStr, String endDateStr) throws ParseException {
		long diffMillisecond = getDifferenceMillisecond(beginDateStr, endDateStr);
		if (diffMillisecond > 0) {
			BigDecimal diffMillisecondBigDecimal = new BigDecimal(diffMillisecond);
			// 单位为分，四舍五入不保留小数
			BigDecimal diffMinuteBigDecimal = diffMillisecondBigDecimal.divide(new BigDecimal("60000"), 0,
					BigDecimal.ROUND_HALF_UP);
			return diffMinuteBigDecimal.intValue();
		} else {
			return 0;
		}
	}
	/**
	 * 计算两个时间差，返回字符串(endDate-beginDate)
	 * @param beginDateStr
	 * @param endDateStr
	 * @return
	 * @throws ParseException
	 */
	public static String getDifferenceString(String beginDateStr, String endDateStr) throws ParseException {
		long diffMillisecond = getDifferenceMillisecond(beginDateStr, endDateStr);
		if (diffMillisecond <= 60000) {
			return "0分钟";
		}
		BigDecimal diffMillisecondBigDecimal = new BigDecimal(diffMillisecond);
		BigDecimal diffMinuteBigDecimal = diffMillisecondBigDecimal.divide(new BigDecimal("60000"), 0,
				BigDecimal.ROUND_DOWN);
		BigDecimal diffHourBigDecimal = diffMinuteBigDecimal.divide(new BigDecimal("60"), 0, BigDecimal.ROUND_DOWN);
		BigDecimal diffdayBigDecimal = diffHourBigDecimal.divide(new BigDecimal("24"), 0, BigDecimal.ROUND_DOWN);
		int diffMinute = diffMinuteBigDecimal.subtract(diffHourBigDecimal.multiply(new BigDecimal("60"))).intValue();
		int diffHour = diffHourBigDecimal.subtract(diffdayBigDecimal.multiply(new BigDecimal("24"))).intValue();
		int diffDay = diffHourBigDecimal.subtract(diffdayBigDecimal.multiply(new BigDecimal("24"))).intValue();
		StringBuilder diffStr = new StringBuilder();
		if (diffDay > 0) {
			diffStr.append(diffDay).append("天");
		}
		if (diffHour > 0) {
			diffStr.append(diffHour).append("小时");
		}
		if (diffMinute > 0) {
			diffStr.append(diffMinute).append("分钟");
		}
		return diffStr.toString();
	}
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/EbcConstant.java

@@ -42,39 +42,45 @@ public class EbcConstant {
	// 围栏标记类型：定点
	public static final String area_type_temporariness = "4";
	//定位状态：正常
	//人员定位状态：正常
	public static final String location_status_normal="0";
	
	//定位状态：离线
	//人员定位状态：离线
	public static final String location_status_offline="1";
	
	//定位状态：定点(超时)违规
	//人员定位状态：定点(超时)违规
	public static final String location_status_overtime="2";
	
	//定位状态：电子围栏(禁区)违规
	//人员定位状态：电子围栏(禁区)违规
	public static final String location_status_exclusion ="3";
	
	//人员状态：SOS(自动)
	//人员定位状态：SOS(自动)
	public static final String location_status_autosos="4";
	
	//人员状态：SOS(手动)
	//人员定位状态：SOS(手动)
	public static final String location_status_jogsos="5";
	
	//人员状态：救援人员
	//人员定位状态：救援人员
	public static final String location_status_rescuers="6";
	
	//告警类型：SOS(手动)
	public static final int alarm_type_jogsos_beidou=2;
	
	//告警类型：SOS(自动)
	public static final int alarm_type_autosos_beidou=1;
	
	//告警类型：离线
	public static final String alarm_type_offline="离线告警";
	public static final int alarm_type_offline_beidou=4;
	
	//告警类型：SOS(手动)
	public static final String alarm_type_jogsos="手动告警";
	
	//人员状态：SOS(手动)
	public static final String location_status_jogsos_ZH="手动告警";
	public static final String alarm_type_jogsos_ZH="手动告警";
	
	//人员状态：SOS(自动)
	public static final String location_status_autosos_ZH="落水告警";
	//告警类型：SOS(自动)
	public static final String alarm_type_autosos_ZH="落水告警";
	//告警类型：离线
	public static final String alarm_type_offline_ZH="离线告警";
	
	//考勤查询日
	public static final String  AREA_IN_OUT_RECORD_DAY="day";
@@ -83,7 +89,5 @@ public class EbcConstant {
	//考勤查询月
	public static final String AREA_IN_OUT_RECORD_MONTH="month";
	//告警类型：SOS(自动)
	public static final String alarm_type_autosos="落水告警";
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/JingPingSendDateUtil.java

@@ -1,9 +1,5 @@
package com.ai.ipu.server.util;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import com.ai.ipu.server.connect.ps.EventChannelTool;
import com.ai.ipu.server.connect.ps.EventChannelTool.PublisherEvent;
import com.ai.ipu.server.connect.ps.ISubscriber;
@@ -38,28 +34,4 @@ public class JingPingSendDateUtil {
		};
		publisher.publish(topic, publisherEvent);
	}
	/**
	 * 计算两个时间相隔的分钟数(endDate-beginDate)
	 * @param beginDate
	 * @param endDate
	 * @return
	 * @throws ParseException 
	 */
	public static int getBetweenMinuteValue(String beginDate, String endDate) throws ParseException {
		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
		long endDateLong = simpleDateFormat.parse(endDate).getTime();
		long beginDateLong = simpleDateFormat.parse(beginDate).getTime();
		long alarmLong = endDateLong - beginDateLong;
		if (alarmLong>0) {
			BigDecimal alarmLongBigDecimal = new BigDecimal(alarmLong);
			// 单位为分，四舍五入不保留小数
			alarmLongBigDecimal = alarmLongBigDecimal.divide(new BigDecimal("60000"), 0, BigDecimal.ROUND_HALF_UP);
			return alarmLongBigDecimal.intValue();
		}else {
			return 0;
		}
		
	}
}