Merge remote-tracking branch 'origin/master'

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

@@ -194,6 +194,7 @@ export default {
    GET_WORK_EMPLOYEE: '/workEmployee/queryWorkEmployee', // 查询人员信息
    GET_ALL_ORGANIZE: '/workEmployee/queryAllOrganize', // 查询部门信息
    ADD_WORK_EMPLOYEE: '/workEmployee/createWorkEmployee', // 新增人员信息
    DEL_WORK_EMPLOYEE: '/workEmployee/deleteWorkEmployee', // 删除人员信息
    UPD_WORK_EMPLOYEE: '/workEmployee/modifyWorkEmployee' // 修改人员信息
  }
}

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

@@ -75,14 +75,11 @@
            <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">
          <t-input v-model="formValidate.name" placeholder="请输入设备名称"></t-input>
        </t-form-item>
        <t-form-item label="设备编号" prop="number">
          <t-input v-model="formValidate.number" placeholder="请输入字母、数字、中划线、下划线、#"></t-input>
        </t-form-item>
        <t-form-item label="半径" prop="radius">
          <t-input v-model="formValidate.radius" placeholder="请输入设备名称"></t-input>
        <t-form-item label="设备名称" prop="name">
          <t-input v-model="formValidate.name" placeholder="请输入设备名称"></t-input>
        </t-form-item>
        <div v-if="formValidate.type!=='001'">
          <t-form-item label="经度" prop="lng">
@@ -94,6 +91,9 @@
            <t-format-input v-model="formValidate.lat" :numeral-decimal-scale="8" numeral placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
        <t-form-item label="半径" prop="radius">
          <t-input v-model="formValidate.radius" placeholder="请输入半径"></t-input>
        </t-form-item>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
@@ -111,9 +111,6 @@
        <t-form-item label="设备名称" prop="resourceToolName">
          <t-input v-model="updateRow.resourceToolName" placeholder="请输入设备名称"></t-input>
        </t-form-item>
        <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>
@@ -124,6 +121,9 @@
            <t-format-input v-model="updateRow.latitude" :numeral-decimal-scale="8" numeral placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
        <t-form-item label="半径" prop="radius">
          <t-input v-model="updateRow.radius" numeral placeholder="请输入半径"></t-input>
        </t-form-item>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
@@ -237,6 +237,11 @@ export default {
        ],
        radius: [
          {
            required: true,
            message: '半径不能为空',
            trigger: 'blur'
          },
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
@@ -322,6 +327,11 @@ export default {
        ],
        radius: [
          {
            required: true,
            message: '半径不能为空',
            trigger: 'blur'
          },
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
@@ -379,11 +389,11 @@ export default {
  },
  methods: {
    async getType() {
      this.fullLoading = true
      // this.fullLoading = true
      await this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
      ).then(res => {
        // 请求成功处理...
        this.fullLoading = false
        // this.fullLoading = false
        this.typeList = res.data
      }).catch(res => {
        // 请求失败处理...
@@ -445,7 +455,7 @@ export default {
    },
    checkReptition(data) {
      return new Promise((resolve) => {
        this.fullLoading = true
        // this.fullLoading = true
        this.$test.post(services.equipment.GET_EQUIPMENT, {
          pageNumber: 1,
          pageSize: 10,
@@ -453,7 +463,7 @@ export default {
        }
        ).then(res => {
        // 请求成功处理...
          this.fullLoading = false
        //   this.fullLoading = false
          console.log(res)
          if (res.data.totalPage > 0 && res.data.data[0].resourceToolId === this.updateRow.resourceToolId) {
            resolve(false)
@@ -476,6 +486,8 @@ export default {
      this.getList()
    },
    cancel() {
      this.$refs['formValidate'].resetFields()
      this.$refs['updateRow'].resetFields()
      this.modal = false
      this.updateModal = false
      this.formValidate = {
@@ -552,15 +564,27 @@ export default {
    },
    handleClick(row) {
      this.updateModal = true
      console.log(row)
      var name
      this.typeList.forEach(element => {
        if (element.resourceToolType === row.resourceToolType) {
          name = element.name
      this.$test.post(services.equipment.GET_EQUIPMENT, {
        pageNumber: 1,
        pageSize: 1,
        data: {
          resourceToolType: '',
          resourceToolNameAsLike: '',
          resourceToolCode: row.resourceToolCode
        }
      }).then(res => {
        // 请求成功处理...
        this.updateRow = res.data.data[0]
        var name
        this.typeList.forEach(element => {
          if (element.resourceToolType === this.updateRow.resourceToolType) {
            name = element.name
          }
        })
        this.updateRow.name = name
      }).catch(res => {
        // 请求失败处理...
      })
      row.name = name
      this.updateRow = row
    },
    remove(row) {
      this.delete([row.resourceToolId])

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

@@ -150,22 +150,6 @@
        <div class="left">
          <div class="header">
            <div>坐标列表</div>
            <div class="import-down">
              <a href="javascript:void(0)" size="sm" @click="handleFile1()"
              >导入</a
              >
              <input
                id="file"
                type="file"
                accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
                style="display: none"
                @change="handleFile($event)"
              />
              <span class="mod-line">|</span>
              <a href="javascript:void(0)" size="sm" @click="downloadTemplate()"
              >下载模板</a
              >
            </div>
          </div>
          <div>
            <t-table :data="modalData" size="sm" height="500">
@@ -194,10 +178,9 @@
            <div>
              2、可编辑坐标列表中的经纬度值调整对应点坐标，对应点在地图中处于选中态
            </div>
            <div>3、导入将清空已绘制信息</div>
          </div>
        </div>
        <div id="modalMap" class="right"></div>
        <div id="modalMap" class="right" style = "margin:0 auto;width: 100%;height:500px" ></div>
      </div>
    </t-modal>
    <t-loading v-model="fullLoading" fullscreen tip="加载中...."></t-loading>
@@ -266,12 +249,12 @@ export default {
  },
  methods: {
    getDepartmentsList() {
      this.fullLoading = true
      // this.fullLoading = true
      this.$test
        .post(services.workEmployee.GET_ALL_ORGANIZE, {})
        .then((res) => {
          // 请求成功处理...
          this.fullLoading = false
          // this.fullLoading = false
          this.departments = res.data
          // this.onReset()
        })
@@ -281,12 +264,12 @@ export default {
        })
    },
    getTagType() {
      this.fullLoading = true
      // this.fullLoading = true
      this.$test
        .post(services.mapTag.MAP_TAG_TYPE, {})
        .then((res) => {
          // 请求成功处理...
          this.fullLoading = false
          // this.fullLoading = false
          console.log(res)
          this.markTypes = res.data
        })
@@ -315,7 +298,6 @@ export default {
      this.polygonDrawer = Ai.DrawPolygon(this.map, options) // 初始化多边形绘制工具
      this.polygonDrawer.enable() // 激活多边形绘制工具
      this.map.on(AiDrawEvent.CREATED, (e) => {
        // debugger
        console.log(e)
        this.layer = this.polygonDrawer.polygon(e) // 获取多边形信息
        var color
@@ -401,7 +383,6 @@ export default {
        .post(services.excel.EXPROT_MAP_TAG, params)
        .then((res) => {
          // 请求成功处理...
          // debugger
          console.log(res)
          this.downloadDoc(res.data)
        })
@@ -410,7 +391,6 @@ export default {
        })
    },
    downloadDoc(response) {
      // debugger
      var blob = new Blob([response], {
        type: 'application/vnd.ms-excel;charset=utf-8'
      })
@@ -467,7 +447,6 @@ export default {
        })
        return false
      }
      // debugger
      if (this.markName === '') {
        this.$Confirm.warning({
          title: '提示',
@@ -649,9 +628,7 @@ export default {
      var files = e.target.files
      var f = files[0]
      var reader = new FileReader()
      // debugger
      reader.onload = function (e) {
        // debugger
        var data = new Uint8Array(e.target.result)
        var workbook = XLSX.read(data, { type: 'array' })
        /* DO SOMETHING WITH workbook HERE */
@@ -674,7 +651,6 @@ export default {
          5
        ) // 地图定位
        // that.map.center =  []
        // debugger
        coverWktStr_blue = coverWktStr_blue.substring(
          0,
          coverWktStr_blue.length - 1

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

@@ -317,8 +317,8 @@ export default {
      }).then(res => {
        // 请求成功处理...
        this.tableLoading = false
        this.table.data = res.data.dataList
        this.table.pager.total = res.data.dataNum
        this.table.data = res.data.data
        this.table.pager.total = res.data.total
      }).catch(res => {
        // 请求失败处理...
        this.tableLoading = false
@@ -329,7 +329,7 @@ export default {
      ).then(res => {
        // 请求成功处理...
        this.currentLoading = false
        this.itemList[0].goList = res.data.result
        this.itemList[0].goList = res.data
      }).catch(res => {
        // 请求失败处理...
      })
@@ -337,7 +337,7 @@ export default {
      ).then(res => {
        // 请求成功处理...
        this.currentLoading = false
        var arr = res.data.result
        var arr = res.data
        for (let i = 0; i < arr.length; i++) {
          arr[i].name = arr[i].resourceToolName
          arr[i].code = arr[i].resourceToolCode
@@ -352,7 +352,7 @@ export default {
      this.$test.post(services.device.GET_DEVICETYPES, {}
      ).then(res => {
        // 请求成功处理...
        this.deviceTypes = res.data.dataList
        this.deviceTypes = res.data
      }).catch(res => {
        // 请求失败处理...
      })
@@ -387,12 +387,10 @@ export default {
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            if (res.data.result) {
              this.relevance = false
              this.loading = false
              this.$Message.success('提交成功!')
              this.getList()
            }
            this.relevance = false
            this.loading = false
            this.$Message.success('提交成功!')
            this.getList()
          }).catch(res => {
            // 请求失败处理...
            this.loading = false
@@ -465,15 +463,12 @@ export default {
          }).then(res => {
            // 请求成功处理...
            that.fullLoading = false
            if (res.data.result) {
              that.$Message.success('提交成功!')
              that.cancel()
              that.getList()
            } else {
              that.$Message.danger(res.data.errMsg)
            }
            that.$Message.success('提交成功!')
            that.cancel()
            that.getList()
          }).catch(res => {
            // 请求失败处理...
            that.fullLoading = false
          })
        } else {
          this.$Message.danger('表单验证失败!')
@@ -490,13 +485,9 @@ export default {
      }).then(res => {
        // 请求成功处理...
        this.fullLoading = false
        if (res.data.result) {
          this.$Message.success('提交成功!')
          this.cancel()
          this.getList()
        } else {
          this.$Message.danger(res.data.errMsg)
        }
        this.$Message.success('提交成功!')
        this.cancel()
        this.getList()
      }).catch(res => {
        // 请求失败处理...
        this.fullLoading = false
@@ -518,12 +509,8 @@ export default {
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              if (res.data.result) {
                this.$Message.success('解绑成功!')
                this.getList()
              } else {
                this.$Message.danger('解绑失败!')
              }
              this.$Message.success('解绑成功!')
              this.getList()
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false
@@ -556,12 +543,8 @@ export default {
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              if (res.data.result) {
                this.$Message.success('解绑成功!')
                this.getList()
              } else {
                this.$Message.danger('解绑失败!')
              }
              this.$Message.success('解绑成功!')
              this.getList()
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false
@@ -578,14 +561,14 @@ export default {
      ).then(res => {
        // 请求成功处理...
        this.updateModal = true
        this.updateFormValidate.number = res.data.resultData.deviceNo
        this.updateFormValidate.type = res.data.resultData.deviceTypeName
        this.updateFormValidate.typeId = res.data.resultData.deviceTypeId
        this.updateFormValidate.id = res.data.resultData.deviceId
        if (res.data.resultData.remarks === '无') {
        this.updateFormValidate.number = res.data.deviceNo
        this.updateFormValidate.type = res.data.deviceTypeName
        this.updateFormValidate.typeId = res.data.deviceTypeId
        this.updateFormValidate.id = res.data.deviceId
        if (res.data.remarks === '无') {
          this.updateFormValidate.desc = ''
        } else {
          this.updateFormValidate.desc = res.data.resultData.remarks
          this.updateFormValidate.desc = res.data.remarks
        }
      }).catch(res => {
        // 请求失败处理...
@@ -603,16 +586,16 @@ export default {
      this.$test.post(services.device.GET_BIND_DEVICE, {deviceId: row.deviceId}
      ).then(res => {
        // 请求成功处理...
        if (res.data.resultData == null) {
        if (res.data == null) {
          this.relevanceValidate.msgisShow = false
          this.relevanceValidate.msg = ''
        } else {
          this.relevanceValidate.msgisShow = true
          var name = ''
          if (res.data.resultData.bindType === '1') {
            name = res.data.resultData.name
          if (res.data.bindType === '1') {
            name = res.data.name
          } else {
            name = res.data.resultData.resourceToolName
            name = res.data.resourceToolName
          }
          this.relevanceValidate.msg = '当前终端已关联 ' + name + ' ,点击保存更改关联关系'
        }
@@ -630,12 +613,8 @@ export default {
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            if (res.data.result) {
              this.$Message.success('操作成功')
              this.getList()
            } else {
              this.$Message.danger(res.data.errMsg)
            }
            this.$Message.success('操作成功')
            this.getList()
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
@@ -665,12 +644,8 @@ export default {
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              if (res.data.result) {
                this.$Message.success('操作成功')
                this.getList()
              } else {
                this.$Message.danger(res.data.errMsg)
              }
              this.$Message.success('操作成功')
              this.getList()
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false

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

@@ -29,10 +29,10 @@
            </div>
          </div>
          <div class="btns">
            <t-button color="secondary" class="reset-btn" @click="onReset">重置</t-button>
            <t-button color="success" icon="search-outline" @click="onSearch">查询</t-button>
            <t-button color="secondary" 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="toBatchRemove">删除</t-button>
          </div>
        </div>
      </div>
@@ -45,12 +45,12 @@
      </div>
    </div>
    <div>
      <t-table :data="table.data" @selection-change="handleSelectionChange">
      <t-table :loading="tableLoading" :data="table.data" @selection-change="handleSelectionChange">
        <t-table-column type="selection" width="70"></t-table-column>
        <t-table-column prop="name" label="姓名"></t-table-column>
        <t-table-column prop="code" label="员工编号"></t-table-column>
        <t-table-column prop="orgName" label="部门"></t-table-column>
        <t-table-column prop="mainJobPosition" label="职务"></t-table-column>
        <t-table-column :formatter="type_formatter" prop="mainJobPosition" label="职务"></t-table-column>
        <t-table-column prop="age" label="年龄"></t-table-column>
        <t-table-column prop="mainWirelessCall" label="手机"></t-table-column>
        <t-table-column
@@ -90,10 +90,8 @@
          ></t-select-tree>
        </t-form-item>
        <t-form-item label="职务" prop="job">
          <t-select v-model="formValidate.job" label-in-value placeholder="请选择职务">
            <t-option value="1">职务1</t-option>
            <t-option value="2">职务2</t-option>
            <t-option value="3">职务3</t-option>
          <t-select v-model="formValidate.job" placeholder="请选择职务">
            <t-option v-for="(item, index) in JobPostions" :key="index" :value="item.code">{{ item.value }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="出生年月" prop="age">
@@ -110,6 +108,41 @@
        <t-button class="submit-button" @click="submit">保存</t-button>
      </div>
    </t-modal>
    <t-modal :visibled.sync="updateModal" :mask-closable="false" title="编辑用户" >
      <t-form ref="updateFormValidate" :model="updateFormValidate" :rules="updateRuleValidate" :label-width="80" label-position="left">
        <t-form-item label="员工编号" prop="number">
          {{ updateFormValidate.number }}
        </t-form-item>
        <t-form-item label="姓名" prop="name">
          <t-input v-model="updateFormValidate.name" placeholder="请输入姓名"></t-input>
        </t-form-item>
        <t-form-item label="部门" prop="department">
          <t-select-tree
            v-model="updateFormValidate.department"
            :node-data="cloneNodes"
            node-key="code"
          ></t-select-tree>
        </t-form-item>
        <t-form-item label="职务" prop="job">
          <t-select v-model="updateFormValidate.job" placeholder="请选择职务">
            <t-option v-for="(item, index) in JobPostions" :key="index" :value="item.code">{{ item.value }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="出生年月" prop="age">
          <!--          <t-input v-model="formValidate.age" placeholder="请输入数字"></t-input>-->
          <t-date-picker v-model="updateFormValidate.age"
                         placeholder="请选择出生年月"></t-date-picker>
        </t-form-item>
        <t-form-item label="手机" prop="phone">
          <t-input v-model="updateFormValidate.phone" placeholder="请输入手机号码"></t-input>
        </t-form-item>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
        <t-button class="submit-button" @click="updateSubmit">保存</t-button>
      </div>
    </t-modal>
    <t-loading v-model="fullLoading" fullscreen tip="加载中...."></t-loading>
  </div>
</template>
<script>
@@ -128,6 +161,9 @@ export default {
      },
      departments: [],
      selections: [],
      JobPostions: [],
      fullLoading: false,
      tableLoading: true,
      queryCondition: {
        type: '',
        employeeNo: '',
@@ -227,6 +263,81 @@ export default {
            }
          }
        ]
      },
      updateModal: false,
      updateFormValidate: {
        id: '',
        name: '',
        number: '',
        department: '',
        job: '',
        age: '',
        phone: ''
      },
      updateRuleValidate: {
        name: [
          {
            required: true,
            message: '姓名不能为空',
            trigger: 'blur'
          }
        ],
        department: [
          {
            required: true,
            message: '部门不能为空',
            trigger: 'change',
            validator: function(rule, value, callback) {
              // TODO 判断编号重复
              if (!value) {
                callback(rule.message)
              } else {
                return true
              }
            }
          }
        ],
        job: [
          {
            required: true,
            message: '职务不能为空',
            trigger: 'change',
            validator: function(rule, value, callback) {
              // TODO 判断编号重复
              if (!value) {
                callback(rule.message)
              } else {
                return true
              }
            }
          }
        ],
        age: [
          {
            required: true,
            message: '出生年月不能为空',
            trigger: 'change'
          }
        ],
        phone: [
          {
            required: true,
            message: '手机不能为空',
            trigger: 'blur'
          },
          {
            message: '手机格式不正确',
            trigger: 'blur',
            validator: function(rule, value, callback) {
              let pattern = /^1[3456789]\d{9}$/
              if (!pattern.test(value)) {
                callback(rule.message)
              } else {
                return true
              }
            }
          }
        ]
      }
    }
  },
@@ -247,17 +358,17 @@ export default {
    }
  },
  mounted() {
    // this.table.data = this.table.data.concat(this.table.data)
    // this.table.pager.total = this.table.data.length
    this.getList()
    this.getDepartmentsList()
    this.initJobPostion()
  },
  methods: {
    getList: function () {
      this.tableLoading = true
      this.$test
        .post(services.workEmployee.GET_WORK_EMPLOYEE, {
          data: {
            orgId: this.queryCondition.department,
            orgCode: this.queryCondition.department,
            code: this.queryCondition.employeeNo,
            name: this.queryCondition.employeeName
          },
@@ -266,13 +377,23 @@ export default {
        })
        .then((res) => {
          // 请求成功处理...
          this.tableLoading = false
          this.table.data = res.data.data
          this.table.pager.total = res.data.total
        })
        .catch((res) => {
          // 请求失败处理...
          this.tableLoading = false
        })
    },
    type_formatter(row, column) {
      var arr = this.JobPostions.filter((item) => {
        return item.code === row.mainJobPosition
      })
      if (arr[0]) {
        return arr[0].value
      }
    },
    getDepartmentsList: function () {
      this.$test
        .post(services.workEmployee.GET_ALL_ORGANIZE, {})
@@ -286,7 +407,7 @@ export default {
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id,
                data: res.data[i].code,
                pid: res.data[i].parentCode
              })
            } else {
@@ -294,7 +415,7 @@ export default {
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id
                data: res.data[i].code
              })
            }
          }
@@ -303,6 +424,17 @@ export default {
          // 请求失败处理...
        })
    },
    initJobPostion: function () {
      this.$test
        .post(services.workEmployee.GET_JOB_POSTION, {})
        .then((res) => {
          // 请求成功处理...
          this.JobPostions = res.data
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    onChange(value) {
      console.log('date change:' + value)
    },
@@ -330,68 +462,67 @@ export default {
      this.getList()
    },
    handleClick(row) {
      this.modal = true
      // 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
      this.$test
        .post(services.workEmployee.GET_WORK_EMPLOYEE, {
          data: {
            id: row.id
          },
          pageNumber: 1,
          pageSize: 1
        })
        .then((res) => {
        // 请求成功处理...
          var user = res.data.data[0]
          this.updateFormValidate = {
            id: user.id,
            name: user.name,
            number: user.code,
            department: user.orgCode,
            job: user.mainJobPosition,
            age: user.birthday,
            phone: user.mainWirelessCall
          }
        })
        .catch((res) => {
        // 请求失败处理...
        })
    },
    remove(row) {
      this.$Confirm.confirm({
        title: '确认要删除用户张三吗？',
        content: '删除后不可恢复',
      let confirm = {
        title: '请确认',
        content: '删除后不可恢复,确认删除吗?',
        ok: () => {
          console.log('点击了确定')
        },
        cancel: () => {
          console.log('点击了取消')
          this.fullLoading = true
          this.$test.post(services.workEmployee.DEL_WORK_EMPLOYEE, {ids: row.id this.$test.post(services.workEmployee.DEL_WORK_EMPLOYEE, {ids: row.id}
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            this.$Message.success('操作成功')
            this.getList()
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
          })
        }
      })
      // let that = this
      // let 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
      //     ).then(res => {
      //       // 请求成功处理...
      //       that.$Message.success('操作成功')
      //       that.getList()
      //     }).catch(res => {
      //       // 请求失败处理...
      //     })
      //   }
      // }
      // this.$Confirm.confirm(confirm)
      }
      this.$Confirm.confirm(confirm)
    },
    cancel() {
      this.modal = false
      this.updateModal = false
      this.$refs['formValidate'].resetFields()
    },
    submit() {
      var that = this
      this.$refs.formValidate.validate(valid => {
        if (valid) {
          that.fullLoading = true
          that.$test.post(services.workEmployee.ADD_WORK_EMPLOYEE, {
            name: that.formValidate.name,
            code: that.formValidate.number,
            organizeCode: that.formValidate.department,
            mainJobPosition: that.formValidate.job.value,
            mainJobPosition: that.formValidate.job,
            birthday: that.formValidate.age,
            // cardType: "居民身份证",
            // cardNo: "43252345455412305567X",
@@ -400,16 +531,47 @@ export default {
          }
          ).then(res => {
            // 请求成功处理...
            if (res.data) {
              that.$Message.success('提交成功!')
              that.cancel()
              that.getList()
            } else {
              this.$Message.danger('终端编号重复!')
            }
            that.fullLoading = false
            that.$Message.success('提交成功!')
            that.cancel()
            that.getList()
            // this.getList(this.table.pager.currentPage, this.table.pager.size, this.queryCondition.equipmentType, this.queryCondition.equipmentName, this.queryCondition.equipmentNumber)
          }).catch(res => {
            // 请求失败处理...
            that.fullLoading = false
          })
        } else {
          this.$Message.danger('表单验证失败!')
        }
      })
    },
    updateSubmit() {
      var that = this
      this.$refs.updateFormValidate.validate(valid => {
        if (valid) {
          that.fullLoading = true
          var birthday = that.updateFormValidate.age.replaceAll(' 00:00:00', '')
          that.$test.post(services.workEmployee.UPD_WORK_EMPLOYEE, {
            id: that.updateFormValidate.id,
            name: that.updateFormValidate.name,
            code: that.updateFormValidate.number,
            organizeCode: that.updateFormValidate.department,
            mainJobPosition: that.updateFormValidate.job,
            birthday: birthday,
            // cardType: "居民身份证",
            // cardNo: "43252345455412305567X",
            // gender: "男",
            mainWirelessCall: that.updateFormValidate.phone
          }
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            that.$Message.success('提交成功!')
            that.cancel()
            that.getList()
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
          })
        } else {
          this.$Message.danger('表单验证失败!')
@@ -422,6 +584,38 @@ export default {
    addUser() {
      this.modal = true
      this.getDepartmentsList()
    },
    toBatchRemove(row) { // 批量删除
      if (this.selections.length === 0) {
        this.$Confirm.info({
          title: '提示',
          content: '请选中需要删除的人员。'
        })
      } else {
        var ids = ''
        for (let i = 0; i < this.selections.length; i++) {
          ids += this.selections[i].id + ','
        }
        ids = ids.substring(0, ids.length - 1)
        let confirm = {
          title: '请确认',
          content: '删除后不可恢复,确认删除吗?',
          ok: () => {
            this.fullLoading = true
            this.$test.post(services.workEmployee.DEL_WORK_EMPLOYEE, {ids: ids}
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              this.$Message.success('操作成功')
              this.getList()
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false
            })
          }
        }
        this.$Confirm.confirm(confirm)
      }
    }
  }
}

location-rescue-service/pom.xml

@@ -6,7 +6,7 @@
    <parent>
        <artifactId>components</artifactId>
        <groupId>com.ai.bss</groupId>
        <version>2.1-SNAPSHOT</version>
        <version>2.1.5-SNAPSHOT</version>
    </parent>
@@ -54,25 +54,25 @@
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-tool-service-api</artifactId>
            <version>2.1-SNAPSHOT</version>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-tool-service</artifactId>
            <version>2.1-SNAPSHOT</version>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>worker-service</artifactId>
            <version>2.1-SNAPSHOT</version>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
		<dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>characteristic-spec-service</artifactId>
            <version>2.1-SNAPSHOT</version>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <!-- <dependency>
@@ -91,7 +91,7 @@
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>system-user-service</artifactId>
            <version>2.1-SNAPSHOT</version>
            <version>2.1.5-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>

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

@@ -184,11 +184,9 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryAssociatInfo")
	public Map<String, Object> queryAssociatInfo(@RequestBody Map<String, Object> params) throws Exception {
		List<? extends Object> userList =  deviceManageService.queryAssociatInfo(params);
		Map<String, Object> result = new HashMap<String, Object>();
		result.put("result", userList);
		return result;
	public CommonResponse<List<? extends Object>> queryAssociatInfo(@RequestBody Map<String, Object> params) throws Exception {
		List<? extends Object> resultList =  deviceManageService.queryAssociatInfo(params);
		return CommonResponse.ok(resultList);
	}
	
	/**

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

@@ -145,11 +145,12 @@ public class MapTagManageController {
            return CommonResponse.fail("500","删除失败");
        }
        List<String> mapTagIdsList = null;
        List<String> mapTagIdsList = new ArrayList<String>();
        if (params.get("mapTagIds") instanceof List) {
            mapTagIdsList = (List<String>) params.get("mapTagIds");
            for (Object object : (List<Object>)params.get("mapTagIds")) {
                mapTagIdsList.add(object.toString())   ;
            }
        } else if (params.get("mapTagIds") instanceof String) {
            mapTagIdsList = new ArrayList<String>();
            mapTagIdsList.add((String) params.get("mapTagIds"));
        } else {
            return CommonResponse.fail("501","删除失败:标记类型错误");

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

@@ -89,7 +89,7 @@ public class MapTagManageServiceImpl implements MapTagManageService {
	@Override
	public CommonResponse<Void> addMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception {
		mapTagInfoDto.setMapAreaSetId("0"); //TODO 固定值 所属地图围栏集合标识
		mapTagInfoDto.setMapAreaSetId(0L); //TODO 固定值 所属地图围栏集合标识
		mapTagInfoDto.setPriority("10");  //优先级
		mapTagInfoDto.setMapType(MapArea.MAP_TYPE_GEOMETRY);	//围栏形状,GEO多边形, RAD 圆形
@@ -105,7 +105,7 @@ public class MapTagManageServiceImpl implements MapTagManageService {
	@Override
	public CommonResponse<Void> modifyMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception {
		mapTagInfoDto.setMapAreaSetId("0"); //TODO 固定值 所属地图围栏集合标识
		mapTagInfoDto.setMapAreaSetId(0L); //TODO 固定值 所属地图围栏集合标识
		mapTagInfoDto.setPriority("10");  //优先级
		mapTagInfoDto.setMapType(MapArea.MAP_TYPE_GEOMETRY);	//围栏形状,GEO多边形, RAD 圆形

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

@@ -0,0 +1,41 @@
package com.ai.bss.location.rescue.util;
import com.ai.ipu.cache.CacheFactory;
import com.ai.ipu.cache.ICache;
public class CacheUtil {
    //private static final Logger logger = LoggerFactory.getLogger(CacheUtil.class);
    private static final String CACHE_NAME = "ssn";
    public static boolean setCache(String key, Object value) throws Exception {
        if (value == null) getCache(key);
        if (key == null) new NullPointerException();
        ICache cache = CacheFactory.getCache(CacheFactory.CacheType.redis, CACHE_NAME);
        return cache.put(key, value);
    }
    public static Object getCache(String key) throws Exception {
        if (key == null) new NullPointerException();
        ICache cache = CacheFactory.getCache(CacheFactory.CacheType.redis, CACHE_NAME);
        return cache.get(key);
    }
    public static boolean removeCache(String key) throws Exception {
        if (key == null) new NullPointerException();
        ICache cache = CacheFactory.getCache(CacheFactory.CacheType.redis, CACHE_NAME);
        return cache.remove(key);
        //CacheFactory.close(CACHE_NAME, cache);
    }
    public static boolean keyExists(String value) throws Exception {
        if (value == null) new NullPointerException();
        ICache cache = CacheFactory.getCache(CacheFactory.CacheType.redis, CACHE_NAME);
        return cache.keyExists(value);
    }
}

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

@@ -186,7 +186,7 @@ public class HttpServiceUtil {
		return body;
	}
	public static String sendGet(String url, Charset encoding) {
	public static String sendGet(String url, Charset encoding,Map<String,String> headerMap) {
		HttpClient httpClient = HttpClients.createDefault();
		HttpGet httpGet = new HttpGet(url);
		httpGet.addHeader(HTTP.CONTENT_TYPE, HTTP_CONTENT_TYPE_JSON);

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

@@ -1,264 +1,252 @@
package com.ai.bss.location.rescue.util;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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;
import com.alibaba.fastjson.JSON;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
/**
 *北向接口统一入口
 * 北向接口统一入口
 *
 * @date 2010/09/24 23:42
 */
@Configuration
public class NorthboundInterfaceUtil {
	private static final Logger logger = LoggerFactory.getLogger(MapTagManageController.class);
	
	@Value("${aap.iot.userCode:IOT_ADMIN}")
	private String userCode;
	@Value("${aap.iot.passWord:123456}")
	private String passWord;
	@Value("${url.iot.login:http://47.105.130.83:8083/sso/login}")
	private String iotLoginUrl;
	@Value("${url.iot.service:http://47.105.130.83:8083/dmp/terminalNorthApi/}")
	private String iotServiceUrl;
	// 定义静态存储map空间存放sign与sessionId
	private volatile static Map<String, String> cacheMap = new ConcurrentHashMap<String, String>();// 缓存map
	// set
	public void setMapCache(Map<String, String> map) {
		Set<String> set = map.keySet();
		Iterator<String> it = set.iterator();
		while (it.hasNext()) {
			String key = it.next();
			cacheMap.put(key, map.get(key));
		}
	}
	// get
	public Map<String, String> getMapCache() {
		return cacheMap;
	}
	// 清除cache
	public void clear() {
		cacheMap.clear();
	}
	/**
	 * GET请求调用北向接口方法
	 * 
	 * @param url
	 * @param params
	 * @return
	 * @throws Exception
	 */
	public Map<String, Object> iotGetCallUtil(String url) throws Exception {
		// 调用北向服务的接口
		logger.debug("GET调用北向接口");
		boolean loginFlag = true;
		// 1.在缓存中获取sessionId与sign
		Map<String, String> mapCache = getMapCache();
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("session_id") == null) {
			// 2.如果没有调用登录接口从新获取
			loginFlag = iotLogin();
		}
		if (!loginFlag) {
			logger.debug("调用北向接口登录失败");
			return new HashMap<String, Object>();
		}
		// 3.调用北向服务接口
		// (1)设置字符集
		Charset charset = Charset.forName("utf-8");
		// (2)调用接口
		String resultJson = HttpServiceUtil.sendGet(iotServiceUrl + url, charset);
		// (3)将参数转为Map<String,String>【将返回值统一为String】
		Map<String, Object> resultMap = JSON.parseObject(resultJson, Map.class);
		// 4.登录超时，需重新登录
		if ("登录超时".equals(resultMap.get("resultMsg"))) {
			logger.info("调用北向接口失败，需重新登录");
			// 4.调用不成功可能是登录过期
			// (1)清除缓存
			clear();
			// (2)重新登录
			loginFlag = iotLogin();
			if (!loginFlag) {
				logger.debug("再次调用北向接口登录失败");
				return new HashMap<String, Object>();
			}
			try {
				// (3)再次调用接口
				String fianlresultJson = HttpServiceUtil.sendGet(iotServiceUrl + url, charset);
				// (4)获取返回值
				resultMap = JSON.parseObject(fianlresultJson, Map.class);
			} catch (Exception e) {
				logger.error("再次调用北向接口失败: " + e.getMessage());
				return new HashMap<String, Object>();
			}
			if (resultMap == null) {
				logger.error("再次调用北向接口返回值为空");
				return new HashMap<String, Object>();
			}
		}
		// 5.判断是否调用成功
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			logger.info("调用北向接口成功");
		} else {
			logger.info("调用北向接口失败");
		}
		return resultMap;
	}
	/**
	 * POST请求调用北向接口方法
	 * 
	 * @param url
	 * @param paramsMap
	 * @return
	 * @throws Exception
	 */
	public Map<String, Object> iotPostCallUtil(String url, Map<String, Object> paramsMap) throws Exception {
		// 调用北向服务的接口
		logger.debug("POSt调用北向接口");
		boolean loginFlag = true;
		// 1.在缓存中获取sessionId与sign
		Map<String, String> mapCache = getMapCache();
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("session_id") == null) {
			// 2.如果没有调用登录接口从新获取
			loginFlag = iotLogin();
		}
		if (!loginFlag) {
			logger.debug("调用北向接口登录失败");
			return new HashMap<String, Object>();
		}
		// 3.调用北向服务接口
		// (1)设置字符集
		Charset charset = Charset.forName("utf-8");
		// 返回值
		Map<String, Object> resultMap = null;
		try {
			// (2)调用接口
			String resultJson = HttpServiceUtil.sendPost(iotServiceUrl + url, paramsMap, charset, getMapCache());
			// (3)将参数转为Map<String,String>【将返回值统一为String】
			resultMap = JSON.parseObject(resultJson, Map.class);
		} catch (Exception e) {
			logger.error("调用北向接口失败: " + e.getMessage());
			return new HashMap<String, Object>();
		}
		if (resultMap == null) {
			logger.error("调用北向接口返回值为空");
			return new HashMap<String, Object>();
		}
		// 4.登录超时，需重新登录
		if ("登录超时".equals(resultMap.get("resultMsg"))) {
			logger.info("调用北向接口登录超时，需重新登录");
			// 4.调用不成功可能是登录过期
			// (1)清除缓存
			clear();
			// (2)重新登录
			loginFlag = iotLogin();
			if (!loginFlag) {
				logger.debug("再次调用北向接口登录失败");
				return new HashMap<String, Object>();
			}
			try {
				// (3)再次调用接口
				String fianlresultJson = HttpServiceUtil.sendPost(iotServiceUrl + url, paramsMap, charset,
						getMapCache());
				// (4)获取返回值
				resultMap = JSON.parseObject(fianlresultJson, Map.class);
			} catch (Exception e) {
				logger.error("再次调用北向接口失败: " + e.getMessage());
				return new HashMap<String, Object>();
			}
			if (resultMap == null) {
				logger.error("再次调用北向接口返回值为空");
				return new HashMap<String, Object>();
			}
		}
		// 5.判断是否调用成功
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			logger.info("调用北向接口成功");
		} else {
			logger.info("调用北向接口失败");
		}
		return resultMap;
	}
	/**
	 * 调用登录接口获取sessionId与sign
	 * 
	 * @return
	 */
	private boolean iotLogin() {
		logger.debug("登录北向接口");
		// 调用登录接口获取sessionId与sign
		HashMap<String, Object> loginParamMap = new HashMap<>();
		loginParamMap.put("userCode", userCode);
		loginParamMap.put("passWord", passWord);
		// 设置字符集
		Charset charset = Charset.forName("utf-8");
		Map loginResultMap = null;
		try {
			// 调用登录接口
			String loginResult = HttpServiceUtil.sendPost(iotLoginUrl, loginParamMap, charset);
			loginResultMap = JSON.parseObject(loginResult, Map.class);
		} catch (Exception e) {
			logger.error("登录北向接口失败: " + e.getMessage());
			return false;
		}
		if (loginResultMap != null && NorthboundInterfaceConstant.resultCode_succeed
				.equals(String.valueOf(loginResultMap.get("resultCode")))) {
			logger.info("登录北向接口成功");
			Map result = (Map) loginResultMap.get("result");
			// 将数据存到缓存中
			setMapCache(result);
			return true;
		} else {
			logger.info("登录北向接口失败");
			return false;
		}
	}
    private static final Logger logger = LoggerFactory.getLogger(NorthboundInterfaceUtil.class);
    @Value("${aap.iot.userCode:IOT_ADMIN}")
    private String userCode;
    @Value("${aap.iot.passWord:123456}")
    private String passWord;
    @Value("${url.iot.login:http://47.105.130.83:8083/sso/login}")
    private String iotLoginUrl;
    @Value("${url.iot.service:http://47.105.130.83:8083/dmp/terminalNorthApi/}")
    private String iotServiceUrl;
    /**
     * GET请求调用北向接口方法
     *
     * @param url
     * @return
     * @throws Exception
     */
    public Map<String, Object> iotGetCallUtil(String url) throws Exception {
        logger.debug("GET调用北向接口");
        Map<String, Object> resultMap = new HashMap<String, Object>();
        Map<String, String> signMap = new HashMap<String, String>();
        // 1.在缓存中获取sessionId与sign
        Object sign =CacheUtil.getCache("ebc_iot_north_sign");
        Object session_id = CacheUtil.getCache("ebc_iot_north_session_id");
        if (sign == null ) {
            // 2.如果没有调用登录接口从新获取
            signMap = iotLogin();
            if (signMap == null) {
                logger.debug("调用北向接口登录失败");
                return resultMap;
            }
        } else {
            signMap.put("ebc_iot_north_sign", String.valueOf(sign));
            signMap.put("ebc_iot_north_session_id", String.valueOf(session_id));
        }
        // 3.调用北向服务接口
        // (1)设置字符集
        Charset charset = Charset.forName("utf-8");
        try {
            // (2)调用接口
            String resultJson = HttpServiceUtil.sendGet(iotServiceUrl + url, charset, signMap);
            // (3)将参数转为Map<String,String>【将返回值统一为String】
            resultMap = JSON.parseObject(resultJson, Map.class);
        } catch (Exception e) {
            logger.error("调用北向接口失败: " + e.getMessage());
            return new HashMap<String, Object>();
        }
        if (resultMap == null) {
            logger.error("调用北向接口返回值为空");
            return new HashMap<String, Object>();
        } else if ("登录超时".equals(resultMap.get("resultMsg"))) {
            // 4.登录超时，需重新登录
            logger.info("调用北向接口失败，需重新登录");
            // (1)清除缓存
            CacheUtil.removeCache("ebc_iot_north_sign");
            CacheUtil.removeCache("ebc_iot_north_session_id");
            // (2)重新登录
            signMap = iotLogin();
            if (signMap == null) {
                logger.debug("再次调用北向接口登录失败");
                return resultMap;
            }
            try {
                // (3)再次调用接口
                String resultJson = HttpServiceUtil.sendGet(iotServiceUrl + url, charset, signMap);
                // (4)获取返回值
                resultMap = JSON.parseObject(resultJson, Map.class);
            } catch (Exception e) {
                logger.error("再次调用北向接口失败: " + e.getMessage());
                return new HashMap<String, Object>();
            }
            if (resultMap == null) {
                logger.error("再次调用北向接口返回值为空");
                return new HashMap<String, Object>();
            }
        }
        // 5.判断是否调用成功
        if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
            logger.info("调用北向接口成功");
            return resultMap;
        } else {
            logger.info("调用北向接口失败");
            return new HashMap<String, Object>();
        }
    }
    /**
     * POST请求调用北向接口方法
     *
     * @param url
     * @param paramsMap
     * @return
     * @throws Exception
     */
    public Map<String, Object> iotPostCallUtil(String url, Map<String, Object> paramsMap) throws Exception {
        logger.debug("POSt调用北向接口");
        Map<String, Object> resultMap = new HashMap<String, Object>();
        Map<String, String> signMap = new HashMap<String, String>();
        // 1.在缓存中获取sessionId与sign
        Object sign =CacheUtil.getCache("ebc_iot_north_sign");
        Object session_id = CacheUtil.getCache("ebc_iot_north_session_id");
        if (sign == null ) {
            // 2.如果没有调用登录接口从新获取
            signMap = iotLogin();
            if (signMap == null) {
                logger.debug("调用北向接口登录失败");
                return resultMap;
            }
        } else {
            signMap.put("ebc_iot_north_sign", String.valueOf(sign));
            signMap.put("ebc_iot_north_session_id", String.valueOf(session_id));
        }
        // 3.调用北向服务接口
        // (1)设置字符集
        Charset charset = Charset.forName("utf-8");
        try {
            // (2)调用接口
            String resultJson = HttpServiceUtil.sendPost(iotServiceUrl + url, paramsMap, charset, signMap);
            // (3)将参数转为Map<String,String>【将返回值统一为String】
            resultMap = JSON.parseObject(resultJson, Map.class);
        } catch (Exception e) {
            logger.error("调用北向接口失败: " + e.getMessage());
            return new HashMap<String, Object>();
        }
        if (resultMap == null) {
            logger.error("调用北向接口返回值为空");
            return new HashMap<String, Object>();
        } else if ("登录超时".equals(resultMap.get("resultMsg"))) {
            // 4.登录超时，需重新登录
            logger.info("调用北向接口登录超时，需重新登录");
            // (1)清除缓存
            CacheUtil.removeCache("ebc_iot_north_sign");
            CacheUtil.removeCache("ebc_iot_north_session_id");
            // (2)重新登录
            signMap = iotLogin();
            if (signMap == null) {
                logger.debug("再次调用北向接口登录失败");
                return resultMap;
            }
            try {
                // (3)再次调用接口
                String resultJson = HttpServiceUtil.sendPost(iotServiceUrl + url, paramsMap, charset, signMap);
                // (4)获取返回值
                resultMap = JSON.parseObject(resultJson, Map.class);
            } catch (Exception e) {
                logger.error("再次调用北向接口失败: " + e.getMessage());
                return new HashMap<String, Object>();
            }
            if (resultMap == null) {
                logger.error("再次调用北向接口返回值为空");
                return new HashMap<String, Object>();
            }
        }
        // 5.判断是否调用成功
        if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
            logger.info("调用北向接口成功");
            return resultMap;
        } else {
            logger.info("调用北向接口失败");
            return new HashMap<String, Object>();
        }
    }
    /**
     * 调用登录接口获取sessionId与sign
     *
     * @return
     */
    private Map<String, String> iotLogin() throws Exception {
        logger.debug("登录北向接口");
        HashMap<String, Object> loginParamMap = new HashMap<>();
        // 调用登录接口获取sessionId与sign
        loginParamMap.put("userCode", userCode);
        loginParamMap.put("passWord", passWord);
        // 设置字符集
        Charset charset = Charset.forName("utf-8");
        //Map<String, String> loginResultMap =new HashMap<String,String>();
        JSONObject loginResultJsonObject = null;
        try {
            // 调用登录接口
            String loginResult = HttpServiceUtil.sendPost(iotLoginUrl, loginParamMap, charset);
            loginResultJsonObject = JSON.parseObject(loginResult);
        } catch (Exception e) {
            logger.error("登录北向接口失败: " + e.getMessage());
            return null;
        }
        if (loginResultJsonObject != null && NorthboundInterfaceConstant.resultCode_succeed.equals(String.valueOf(loginResultJsonObject.get("resultCode")))) {
            logger.info("登录北向接口成功");
            Map<String, String> resultMap = (Map<String, String>) loginResultJsonObject.get("result");
            // 将数据存到缓存中
            CacheUtil.setCache("ebc_iot_north_sign", resultMap.get("sign"));
            CacheUtil.setCache("ebc_iot_north_session_id", resultMap.get("session_id"));
            return resultMap;
        } else {
            logger.info("登录北向接口失败");
            return null;
        }
    }
}