Merge remote-tracking branch 'origin/master'

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

@@ -151,9 +151,11 @@ export default {
    UPD_MAP_TAG: '/mapTag/modifyMapTagInfo' // 查询地图标记信息用作修改
  },
  equipment: {
    EQUIPMENT_TYPE: '/equipment/loadAllResourceToolType', // 获取所有设备类型
    GET_ALL_EQUIPMENT: '/equipment/queryAllEquipmentInfo', // 查询所有设备信息
    GET_EQUIPMENT: '/equipment/queryEquipmentInfo', // 查询设备管理信息
    ADD_EQUIPMENT: '/equipment/modifyEquipmentInfo', // 新增/修改设备管理信息
    CREATE_EQUIPMENT: '/equipment/createEquipmentInfo', // 新增设备管理信息
    UPDATE_EQUIPMENT: '/equipment/modifyEquipmentInfo',
    DEL_EQUIPMENT: '/equipment/deleteEquipmentInfo', // 删除设备管理信息
    REPETITION_EQUIPMENT: '/equipment/verifyEquipmentInfoRepetition', // 删除设备管理信息
    GET_ONE_EQUIPMENT: '/equipment/queryOneEquipmentInfo' // 查询单个设备信息

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

@@ -27,7 +27,7 @@
        }
      }
      .label{
        min-width: 30px;
        min-width: 70px;
      }
      .btns button{
        margin: 0 2px;
@@ -37,6 +37,15 @@
  .table-pager{
    margin: 20px auto;
  }
  .demo-loading-container{
    display: inline-block;
    position: relative;
    border: 1px solid #eee;
  }
}
.loading--fix{
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}
.submit-button{
  background-color: #147BD1;

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

@@ -6,10 +6,7 @@
          <div class="label">设备类型：</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.equipmentType" style="width: 200px" clearable placeholder="请选择...">
              <t-option value="001">船舶</t-option>
              <t-option value="002">风机</t-option>
              <t-option value="003">升压站</t-option>
              <t-option value="004">测风塔</t-option>
              <t-option v-for="(item,index) in typeList" :value="item.resourceToolType" :key="index+'type'">{{ item.name }}</t-option>
            </t-select>
          </div>
        </div>
@@ -29,7 +26,7 @@
          <t-button color="success" icon="search-outline" @click="onSearch">查询</t-button>
          <t-button color="secondary" icon="loading" class="reset-btn" @click="onReset">重置</t-button>
          <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
          <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
          <t-button color="secondary" icon="delete-outline" @click="batchDelete">删除</t-button>
        </div>
      </div>
      <div class="search-ctn" style="justify-content: flex-end;">
@@ -41,32 +38,19 @@
      </div>
    </div>
    <div>
      <t-table :data="table.data">
      <t-table :data="table.data" :loading="tableLoading" @selection-change="handleSelectionChange">
        <t-table-column type="selection" width="70"></t-table-column>
        <t-table-column prop="FACILITY_NAME" label="设备名称"></t-table-column>
        <t-table-column prop="FACILITY_CODE" label="设备编号"></t-table-column>
        <t-table-column prop="FACILITY_TYPE" label="设备类型">
          <template slot-scope="scope">
            <div v-if="scope.row.FACILITY_TYPE==1">
              <span >船舶</span>
            </div>
            <div v-if="scope.row.FACILITY_TYPE==2">
              <span>风机</span>
            </div>
            <div v-if="scope.row.FACILITY_TYPE==3">
              <span>升压站</span>
            </div>
            <div v-if="scope.row.FACILITY_TYPE==4">
              <span>测风塔</span>
            </div>
          </template>
        <t-table-column prop="resourceToolName" label="设备名称"></t-table-column>
        <t-table-column prop="resourceToolCode" label="设备编号"></t-table-column>
        <t-table-column :formatter="type_formatter" prop="resourceToolType" label="设备类型">
        </t-table-column>
        <t-table-column :formatter="longLatFormatter" prop="LONGITUDE" label="经度"></t-table-column>
        <t-table-column :formatter="longLatFormatter" prop="LATITUDE" label="纬度"></t-table-column>
        <t-table-column prop="radius" label="半径"></t-table-column>
        <t-table-column prop="longitude" label="经度"></t-table-column>
        <t-table-column prop="latitude" label="纬度"></t-table-column>
        <t-table-column
            fixed="right"
            label="操作"
            width="120"
          fixed="right"
          label="操作"
          width="120"
        >
          <template slot-scope="scope">
            <a href="javascript:void(0)" size="sm" @click="handleClick(scope.row)">编辑</a>
@@ -84,11 +68,11 @@
               @on-change="onPagerChange">
      </t-pager>
    </div>
    <t-modal :visibled.sync="modal":mask-closable="false" title="新增设备" >
    <t-modal :visibled.sync="modal" :mask-closable="false" title="新增设备" >
      <t-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" label-position="left">
        <t-form-item label="设备类型" prop="type">
          <t-select v-model="formValidate.type" placeholder="请选择设备类型" clearable @change="typeChange(1)">
            <t-option v-for="(item, index) in typeList" :value="item.value" :key="index">{{ item.label }}</t-option>
          <t-select v-model="formValidate.type" placeholder="请选择设备类型" clearable>
            <t-option v-for="(item,index) in typeList" :value="item.resourceToolType" :key="index+'type'">{{ item.name }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="设备名称" prop="name">
@@ -97,14 +81,17 @@
        <t-form-item label="设备编号" prop="number">
          <t-input v-model="formValidate.number" placeholder="请输入字母、数字、中划线、下划线、#"></t-input>
        </t-form-item>
        <div v-if="!lngLatDisabled">
        <t-form-item label="半径" prop="radius">
          <t-input v-model="formValidate.radius" placeholder="请输入设备名称"></t-input>
        </t-form-item>
        <div v-if="formValidate.type!=='001'">
          <t-form-item label="经度" prop="lng">
            <t-format-input v-model="formValidate.lng" numeral numeral-decimal-scale=8 placeholder="请输入数字"></t-format-input>
            <t-format-input v-model="formValidate.lng" :numeral-decimal-scale="8" numeral placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
        <div v-if="!lngLatDisabled">
        <div v-if="formValidate.type!=='001'">
          <t-form-item label="纬度" prop="lat">
            <t-format-input v-model="formValidate.lat" numeral numeral-decimal-scale=8 placeholder="请输入数字"></t-format-input>
            <t-format-input v-model="formValidate.lat" :numeral-decimal-scale="8" numeral placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
      </t-form>
@@ -113,27 +100,28 @@
        <t-button class="submit-button" @click="submit">保存</t-button>
      </div>
    </t-modal>
    <t-modal :visibled.sync="updateModal":mask-closable="false" title="编辑设备" >
      <t-form ref="updateRow" :model="updateRow" :rules="updateRowValidate" :label-width="80" label-position="left">
        <t-form-item label="设备类型" prop="FACILITY_TYPE">
          <t-select v-model="updateRow.FACILITY_TYPE" placeholder="请选择设备类型" clearable @change="typeChange(2)">
            <t-option v-for="(item, index) in typeList" :value="item.value" :key="index">{{ item.label }}</t-option>
          </t-select>
    <t-modal :visibled.sync="updateModal" :mask-closable="false" title="编辑设备" >
      <t-form ref="updateRow" :model="updateRow" :rules="ruleUpdateValidate" :label-width="80" label-position="left">
        <t-form-item label="设备类型" prop="resourceToolType">
          {{ updateRow.name }}
        </t-form-item>
        <t-form-item label="设备名称" prop="FACILITY_NAME">
          <t-input v-model="updateRow.FACILITY_NAME" placeholder="请输入设备名称"></t-input>
        <t-form-item label="设备编号" prop="resourceToolCode">
          {{ updateRow.resourceToolCode }}
        </t-form-item>
        <t-form-item label="设备编号" prop="FACILITY_CODE">
          {{ updateRow.FACILITY_CODE }}
        <t-form-item label="设备名称" prop="resourceToolName">
          <t-input v-model="updateRow.resourceToolName" placeholder="请输入设备名称"></t-input>
        </t-form-item>
        <div v-if="!lngLatDisabled">
          <t-form-item label="经度" prop="LONGITUDE">
            <t-format-input v-model="updateRow.LONGITUDE" numeral numeral-decimal-scale=8 placeholder="请输入数字"></t-format-input>
        <t-form-item label="半径" prop="radius">
          <t-input v-model="updateRow.radius" numeral placeholder="请输入设备半径"></t-input>
        </t-form-item>
        <div v-if="updateRow.resourceToolType!=='001'">
          <t-form-item label="经度" prop="longitude">
            <t-format-input v-model="updateRow.longitude" :numeral-decimal-scale="8" numeral placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
        <div v-if="!lngLatDisabled">
          <t-form-item label="纬度" prop="LATITUDE">
            <t-format-input v-model="updateRow.LATITUDE" numeral numeral-decimal-scale=8 placeholder="请输入数字"></t-format-input>
        <div v-if="updateRow.resourceToolType!=='001'">
          <t-form-item label="纬度" prop="latitude">
            <t-format-input v-model="updateRow.latitude" :numeral-decimal-scale="8" numeral placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
      </t-form>
@@ -142,6 +130,7 @@
        <t-button class="submit-button" @click="updateSubmit">保存</t-button>
      </div>
    </t-modal>
    <t-loading v-model="fullLoading" fullscreen tip="加载中...."></t-loading>
  </div>
</template>
<script>
@@ -150,31 +139,7 @@ import services from '../../conf/services'
export default {
  data() {
    return {
      // currentLoading: false,
      // searchResult: [],
      // demoDataA: [],
      // currentLoading_n: false,
      // searchResult_n: [],
      // demoDataA_n: [],
      lngLatDisabled: false,
      typeList: [
        {
          value: '001',
          label: '船舶'
        },
        {
          value: '002',
          label: '风机'
        },
        {
          value: '003',
          label: '升压站'
        },
        {
          value: '004',
          label: '测风塔'
        }
      ],
      typeList: [],
      table: {
        data: [
        ],
@@ -184,25 +149,28 @@ export default {
          total: 0
        }
      },
      selection: [],
      tableLoading: true,
      fullLoading: false,
      queryCondition: {
        type: '',
        equipmentType: '',
        equipmentType: null,
        equipmentName: '',
        equipmentNumber: ''
      },
      rangeDate: '',
      modal: false,
      updateModal: false,
      updateRow: {
        FACILITY_TYPE: '',
        FACILITY_NAME: '',
        FACILITY_CODE: '',
        LONGITUDE: '',
        LATITUDE: ''
        resourceToolType: '',
        resourceToolName: '',
        radius: null,
        resourceToolCode: '',
        longitude: '',
        latitude: ''
      },
      formValidate: {
        type: '',
        name: '',
        radius: null,
        number: '',
        lng: '',
        lat: ''
@@ -225,9 +193,14 @@ export default {
            t: this,
            validator: async function(rule, value, callback) {
              // TODO 判断编号重复
              if (await rule.t.checkReptition(1, value)) {
              var flag = await rule.t.checkReptition({
                resourceToolName: value
              })
              console.log(flag)
              if (flag) {
                console.log('编号重复')
                callback(rule.message)
              }else {
              } else {
                return true
              }
            }
@@ -248,7 +221,10 @@ export default {
                callback(rule.message)
              } else {
                // TODO 判断编号重复
                var y = await rule.t.checkReptition(2, value)
                var y = await rule.t.checkReptition({
                  resourceToolCode: value
                })
                console.log(y)
                if (y) {
                  rule.message = '编号重复'
                  callback(rule.message)
@@ -259,6 +235,19 @@ export default {
            }
          }
        ],
        radius: [
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
              if (isNaN(value)) {
                callback(rule.message)
              } else {
                return true
              }
            }
          }
        ],
        lng: [
          {
            required: true,
@@ -280,7 +269,7 @@ export default {
        lat: [
          {
            required: true,
            message: '经度不能为空',
            message: '纬度不能为空',
            trigger: 'blur'
          },
          {
@@ -296,26 +285,34 @@ export default {
          }
        ]
      },
      updateRowValidate: {
        FACILITY_TYPE: [{
          required: true,
          message: '设备类型不能为空',
          trigger: 'change'
        }],
        FACILITY_NAME: [
      ruleUpdateValidate: {
        resourceToolName: [
          {
            required: true,
            message: '设备名称不能为空',
            trigger: 'blur'
            trigger: 'blur',
            validator: (rule, value, callback) => {
              console.log(value)
              if (value) {
                callback()
              } else {
                callback(rule.message)
              }
            }
          },
          {
            message: '设备名称重复',
            trigger: 'blur',
            t: this,
            validator: async function(rule, value, callback) {
              console.log(value)
              // TODO 判断编号重复
              var x = await rule.t.checkReptition(3, value)
              if (x) {
              var flag = await rule.t.checkReptition({
                resourceToolName: value
              })
              console.log(flag)
              if (flag) {
                console.log('编号重复')
                callback(rule.message)
              } else {
                return true
@@ -323,7 +320,20 @@ export default {
            }
          }
        ],
        LONGITUDE: [
        radius: [
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
              if (isNaN(value)) {
                callback(rule.message)
              } else {
                return true
              }
            }
          }
        ],
        longitude: [
          {
            required: true,
            message: '经度不能为空',
@@ -341,10 +351,10 @@ export default {
            }
          }
        ],
        LATITUDE: [
        latitude: [
          {
            required: true,
            message: '经度不能为空',
            message: '纬度不能为空',
            trigger: 'blur'
          },
          {
@@ -363,84 +373,98 @@ export default {
    }
  },
  mounted() {
    this.getList()
    this.getType().then(() => {
      this.getList()
    })
  },
  methods: {
    async getType() {
      await this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
      ).then(res => {
        // 请求成功处理...
        if (res.data.success) {
          this.typeList = res.data.data
        }
      }).catch(res => {
        // 请求失败处理...
      })
    },
    getList() {
      var params = new FormData()
      params.append('data', JSON.stringify({
        pageNum: this.table.pager.currentPage,
      this.tableLoading = true
      this.$test.post(services.equipment.GET_EQUIPMENT, {
        pageNumber: this.table.pager.currentPage,
        pageSize: this.table.pager.size,
        FACILITY_CODE: this.queryCondition.equipmentNumber,
        FACILITY_TYPE: this.queryCondition.equipmentType,
        FACILITY_NAME: this.queryCondition.equipmentName
      }))
      this.$test.post(services.equipment.GET_EQUIPMENT, params
        data: {
          resourceToolType: this.queryCondition.equipmentType,
          resourceToolNameAsLike: this.queryCondition.equipmentName,
          resourceToolCode: this.queryCondition.equipmentNumber
        }
      }
      ).then(res => {
        // 请求成功处理...
        this.table.data = res.data.result.list
        this.table.pager.total = res.data.result.total
        console.log(res)
        this.tableLoading = false
        if (res.data.success) {
          this.table.data = res.data.data.data
          this.table.pager.total = res.data.data.total
        }
      }).catch(res => {
        // 请求失败处理...
      })
    },
    onChange(value) {
      console.log('date change:' + value)
    type_formatter(row, column) {
      var arr = this.typeList.filter((item) => {
        return item.resourceToolType === row.resourceToolType
      })
      if (arr[0]) {
        return arr[0].name
      }
    },
    onReset() {
      this.queryCondition.equipmentType = ''
      this.queryCondition.equipmentName = ''
      this.queryCondition.equipmentNumber = ''
      this.searchResult = [
        {
          FACILITY_CODE: '',
          FACILITY_ID: '',
          FACILITY_NAME: '',
          FACILITY_TYPE: '',
          LATITUDE: '',
          LONGITUDE: ''
        }
      ]
      this.searchResult_n = [
        {
          FACILITY_CODE: '',
          FACILITY_ID: '',
          FACILITY_NAME: '',
          FACILITY_TYPE: '',
          LATITUDE: '',
          LONGITUDE: ''
        }
      ]
      this.queryCondition = {
        equipmentType: null,
        equipmentName: '',
        equipmentNumber: ''
      }
      this.onSearch()
    },
    onSearch() {
      this.table = {
        data: [
        ],
        pager: {
          currentPage: 1,
          size: 10,
          total: 0
        }
      }
      this.getList()
    },
    toExport() {
    },
    checkReptition(type, value) {
      var that = this
      return new Promise(function(resolve) {
        var params = new FormData()
        if (type === 1) {
          params.append('data', JSON.stringify({
            FACILITY_NAME: value
          }))
        } else if (type === 2) {
          params.append('data', JSON.stringify({
            FACILITY_CODE: value
          }))
        } else {
          params.append('data', JSON.stringify({
            FACILITY_NAME: value,
            FACILITY_ID: that.updateRow.FACILITY_ID
          }))
    checkReptition(data) {
      return new Promise((resolve) => {
        this.$test.post(services.equipment.GET_EQUIPMENT, {
          pageNumber: 1,
          pageSize: 10,
          data: data
        }
        that.$test.post(services.equipment.REPETITION_EQUIPMENT, params
        ).then(res => {
          console.log(1)
          resolve(res.data.result)
        // 请求成功处理...
          console.log(res)
          if (res.data.success) {
            if (res.data.data.totalPage > 0 && res.data.data.data[0].resourceToolId === this.updateRow.resourceToolId) {
              resolve(false)
            } else {
              resolve(res.data.data.totalPage > 0)
            }
          } else {
            resolve(false)
          }
        }).catch(res => {
        // 请求失败处理...
          resolve(false)
        })
      })
    },
@@ -453,37 +477,46 @@ export default {
      this.getList()
    },
    cancel() {
      this.$refs['formValidate'].resetFields()
      this.$refs['updateRow'].resetFields()
      this.modal = false
      this.updateModal = false
      this.formValidate.type = ''
      this.formValidate.name = ''
      this.formValidate.number = ''
      this.formValidate.lng = ''
      this.formValidate.lat = ''
      this.table.pager.currentPage = 1
      this.formValidate = {
        type: '',
        name: '',
        radius: null,
        number: '',
        lng: '',
        lat: ''
      }
    },
    submit() {
      this.$refs.formValidate.validate(valid => {
        console.log(valid)
        if (valid) {
          var params = new FormData()
          params.append('data', JSON.stringify({
            params: {
              FACILITY_TYPE: this.formValidate.type,
              FACILITY_NAME: this.formValidate.name,
              FACILITY_CODE: this.formValidate.number,
              LONGITUDE: this.formValidate.lng,
              LATITUDE: this.formValidate.lat
            }
          }))
          this.$test.post(services.equipment.ADD_EQUIPMENT, params
          this.fullLoading = true
          this.$test.post(services.equipment.CREATE_EQUIPMENT, {data: {
            latitude: this.formValidate.lat ? this.formValidate.lat : null,
            longitude: this.formValidate.lng ? this.formValidate.lng : null,
            radius: this.formValidate.radius ? this.formValidate.radius : null,
            resourceToolCode: this.formValidate.number,
            resourceToolName: this.formValidate.name,
            resourceToolType: this.formValidate.type
          }}
          ).then(res => {
            // 请求成功处理...
            this.$Message.success('提交成功!')
            this.getList()
            this.cancel()
            this.fullLoading = false
            if (res.data.success) {
              this.$Message.success('提交成功!')
              this.getList()
              this.modal = false
              this.formValidate = {
                type: '',
                name: '',
                radius: null,
                number: '',
                lng: '',
                lat: ''
              }
            }
          }).catch(res => {
            // 请求失败处理...
          })
@@ -496,22 +529,19 @@ export default {
      this.$refs.updateRow.validate(valid => {
        console.log(valid)
        if (valid) {
          var params = new FormData()
          params.append('data', JSON.stringify({
            params: {
              FACILITY_ID: this.updateRow.FACILITY_ID,
              FACILITY_TYPE: this.updateRow.FACILITY_TYPE,
              FACILITY_NAME: this.updateRow.FACILITY_NAME,
              LONGITUDE: this.updateRow.LONGITUDE,
              LATITUDE: this.updateRow.LATITUDE
            }
          }))
          this.$test.post(services.equipment.ADD_EQUIPMENT, params
          this.fullLoading = true
          console.log(this.updateRow)
          this.$test.post(services.equipment.UPDATE_EQUIPMENT, {
            data: this.updateRow
          }
          ).then(res => {
            // 请求成功处理...
            this.$Message.success('提交成功!')
            this.getList()
            this.cancel()
            this.fullLoading = false
            if (res.data.success) {
              this.$Message.success('提交成功!')
              this.getList()
              this.updateModal = false
            }
          }).catch(res => {
            // 请求失败处理...
          })
@@ -521,63 +551,63 @@ export default {
      })
    },
    addEquipment() {
      this.lngLatDisabled = false
      this.modal = true
    },
    handleClick(row) {
      var params = new FormData()
      params.append('data', JSON.stringify({
        FACILITY_ID: row.FACILITY_ID
      }))
      this.$test.post(services.equipment.GET_ONE_EQUIPMENT, params
      ).then(res => {
        // 请求成功处理...
        this.updateModal = true
        this.updateRow = res.data.resultData
        this.typeChange(2)
      }).catch(res => {
        // 请求失败处理...
      this.updateModal = true
      console.log(row)
      var name
      this.typeList.forEach(element => {
        if (element.resourceToolType === row.resourceToolType) {
          name = element.name
        }
      })
      row.name = name
      this.updateRow = row
    },
    remove(row) {
      let that = this
      let confirm = {
      this.delete([row.resourceToolId])
    },
    delete(arr) {
      this.$Confirm.confirm({
        title: '请确认',
        content: '删除后不可恢复,确认删除吗?',
        ok: function () {
          var params = new FormData()
          params.append('data', JSON.stringify({
            params: {
              FACILITY_ID: row.FACILITY_ID
            }
          }))
          this.$test.post(services.equipment.DEL_EQUIPMENT, params
        ok: () => {
          this.fullLoading = true
          this.$test.post(services.equipment.DEL_EQUIPMENT, {
            data: arr
          }
          ).then(res => {
            // 请求成功处理...
            that.$Message.success('操作成功')
            that.getList()
            this.fullLoading = false
            if (res.data.success) {
              this.$Message.success('操作成功')
              this.table.pager.currentPage = 1
              this.getList()
            }
          }).catch(res => {
            // 请求失败处理...
          })
        }
      }
      this.$Confirm.confirm(confirm)
      })
    },
    longLatFormatter(cjsj, column, cellValue, index) {
      if (cjsj.FACILITY_TYPE==1) {
        return '--'
      }
      return cellValue
    handleSelectionChange(val) {
      var arr = []
      val.forEach(element => {
        arr.push(element.resourceToolId)
      })
      this.selection = arr
    },
    typeChange(t) {
      var value
      if (t === 1) {
        value = this.formValidate.type
      } else {
        value = this.updateRow.FACILITY_TYPE
      }
      this.lngLatDisabled = (value == 1)
    batchDelete() {
      console.log(this.selection)
      this.delete(this.selection)
    }
    // longLatFormatter(row, column, cellValue, index) {
    //   if (cjsj.FACILITY_TYPE === '001') {
    //     return '--'
    //   }
    //   return cellValue
    // },
  }
}
</script>

location-rescue-service/.gitignore

@@ -1,7 +1,37 @@
/bin/
### Java template
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
*.zip
*.tar.gz
*.rar
#eclipse
/.settings
/target/
/.classpath
/.idea
/location-rescue-service.iml
/.project
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
*.iml
.idea
target/
logs/
.DS_Store

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

@@ -1,185 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
  <component name="FacetManager">
    <facet type="jpa" name="JPA">
      <configuration>
        <setting name="validation-enabled" value="true" />
        <setting name="provider-name" value="Hibernate" />
        <datasource-mapping>
          <factory-entry name="Entities" />
          <factory-entry name="entityManagerFactory" />
        </datasource-mapping>
        <naming-strategy-map />
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="web" name="Web">
      <configuration>
        <webroots />
      </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: 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-common:4.1.36.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-handler: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-codec: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.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: 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: 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.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-tx: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.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: org.jboss.logging:jboss-logging:3.3.2.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.dom4j:dom4j:2.1.1" 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-web:5.1.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc: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: 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: javax.servlet:javax.servlet-api:4.0.1" 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.ai.bss:work-tool-service: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: 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" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" 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: 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.slf4j:slf4j-api:1.7.26" 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.apache.logging.log4j:log4j-api: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/src/main/java/com/ai/bss/location/rescue/controller/DeviceManageController.java

@@ -99,7 +99,7 @@ public class DeviceManageController {
	public Map<String, Object> addDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceNo") == null||"".equals(params.get("deviceId"))) {
		if (params == null || params.get("deviceNo") == null||"".equals(params.get("deviceNo"))) {
			result.put("result", false);
			result.put("errMsg", "添加失败");
			return result;

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/DeviceManageServiceImpl.java

@@ -88,9 +88,9 @@ public class DeviceManageServiceImpl implements DeviceManageService {
			for (CharacteristicSpecValue characteristicSpecValue : characteristicSpecValueList) {
				specIds.add(characteristicSpecValue.getCode());
			}
			paramsMap.put("specId", specIds);
			paramsMap.put("specIdList", specIds);
		} else {
			paramsMap.put("specId", params.get("deviceTypeId"));
			paramsMap.put("specIdList", params.get("deviceTypeId"));
		}
		// 是否绑定

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/GisParamServiceImpl.java

@@ -18,22 +18,22 @@ import com.alibaba.fastjson.JSON;
public class GisParamServiceImpl implements GisParamService {
	Logger logger = LoggerFactory.getLogger(GisParamServiceImpl.class);
	@Value("${aap.gis.userName}")
	@Value("${aap.gis.userName:EBC_PPRS}")
	private String gisUserName;
	@Value("${aap.gis.passwd}")
	@Value("${aap.gis.passwd:ITBS93wMYHosT}")
	private String gisPasswd;
	@Value("${url.gis.token}")
	@Value("${url.gis.token:http://192.168.74.189:9999/gisIntf/account/gettoken}")
	private String tokenUrl;
	@Value("${seaMap.centre.longitude}")
	@Value("${seaMap.centre.longitude:123.396036}")
	private String longitude;
	@Value("${seaMap.centre.latitude}")
	@Value("${seaMap.centre.latitude:31.560302}")
	private String latitude;
	@Value("${seaMap.scale}")
	@Value("${seaMap.scale:11}")
	private String scale;
	@Override

location-rescue-service/src/main/java/com/ai/bss/location/rescue/util/EbcConstant.java

@@ -42,7 +42,9 @@ public class EbcConstant {
	//静态常量: 围栏类型
	public static final String BUSINESS_SPEC_MAP_AREA_TYPE="MAP_AREA_TYPE";
	
	
	//静态常量: 围栏类型
	public static final String BUSINESS_SPEC_EMPLOYEE_POSITION="mainJobPosition";
		
	
	
	

location-rescue-service/src/main/java/com/ai/bss/location/rescue/util/NorthboundInterfaceUtil.java

@@ -9,7 +9,9 @@ import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import com.ai.bss.location.rescue.controller.MapTagManageController;
@@ -19,21 +21,21 @@ import com.alibaba.fastjson.JSON;
 *北向接口统一入口
 * @date 2010/09/24 23:42
 */
@Component
@Configuration
public class NorthboundInterfaceUtil {
	private static final Logger logger = LoggerFactory.getLogger(MapTagManageController.class);
	
	@Value("${aap.iot.userCode}")
	@Value("${aap.iot.userCode:IOT_ADMIN}")
	private String userCode;
	@Value("${aap.iot.passWord}")
	@Value("${aap.iot.passWord:123456}")
	private String passWord;
	@Value("${url.iot.login}")
	@Value("${url.iot.login:http://47.105.130.83:8083/sso/login}")
	private String iotLoginUrl;
	@Value("${url.iot.service}")
	@Value("${url.iot.service:http://47.105.130.83:8083/dmp/terminalNorthApi/}")
	private String iotServiceUrl;
	// 定义静态存储map空间存放sign与sessionId

security-protection-service/.gitignore

@@ -0,0 +1,37 @@
### Java template
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
*.zip
*.tar.gz
*.rar
#eclipse
/.settings
/.classpath
/.project
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
*.iml
.idea
target/
logs/
.DS_Store