Merge remote-tracking branch 'origin/master'

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

@@ -148,7 +148,8 @@ export default {
    GET_ONE_MAP_TAG: '/mapTag/queryOneMapTagInfo', // 查询地图标记信息
    ADD_MAP_TAG: '/mapTag/addMapTagInfo', // 新增地图标记信息
    DEL_MAP_TAG: '/mapTag/deleteMapTagInfo', // 删除地图标记信息
    UPD_MAP_TAG: '/mapTag/modifyMapTagInfo' // 查询地图标记信息用作修改
    UPD_MAP_TAG: '/mapTag/modifyMapTagInfo', // 查询地图标记信息用作修改
    MAP_TAG_TYPE: '/mapTag/queryMapAreaTypeList' // 查询标记类型下拉列表
  },
  equipment: {
    EQUIPMENT_TYPE: '/equipment/loadAllResourceToolType', // 获取所有设备类型

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

@@ -15,8 +15,7 @@
      display: flex;
      justify-content: space-between;
      >div{
        display: flex; 
        margin: 0 20px 16px 0;    
        display: flex;  
        line-height: 2;
        .label-content{
          display: flex; 
@@ -36,7 +35,7 @@
        }
      }
      .btns{
        min-width: 330px;
        min-width: 415px;
        button{
          margin: 0 2px;
        }
@@ -47,6 +46,10 @@
    margin: 20px auto;
  }
}
.loading--fix{
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}
.modal{
  .top{
    display: flex;

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

@@ -7,17 +7,30 @@
            <div class="label">部门：</div>
            <div class="input-rule">
              <t-select-tree
                v-model="queryCondition.department"
                v-model="queryCondition.entityId"
                :node-data="cloneNodes"
                node-key="id"
              ></t-select-tree>
            </div>
          </div>
          <div class="label-content">
            <div class="label">标记类型:</div>
            <div class="input-rule">
              <t-select v-model="queryCondition.mapAreaType" placeholder="请输入...">
                <t-option
                  v-for="item in markTypes"
                  :key="item.mapAreaTypeId"
                  :value="item.mapAreaTypeId"
                >{{ item.mapAreaTypeName }}</t-option
                >
              </t-select>
            </div>
          </div>
          <div class="label-content">
            <div class="label">标记名称:</div>
            <div class="input-rule">
              <t-input
                v-model="queryCondition.userName"
                v-model="queryCondition.mapAreaName"
                placeholder="请输入..."
              ></t-input>
            </div>
@@ -26,38 +39,27 @@
            <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="batchDelete">删除</t-button>
          </div>
        </div>
      </div>
      <div class="search-ctn" style="justify-content: flex-end;">
        <div class="btns">
          <t-button color="success" icon="plus-outline" @click="markModal(1)"
          >考勤区域</t-button
          >
          <t-button color="success" icon="plus-outline" @click="markModal(2)"
          >作业区域</t-button
          >
          <t-button color="success" icon="plus-outline" @click="markModal(3)"
          >电子围栏</t-button
          >
          <t-button color="success" icon="plus-outline" @click="markModal(4)"
          >定点</t-button
          <t-button v-for="(item,index) in markTypes" :key="index+'type'" color="success" icon="plus-outline" @click="markModal(item.mapAreaTypeId)"
          >{{ item.mapAreaTypeName }}</t-button
          >
        </div>
      </div>
    </div>
    <div>
      <t-table :data="table.data">
        <t-table-column prop="MAP_TAG_NAME" label="标记名称"></t-table-column>
        <t-table-column label="类型">
          <template slot-scope="scope">
            <div v-if="scope.row.MAP_TAG_TYPE == 1">考勤区域</div>
            <div v-if="scope.row.MAP_TAG_TYPE == 2">作业区域</div>
            <div v-if="scope.row.MAP_TAG_TYPE == 3">电子围栏</div>
            <div v-if="scope.row.MAP_TAG_TYPE == 4">定点</div>
          </template>
      <t-table :data="table.data" :loading="tableLoading" @selection-change="handleSelectionChange">
        <t-table-column type="selection" width="70"></t-table-column>
        <t-table-column prop="mapAreaName" label="标记名称"></t-table-column>
        <t-table-column :formatter="type_formatter" label="类型">
        </t-table-column>
        <t-table-column
          :formatter="timestampToTime"
          prop="CREATE_DATE"
          prop="creatDate"
          label="创建时间"
        ></t-table-column>
        <t-table-column fixed="right" label="操作" width="120">
@@ -102,10 +104,10 @@
        <div>
          <div class="label">部门:</div>
          <div class="input-rule">
            <t-select-tree v-model="department"
            <t-select-tree v-model="department" :disabled="update"
                           :node-data="cloneNodes"
                           style="width:200px"
                           node-key="id"
                           style="width:200px"
            ></t-select-tree>
          </div>
        </div>
@@ -115,9 +117,9 @@
            <t-select v-model="markType" style="width:100px" placeholder="请输入...">
              <t-option
                v-for="item in markTypes"
                :key="item.id"
                :value="item.id"
              >{{ item.type }}</t-option
                :key="item.mapAreaTypeId"
                :value="item.mapAreaTypeId"
              >{{ item.mapAreaTypeName }}</t-option
              >
            </t-select>
          </div>
@@ -198,6 +200,7 @@
        <div id="modalMap" class="right"></div>
      </div>
    </t-modal>
    <t-loading v-model="fullLoading" fullscreen tip="加载中...."></t-loading>
  </div>
</template>
<script>
@@ -215,10 +218,13 @@ export default {
          total: 0
        }
      },
      tableLoading: true,
      fullLoading: false,
      departments: [],
      queryCondition: {
        department: '',
        userName: ''
        entityId: null,
        mapAreaName: null,
        mapAreaType: null
      },
      rangeDate: '',
      addMark: false,
@@ -226,40 +232,25 @@ export default {
      markName: '',
      residenceTimeLength: '',
      markType: 1,
      markTypes: [
        {
          id: 1,
          type: '考勤区域'
        },
        {
          id: 2,
          type: '作业区域'
        },
        {
          id: 3,
          type: '电子围栏'
        },
        {
          id: 4,
          type: '定点'
        }
      ],
      markTypes: [],
      department: '',
      modalData: [],
      map: null,
      polygonDrawer: null
      polygonDrawer: null,
      selection: []
    }
  },
  computed: {
    cloneNodes() {
      return this.departments.map((item) => {
        let obj = {
          label: item.label,
          title: item.title,
          id: item.id,
          data: item.data
          label: item.name,
          title: item.name,
          id: item.code,
          data: item.id
        }
        if (item.pid) {
          obj.pid = item.pid
        if (item.parentCode > 0) {
          obj.pid = item.parentCode
        }
        return obj
      })
@@ -267,6 +258,7 @@ export default {
  },
  created() {
    this.getDepartmentsList()
    this.getTagType()
    this.getList()
  },
  mounted() {
@@ -278,26 +270,20 @@ export default {
        .post(services.workEmployee.GET_ALL_ORGANIZE, {})
        .then((res) => {
          // 请求成功处理...
          // this.departments = res.data
          this.departments = []
          for (let i = 0; i < res.data.length; i++) {
            if (res.data[i].parentCode > 0) {
              this.departments.push({
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id,
                pid: res.data[i].parentCode
              })
            } else {
              this.departments.push({
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id
              })
            }
          }
          this.departments = res.data
          // this.onReset()
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    getTagType() {
      this.$test
        .post(services.mapTag.MAP_TAG_TYPE, {})
        .then((res) => {
          // 请求成功处理...
          console.log(res)
          this.markTypes = res.data.dataList
        })
        .catch((res) => {
          // 请求失败处理...
@@ -337,7 +323,6 @@ export default {
        this.layer.options.opacity = 1.0
        this.layer.options.color = color
        this.layer.options.fillColor = color
        // console.log(this.polygonDrawer.getPoints())
        this.modalData = this.layer._latlngs[0]
        this.polygonDrawer.editing(this.layer)
        this.polygonDrawer.disable()
@@ -345,36 +330,50 @@ export default {
      })
    },
    getList() {
      var params = new FormData()
      params.append(
        'data',
        JSON.stringify({
          pageNum: this.table.pager.currentPage,
          pageSize: this.table.pager.size,
          mapTagName: this.queryCondition.userName
        })
      )
      this.tableLoading = true
      this.table.data = []
      this.$test
        .post(services.mapTag.GET_MAP_TAG, params)
        .post(services.mapTag.GET_MAP_TAG,
          {
            pageNumber: this.table.pager.currentPage,
            pageSize: this.table.pager.size,
            data: this.queryCondition
          })
        .then((res) => {
          // 请求成功处理...
          this.table.data = res.data.dataList
          this.table.pager.total = res.data.dataNum
          console.log(res)
          this.tableLoading = false
          this.table.data = res.data.data
          this.table.pager.total = res.data.total
          // this.table.pager.currentPage = pageNum
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    type_formatter(row, column) {
      var arr = this.markTypes.filter((item) => {
        return item.mapAreaTypeId === row.businessType
      })
      if (arr[0]) {
        return arr[0].mapAreaTypeName
      }
    },
    onChange(value) {
      console.log('date change:' + value)
    },
    onReset() {
      this.queryCondition.userName = ''
      console.log(this.departments)
      this.queryCondition = {
        entityId: this.departments[0].id,
        mapAreaName: null,
        mapAreaType: null
      }
      this.table.pager.currentPage = 1
      this.getList()
    },
    onSearch() {
      console.log(this.queryCondition)
      this.table.pager.currentPage = 1
      this.getList()
    },
@@ -423,6 +422,7 @@ export default {
      this.update = false
      this.updateId = null
      this.markName = ''
      this.department = null
      this.residenceTimeLength = ''
      this.modalData = []
      this.polygonDrawer.enable()
@@ -435,7 +435,7 @@ export default {
      }
    },
    timestampToTime(cjsj) {
      var date = new Date(cjsj.CREATE_DATE) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
      var date = new Date(cjsj.creatDate) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
      var Y = date.getFullYear() + '-'
      var M =
          (date.getMonth() + 1 < 10
@@ -452,7 +452,8 @@ export default {
      return Y + M + D + ' ' + h + ':' + m + ':' + s
    },
    submitMark() {
      if (this.modalData.length == 0) {
      console.log(this.layer.getPoints())
      if (this.modalData.length === 0) {
        this.$Confirm.warning({
          title: '提示',
          content: '请输添加标记'
@@ -467,7 +468,13 @@ export default {
        })
        return false
      }
      if (this.department === '') {
        this.$Confirm.warning({
          title: '提示',
          content: '请选择部门'
        })
        return false
      }
      if (this.markType === 4 && !this.residenceTimeLength) {
        this.$Confirm.warning({
          title: '提示',
@@ -475,55 +482,47 @@ export default {
        })
        return false
      }
      let arr = ''
      for (let i = 0; i < this.modalData.length; i++) {
        arr = arr + (this.modalData[i].lng + ' ' + this.modalData[i].lat + ',')
      }
      arr = arr + (this.modalData[0].lng + ' ' + this.modalData[0].lat)
      var params = new FormData()
      if (this.update) {
        params.append(
          'data',
          JSON.stringify({
            mapTagName: this.markName,
            mapTagType: this.markType,
            residenceTimeLength: this.residenceTimeLength,
            mapTagShape: arr,
            mapTagId: this.updateId
          })
        )
      if (this.update) { // 更新
        this.fullLoading = true
        this.$test
          .post(services.mapTag.UPD_MAP_TAG, params)
          .post(services.mapTag.UPD_MAP_TAG, {
            mapAreaId: this.updateId,
            mapAreaName: this.markName,
            businessType: this.markType,
            mapAreaContent: this.layer.getPoints(),
            entityId: this.department,
            limitDuration: this.residenceTimeLength ? this.residenceTimeLength : null
          })
          .then((res) => {
            // 请求成功处理...
            this.fullLoading = false
            this.getList()
            this.polygonDrawer.disable()
            this.modalData = []
            this.markName = ''
            this.department = null
            this.$Message.success('操作成功')
            this.map.removeLayer(this.layer)
            this.update = false
          })
          .catch((res) => {
            this.fullLoading = false
            // 请求失败处理...
          })
      } else {
        params.append(
          'data',
          JSON.stringify({
            mapTagName: this.markName,
            mapTagType: this.markType,
            residenceTimeLength: this.residenceTimeLength,
            mapTagShape: arr
          })
        )
      } else { // 新增
        this.update = false
        this.fullLoading = true
        this.$test
          .post(services.mapTag.ADD_MAP_TAG, params)
          .post(services.mapTag.ADD_MAP_TAG, {
            mapAreaName: this.markName,
            businessType: this.markType,
            mapAreaContent: this.layer.getPoints(),
            entityId: this.department,
            limitDuration: this.residenceTimeLength ? this.residenceTimeLength : null
          })
          .then((res) => {
            // 请求成功处理...
            this.fullLoading = false
            this.$Message.success('操作成功')
            this.map.removeLayer(this.layer)
            this.polygonDrawer.disable()
@@ -533,6 +532,7 @@ export default {
            this.getList()
          })
          .catch((res) => {
            this.fullLoading = false
            // 请求失败处理...
          })
      }
@@ -569,53 +569,44 @@ export default {
      this.getList()
    },
    handleClick(row) {
      var params = new FormData()
      params.append(
        'data',
        JSON.stringify({
          mapTagId: row.MAP_TAG_ID
        })
      )
      this.$test
        .post(services.mapTag.GET_ONE_MAP_TAG, params)
        .post(services.mapTag.GET_ONE_MAP_TAG, {
          mapTagId: row.mapAreaId
        })
        .then((res) => {
          // 请求成功处理...
          this.modalData = []
          var coverWktStr_blue = res.data.resultData.MAP_TAG_SHAPE
          // debugger
          // var arr = coverWktStr_blue.replace('POLYGON((','').split(',')[0].split(' ')
          // this.map.setView([arr[1], arr[0]], 10)
          console.log(res.data.resultData.MAP_TAG_SHAPE)
          var color
          if (row.MAP_TAG_TYPE == '3') {
          if (row.businessType == '3') {
            color = 'red'
          } else if (row.MAP_TAG_TYPE == '2') {
          } else if (row.businessType == '2') {
            color = 'green'
          } else {
            color = 'blue'
          }
          var coverLayer_blue = new Ai.Polygon(coverWktStr_blue, {color: color, opacity: 1.0})
          var coverLayer = new Ai.Polygon(res.data.resultData.mapAreaContent, {color: color, opacity: 1.0})
          // this.map.addLayer(coverLayer_blue)
          // 面设为编辑状态
          coverLayer_blue.snapediting = new Ai.PolylineSnap(
          coverLayer.snapediting = new Ai.PolylineSnap(
            this.map,
            coverLayer_blue
            coverLayer
          )
          coverLayer_blue.snapediting.enable()
          this.layer = coverLayer_blue
          this.map.addLayer(coverLayer_blue)
          coverLayer.snapediting.enable()
          this.layer = coverLayer
          this.map.addLayer(coverLayer)
          this.polygonDrawer.editing(this.layer)
          this.modalData = coverLayer_blue._latlngs[0]
          this.modalData = coverLayer._latlngs[0]
          this.polygonDrawer.disable()
          this.map.setViewPort([this.layer])
        })
        .catch((res) => {
          // 请求失败处理...
        })
      this.markName = row.MAP_TAG_NAME
      this.markType = parseInt(row.MAP_TAG_TYPE)
      this.updateId = row.MAP_TAG_ID
      this.residenceTimeLength = row.RESIDENCE_TIME_LENGTH
      this.markName = row.mapAreaName
      this.markType = row.businessType
      this.updateId = row.mapAreaId
      this.department = parseInt(row.entityId)
      this.residenceTimeLength = row.limitDuration
      this.addMark = true
      this.update = true
      this.polygonDrawer.enable()
@@ -694,37 +685,43 @@ export default {
        that.modalData = coverLayer_blue._latlngs[0]
        that.polygonDrawer.disable()
      }
      // debugger
      reader.readAsArrayBuffer(f)
    },
    remove(row) {
      let that = this
      let confirm = {
      this.$Confirm.confirm({
        title: '请确认',
        content: '删除后不可恢复,确认删除吗?',
        ok: function () {
          var params = new FormData()
          params.append(
            'data',
            JSON.stringify({
              mapTagId: row.MAP_TAG_ID
            })
          )
          // debugger
          this.$test
            .post(services.mapTag.DEL_MAP_TAG, params)
            .then((res) => {
              // 请求成功处理...
              // debugger
              this.$Message.success('操作成功')
              that.getList()
            })
            .catch((res) => {
              // 请求失败处理...
            })
        ok: () => {
          this.delete([row.mapAreaId])
        }
      }
      this.$Confirm.confirm(confirm)
      })
    },
    handleSelectionChange(val) {
      var arr = []
      val.forEach(element => {
        arr.push(element.mapAreaId)
      })
      this.selection = arr
    },
    batchDelete() {
      this.delete(this.selection)
    },
    delete(ids) {
      this.fullLoading = true
      this.$test
        .post(services.mapTag.DEL_MAP_TAG, {
          mapTagIds: ids
        })
        .then((res) => {
          // 请求成功处理...
          this.fullLoading = false
          this.$Message.success('操作成功')
          this.getList()
        })
        .catch((res) => {
          this.fullLoading = false
          // 请求失败处理...
        })
    }
  }
}

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

@@ -90,4 +90,8 @@
.submit-button{
  background-color: #147BD1;
  color: #ffffff;
}
.loading--fix{
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}

location-rescue-service/pom.xml

@@ -101,14 +101,19 @@
                </exclusion>
            </exclusions>
        </dependency>
       <!-- uspa登录拦截效验-->
        <dependency>
<!--        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>sso-util</artifactId>
            <version>1.0.0-RELEASE</version>
        </dependency>-->
        <dependency>
            <groupId>com.wframe</groupId>
            <artifactId>sso-util</artifactId>
            <version>1.2</version>
        </dependency>
        <!-- 缓存 -->
        <dependency>
		   <groupId>com.ai.ipu</groupId>

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/LocationManagementController.java

@@ -1,12 +1,19 @@
package com.ai.bss.location.rescue.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.bss.location.rescue.service.impl.LocationManagementServiceImpl;
import com.ai.bss.location.rescue.util.MirrorSendDateUtil;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
/**
 * 人员定位管理
@@ -17,6 +24,9 @@ import com.ai.bss.location.rescue.util.MirrorSendDateUtil;
@RequestMapping("/locationManagement")
public class LocationManagementController {
	@Autowired
	LocationManagementServiceImpl locationManagementServiceImpl;
	/**
	 * 推送镜屏数据测试
	 * @param msg
@@ -25,13 +35,25 @@ public class LocationManagementController {
	@ResponseBody
	@RequestMapping(value = "/mirrorSendDataTest", method = RequestMethod.POST)
	public String mirrorSendDataTest(@RequestBody String msg) {
		
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, msg);
		
		return msg;
	}
	
	
	
	
	/**
	 * 获取已绑定终端的人员列表
	 * @return
	 */
	@ResponseBody
	@RequestMapping("/queryEmployeeBindDeviceList")
	public Map<String, Object> queryEmployeeBindDeviceList() {
		Map<String, Object> result = new HashMap<String, Object>();
		List<EmployeeTerminalRelaDto> resultList = locationManagementServiceImpl.queryEmployeeBindDeviceList();
		result.put("dataList", resultList);
		return result;
	}
}

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

@@ -1,16 +1,34 @@
package com.ai.bss.location.rescue.service.impl;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.service.interfaces.LocationManagementService;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
@Service
public class LocationManagementServiceImpl implements LocationManagementService {
	Logger logger = LoggerFactory.getLogger(LocationManagementServiceImpl.class);
	@Autowired
	EmployeeTerminalRelaQuery employeeTerminalRelaQuery;
	
	
	@Override
	public List<EmployeeTerminalRelaDto> queryEmployeeBindDeviceList() {
		  String entityId = "0000"; //TODO 组织id
		  //根据组织编码查询该组织下绑定了终端的人员信息, 组织编码为空查询所有人员
		  CommonRequest<String> param = CommonRequest.<String>builder().data(entityId).build();
		  
		  CommonResponse<List<EmployeeTerminalRelaDto>> commonResponse = employeeTerminalRelaQuery.queryIndividualDevRelaByOrgCode(param);
		
		return commonResponse.getData();
	}
	
}	

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/LocationManagementService.java

@@ -1,5 +1,9 @@
package com.ai.bss.location.rescue.service.interfaces;
import java.util.List;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
/**
 * 人员定位管理
 * @author konghl@asiainfo.com
@@ -7,4 +11,10 @@ package com.ai.bss.location.rescue.service.interfaces;
 */
public interface LocationManagementService {
	/**
	 * 获取已绑定终端的人员列表
	 * @return
	 */
	List<EmployeeTerminalRelaDto> queryEmployeeBindDeviceList();
}

location-rescue-service/src/main/resources/application.properties

@@ -17,6 +17,24 @@ spring.jpa.properties.hibernate.format_sql=true
spring.jpa.properties.hibernate.generate_statistics=false
spring.main.allow-bean-definition-overriding=true
#kafka
spring.kafka.bootstrap-servers=47.105.160.21:9090
spring.kafka.producer.retries=0
spring.kafka.producer.batch-size=16384
spring.kafka.producer.buffer-memory=33554432
spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
spring.kafka.consumer.group-id=spring-boot-demo
spring.kafka.consumer.enable-auto-commit=false
spring.kafka.consumer.auto-offset-reset=latest
spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
spring.kafka.consumer.properties.session.timeout.ms=60000
spring.kafka.listener.log-container-config=false
spring.kafka.listener.concurrency=5
spring.kafka.listener.ack-mode=manual-immediate
# CACHE
#spring.cache.type=ehcache
#spring.cache.ehcache.config=ehcache.xml