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

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

@@ -155,7 +155,8 @@ export default {
    GET_EQUIPMENT: '/equipment/queryEquipmentInfo', // 查询设备管理信息
    ADD_EQUIPMENT: '/equipment/modifyEquipmentInfo', // 新增/修改设备管理信息
    DEL_EQUIPMENT: '/equipment/deleteEquipmentInfo', // 删除设备管理信息
    REPETITION_EQUIPMENT: '/equipment/verifyEquipmentInfoRepetition' // 删除设备管理信息
    REPETITION_EQUIPMENT: '/equipment/verifyEquipmentInfoRepetition', // 删除设备管理信息
    GET_ONE_EQUIPMENT: '/equipment/queryOneEquipmentInfo' // 查询单个设备信息
  },
  device: {
    GET_ASSOCIATINFO: '/device/queryAssociatInfo', // 关联列表信息查询

ebc-middle-platform/src/modules/attendance/track.vue

@@ -91,7 +91,6 @@ export default {
        .post(services.trackAnalysis.GET_TRACKANALYSIS, params)
        .then((res) => {
        // 请求成功处理...
          debugger
          this.table.data = res.data.result.list
          this.table.pager.total = res.data.result.total
        })

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

@@ -34,9 +34,9 @@
      </div>
      <div class="search-ctn" style="justify-content: flex-end;">
        <div class="btns">
          <t-button color="success" icon="plus-outline" @click="addEquipment">新增</t-button>
          <t-button color="success" icon="upload-outline" @click="onReset">导入</t-button>
          <t-button color="success" icon="download-outline" @click="onReset">下载模板</t-button>
          <t-button color="success" icon="plus-outline" @click="addEquipment">新增</t-button>
        </div>
      </div>
    </div>
@@ -61,8 +61,8 @@
            </div>
          </template>
        </t-table-column>
        <t-table-column prop="LONGITUDE" label="经度"></t-table-column>
        <t-table-column prop="LATITUDE" label="纬度"></t-table-column>
        <t-table-column :formatter="longLatFormatter" prop="LONGITUDE" label="经度"></t-table-column>
        <t-table-column :formatter="longLatFormatter" prop="LATITUDE" label="纬度"></t-table-column>
        <t-table-column
            fixed="right"
            label="操作"
@@ -84,50 +84,58 @@
               @on-change="onPagerChange">
      </t-pager>
    </div>
    <t-modal :visibled.sync="modal" title="新增设备" >
    <t-modal :visibled.sync="modal":mask-closable="false" title="新增设备" >
      <t-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" label-position="left">
        <t-form-item label="设备类型" prop="type">
          <t-select v-model="formValidate.type" placeholder="请选择设备类型" clearable>
          <t-select v-model="formValidate.type" placeholder="请选择设备类型" clearable @change="typeChange(1)">
            <t-option v-for="(item, index) in typeList" :value="item.value" :key="index">{{ item.label }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="设备名称" prop="name">
          <t-input v-model="formValidate.name" placeholder="请输入风机名称"></t-input>
          <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="lng">
          <t-input v-model="formValidate.lng" placeholder="请输入数字"></t-input>
           </t-form-item>
        <t-form-item label="纬度" prop="lat">
          <t-input v-model="formValidate.lat" placeholder="请输入数字"></t-input>
        </t-form-item>
        <div v-if="!lngLatDisabled">
          <t-form-item label="经度" prop="lng">
               <t-format-input v-model="formValidate.lng" numeral numeral-decimal-scale=8 placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
        <div v-if="!lngLatDisabled">
          <t-form-item label="纬度" prop="lat">
            <t-format-input v-model="formValidate.lat" numeral numeral-decimal-scale=8 placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
        <t-button class="submit-button" @click="submit">保存</t-button>
      </div>
    </t-modal>
    <t-modal :visibled.sync="updateModal" title="编辑设备" >
    <t-modal :visibled.sync="updateModal":mask-closable="false" title="编辑设备" >
      <t-form ref="updateRow" :model="updateRow" :rules="updateRowValidate" :label-width="80" label-position="left">
        <t-form-item label="设备类型" prop="FACILITY_TYPE">
          <t-select v-model="updateRow.FACILITY_TYPE" placeholder="请选择设备类型" clearable>
          <t-select v-model="updateRow.FACILITY_TYPE" placeholder="请选择设备类型" clearable @change="typeChange(2)">
            <t-option v-for="(item, index) in typeList" :value="item.value" :key="index">{{ item.label }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="设备名称" prop="FACILITY_NAME">
          <t-input v-model="updateRow.FACILITY_NAME" placeholder="请输入风机名称"></t-input>
          <t-input v-model="updateRow.FACILITY_NAME" placeholder="请输入设备名称"></t-input>
        </t-form-item>
        <t-form-item label="设备编号" prop="FACILITY_CODE">
          {{ updateRow.FACILITY_CODE }}
        </t-form-item>
        <t-form-item label="经度" prop="LONGITUDE">
          <t-input v-model="updateRow.LONGITUDE" placeholder="请输入数字"></t-input>
           </t-form-item>
        <t-form-item label="纬度" prop="LATITUDE">
          <t-input v-model="updateRow.LATITUDE" placeholder="请输入数字"></t-input>
        </t-form-item>
        <div v-if="!lngLatDisabled">
          <t-form-item label="经度" prop="LONGITUDE">
               <t-format-input v-model="updateRow.LONGITUDE" numeral numeral-decimal-scale=8 placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
        <div v-if="!lngLatDisabled">
          <t-form-item label="纬度" prop="LATITUDE">
            <t-format-input v-model="updateRow.LATITUDE" numeral numeral-decimal-scale=8 placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
@@ -148,6 +156,7 @@ export default {
      // currentLoading_n: false,
      // searchResult_n: [],
      // demoDataA_n: [],
      lngLatDisabled: false,
      typeList: [
        {
          value: '001',
@@ -454,7 +463,6 @@ export default {
      this.formValidate.lng = ''
      this.formValidate.lat = ''
      this.table.pager.currentPage = 1
      this.getList()
    },
    submit() {
      this.$refs.formValidate.validate(valid => {
@@ -474,6 +482,7 @@ export default {
          ).then(res => {
            // 请求成功处理...
            this.$Message.success('提交成功!')
            this.getList()
            this.cancel()
          }).catch(res => {
            // 请求失败处理...
@@ -501,6 +510,7 @@ export default {
          ).then(res => {
            // 请求成功处理...
            this.$Message.success('提交成功!')
            this.getList()
            this.cancel()
          }).catch(res => {
            // 请求失败处理...
@@ -511,11 +521,23 @@ export default {
      })
    },
    addEquipment() {
      this.lngLatDisabled = false
      this.modal = true
    },
    handleClick(row) {
      this.updateModal = true
      this.updateRow = row
      var params = new FormData()
      params.append('data', JSON.stringify({
        FACILITY_ID: row.FACILITY_ID
      }))
      this.$test.post(services.equipment.GET_ONE_EQUIPMENT, params
      ).then(res => {
        // 请求成功处理...
        this.updateModal = true
        this.updateRow = res.data.resultData
        this.typeChange(2)
      }).catch(res => {
        // 请求失败处理...
      })
    },
    remove(row) {
      let that = this
@@ -540,6 +562,21 @@ export default {
        }
      }
      this.$Confirm.confirm(confirm)
    },
    longLatFormatter(cjsj, column, cellValue, index) {
      if (cjsj.FACILITY_TYPE==1) {
        return '--'
      }
      return cellValue
    },
    typeChange(t) {
      var value
      if (t === 1) {
        value = this.formValidate.type
      } else {
        value = this.updateRow.FACILITY_TYPE
      }
      this.lngLatDisabled = (value == 1)
    }
  }
}

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

@@ -27,9 +27,9 @@
      </div>
      <div class="search-ctn" style="justify-content: flex-end;">
        <div class="btns">
          <t-button color="success" icon="plus-outline" @click="addTerminal">新增</t-button>
          <t-button color="success" icon="upload-outline" @click="onReset">导入</t-button>
          <t-button color="success" icon="download-outline" @click="onReset">下载模板</t-button>
          <t-button color="success" icon="plus-outline" @click="addTerminal">新增</t-button>
        </div>
      </div>
    </div>
@@ -575,7 +575,11 @@ export default {
      this.updateModal = true
      this.updateFormValidate.number = row.deviceNo
      this.updateFormValidate.id = row.deviceId
      this.updateFormValidate.desc = row.remarks
      if (row.remarks === '无') {
        this.updateFormValidate.desc = ''
      } else {
        this.updateFormValidate.desc = row.remarks
      }
    },
    handleClickUser(row) {
      this.initItemList()

ebc-sea-platform/src/main/java/com/ai/ipu/server/controller/ReceiveSubscribeController.java

@@ -1,8 +1,6 @@
package com.ai.ipu.server.controller;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -17,7 +15,6 @@ import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.service.interfaces.ReceiveSubscribeService;
import com.ai.ipu.server.util.EbcConstant;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
/**
@@ -44,8 +41,8 @@ public class ReceiveSubscribeController {
		logger.info("已接收定位消息，消息为：" + msg);
		// 解析数据
		List<Map> msgList = JSON.parseArray(msg, Map.class);
		for (Map msgMap : msgList) {
		JSONObject msgMap=(JSONObject) JSONObject.parse(msg);
		
			String msgJson = (String) msgMap.get("dataPointValue");
			JSONObject detailInfo = JSONObject.parseObject(msgJson);
			JMap detailInfoMap = new JsonMap();
@@ -63,11 +60,9 @@ public class ReceiveSubscribeController {
			detailInfoMap.put("latitude",
					latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
			// 分析并推送定位数据
			// 解析并推送定位数据
			receiveSubscribeService.receiveIotLocationData(detailInfoMap);
		}
		return msg;
	}
@@ -82,8 +77,8 @@ public class ReceiveSubscribeController {
		logger.info("已接收告警消息，消息为：" + msg);
		// 解析数据
		List<Map> msgList = JSON.parseArray(msg, Map.class);
		for (Map msgMap : msgList) {
		JSONObject msgMap=(JSONObject) JSONObject.parse(msg);
		
			String msgJson = (String) msgMap.get("dataPointValue");
			JSONObject detailInfo = JSONObject.parseObject(msgJson);
			JMap detailInfoMap = new JsonMap();
@@ -101,33 +96,12 @@ public class ReceiveSubscribeController {
			detailInfoMap.put("latitude",
					latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
			// 报警类型
			switch (detailInfo.getJSONObject("alarmType").getIntValue("value")) {
			case EbcConstant.alarm_type_autosos_beidou:
				// 自动报警
				detailInfoMap.put("locationStatus", EbcConstant.location_status_autosos);// 定位状态
				detailInfoMap.put("alarmType", EbcConstant.alarm_type_autosos_ZH);// 报警类型
				break;
			case EbcConstant.alarm_type_jogsos_beidou:
				// 手动报警
				detailInfoMap.put("locationStatus", EbcConstant.location_status_jogsos);// 定位状态
				detailInfoMap.put("alarmType", EbcConstant.alarm_type_jogsos_ZH);// 报警类型
				break;
			case EbcConstant.alarm_type_offline_beidou:
				// 离线
				detailInfoMap.put("locationStatus", EbcConstant.location_status_offline);// 定位状态
				detailInfoMap.put("alarmType", EbcConstant.alarm_type_offline_ZH);// 报警类型
				break;
			default:
				logger.error("告警消息的内容错误，消息为：" + msg);
				return msg;
			}
			//报警类型
			detailInfoMap.put("alarmType",detailInfo.getJSONObject("alarmType").getIntValue("value"));
			
			// 分析并推送报警数据
			receiveSubscribeService.receiveIotAlarmData(detailInfoMap);
		}
		return msg;
	}

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/iotData/ManageIotNewAlarmData.java

@@ -12,6 +12,7 @@ import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.MapTagManageDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
@Component
@@ -37,12 +38,32 @@ public class ManageIotNewAlarmData {
	}
	private void sendJingpingData(JMap params, String logId) {
		// 报警类型
		switch (params.getInt("alarmType")) {
		case EbcConstant.alarm_type_autosos_beidou:
			// 自动报警
			params.put("locationStatus", EbcConstant.location_status_autosos);// 定位状态
			params.put("alarmType", EbcConstant.alarm_type_autosos_ZH);// 报警类型
			break;
		case EbcConstant.alarm_type_jogsos_beidou:
			// 手动报警
			params.put("locationStatus", EbcConstant.location_status_jogsos);// 定位状态
			params.put("alarmType", EbcConstant.alarm_type_jogsos_ZH);// 报警类型
			break;
		case EbcConstant.alarm_type_offline_beidou:
			// 离线
			params.put("locationStatus", EbcConstant.location_status_offline);// 定位状态
			params.put("alarmType", EbcConstant.alarm_type_offline_ZH);// 报警类型
			break;
		default:
			logger.error("告警消息的内容错误");
		}
		params.put("alarmDate", params.getString("newDate"));// 求救时间
		params.put("alarmLong", "0");// 求救时长
		params.put("isNewAlarm", "1");
		params.put("alarmLogId", logId);
		params.put("isNewAlarm", "1");
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, params);
	}
@@ -67,7 +88,6 @@ public class ManageIotNewAlarmData {
		// 报警位置
		if (currentAreaInfoList == null || currentAreaInfoList.isEmpty()) {
			dataMap.put("callerLocation", "");
		} else {
			StringBuffer mapTagName = new StringBuffer(String.valueOf(currentAreaInfoList.get(0).get("MAP_TAG_NAME")));
			for (int i = 1; i < currentAreaInfoList.size(); i++) {