Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git

ebc-middle-platform/src/conf/services.js

@@ -68,7 +68,11 @@ export default {
    GETBYNAMESEARCHORG: '/org/queryOrg/', // 根据NAME查组织
    STAFF: '/staff', // 根据组织id新建post, 修改put，删除delete员工信息
    SEARCHSTAFF: '/staff/staffId/', // 根据组织id新建post, 修改put，删除delete员工信息
    QUERYSTAFF: '/staff/queryStaff' // 根据组织id查找员工列表
    QUERYSTAFF: '/staff/queryStaff', // 根据组织id查找员工列表
    MAP_LOCATION_VIEW: '/locationManagement/loadMapLocationView', // 初始化人员定位页面的数据
    BIND_DEVICE: '/workEmployee/queryEmployeeBindDeviceList', // 查询绑定的人员列表
    FENCE_BY_DEPARTMENT: '/mapTag/queryAllMapTagByOrg', // 按部门查询查询围栏
    EQUIPMENT_NOT_BIND: '/equipment/queryAllEquipmentNotBind' // 查询所有未绑定的设备
  },
  position: {
    POSITION: '/position/', // 新增post，修改put，删除delete岗位信息

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

@@ -11,9 +11,10 @@
      .person-info{
        display: flex;
        font-size: 16px;
        div{
        >div{
          margin-right: 10px;
          display: flex;
          min-width: 85px;
          .number{
            color: #2373D2;
            font-size: 24px;
@@ -49,6 +50,7 @@
        .time{
          font-size: 16px;
          margin-left: 50px;
          min-width: 230px;
        }
      }
      .right-content{

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

@@ -36,7 +36,7 @@
          "
        >轨迹</t-button
        >
        <div>悬浮窗<t-switch rounded></t-switch></div>
        <div style="min-width:100px">悬浮窗<t-switch rounded></t-switch></div>
      </div>
    </div>
    <div id="div1" style="height: 100%"></div>
@@ -102,7 +102,7 @@
            style="width: 200px"
          ></t-input>
          <div>
            <div v-for="(item,index) in personList" :class="trackPerson==item.deviceId?'active':''" :key="index" @click="personTrack(item)">{{ item.userName }}</div>
            <div v-for="(item,index) in personList" :class="trackPerson==item.code?'active':''" :key="index" @click="personTrack(item)">{{ item.name }}</div>
          </div>
        </div>
        <div class="track-modal-right">
@@ -127,15 +127,7 @@
              placeholder="请选择时间"
              @date-change="onChangeDate">
            </t-date-picker>
            <!-- <t-date-picker
              :class="trackQueryCondition.currentIndex === 3?'':'hidden'"
              v-model="rangeDate"
              style="width: 250px"
              type="dateRange"
              placeholder="请选择时间"
              @date-change="onChangeDate"
            ></t-date-picker> -->
            <div style="display: flex;line-height:32.5px">
            <div style="display: flex;line-height:32.5px;width: 120px;">
              <div>速度</div>
              <t-select>
                <t-option>1x</t-option>
@@ -177,7 +169,7 @@
import './orientation.scss'
import services from '../../conf/services'
import EventBus from '../../bus'
import { GIS_SEA_LAYER_URL, GIS_SEA_URL } from '@/constants'
import { GIS_SEA_LAYER_URL, GIS_SEA_URL } from '../../constants'
export default {
  filters: {
    dateFormat(value) {
@@ -337,7 +329,8 @@ export default {
      personList: [],
      rescuer: [],
      appointAlarmId: '',
      trackPerson: ''
      trackPerson: '',
      orgId: ''
    }
  },
  mounted() {
@@ -378,29 +371,64 @@ export default {
        center: this.$store.getters.getMapParam.center,
        zoom: this.$store.getters.getMapParam.zoom
      })
      var maplayer
      maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      var maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      this.map.addLayer(maplayer)
      var la = Ai.WMTSLayer(
        GIS_SEA_URL,
        { opacity: 0.5 }
      )
      this.map.addLayer(maplayer)
      this.map.addLayer(la)
      Ai.Scale({ position: 'bottomright' }).addTo(this.map)
      Ai.Zoom({ type: 'small' }).addTo(this.map)
      this.loadMapArea()
      this.loadMapView()
    },
    loadMapView() {
      // this.$test
      //   .post(services.mapTag.GET_MAP_PARAM, {})
      //   .then((res) => {
      //     if (res.data.success) {
      //     }
      //   })
      //   .catch((res) => {
      //     // 请求失败处理...
      //   })
      this.$test
        .post(services.organization.MAP_LOCATION_VIEW, {})
        .then((res) => {
          console.log(res)
          this.loadUnaggregated(res.data.unaggregatedEntityPositionList)
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    loadUnaggregated(dataList) { // 加载不聚合的人
      var points = []
      dataList.forEach(element => {
        var point = Ai.Point([element.latitude, element.longitude], {
          icon: Ai.DivIcon({
            html: '<div class="sos">1人</div>',
            className: 'person-count',
            // 设置图标大小
            // iconSize: [20, 20],
            // 设置点对象和图标的相对偏移量
            iconAnchor: [15, 15]
          })
        })
        this.map.addLayer(point)
        var popup = Ai.Popup({
          minWidth: 100,
          offset: [0, -10],
          autoClose: false,
          closeButton: false
        })
        var content =
                  '<div class="tips-item"><div class="container">' +
                  '<div class="sos">' + element.name + '</div>' +
                 '</div></div>'
        // 设置弹出框弹出位置
        popup.setLatLng(point.getLatLng())
        // 设置弹出框弹出内容
        popup.setContent(content)
        popup.openOn(this.map)
        points.push(point)
      })
      this.map.setViewPort([points])
    },
    loadAggregated(dataList) {
    },
    loadMapArea() {
      // data.forEach(element => {
@@ -422,7 +450,7 @@ export default {
          // 设置图标大小
          iconSize: [20, 20],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [0, 0]
          iconAnchor: [100, 100]
        })
      })
      var layer = new Ai.FeatureGroup()
@@ -432,7 +460,7 @@ export default {
      var popup = Ai.Popup({
        minWidth: 300,
        offset: [0, -40],
        autoClose: true,
        autoClose: false,
        closeButton: false
      })
      var content =
@@ -469,14 +497,49 @@ export default {
        ak: this.$store.getters.getGisToken,
        center: [39.915599, 122.406568]
      })
      var maplayer = null
      maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      var maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      var la = Ai.WMTSLayer(GIS_SEA_URL, {opacity: 0.5})
      this.trackMap.addLayer(maplayer)
      this.trackMap.addLayer(la)
      Ai.Scale({position: 'bottomright'}).addTo(this.trackMap)
      Ai.Zoom({type: 'small'}).addTo(this.trackMap)
      this.loadBindDevicePerson()
      this.loadNotBindEquipment()
    },
    loadBindDevicePerson() {
      this.$test
        .post(services.organization.BIND_DEVICE, {})
        .then((res) => {
          console.log(res)
          this.personList = res.data
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    loadNotBindEquipment() {
      this.$test
        .post(services.organization.EQUIPMENT_NOT_BIND, {})
        .then((res) => {
          console.log(res)
          res.data.forEach(e => {
            var point = Ai.Point([e.latitude, e.longitude], {
              icon: Ai.Icon({
                // 设置图标URL路径
                iconUrl: '/static/images/风机.png',
                // 设置图标大小
                iconSize: [20, 20],
                // 设置点对象和图标的相对偏移量
                iconAnchor: [0, 0]
              })
            })
            this.trackMap.addLayer(point)
          })
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    onChangeDate() { // 轨迹时间选择
    },
@@ -560,7 +623,25 @@ export default {
    },
    personTrack(item) {
      console.log(item)
      this.trackPerson = item.deviceId
      this.trackPerson = item.code
      if (this.orgId !== item.orgId) {
        this.$test
          .post(services.organization.FENCE_BY_DEPARTMENT, {entityId: item.orgId})
          .then((res) => {
            this.orgId = item.orgId
            console.log(res)
            var la = new Ai.FeatureGroup()
            res.data.forEach(e => {
              var wktstr = e.mapAreaContent
              var polygon = Ai.Polygon(wktstr, {color: 'red'})
              la.addLayer(polygon)
            })
            this.trackMap.addLayer(la)
          })
          .catch((res) => {
          // 请求失败处理...
          })
      }
    },
    playback() {
      var coords = [[40.026037, 116.323928, '1'], [40.017886, 116.328048], [40.00763, 116.336631], [39.99132, 116.338348], [39.97527, 116.341094], [39.96685, 116.346244], [39.96633, 116.354827], [39.96580, 116.37233], [39.96659, 116.38538], [39.96685, 116.40048], [39.96685, 116.41834], [39.96028, 116.419029], [39.95501, 116.41937], [39.92501, 116.41937], [39.91501, 116.41937], [39.90501, 116.41937], [39.87501, 116.41937]]

ebc-middle-platform/src/modules/system-management/equipment-management.scss

@@ -44,7 +44,6 @@
  }
}
.loading--fix{
  position: absolute;
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}

ebc-middle-platform/src/modules/system-management/map-mark.scss

@@ -47,7 +47,6 @@
  }
}
.loading--fix{
  position: absolute;
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}

ebc-middle-platform/src/modules/system-management/terminal-management.scss

@@ -92,7 +92,6 @@
  color: #ffffff;
}
.loading--fix{
  position: absolute;
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}

location-rescue-service/location-rescue-service.iml

@@ -0,0 +1,232 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="jpa" name="JPA">
      <configuration>
        <setting name="validation-enabled" value="true" />
        <setting name="provider-name" value="Hibernate" />
        <datasource-mapping>
          <factory-entry name="entityManagerFactory" />
        </datasource-mapping>
        <naming-strategy-map />
      </configuration>
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.3" level="project" />
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.8" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.8" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:work-tool-service-api:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:work-tool-model:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.abc:persistence-mysql8:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.abc:persistence-api:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.4" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.10.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
    <orderEntry type="library" name="Maven: org.javassist:javassist:3.23.2-GA" level="project" />
    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-envers:5.3.10.Final" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.9" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.17" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.17" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.19" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.19" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.19" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.16.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:components-common:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.abc:api-common:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.abc:exception:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.abc:utils:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
    <orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.69" level="project" />
    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:guava:27.1-jre" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.5.2" level="project" />
    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.2.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
    <orderEntry type="library" name="Maven: com.vividsolutions:jts-core:1.14.0" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:work-tool-service:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:position-service-api:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:position-model:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:position-service:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:worker-service:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:worker-model:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-spatial:5.3.10.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
    <orderEntry type="library" name="Maven: org.geolatte:geolatte-geom:1.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.5" level="project" />
    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:worker-service-api:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.kafka:spring-kafka:2.2.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.lz4:lz4-java:1.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.12" level="project" />
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.12" level="project" />
    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:characteristic-spec-service:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:infrastructure:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.abc:core:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.4" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.36.Final" level="project" />
    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.9.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.6" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-logging:commons-logging:1.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: logkit:logkit:1.0.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: avalon-framework:avalon-framework:4.1.3" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.servlet:servlet-api:2.3" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:charcateristic-spec-service-api:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:characteristic-spec-model:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:system-user-service:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:system-user-model:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:person-model:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:system-user-service-api:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:person-service:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.bss:person-service-api:2.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.wframe:sso-util:1.2" level="project" />
    <orderEntry type="library" name="Maven: com.ai.ipu:ipu-cache:3.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.ipu:ipu-basic:3.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.ipu:ipu-common:3.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.wade:wade-data:1.0" level="project" />
    <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.3.8" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.11" level="project" />
    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
    <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
    <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.0" level="project" />
    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.9.2" level="project" />
    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.11.2" level="project" />
    <orderEntry type="library" name="Maven: com.ai.wade:wade-cache:1.0" level="project" />
    <orderEntry type="library" name="Maven: com.ai.wade:wade-apache:1.0" level="project" />
    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.2" level="project" />
    <orderEntry type="library" name="Maven: com.ai.ipu.server:iot-stomp-server:3.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.ai.ipu.server:ipu-connect-server:3.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.8" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.36.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-codec-mqtt:4.1.36.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.36.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.36.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.36.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.36.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.36.Final" level="project" />
    <orderEntry type="library" name="Maven: de.schlichtherle.truelicense:truelicense-core:1.33" level="project" />
    <orderEntry type="library" name="Maven: de.schlichtherle.truelicense:truelicense-xml:1.33" level="project" />
    <orderEntry type="library" name="Maven: de.schlichtherle.truelicense:truelicense-swing:1.33" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2" level="project" />
    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
  </component>
</module>

location-rescue-service/pom.xml

@@ -74,7 +74,7 @@
            <artifactId>characteristic-spec-service</artifactId>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        
        <!-- <dependency>
            <groupId>com.ai.ipu</groupId>
            <artifactId>ipu-common</artifactId>

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/attendanceRulesController.java

@@ -13,7 +13,7 @@ import java.util.Date;
import java.util.Map;
/**
 * 异常考勤
 * 考勤规则
 */
@Controller
@RequestMapping("/attendanceRules")