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

 Conflicts:

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

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

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

    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

      display: flex;
      justify-content: space-between;
      >div{
        display: flex; 
        margin: 0 20px 16px 0;    
        display: flex;  
        line-height: 2;
        .label-content{
          display: flex; 
        }
      }
      .btns{
        min-width: 330px;
        min-width: 415px;
        button{
          margin: 0 2px;
        }
    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

            <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>
            <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">
        <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>
            <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>
        <div id="modalMap" class="right"></div>
      </div>
    </t-modal>
    <t-loading v-model="fullLoading" fullscreen tip="加载中...."></t-loading>
  </div>
</template>
<script>
          total: 0
        }
      },
      tableLoading: true,
      fullLoading: false,
      departments: [],
      queryCondition: {
        department: '',
        userName: ''
        entityId: null,
        mapAreaName: null,
        mapAreaType: null
      },
      rangeDate: '',
      addMark: false,
      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
      })
  },
  created() {
    this.getDepartmentsList()
    this.getTagType()
    this.getList()
  },
  mounted() {
        .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) => {
          // 请求失败处理...
        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()
      })
    },
    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()
    },
      this.update = false
      this.updateId = null
      this.markName = ''
      this.department = null
      this.residenceTimeLength = ''
      this.modalData = []
      this.polygonDrawer.enable()
      }
    },
    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
      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: '请输添加标记'
        })
        return false
      }
      if (this.department === '') {
        this.$Confirm.warning({
          title: '提示',
          content: '请选择部门'
        })
        return false
      }
      if (this.markType === 4 && !this.residenceTimeLength) {
        this.$Confirm.warning({
          title: '提示',
        })
        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()
            this.getList()
          })
          .catch((res) => {
            this.fullLoading = false
            // 请求失败处理...
          })
      }
      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()
        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

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

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

        return result;
    }
    /**
     * 删除用户信息
     */
    @ResponseBody
    @RequestMapping("/deleteWorkEmployee")
    public boolean deleteWorkEmployee(@RequestBody List<EmployeeDto> employeeDtoList) throws Exception {
        boolean result = userManageService.deleteWorkEmployee(employeeDtoList);
        return result;
    }
	/**
	 * 删除用户信息
	 */
	@ResponseBody
	@RequestMapping("/deleteWorkEmployee")
	public boolean deleteWorkEmployee(@RequestBody Map<String, String> params) throws Exception {
		boolean result = userManageService.deleteWorkEmployee(params);
		return result;
	}
	/**
	 * 修改用户信息
	 */
	@ResponseBody
	@RequestMapping("/modifyWorkEmployee")
	public boolean modifyWorkEmployee(@RequestBody EmployeeDto employeeDto ) throws Exception {
		boolean result = userManageService.modifyWorkEmployee(employeeDto);
		return result;
	}
    /**
     * 获取已绑定终端的人员列表

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

    }
    @Override
    public boolean deleteWorkEmployee(List<EmployeeDto> employeeDtoList) {
    public boolean deleteWorkEmployee(Map<String, String> params) {
        boolean success = false;
        for(EmployeeDto employeeDto:employeeDtoList ){
            CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
            CommonResponse<Void> response = employeeService.deleteWorkEmployee(request);
            success = response.isSuccess();
        if (params.get("ids")!=null&&!"".equals(params.get("ids"))) {
            String ids = params.get("ids");
            String[] idsArray = ids.split(",");
            EmployeeDto employeeDto=new EmployeeDto();
            for(String id: idsArray){
                long lid = Long.parseLong(id);
                employeeDto.setId(lid);
                CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
                CommonResponse<Void> response = employeeService.deleteWorkEmployee(request);
                success = response.isSuccess();
            }
            return success;
        }else {
            return success;
        }
    }
    @Override
    public boolean modifyWorkEmployee(EmployeeDto employeeDto) {
        CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
        CommonResponse<Void> response = employeeService.modifyEmployee(request);
        boolean success = response.isSuccess();
        return success;
    }

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

	boolean createWorkEmployee(EmployeeDto employeeDto) throws Exception;
	boolean deleteWorkEmployee(Map<String, String> params);
	boolean modifyWorkEmployee(EmployeeDto employeeDto);
	boolean deleteWorkEmployee(List<EmployeeDto> employeeDtoList);
	/**