Merge remote-tracking branch 'origin/master'

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

@@ -169,6 +169,10 @@ export default {
  history: {
    GET_HISTORICAL_ALARM: '/history/queryHistoricalAlarm' // 查询历史报警信息
  },
  areaInOutRecord: {
    GET_ATTENDANCE: '/areaInOutRecord/queryPageAttendanceCount', // 分页查询考勤统计分析
    GET_ATTENDANCE_DETAILE: '/areaInOutRecord/queryPageAttendanceRecordDetaile' // 分页查询考勤统计分析
  },
  excel: {
    EXPROT_MAP_TAG: '/ExportToExcel/exportMapTagInfoToExcel' // 导出地图标记信息
  }

ebc-middle-platform/src/constants.js

@@ -16,4 +16,4 @@ export const GIS_SEA_LAYER_URL = 'http://192.168.74.189:9999/tdtvector' // 海
export const GIS_SEA_URL = 'http://192.168.74.216:5071/gisserver/dzht/dzht/wmts' // 海图地址
export const GIS_CENTER = [33.597844, 123.647472] // 海图中心点
export const GIS_ZOOM = 7 // 海图默认缩放
export const socketUrl = 'ws://127.0.0.1:7100/stomp'
export const socketUrl = 'ws://10.19.90.34:7100/stomp'

ebc-middle-platform/src/ipu-stomp.js

@@ -25,4 +25,7 @@ function successCallback() {
  stompClient.subscribe('personnel', msg => {
    EventBus.$emit('person', msg)
  })
  stompClient.subscribe('ship', msg => {
    EventBus.$emit('ship', msg)
  })
}

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

@@ -10,17 +10,20 @@
            <t-button v-for="(item,index) in queryCondition.type" :class="index==queryCondition.currentIndex?'active':''" :key="index" color="secondary" @click="changeType(index)">{{ item }}</t-button>
          </t-button-group>
        </div>
        <div>
          <t-date-picker v-model="queryCondition.singleDateVal" style="width:120px" placeholder="时间" @date-change="onChangeDate"
        <div v-if="queryCondition.dateType">
          <t-date-picker v-model="queryCondition.singleDateVal" type= "date" style="width:120px" placeholder="时间" @date-change="onChangeDate"
          ></t-date-picker>
        </div>
        <div v-if="!queryCondition.dateType">
          <div>
            <t-date-picker v-model="queryCondition.singleDateVal" type="month" style="width:120px" placeholder="时间" @date-change="onChangeDate"
            ></t-date-picker>
          </div>
        </div>
        <div>
          <div class="label">姓名:</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
              <t-option>张三</t-option>
              <t-option>李四</t-option>
            </t-select>
            <t-input v-model="queryCondition.alarmPerson" placeholder="请输入..."></t-input>
          </div>
        </div>
        <div class="btns">
@@ -32,12 +35,12 @@
    </div>
    <div>
      <t-table :data="table.data">
        <t-table-column prop="name" label="姓名"></t-table-column>
        <t-table-column prop="job" label="职务"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex === 0" prop="time" label="打卡时间"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex !== 0" prop="attendance" label="出勤天数（天）"></t-table-column>
        <t-table-column prop="userName" label="姓名"></t-table-column>
        <t-table-column prop="duty" label="职务"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex === 0" prop="IN_DATE" label="打卡时间"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex !== 0" prop="gateDays" label="出勤天数（天）"></t-table-column>
        <t-table-column
          v-if="queryCondition.currentIndex !== 0"
          v-if="queryCondition.currentIndex === 1"
          fixed="right"
          label="操作"
          width="120"
@@ -46,6 +49,16 @@
            <a href="javascript:void(0)" size="sm" @click="detail(scope.row)">详情</a>
          </template>
        </t-table-column>
        <t-table-column
          v-if="queryCondition.currentIndex === 2"
          fixed="right"
          label="操作"
          width="120"
        >
          <template slot-scope="scope">
            <a href="javascript:void(0)" size="sm" @click="monthDetail(scope.row)">详情</a>
          </template>
        </t-table-column>
      </t-table>
      <t-pager :total="table.pager.total" :current.sync="table.pager.currentPage"
               :page-size.sync="table.pager.size"
@@ -58,46 +71,50 @@
    </div>
    <t-modal :visibled.sync="modal" :footer-visibled="false" class="modal" title="考勤详情" width="1200px">
      <div class="title">
        <div>姓名：张三</div>
        <div>职务：运维人员</div>
        <div>考勤时间：2020-08-01 ~ 2020-08-07</div>
        <div>出勤天数：7天</div>
        <div>姓名：{{ modalData.userName }}</div>
        <div>职务：{{ modalData.duty }}</div>
        <div>考勤时间：{{ modalData.date }}</div>
        <div>出勤天数：{{ modalData.days }}</div>
      </div>
      <div>
        <t-table :data="modalData.table">
          <t-table-column prop="date" label="日期"></t-table-column>
          <t-table-column prop="time" label="打卡时间" ></t-table-column>
          <t-table-column prop="printTime" label="打卡时间" ></t-table-column>
        </t-table>
      </div>
    </t-modal>
    <t-modal :visibled.sync="monthModal" :footer-visibled="false" class="modal" title="考勤详情" width="1200px">
      <div class="title">
        <div>姓名：{{ monthModalData.userName }}</div>
        <div>职务：{{ monthModalData.duty }}</div>
        <div>考勤时间：{{ monthModalData.date }}</div>
        <div>出勤天数：{{ monthModalData.days }}</div>
      </div>
      <div>
        <t-table :data="monthModalData.table.data">
          <t-table-column prop="date" label="日期"></t-table-column>
          <t-table-column prop="printTime" label="打卡时间" ></t-table-column>
        </t-table>
        <t-pager :total="monthModalData.table.pager.total" :current.sync="monthModalData.table.pager.currentPage"
                 :page-size.sync="monthModalData.table.pager.size"
                 :sizer-range="[10,20,50]"
                 class="px-24 pt-16 float-right"
                 show-elevator show-sizer
                 @on-size-change="onModalSizeChange"
                 @on-change="onModalPagerChange">
        </t-pager>
      </div>
    </t-modal>
  </div>
</template>
<script>
import './attendance.scss'
import services from "../../conf/services";
export default {
  data() {
    return {
      table: {
        data: [
          {
            name: '王小明',
            job: '运维人员',
            time: '08:18',
            attendance: '7'
          },
          {
            name: '王小明',
            job: '运维人员',
            time: '08:18',
            attendance: '7'
          },
          {
            name: '王小明',
            job: '运维人员',
            time: '08:18',
            attendance: '7'
          }
        ],
        data: [],
        pager: {
          currentPage: 1,
          size: 10,
@@ -105,8 +122,9 @@ export default {
        }
      },
      queryCondition: {
        dateType: true,
        type: [
          '日', '月', '年'
          '日', '周', '月'
        ],
        currentIndex: 0,
        singleDateVal: '',
@@ -114,71 +132,217 @@ export default {
      },
      modal: false,
      modalData: {
        table: [{
          date: '2020-08-01',
          time: '08:18'
        }, {
          date: '2020-08-02',
          time: '08:18'
        }, {
          date: '2020-08-03',
          time: '08:18'
        }, {
          date: '2020-08-04',
          time: '08:18'
        }, {
          date: '2020-08-05',
          time: '08:18'
        }, {
          date: '2020-08-06',
          time: '08:18'
        }, {
          date: '2020-08-07',
          time: '08:18'
        }]
        userName: '',
        duty: '',
        date: '',
        days: '',
        table: []
      },
      monthModal: false,
      monthModalData: {
        userName: '',
        EMPLOYEE_ID: '',
        duty: '',
        date: '',
        days: '',
        table: {
          data: [],
          pager: {
            currentPage: 1,
            size: 10,
            total: 0
          }
        }
      }
    }
  },
  mounted() {
    this.table.data = this.table.data.concat(this.table.data)
    this.table.pager.total = this.table.data.length
    this.getList()
  },
  methods: {
    changeType(index) {
      this.queryCondition.currentIndex = index
      this.queryCondition.singleDateVal = ''
      this.queryCondition.dateType = !(index === 2)
      this.getList()
    },
    onChangeDate(value) {
      console.log(value)
      this.singleDateVal = value
      this.onSearch()
    },
    onChange(value) {
      console.log('date change:' + value)
    },
    onReset() {
      this.queryCondition = {
        dateType: true,
        type: [
          '日', '月', '年'
          '日', '周', '月'
        ],
        currentIndex: 0,
        singleDateVal: '',
        alarmPerson: ''
      }
      this.table.pager.currentPage = 1
      this.table.pager.size = 10
      this.getList()
    },
    getList() {
      var mark
      if (this.queryCondition.currentIndex === 0) {
        mark = 'day'
      } else if (this.queryCondition.currentIndex === 1) {
        mark = 'week'
      } else {
        mark = 'month'
      }
      var params = new FormData()
      params.append(
        'data',
        JSON.stringify({
          currentDate: this.queryCondition.singleDateVal,
          mark: mark,
          userName: this.queryCondition.alarmPerson,
          pageNum: this.table.pager.currentPage,
          pageSize: this.table.pager.size
        })
      )
      this.$test
        .post(services.areaInOutRecord.GET_ATTENDANCE, params)
        .then((res) => {
          // 请求成功处理...
          this.table.data = res.data.list
          this.table.pager.total = res.data.total
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    onSearch() {
      this.table.pager.currentPage = 1
      this.getList()
    },
    toExport() {
    },
    onPagerChange(page) {
      this.table.pager.currentPage = page
      this.getList()
    },
    onSizeChange(number) {
      this.table.pager.currentPage = 1
      this.table.pager.size = number
      this.getList()
    },
    onModalPagerChange(page) {
      this.monthModalData.table.pager.currentPage = page
      this.getMonthDetail()
    },
    onModalSizeChange(number) {
      this.monthModalData.table.pager.currentPage = 1
      this.monthModalData.table.pager.size = number
      this.getMonthDetail()
    },
    detail(row) {
      this.modal = true
      var data
      if (this.queryCondition.singleDateVal === '') {
        data = this.getTime(2)
      } else {
        data = this.queryCondition.singleDateVal
      }
      this.modalData.date = this.getBeforeDate(6, data) + ' ~ ' + data
      this.modalData.userName = row.userName
      this.modalData.duty = row.duty
      this.modalData.days = row.gateDays
      var params = new FormData()
      params.append(
        'data',
        JSON.stringify({
          EMPLOYEE_ID: row.EMPLOYEE_ID,
          mark: 'week',
          currentDate: this.queryCondition.singleDateVal
        })
      )
      this.$test
        .post(services.areaInOutRecord.GET_ATTENDANCE_DETAILE, params)
        .then((res) => {
          // 请求成功处理...
          this.modalData.table = res.data.list
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    monthDetail(row) {
      this.monthModal = true
      if (this.queryCondition.singleDateVal === '') {
        this.monthModalData.date = this.getTime(1)
      } else {
        this.monthModalData.date = this.queryCondition.singleDateVal
      }
      this.monthModalData.userName = row.userName
      this.monthModalData.duty = row.duty
      this.monthModalData.days = row.gateDays
      this.monthModalData.EMPLOYEE_ID = row.EMPLOYEE_ID
      this.getMonthDetail()
    },
    getMonthDetail() {
      var params = new FormData()
      params.append(
        'data',
        JSON.stringify({
          EMPLOYEE_ID: this.monthModalData.EMPLOYEE_ID,
          mark: 'month',
          currentDate: this.queryCondition.singleDateVal,
          pageNum: this.monthModalData.table.pager.currentPage,
          pageSize: this.monthModalData.table.pager.size
        })
      )
      this.$test
        .post(services.areaInOutRecord.GET_ATTENDANCE_DETAILE, params)
        .then((res) => {
          debugger;
          // 请求成功处理...
          this.monthModalData.table.data = res.data.list
          this.monthModalData.table.pager.total = res.data.total
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    getTime(type) {
      var date = new Date()
      var year = date.getFullYear()
      var mon = date.getMonth() + 1
      var da = date.getDate()
      mon = mon < 10 ? '0' + mon : mon
      da = da < 10 ? '0' + da : da
      if (type === 1) {
        return year + '-' + mon
      } else {
        return year + '-' + mon + '-' + da
      }
    },
    // 根据传入的整数和时间计算一周前的日期
    getBeforeDate(days, date) {
      var now
      if (date !== '') {
        var arr = date.split('-')
        now = new Date(arr[0], arr[1], arr[2]).getTime()
      } else {
        now = new Date().getTime()
      }
      var ago = now - 86400000 * days // 一天的毫秒数为86400000
      var agoData = new Date(ago)
      var year = agoData.getFullYear()
      var mon = agoData.getMonth() + 1
      var day = agoData.getDate()
      mon = mon < 10 ? '0' + mon : mon
      day = day < 10 ? '0' + day : day
      return year + '-' + mon + '-' + day
    }
  }
}
</script>

ebc-middle-platform/src/modules/orientation/orientation.vue

@@ -331,6 +331,10 @@ export default {
    EventBus.$on('person', (msg) => { // 获取镜屏推送消息
      this.changeLocation(msg)
    })
    EventBus.$on('ship', (msg) => { // 获取镜屏推送消息
      console.log(msg)
      this.changeShip(msg)
    })
  },
  methods: {
    async getGisToken() {
@@ -345,6 +349,7 @@ export default {
    },
    changeLocation(msg) { // 修改人员信息状态等
      var obj = JSON.parse(msg.body)
      console.log('person' + obj)
      var flag = false
      this.layer.personLayer.eachLayer((e) => {
        if (e.getAttributes().deviceId == obj.deviceId) {
@@ -368,6 +373,49 @@ export default {
        this.popupContent(obj, point)
      }
    },
    changeShip(msg) {
      var obj = JSON.parse(msg.body)
      console.log('ship' + obj)
      this.layer.equipmentLayer.eachLayer((point) => {
        if (point.getAttributes().DEVICE_NO == obj.deviceNo) {
          point.setLatLng([obj.latitude, obj.longitude])
          this.popupContentShip(obj, point)
        }
      })
    },
    popupContentShip(e, point) {
      point.on('click', (pointE) => {
        var content =
                  '<div class="tips-item"><div class="top"><div>' + e.shipName + '</div></div><div class="middle"><div class="row">' +
                  '<div>设备编号</div>' +
                  '<div>' + e.deviceNo + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>经度</div>' +
                  '<div>' + e.longitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>纬度</div>' +
                  '<div>' + e.latitude + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>最新定位时间</div>' +
                  '<div>' + e.newDate + '</div>' +
                  '</div>' +
                  '</div></div>' +
                  '</div></div>'
        Ai.Popup({
          minWidth: 300,
          offset: [0, -10],
          autoClose: true
        })
        // 设置弹出框弹出位置
          .setLatLng(point.getLatLng())
        // 设置弹出框弹出内容
          .setContent(content)
          .openOn(this.map)
      })
    },
    popupContent(e, point) { // 修改点的信息
      console.log(e, point)
      window.Vue = this
@@ -589,6 +637,34 @@ export default {
              })
            })
            point.setAttributes(e)
            point.on('click', (pointE) => {
              var deviceContent = e.DEVICE_NO ? ('<div class="row"><div>设备编号</div><div>' + e.DEVICE_NO + '</div></div>') : ''
              var dateCOntent = e.NEW_DATE ? ('<div class="row"><div>最新定位时间</div><div>' + e.NEW_DATE + '</div></div>') : ''
              var content =
                  '<div class="tips-item"><div class="top"><div>' + e.FACILITY_NAME + '</div></div><div class="middle">' +
                  deviceContent +
                  '<div class="row">' +
                  '<div>经度</div>' +
                  '<div>' + e.LONGITUDE + '</div>' +
                  '</div>' +
                  '<div class="row">' +
                  '<div>纬度</div>' +
                  '<div>' + e.LATITUDE + '</div>' +
                  '</div>' +
                  dateCOntent +
                  '</div></div>' +
                  '</div></div>'
              Ai.Popup({
                minWidth: 300,
                offset: [0, -10],
                autoClose: true
              })
                // 设置弹出框弹出位置
                .setLatLng(point.getLatLng())
                // 设置弹出框弹出内容
                .setContent(content)
                .openOn(this.map)
            })
            if (['001', '002', '003'].indexOf(e.FACILITY_TYPE) !== -1) {
              this.layer.equipmentLayer.addLayer(point)
            }

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

@@ -14,7 +14,7 @@ import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.NorthboundInterfaceUtil;
import com.ai.ipu.server.util.NorthboundInterfaceConstant;
/**
 * 终端管理
@@ -107,7 +107,7 @@ public class DeviceManageController {
		Map<String, String> resultMap = deviceManageService.addDeviceInfo(params);
		if (NorthboundInterfaceUtil.resultCode_succeed.equals(resultMap.get("resultCode"))) {
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			result.put("result", true);
		} else {
			result.put("result", false);
@@ -137,7 +137,7 @@ public class DeviceManageController {
		Map<String, String> resultMap = deviceManageService.modifyDeviceInfo(params);
		if (NorthboundInterfaceUtil.resultCode_succeed.equals(resultMap.get("resultCode"))) {
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			result.put("result", true);
		} else {
			result.put("result", false);
@@ -167,7 +167,7 @@ public class DeviceManageController {
		Map<String, String> resultMap = deviceManageService.deleteDeviceInfo(params);
		if (NorthboundInterfaceUtil.resultCode_succeed.equals(resultMap.get("resultCode"))) {
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			result.put("result", true);
		} else {
			result.put("result", false);
@@ -252,7 +252,7 @@ public class DeviceManageController {
	public JMap queryCurrentDeviceLocationInfo(JMap params) throws Exception {
		JMap result = new JsonMap();
		List<Map<String, Object>> resultList = deviceManageService.queryCurrentDeviceLocationInfo(params);
		List<Map<String, String>> resultList = deviceManageService.queryCurrentDeviceLocationInfo(params);
		result.put("dataList", resultList);
		return result;
	}

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

@@ -48,7 +48,6 @@ public class ReceiveSubscribeController {
		dataMap.put("longitude",detailInfo.getJSONObject("longitude").getString("value"));//经度
		dataMap.put("latitude",detailInfo.getJSONObject("latitude").getString("value"));//纬度
		dataMap.put("newDate",detailInfo.getJSONObject("msgDate").getString("value"));//最新定位时间
		dataMap.put("locationStatus",EbcConstant.location_status_normal);//定位状态
		
		//分析并推送定位数据
		receiveSubscribeService.receiveIotLocationData(dataMap);

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/AreaInOutRecordDaoImpl.java

@@ -84,21 +84,13 @@ public class AreaInOutRecordDaoImpl extends AbstractBizDao implements AreaInOutR
	}
	@Override
	public List<Map<String, Object>> getBeforeAreaInfo(JMap params) throws Exception {
	public List<Map<String, Object>> getBeforeInAreaInfo(String deviceId,List<String> mapTagTypeList) throws Exception {
		Map<String, Object> dataMap = new HashMap<String, Object>();
		StringBuilder sql = new StringBuilder();
		sql.append(" SELECT a.RECORD_ID,a.MAP_TAG_ID,a.IN_DATE, ");
		sql.append(" m.MAP_TAG_NAME,m.MAP_TAG_TYPE,m.RESIDENCE_TIME_LENGTH ");
		sql.append(" FROM LR_AREA_IN_OUT_RECORD a ");
		sql.append(" LEFT JOIN LR_MAP_TAG m ON m.MAP_TAG_ID=a.MAP_TAG_ID ");
		sql.append(" WHERE 1=1 ");
		sql.append(" AND a.OUT_DATE IS NULL ");
		sql.append(" AND a.DEVICE_ID = #{deviceId} ");
		dataMap.put("deviceId", params.get("deviceId"));
		return dao.executeSelect(sql.toString(), dataMap);
		dataMap.put("deviceId", deviceId);
		dataMap.put("mapTagTypeList", mapTagTypeList);
		
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		return mgmtDao.executeSelect("ipu.AreaInOutRecordDao",  "getBeforeInAreaInfo", dataMap);
	}
	@Override

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/DeviceManageDaoImpl.java

@@ -6,28 +6,34 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.database.dao.impl.AbstractBizDao;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.enums.IotUrlEnums;
import com.ai.ipu.server.enums.ProductEnums;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.NorthboundInterfaceConstant;
import com.ai.ipu.server.util.NorthboundInterfaceUtil;
import com.ai.ipu.sql.mgmt.ISqlMgmtDao;
import com.ai.ipu.sql.mgmt.SqlMgmtDaoFactory;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@Component
public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageDao {
	private String connName = "ebc";
	
	public DeviceManageDaoImpl() throws IOException {
		super("ebc");
	}
	private String connName = "ebc";
	@Autowired
	NorthboundInterfaceUtil northboundInterfaceUtil;
	private String userAndDevicetableName = "LR_PARTY_TERMINAL"; // 人员和终端关联表
	private String equipmentTableName = "LR_FACILITY"; // 设施表
@@ -40,36 +46,16 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
		paramsMap.put("businessParams", params.get("businessParams"));
		// 拼接接口地址
		String url = IotUrlEnums.queryPageDevice.getUrl();
		Map<String, String> map = NorthboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		String url = NorthboundInterfaceConstant.queryPageDevice;
		Map<String, String> map = northboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return map;
	}
	@Override
	public List<Map<String, Object>> getBindDeviceList() throws Exception {
		StringBuilder sql = new StringBuilder();
		sql.append(" SELECT FACILITY_NAME NAME,DEVICE_ID FROM LR_FACILITY ");
		sql.append(" WHERE 1=1 ");
		sql.append(" AND FACILITY_TYPE ='").append(ProductEnums.ship.getProductId()).append("' ");
		sql.append(" AND DEVICE_ID IS NOT NULL ");
		sql.append(" UNION ALL ");
		sql.append(" SELECT PARTY_NAME NAME,DEVICE_ID FROM LR_PARTY_TERMINAL ");
		sql.append(" WHERE 1=1 ");
		sql.append(" AND DEVICE_ID IS NOT NULL ");
		List<Map<String, Object>> list = dao.executeSelect(sql.toString());
		return list == null ? new ArrayList<Map<String, Object>>() : list;
	}
	@Override
	public JMap queryOneDeviceInfo(JMap params) throws Exception {
		// 拼接接口地址
		String url = IotUrlEnums.queryOneDevice.getUrl() + params.getString("deviceId");
		Map<String, String> map = NorthboundInterfaceUtil.iotGetCallUtil(url);
		String url = NorthboundInterfaceConstant.queryOneDevice + params.getString("deviceId");
		Map<String, String> map = northboundInterfaceUtil.iotGetCallUtil(url);
		JMap deviceInfoMap = new JsonMap(JSONObject.toJSONString(map.get("result")));
		String remarks = deviceInfoMap.getString("remarks") == null ? "" : deviceInfoMap.getString("remarks");
@@ -90,8 +76,8 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
		paramsMap.put("remarks", params.getString("remarks")); // 备注
		// 拼接接口地址
		String url = IotUrlEnums.addDevice.getUrl();
		Map<String, String> map = NorthboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		String url = NorthboundInterfaceConstant.addDevice;
		Map<String, String> map = northboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return map;
	}
@@ -107,18 +93,18 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
		paramsMap.put("remarks", params.getString("remarks")); // 备注
		// 拼接接口地址
		String url = IotUrlEnums.updateDevice.getUrl();
		Map<String, String> map = NorthboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		String url = NorthboundInterfaceConstant.updateDevice;
		Map<String, String> map = northboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return map;
	}
	@Override
	public Map<String, String> deleteDeviceInfo(JMap params) throws Exception {
		// 拼接接口地址
		String url = IotUrlEnums.deleteDevice.getUrl() + params.getString("deviceId");
		Map<String, String> map = NorthboundInterfaceUtil.iotGetCallUtil(url);
		//根据终端id删除终端关联信息
		if (NorthboundInterfaceUtil.resultCode_succeed.equals(map.get("resultCode"))) {
		String url = NorthboundInterfaceConstant.deleteDevice + params.getString("deviceId");
		Map<String, String> map = northboundInterfaceUtil.iotGetCallUtil(url);
		// 根据终端id删除终端关联信息
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(map.get("resultCode"))) {
			HashMap<String, Object> paramsHashMap = new HashMap<>();
			paramsHashMap.put("DEVICE_ID", params.get("deviceId"));
			int i = unbindDevice(paramsHashMap);
@@ -135,12 +121,49 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
	}
	@Override
	public Map<String, Object> queryOneBindDeviceInfo(Map<String, Object> dataMap) throws Exception {
		List<Map<String, Object>> userAndDeviceList = dao.selectByCond(userAndDevicetableName, dataMap);
		if (userAndDeviceList.isEmpty()) {
	public List<Map<String, Object>> queryAllBindShip() throws Exception {
		Map<String, Object> dataMap=new HashMap<String, Object>();
		dataMap.put("shipProductId",ProductEnums.ship.getProductId());
		
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		return mgmtDao.executeSelect("ipu.DeviceManageDao", "queryAllBindShip", dataMap);
	}
	@Override
	public List<Map<String, Object>> queryAllBindUser() throws Exception {
		Map<String, Object> dataMap=new HashMap<String, Object>();
		
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		return mgmtDao.executeSelect("ipu.DeviceManageDao", "queryAllBindUser", dataMap);
	}
	@Override
	public Map<String, Object> queryOneBindShip(String deviceId,String bindCode) throws Exception {
		Map<String, Object> dataMap=new HashMap<String, Object>();
		dataMap.put("shipProductId",ProductEnums.ship.getProductId());
		dataMap.put("deviceId",deviceId);
		dataMap.put("bindCode", bindCode);
		
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		List<Map<String, Object>> list =  mgmtDao.executeSelect("ipu.DeviceManageDao", "queryOneBindShip", dataMap);
		
		if (list.isEmpty()) {
			return null;
		} else {
			return userAndDeviceList.get(0);
			return list.get(0);
		}
	}
	@Override
	public Map<String, Object> queryOneBindUser(String deviceId,String bindCode) throws Exception {
		Map<String, Object> dataMap=new HashMap<String, Object>();
		dataMap.put("deviceId",deviceId);
		dataMap.put("bindCode", bindCode);
		
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		List<Map<String, Object>> list =  mgmtDao.executeSelect("ipu.DeviceManageDao", "queryOneBindUser", dataMap);
		
		if (list.isEmpty()) {
			return null;
		} else {
			return list.get(0);
		}
	}
@@ -161,11 +184,11 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
			// 插入一条新的关联数据
			return dao.insert(userAndDevicetableName, params);
		} else if (EbcConstant.bind_device_type_ship.equals(type)) {
			//将之前的数据删除
			// 将之前的数据删除
			paramsMap.put("ORIGINAL_DEVICE_ID", params.get("DEVICE_ID"));
			paramsMap.put("DEVICE_ID", null);
			dao1.executeUpdate("ipu.EquipmentManageDao", "updateEquipmentInfo", paramsMap);
			//从新插入设备表
			// 从新插入设备表
			paramsHashMap.put("FACILITY_ID", params.get("FACILITY_ID"));
			paramsHashMap.put("DEVICE_ID", params.get("DEVICE_ID"));
			return dao.update(equipmentTableName, paramsHashMap);
@@ -176,95 +199,41 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
	@Override
	public int unbindDevice(Map params) throws Exception {
		HashMap<String, Object> paramsHashMap = new HashMap<>();
		//删除终端人员关联表
		// 删除终端人员关联表
		paramsHashMap.put("DEVICE_ID", params.get("DEVICE_ID"));
		ISqlMgmtDao dao1 = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		int i = dao1.executeUpdate("ipu.EquipmentManageDao", "deletePartyTerminalForDeviceId", paramsHashMap);
		//修改设备表
		// 修改设备表
		paramsHashMap.put("ORIGINAL_DEVICE_ID", params.get("DEVICE_ID"));
		paramsHashMap.put("DEVICE_ID", null);
		int num = dao1.executeUpdate("ipu.EquipmentManageDao", "updateEquipmentInfo", paramsHashMap);
		return i>num?i:num;
		return i > num ? i : num;
	}
	@Override
	public List<Map<String, Object>> queryCurrentDeviceLocationInfo(JMap params) throws Exception {
		// TODO 调用北向接口获取当前终端位置
		List<Map<String, Object>> list=new ArrayList<Map<String, Object>>();
		Map<String, Object> map1=new HashMap<String, Object>();
		map1.put("userName", "张三");//人员姓名
		map1.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map1.put("deviceId", "999571");//终端ID
		map1.put("deviceNo", "999571");//终端编号
		map1.put("longitude", "123.7709439");//经度
		map1.put("latitude", "31.5847745");//纬度
		map1.put("newDate", "2020-10-27 13:14:15");//最新定位时间
		list.add(map1);
	public List<Map<String, String>> queryCurrentDeviceLocationInfo(List<String> deviceIdsList) throws Exception {
		Map<String, Object> paramsMap = new HashMap<String, Object>();
		paramsMap.put("resourceIdInArr", deviceIdsList);// 终端id
		Map<String, Object> map2=new HashMap<String, Object>();
		map2.put("userName", "李四");//人员姓名
		map2.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map2.put("deviceId", "981489");//终端ID
		map2.put("deviceNo", "981489");//终端编号
		map2.put("longitude", "125.4221927");//经度
		map2.put("latitude", "32.0453331");//纬度
		map2.put("newDate", "2020-10-26 11:22:33");//最新定位时间
		list.add(map2);
		
		Map<String, Object> map3=new HashMap<String, Object>();
		map3.put("userName", "王五");//人员姓名
		map3.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map3.put("deviceId", "981453");//终端ID
		map3.put("deviceNo", "981453");//终端编号
		map3.put("longitude", "122.0221926");//经度
		map3.put("latitude", "33.5453331");//纬度
		map3.put("newDate", "2020-10-27 12:31:45");//最新定位时间
		list.add(map3);
		
		Map<String, Object> map4=new HashMap<String, Object>();
		map4.put("userName", "赵六");//人员姓名
		map4.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map4.put("deviceId", "23125");//终端ID
		map4.put("deviceNo", "23125");//终端编号
		map4.put("longitude", "125.3221927");//经度
		map4.put("latitude", "33.3453331");//纬度
		map4.put("newDate", "2020-10-27 13:40:40");//最新定位时间
		list.add(map4);
		
		Map<String, Object> map5=new HashMap<String, Object>();
		map5.put("userName", "田七");//人员姓名
		map5.put("locationStatus", EbcConstant.location_status_normal);//状态: 0定位
		map5.put("deviceId", "23126");//终端ID
		map5.put("deviceNo", "23126");//终端编号
		map5.put("longitude", "125.4221927");//经度
		map5.put("latitude", "32.9453331");//纬度
		map5.put("newDate", "2020-10-27 18:20:30");//最新定位时间
		list.add(map5);
		
		Map<String, Object> map6=new HashMap<String, Object>();
		map6.put("userName", "周八");//人员姓名
		map6.put("locationStatus", EbcConstant.location_status_exclusion);//状态:3违规(禁区)
		map6.put("deviceId", "23128");//终端ID
		map6.put("deviceNo", "23128");//终端编号
		map6.put("longitude", "124.5309335");//经度
		map6.put("latitude", "33.7753425");//纬度
		map6.put("newDate", "2020-10-27 14:28:38");//最新定位时间
		list.add(map6);
		// 拼接接口地址
		String url = NorthboundInterfaceConstant.queryMoreDeviceNewIncident;
		Map<String, String> map = northboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		List<Map> resultList = JSON.parseArray(JSONObject.toJSONString(map.get("result")), Map.class);
		List<Map<String, String>> list = new ArrayList<Map<String, String>>();
		for (Map resultMap : resultList) {
			String object = (String) resultMap.get("dataPointValue");
			JSONObject detailInfo = JSONObject.parseObject(object);
			Map<String, String> detailInfoMap = new HashMap<String, String>();
			detailInfoMap.put("deviceId", String.valueOf(resultMap.get("resourceId")));// 设备id
			detailInfoMap.put("deviceNo", String.valueOf(resultMap.get("resourceId")));// 设备编码
			detailInfoMap.put("longitude", detailInfo.getJSONObject("longitude").getString("value"));// 经度
			detailInfoMap.put("latitude", detailInfo.getJSONObject("latitude").getString("value"));// 纬度
			detailInfoMap.put("newDate", detailInfo.getJSONObject("msgDate").getString("value"));// 最新定位时间
			list.add(detailInfoMap);
		}
		
		Map<String, Object> map7=new HashMap<String, Object>();
		map7.put("userName", "吴九");//人员姓名
		map7.put("locationStatus", EbcConstant.location_status_offline);//状态:1离线
		map7.put("deviceId", "23129");//终端ID
		map7.put("deviceNo", "23129");//终端编号
		map7.put("longitude", "122.4221927");//经度
		map7.put("latitude", "32.6453331");//纬度
		map7.put("newDate", "2020-10-27 14:15:22");//最新定位时间
		list.add(map7);
		return list;
	}
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/EquipmentManageDaoImpl.java

@@ -1,26 +1,20 @@
package com.ai.ipu.server.dao.impl;
import com.ai.ipu.data.JList;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Component;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonList;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.database.dao.IpuDaoManager;
import com.ai.ipu.database.dao.impl.AbstractBizDao;
import com.ai.ipu.server.dao.interfaces.EquipmentManageDao;
import com.ai.ipu.server.dao.interfaces.MapTagManageDao;
import com.ai.ipu.sql.mgmt.ISqlMgmtDao;
import com.ai.ipu.sql.mgmt.SqlMgmtDaoFactory;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component
public class EquipmentManageDaoImpl extends AbstractBizDao implements EquipmentManageDao {

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/RescueDaoImpl.java

@@ -12,10 +12,14 @@ import com.ai.ipu.data.JMap;
import com.ai.ipu.database.dao.impl.AbstractBizDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.sql.mgmt.ISqlMgmtDao;
import com.ai.ipu.sql.mgmt.SqlMgmtDaoFactory;
@Component
public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
	
	private String connName = "ebc";
	
	public RescueDaoImpl() throws IOException {
		super("ebc");
	}
@@ -27,21 +31,13 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
	}
	@Override
	public Map<String, Object> queryNoCloseRescueLog(JMap params) throws Exception {
	public List<Map<String, Object>> queryNoCloseRescueLog(List<String> deviceIdsList) throws Exception {
		Map<String, Object> dataMap=new HashMap<String, Object>();
		StringBuilder sql=new StringBuilder();
		sql.append(" SELECT l.LOG_ID,l.CALLER_ID,l.DEVICE_ID,l.PARTY_TYPE,l.PARTY_CODE, ");
		sql.append(" l.PARTY_NAME,l.ALARM_TYPE,l.CALLER_DATE, ");
		sql.append(" l.RESCUERS_DATE,l.REMARKS ");
		sql.append(" FROM LR_RESCUE_LOG l ");
		sql.append(" WHERE 1=1 ");
		sql.append(" AND RESCUERS_DATE IS NULL ");//TODO 救援时间为空
		sql.append(" AND ALARM_TYPE <> '").append(EbcConstant.alarm_type_offline).append("' ");//不属于离线告警
		sql.append(" AND DEVICE_ID = #{deviceId} ");
		dataMap.put("deviceId", params.get("deviceId"));
		dataMap.put("deviceIdsList", deviceIdsList);//设备ID
		dataMap.put("offlineType", EbcConstant.alarm_type_offline);//不属于离线告警
		
		return dao.executeSelectOne(sql.toString(), dataMap);
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		return mgmtDao.executeSelect("ipu.RescueDao",  "queryNoCloseRescueLog", dataMap);
	}
	@Override

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/interfaces/AreaInOutRecordDao.java

@@ -69,11 +69,12 @@ public interface AreaInOutRecordDao {
	/**
	 * 查询之前所在围栏的信息
	 * @param params
	 * @param deviceId 设备ID
	 * @param mapTagTypeList 围栏类型
	 * @return 
	 * @throws Exception
	 */
	List<Map<String, Object>> getBeforeAreaInfo(JMap params) throws Exception;
	List<Map<String, Object>> getBeforeInAreaInfo(String deviceId,List<String> mapTagTypeList) throws Exception;
	/**
	 * 插入进入围栏的日志

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/interfaces/DeviceManageDao.java

@@ -19,13 +19,6 @@ public interface DeviceManageDao {
	Map<String, String> queryPageDeviceInfo(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 查询已和人员(船舶)绑定的终端信息
	 * @return
	 * @throws Exception
	 */
	List<Map<String, Object>> getBindDeviceList() throws Exception;
	/**
	 * 获取单个终端信息
	 * @param params
	 * @return
@@ -60,16 +53,59 @@ public interface DeviceManageDao {
	List<Map<String, Object>> queryAssociatBoatInfo(JMap params) throws Exception;
	/**
	 * 查询单个终端绑定信息
	 * @param params
	 * 查询所有已和船舶绑定的信息
	 * @return
	 * @throws Exception
	 */
	List<Map<String, Object>> queryAllBindShip() throws Exception;
	/**
	 * 查询所有已和人员绑定的信息
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryOneBindDeviceInfo(Map<String, Object> dataMap) throws Exception;
	List<Map<String, Object>> queryAllBindUser() throws Exception;
	/**
	 * 查询单个船舶的绑定信息
	 * @param deviceId 设备ID
	 * @param bindCode 船舶的CODE
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryOneBindShip(String deviceId,String bindCode) throws Exception;
	
	/**
	 * 查询单个人员的绑定信息
	 * @param deviceId 设备ID
	 * @param bindCode 人员的CODE
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryOneBindUser(String deviceId,String bindCode) throws Exception;
	
	/**
	 * 绑定终端
	 * @param params
	 * @param type
	 * @return
	 * @throws Exception
	 */
	int bindDevice(Map params, String type) throws Exception;
	/**
	 * 解绑终端
	 * @param params
	 * @return
	 * @throws Exception
	 */
	int unbindDevice(Map params) throws Exception;
	
	List<Map<String, Object>> queryCurrentDeviceLocationInfo(JMap params) throws Exception;
	/**
	 * 获取终端的最新事件
	 * @param deviceIds
	 * @return
	 * @throws Exception
	 */
	List<Map<String, String>> queryCurrentDeviceLocationInfo(List<String> deviceIdsList) throws Exception;
	
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/interfaces/RescueDao.java

@@ -18,12 +18,12 @@ public interface RescueDao {
	JMap queryPageRescueLog(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 根据终端标识获取未关闭的报警救援日志
	 * @param params
	 * 根据终端ID获取未关闭的报警救援日志
	 * @param deviceIdsList
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryNoCloseRescueLog(JMap params) throws Exception;
	List<Map<String, Object>> queryNoCloseRescueLog(List<String> deviceIdsList) throws Exception;
	/**
	 * 根据终端标识获取单个报警救援日志

ebc-sea-platform/src/main/java/com/ai/ipu/server/enums/IotUrlEnums.java

@@ -1,36 +0,0 @@
package com.ai.ipu.server.enums;
import org.springframework.beans.factory.annotation.Value;
/**
 * iot 北向接口业务数据的地址枚举
 * 
 * @author konghl@asiainfo.com
 * 2020-10-20
 */
public enum IotUrlEnums {
	// 分页查询终端
	queryPageDevice("findTerminal"),
	// 添加终端
	addDevice("device"),
	// 修改终端
	updateDevice("updateDevice"),
	// 删除终端
	deleteDevice("deleteDevice?deviceId="),
	// 查询单个设备
	queryOneDevice("deviceSimpleDetail?deviceId=");
	private String url;
	@Value("${url.iot.service}")
	private String iotServiceUrl;
	private IotUrlEnums(String url) {
		this.url = url;
	}
	public String getUrl() {
		return iotServiceUrl + "/" + url;
	}
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/DeviceManageServiceImpl.java

@@ -1,5 +1,6 @@
package com.ai.ipu.server.service.impl;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -12,10 +13,13 @@ import org.springframework.stereotype.Service;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.enums.UserEnums;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
import com.alibaba.fastjson.JSON;
@Service
@@ -25,6 +29,12 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	@Autowired
	DeviceManageDao deviceManageDao;
	@Autowired
	RescueDao rescueDao;
	@Autowired
	AreaInOutRecordDao areaInOutRecordDao;
	@Override
	public JMap queryPageDeviceInfo(JMap params, int pageNum, int pageSize) throws Exception {
		String isBindDevice = params.getString("IsBindDevice");// 是否绑定设备
@@ -32,7 +42,9 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		boolean unBindDeviceBoolean = EbcConstant.bind_device_no.equals(isBindDevice);
		// 获取已绑定的设备列表
		List<Map<String, Object>> bindDeviceList = deviceManageDao.getBindDeviceList();
		List<Map<String, Object>> allBindInfoList = deviceManageDao.queryAllBindShip();
		List<Map<String, Object>> bindUserList = deviceManageDao.queryAllBindUser();
		allBindInfoList.addAll(bindUserList);
		// 查询条件
		Map<String, String> businessParams = new HashMap<String, String>();
@@ -42,9 +54,9 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		if (bindDeviceBoolean || unBindDeviceBoolean) {
			// 获取已绑定的设备ids(用逗号隔开)
			StringBuilder deviceIds = new StringBuilder();
			for (int i = 0; i < bindDeviceList.size(); i++) {
				deviceIds.append(bindDeviceList.get(i).get("DEVICE_ID"));
				if (i < bindDeviceList.size() - 1) {
			for (int i = 0; i < allBindInfoList.size(); i++) {
				deviceIds.append(allBindInfoList.get(i).get("DEVICE_ID"));
				if (i < allBindInfoList.size() - 1) {
					deviceIds.append(",");
				}
			}
@@ -80,7 +92,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
				// 绑定信息
				dataMap.put("bindName", "--");
				if (!unBindDeviceBoolean) {
					for (Map bindDeviceMap : bindDeviceList) {
					for (Map bindDeviceMap : allBindInfoList) {
						if (deviceId.equals(String.valueOf(bindDeviceMap.get("DEVICE_ID")))) {
							dataMap.put("bindName", bindDeviceMap.get("NAME"));
							break;
@@ -161,9 +173,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	@Override
	public Map<String, Object> verifyUserOrBoatAssociatInfo(JMap params) throws Exception {
		// 查询用户与终端关联表，如果有数据返回，无数据返回空
		Map<String, Object> dataMap=new HashMap<String, Object>();
		dataMap.put("PARTY_CODE", params.get("PARTY_CODE"));
		Map<String, Object> userAndDeviceMap = deviceManageDao.queryOneBindDeviceInfo(dataMap);
		Map<String, Object> userAndDeviceMap = deviceManageDao.queryOneBindUser(null, params.getString("PARTY_CODE"));
		return userAndDeviceMap;
	}
@@ -179,9 +189,209 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		return num > 0;
	}
	
	public List<Map<String, String>> queryCurrentDeviceLocationInfo11(JMap params) throws Exception {
		List<Map<String, String>> list = new ArrayList<Map<String, String>>();
		Map<String, String> map1 = new HashMap<String, String>();
		map1.put("userName", "张三");// 人员姓名
		map1.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map1.put("deviceId", "999571");// 终端ID
		map1.put("deviceNo", "999571");// 终端编号
		map1.put("longitude", "123.7709439");// 经度
		map1.put("latitude", "31.5847745");// 纬度
		map1.put("newDate", "2020-10-27 13:14:15");// 最新定位时间
		list.add(map1);
		Map<String, String> map2 = new HashMap<String, String>();
		map2.put("userName", "李四");// 人员姓名
		map2.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map2.put("deviceId", "981489");// 终端ID
		map2.put("deviceNo", "981489");// 终端编号
		map2.put("longitude", "125.4221927");// 经度
		map2.put("latitude", "32.0453331");// 纬度
		map2.put("newDate", "2020-10-26 11:22:33");// 最新定位时间
		list.add(map2);
		Map<String, String> map3 = new HashMap<String, String>();
		map3.put("userName", "王五");// 人员姓名
		map3.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map3.put("deviceId", "981453");// 终端ID
		map3.put("deviceNo", "981453");// 终端编号
		map3.put("longitude", "122.0221926");// 经度
		map3.put("latitude", "33.5453331");// 纬度
		map3.put("newDate", "2020-10-27 12:31:45");// 最新定位时间
		list.add(map3);
		Map<String, String> map4 = new HashMap<String, String>();
		map4.put("userName", "赵六");// 人员姓名
		map4.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map4.put("deviceId", "23125");// 终端ID
		map4.put("deviceNo", "23125");// 终端编号
		map4.put("longitude", "125.3221927");// 经度
		map4.put("latitude", "33.3453331");// 纬度
		map4.put("newDate", "2020-10-27 13:40:40");// 最新定位时间
		list.add(map4);
		Map<String, String> map5 = new HashMap<String, String>();
		map5.put("userName", "田七");// 人员姓名
		map5.put("locationStatus", EbcConstant.location_status_normal);// 状态: 0定位
		map5.put("deviceId", "23126");// 终端ID
		map5.put("deviceNo", "23126");// 终端编号
		map5.put("longitude", "125.4221927");// 经度
		map5.put("latitude", "32.9453331");// 纬度
		map5.put("newDate", "2020-10-27 18:20:30");// 最新定位时间
		list.add(map5);
		Map<String, String> map6 = new HashMap<String, String>();
		map6.put("userName", "周八");// 人员姓名
		map6.put("locationStatus", EbcConstant.location_status_exclusion);// 状态:3违规(禁区)
		map6.put("deviceId", "23128");// 终端ID
		map6.put("deviceNo", "23128");// 终端编号
		map6.put("longitude", "124.5309335");// 经度
		map6.put("latitude", "33.7753425");// 纬度
		map6.put("newDate", "2020-10-27 14:28:38");// 最新定位时间
		list.add(map6);
		Map<String, String> map7 = new HashMap<String, String>();
		map7.put("userName", "吴九");// 人员姓名
		map7.put("locationStatus", EbcConstant.location_status_offline);// 状态:1离线
		map7.put("deviceId", "23129");// 终端ID
		map7.put("deviceNo", "23129");// 终端编号
		map7.put("longitude", "122.4221927");// 经度
		map7.put("latitude", "32.6453331");// 纬度
		map7.put("newDate", "2020-10-27 14:15:22");// 最新定位时间
		list.add(map7);
		return list;
	}
	
	@Override
	public List<Map<String, Object>> queryCurrentDeviceLocationInfo(JMap params) throws Exception {
		return deviceManageDao.queryCurrentDeviceLocationInfo(params);
	public List<Map<String, String>> queryCurrentDeviceLocationInfo(JMap params) throws Exception {
		// 获取已绑定的设备列表
		List<Map<String, Object>> bindUserDeviceList = deviceManageDao.queryAllBindUser();
		if (bindUserDeviceList == null || bindUserDeviceList.isEmpty()) {
			return new ArrayList<Map<String, String>>();
		}
		List<String> deviceIdsList = new ArrayList<String>();
		for (int i = 0; i < bindUserDeviceList.size(); i++) {
			deviceIdsList.add(String.valueOf(bindUserDeviceList.get(i).get("DEVICE_ID")));
		}
		// 获取设备当前位置信息
		List<Map<String, String>> list = deviceManageDao.queryCurrentDeviceLocationInfo(deviceIdsList);
		// 查询是否为需救援的人员
		List<Map<String, Object>> alarmMapList = rescueDao.queryNoCloseRescueLog(deviceIdsList);
		// 查询人员所在围栏信息
		List<String> mapTagTypeList = new ArrayList<String>();
		mapTagTypeList.add(EbcConstant.area_type_exclusion);
		mapTagTypeList.add(EbcConstant.area_type_temporariness);
		List<Map<String, Object>> areaViolationMapList = areaInOutRecordDao.getBeforeInAreaInfo(null, mapTagTypeList);
		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
		// 拼接返回数据
		for (Map<String, String> map : list) {
			String deviceId = map.get("deviceId");
			map.put("locationStatus", EbcConstant.location_status_normal);// 定位状态
			
			boolean flag = true;
			// 设备绑定的信息
			for (Map<String, Object> bindDeviceMap : bindUserDeviceList) {
				if (deviceId.equals(String.valueOf(bindDeviceMap.get("DEVICE_ID")))) {
					map.put("userName", String.valueOf(bindDeviceMap.get("NAME")));
					break;
				}
			}
			if (alarmMapList != null && flag) {
				// 求救信息
				for (int i = 0; i < alarmMapList.size() && flag; i++) {
					Map<String, Object> alarmMap = alarmMapList.get(i);
					if (deviceId.equals(String.valueOf(alarmMap.get("DEVICE_ID")))) {
						// 求救时间
						String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));
						map.put("alarmDate", alarmDate);
						// 计算求救时长
						int alarmLong = JingPingSendDateUtil.getBetweenMinuteValue(alarmDate, map.get("newDate"));
						map.put("alarmLong", String.valueOf(alarmLong));
						flag = false;
					}
				}
			}
			if (areaViolationMapList != null && flag) {
				// 违规信息
				int maxMapTagGrade = 0; // 围栏优先级(电子围栏5>定点3>考勤1、作业1)
				long minInAreaLong = System.currentTimeMillis();// 进入围栏最早的时间戳
				Map<String, Object> areaInfoMap = null;// 用于计算时间的围栏信息
				for (int i = 0; i < areaViolationMapList.size(); i++) {
					Map<String, Object> areaViolationMap = areaViolationMapList.get(i);
					if (deviceId.equals(String.valueOf(areaViolationMap.get("DEVICE_ID")))) {
						// 比较优先级
						int mapTagGrade = 0;
						switch (String.valueOf(areaViolationMap.get("MAP_TAG_TYPE"))) {
						case EbcConstant.area_type_exclusion:
							mapTagGrade = 5;
							break;
						case EbcConstant.area_type_temporariness:
							mapTagGrade = 3;
							break;
						}
						if (mapTagGrade == maxMapTagGrade) {
							// 比较进入时长时间
							long inAreaLong = simpleDateFormat.parse(String.valueOf(areaViolationMap.get("IN_DATE")))
									.getTime();
							if (inAreaLong < minInAreaLong) {
								minInAreaLong = inAreaLong;
								areaInfoMap = areaViolationMap;
							}
						} else if (mapTagGrade > maxMapTagGrade) {
							maxMapTagGrade = mapTagGrade;
							minInAreaLong = simpleDateFormat.parse(String.valueOf(areaViolationMap.get("IN_DATE")))
									.getTime();
							areaInfoMap = areaViolationMap;
						}
					}
				}
				// 判断是否在违规
				if (maxMapTagGrade == 5) {
					logger.info("镜屏推送进入电子围栏的信息");
					// 进入电子围栏(禁区)，需显示进入时间
					map.put("inDate", simpleDateFormat.format(areaInfoMap.get("IN_DATE"))); // 进入时间
					map.put("locationStatus", EbcConstant.location_status_exclusion); // 定位状态
				} else if (maxMapTagGrade == 3) {
					// 进入定点(限时)，需计算是否超时
					int fixedLong = JingPingSendDateUtil
							.getBetweenMinuteValue(String.valueOf(areaInfoMap.get("IN_DATE")), map.get("newDate"));
					if (fixedLong > 0) {
						// 围栏要求定点时间
						int residenceTimeLength = Integer
								.parseInt(String.valueOf(areaInfoMap.get("RESIDENCE_TIME_LENGTH")));
						if (residenceTimeLength <= fixedLong) {
							// 已超时
							map.put("locationStatus", EbcConstant.location_status_overtime);// 定位状态
						}
					}
					map.put("fixedLong", String.valueOf(fixedLong));// 停留时长
				}
			}
		}
		return list;
	}
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/EquipmentManageServiceImpl.java

@@ -1,5 +1,6 @@
package com.ai.ipu.server.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -9,58 +10,98 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.dao.interfaces.EquipmentManageDao;
import com.ai.ipu.server.service.interfaces.EquipmentManageService;
import com.github.pagehelper.PageInfo;
@Service
public class EquipmentManageServiceImpl implements EquipmentManageService {
    Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
	Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
    @Autowired
    EquipmentManageDao equipmentManageDao;
	@Autowired
	EquipmentManageDao equipmentManageDao;
	@Autowired
	DeviceManageDao deviceManageDao;
	@Override
	public PageInfo queryEquipmentInfo(JMap params) throws Exception {
		return equipmentManageDao.queryEquipmentInfo(params);
	}
    @Override
    public PageInfo queryEquipmentInfo(JMap params) throws Exception {
        return equipmentManageDao.queryEquipmentInfo(params);
    }
    @Override
    public int modifyEquipmentInfo(JMap params) throws Exception{
        return equipmentManageDao.modifyEquipmentInfo(params);
    }
	@Override
	public int modifyEquipmentInfo(JMap params) throws Exception {
		return equipmentManageDao.modifyEquipmentInfo(params);
	}
    @Override
    public int addEquipmentInfo(JMap params) throws Exception{
        return equipmentManageDao.addEquipmentInfo(params);
    }
	@Override
	public int addEquipmentInfo(JMap params) throws Exception {
		return equipmentManageDao.addEquipmentInfo(params);
	}
    @Override
    public boolean deleteEquipmentInfo(JMap params) throws Exception{
        return equipmentManageDao.deleteEquipmentInfo(params);
    }
	@Override
	public boolean deleteEquipmentInfo(JMap params) throws Exception {
		return equipmentManageDao.deleteEquipmentInfo(params);
	}
    @Override
    public boolean deleteEquipmentsInfo(List<Map<String,Object>> paramsList) throws Exception {
        return equipmentManageDao.deleteEquipmentsInfo(paramsList);
    }
	@Override
	public boolean deleteEquipmentsInfo(List<Map<String, Object>> paramsList) throws Exception {
		return equipmentManageDao.deleteEquipmentsInfo(paramsList);
	}
    @Override
    public boolean importEquipmentInfo(List<Map<String,Object>> paramsList) throws Exception {
        return equipmentManageDao.importEquipmentInfo(paramsList);
    }
	@Override
	public boolean importEquipmentInfo(List<Map<String, Object>> paramsList) throws Exception {
		return equipmentManageDao.importEquipmentInfo(paramsList);
	}
    @Override
	@Override
	public List<Map<String, Object>> queryAllEquipmentInfo(JMap params) throws Exception {
		return equipmentManageDao.queryAllEquipmentInfo(params);
		// 获取所有设备列表
		List<Map<String, Object>> equipmentList = equipmentManageDao.queryAllEquipmentInfo(params);
		// 获取已绑定船舶的信息
		List<Map<String, Object>> bindInfoList = deviceManageDao.queryAllBindShip();
		if (bindInfoList != null) {
			// 获取定位信息
			List<String> deviceIdsList = new ArrayList<String>();
			for (Map<String, Object> bindInfoMap : bindInfoList) {
				deviceIdsList.add(String.valueOf(bindInfoMap.get("DEVICE_ID")));
			}
			List<Map<String, String>> deviceLocationInfoList = deviceManageDao
					.queryCurrentDeviceLocationInfo(deviceIdsList);
			// 拼接船舶最新的位置信息
			for (Map<String, Object> bindInfoMap : bindInfoList) {
				String code = String.valueOf(bindInfoMap.get("CODE"));
				String deviceId = String.valueOf(bindInfoMap.get("DEVICE_ID"));
				for (Map<String, Object> equipmentMap : equipmentList) {
					if (code.equals(String.valueOf(equipmentMap.get("FACILITY_CODE")))) {
						equipmentMap.put("DEVICE_ID", deviceId);// 设备ID
						equipmentMap.put("DEVICE_NO", deviceId);// 设备编码
						
						for (Map<String, String> deviceLocationInfoMap : deviceLocationInfoList) {
							if (deviceId.equals(deviceLocationInfoMap.get("deviceId"))) {
								equipmentMap.put("LONGITUDE", deviceLocationInfoMap.get("longitude"));// 经度
								equipmentMap.put("LATITUDE", deviceLocationInfoMap.get("latitude"));// 纬度
								equipmentMap.put("NEW_DATE", deviceLocationInfoMap.get("newDate"));// 最新定位时间
								break;
							}
						}
						break;
					}
				}
			}
		}
		return equipmentList;
	}
    
    @Override
    public Map<String, Object> verifyEquipmentInfoRepetition(JMap params) throws Exception{
        return equipmentManageDao.verifyEquipmentInfoRepetition(params);
    }
	@Override
	public Map<String, Object> verifyEquipmentInfoRepetition(JMap params) throws Exception {
		return equipmentManageDao.verifyEquipmentInfoRepetition(params);
	}
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/ReceiveSubscribeServiceImpl.java

@@ -98,20 +98,36 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
	 */
	private void executeReceiveIotLocationData(JMap params) throws Exception {
		// 1、获取人员信息
		Map<String, Object> dataMap=new HashMap<String, Object>();
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("DEVICE_ID", params.get("deviceId"));
		Map<String, Object> deviceAndUser = deviceManageDao.queryOneBindDeviceInfo(dataMap);
		params.put("userName", deviceAndUser.get("PARTY_NAME"));
		// 2、查询是否为需救援的人员
		Map<String, Object> alarmMap = rescueDao.queryNoCloseRescueLog(params);
		// 当前已为报警信息
		if (alarmMap != null && !alarmMap.isEmpty()) {
			logger.info("定位信息为已报警人员：" + alarmMap.get("MAP_TAG_NAME"));
			// 执行对应方法
			beforeAlarmLocationData(params, alarmMap);
			// 报警人员不再进行围栏计算
		Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindUser(params.getString("deviceId"), null);
		if (bindInfoMap != null) {
			logger.debug("定位信息的对象为人员: " + bindInfoMap.get("NAME"));
			params.put("userName", bindInfoMap.get("NAME"));
			params.put("userCode", bindInfoMap.get("CODE"));
			dataMap.put("locationStatus", EbcConstant.location_status_normal);// 定位状态
		} else {
			bindInfoMap = deviceManageDao.queryOneBindShip(params.getString("deviceId"), null);
			if (bindInfoMap != null) {
				logger.info("定位信息的对象为船舶: " + bindInfoMap.get("NAME"));
				params.put("shipName", bindInfoMap.get("NAME"));
				params.put("shipCode", bindInfoMap.get("CODE"));
				// 推送镜屏
				String jingpingData = JSON.toJSONString(params);
				logger.debug("推送镜屏数据：" + jingpingData);
				JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_ship, jingpingData);
			} else {
				logger.error("定位设备未绑定");
			}
			return;
		}
		// 2、是否为未被救援的信息
		if (IsAlarmNotRescued(params)) {
			logger.info("定位信息为已报警人员: " + params.get("userName"));
			// 已报警人员不进行围栏计算
			return;
		}
@@ -121,7 +137,8 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
				params.getString("latitude"));
		// 4、查询人员之前所在围栏信息
		List<Map<String, Object>> beforeAreaMapList = areaInOutRecordDao.getBeforeAreaInfo(params);
		List<Map<String, Object>> beforeAreaMapList = areaInOutRecordDao
				.getBeforeInAreaInfo(params.getString("deviceId"), null);
		// 5、判断当前是否在围栏内
		if (currentAreaInfoJMap.getInt("mapTagNum") == 0) {
@@ -134,23 +151,36 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
	}
	/**
	 * 当前已为报警信息
	 * 是否为未被救援的信息
	 * 
	 * @param params
	 * @param alarmMap
	 * @throws ParseException 
	 */
	private void beforeAlarmLocationData(JMap params, Map<String, Object> alarmMap) throws Exception {
		String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));// 求救时间
	private boolean IsAlarmNotRescued(JMap params) throws Exception {
		// 查询是否为未被救援的人员
		List<String> deviceIdsList = new ArrayList<String>();
		deviceIdsList.add(params.getString("deviceId"));
		List<Map<String, Object>> alarmList = rescueDao.queryNoCloseRescueLog(deviceIdsList);
		if (alarmList == null || alarmList.isEmpty()) {
			return false;
		}
		// 求救时间
		String alarmDate = String.valueOf(alarmList.get(0).get("CALLER_DATE"));
		params.put("alarmDate", alarmDate);
		// 计算持续时长
		// 计算求救时长
		params.put("alarmLong", JingPingSendDateUtil.getBetweenMinuteValue(alarmDate, params.getString("newDate")));
		params.put("isNewAlarm", "0");
		// 推送镜屏
		String jingpingData = JSON.toJSONString(params);
		logger.debug("推送镜屏数据：" + jingpingData);
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, jingpingData);
		return true;
	}
	/**
@@ -247,7 +277,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		}
		// 推送镜屏
		currentInAreaSendData(params, currentAreaInfoList);
		currentInAreaSendJingping(params, currentAreaInfoList);
	}
	/**
@@ -256,7 +286,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
	 * @param currentAreaInfoList
	 * @throws ParseException 
	 */
	private void currentInAreaSendData(JMap params, List<Map<String, Object>> currentAreaInfoList)
	private void currentInAreaSendJingping(JMap params, List<Map<String, Object>> currentAreaInfoList)
			throws ParseException {
		int maxMapTagGrade = 0; // 围栏优先级(电子围栏5>定点3>考勤1、作业1)
@@ -299,12 +329,12 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
			}
		}
		//判断是否在违规(增加字段)
		// 判断是否在违规
		if (maxMapTagGrade == 5) {
			logger.info("镜屏推送进入电子围栏的信息");
			// 进入电子围栏(禁区)，需显示进入时间
			params.put("inDate", simpleDateFormat.format(sendDataAreaInfo.get("inAreaDate"))); //进入时间
			params.put("locationStatus", EbcConstant.location_status_exclusion); //定位状态
			params.put("inDate", simpleDateFormat.format(sendDataAreaInfo.get("inAreaDate"))); // 进入时间
			params.put("locationStatus", EbcConstant.location_status_exclusion); // 定位状态
		} else if (maxMapTagGrade == 3) {
			// 进入定点(限时)，需计算是否超时
@@ -313,15 +343,16 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
			if (fixedLong > 0) {
				// 围栏要求定点时间
				int residenceTimeLength = Integer.parseInt(String.valueOf(sendDataAreaInfo.get("RESIDENCE_TIME_LENGTH")));
				int residenceTimeLength = Integer
						.parseInt(String.valueOf(sendDataAreaInfo.get("RESIDENCE_TIME_LENGTH")));
				if (residenceTimeLength <= fixedLong) {
					// 已超时
					logger.info("镜屏推送进入定点(限时)的信息:已超时");
					params.put("locationStatus", EbcConstant.location_status_overtime);//定位状态
					params.put("locationStatus", EbcConstant.location_status_overtime);// 定位状态
				}
			}
			params.put("fixedLong", fixedLong);//停留时长
			params.put("fixedLong", fixedLong);// 停留时长
		}
		String jingpingData = JSON.toJSONString(params);
@@ -336,33 +367,33 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
	 */
	private void executeReceiveIotAlarmData(JMap params) throws Exception {
		// 1、获取人员信息
		Map<String, Object> dataMap=new HashMap<String, Object>();
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("DEVICE_ID", params.get("deviceId"));
		Map<String, Object> deviceAndUser = deviceManageDao.queryOneBindDeviceInfo(dataMap);
		params.put("userName", deviceAndUser.get("PARTY_NAME"));
		Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindUser(params.getString("deviceId"), null);
		// 2、查询是否为需救援的人员
		Map<String, Object> alarmMap = rescueDao.queryNoCloseRescueLog(params);
		logger.debug("报警信息的对象为人员: " + bindInfoMap.get("NAME"));
		params.put("userName", bindInfoMap.get("NAME"));
		params.put("userCode", bindInfoMap.get("CODE"));
		// 3、判断是否存在未救援的报警信息
		if (alarmMap == null || alarmMap.isEmpty()) {
			logger.debug("新增报警信息");
			params.put("isNewAlarm", "1");
			params.put("alarmDate", params.getString("newDate"));//求救时间
			params.put("alarmLong", "0");//求救时长
			// 推送镜屏
			String jingpingData = JSON.toJSONString(params);
			logger.debug("推送镜屏数据：" + jingpingData);
			JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, jingpingData);
			
			// 保存报警数据
			saveAlarmData(params, deviceAndUser);
		} else {
			params.put("isNewAlarm", "0");
			logger.debug("报警信息未处理");
			beforeAlarmLocationData(params, alarmMap);
		// 2、是否为未被救援的信息
		if (IsAlarmNotRescued(params)) {
			logger.debug("报警信息未处理: " + params.get("userName"));
			return;
		}
		// 3、判断是否存在未救援的报警信息
		logger.debug("新增报警信息");
		params.put("isNewAlarm", "1");
		params.put("alarmDate", params.getString("newDate"));// 求救时间
		params.put("alarmLong", "0");// 求救时长
		// 推送镜屏
		String jingpingData = JSON.toJSONString(params);
		logger.debug("推送镜屏数据：" + jingpingData);
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, jingpingData);
		// 保存报警数据
		saveAlarmData(params, bindInfoMap);
	}
	/**
@@ -378,11 +409,11 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		// 2、拼接添加数据
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("CALLER_ID", deviceAndUser.get("PARTY_CODE")); // 报警人员标识
		dataMap.put("CALLER_ID", deviceAndUser.get("CODE")); // 报警人员标识
		dataMap.put("DEVICE_ID", params.get("deviceId")); // 终端标识
		dataMap.put("PARTY_TYPE", deviceAndUser.get("PARTY_TYPE")); // 参与人类型
		dataMap.put("PARTY_CODE", deviceAndUser.get("PARTY_CODE")); // 参与人业务编码
		dataMap.put("PARTY_NAME", deviceAndUser.get("PARTY_NAME")); // 参与人名称
		dataMap.put("PARTY_TYPE", deviceAndUser.get("TYPE")); // 参与人类型
		dataMap.put("PARTY_CODE", deviceAndUser.get("CODE")); // 参与人业务编码
		dataMap.put("PARTY_NAME", deviceAndUser.get("NAME")); // 参与人名称
		dataMap.put("ALARM_TYPE", params.get("alarmType")); // 告警类型
		dataMap.put("LONGITUDE", params.get("longitude")); // 报警经度
		dataMap.put("LATITUDE", params.get("latitude")); // 报警纬度

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/interfaces/DeviceManageService.java

@@ -67,5 +67,5 @@ public interface DeviceManageService {
	Map<String, Object> verifyUserOrBoatAssociatInfo(JMap params) throws Exception;
	
	List<Map<String, Object>> queryCurrentDeviceLocationInfo(JMap params) throws Exception;
	List<Map<String, String>> queryCurrentDeviceLocationInfo(JMap params) throws Exception;
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/HttpServiceUtil.java

@@ -201,13 +201,13 @@ public class HttpServiceUtil {
		return responseEx(httpClient, response, encoding);
	}
	public static String sendPost(String url, Map<String, Object> params, Charset encoding) {
	public static String sendPost(String url, Map<String, Object> paramsMap, Charset encoding) {
		HttpClient httpClient = HttpClients.createDefault();
		String resp = "";
		HttpPost httpPost = new HttpPost(url);
		httpPost.addHeader(HTTP.CONTENT_TYPE, HTTP_CONTENT_TYPE_JSON);
		if (params != null && params.size() > 0) {
			StringEntity se = new StringEntity(JSONObject.toJSONString(params), encoding);
		if (paramsMap != null && paramsMap.size() > 0) {
			StringEntity se = new StringEntity(JSONObject.toJSONString(paramsMap), encoding);
			httpPost.setEntity(se);
		}
		CloseableHttpResponse response = null;
@@ -219,7 +219,7 @@ public class HttpServiceUtil {
		return responseEx(httpClient, response, encoding);
	}
	public static String sendPost(String url, Map<String, Object> params, Charset encoding,
	public static String sendPost(String url, Map<String, Object> paramsMap, Charset encoding,
			Map<String, String> headerMap) {
		HttpClient httpClient = HttpClients.createDefault();
		String resp = "";
@@ -235,8 +235,8 @@ public class HttpServiceUtil {
		}
		httpPost.addHeader(HTTP.CONTENT_TYPE, HTTP_CONTENT_TYPE_JSON);
		if (params != null && params.size() > 0) {
			StringEntity se = new StringEntity(JSONObject.toJSONString(params), encoding);
		if (paramsMap != null && paramsMap.size() > 0) {
			StringEntity se = new StringEntity(JSONObject.toJSONString(paramsMap), encoding);
			httpPost.setEntity(se);
		}
		CloseableHttpResponse response = null;

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/JingPingSendDateUtil.java

@@ -19,8 +19,8 @@ public class JingPingSendDateUtil {
	// 人员定位topic
	public static final String topic_personnel = "personnel";
	// 救援定位topic
	//public static final String topic_alarm = "alarm";
	// 船舶定位topic
	public static final String topic_ship = "ship";
	public static void sendData(String topic, String msg) {
		if (!EventChannelTool.isExistSubscriber(topic)) {

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/NorthboundInterfaceConstant.java

@@ -0,0 +1,30 @@
package com.ai.ipu.server.util;
/**
 * 北向接口的常量
 * @author konghl@asiainfo.com
 * 2020-10-29
 */
public class NorthboundInterfaceConstant {
	// 分页查询终端
	public static final String queryPageDevice="findTerminal";
	
	// 添加终端
	public static final String addDevice="device";
	
	// 修改终端
	public static final String updateDevice="updateDevice";
	
	// 删除终端
	public static final String deleteDevice="deleteDevice?deviceId=";
	
	// 查询单个设备
	public static final String queryOneDevice="deviceSimpleDetail?deviceId=";
	
	// 查询多个设备解析后的事件
	public static final String queryMoreDeviceNewIncident="findTerminalEventDataParseInResourceIdsLastData";
	// 调用成功标识
	public static final String resultCode_succeed = "0";
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/NorthboundInterfaceUtil.java

@@ -24,22 +24,22 @@ public class NorthboundInterfaceUtil {
	private static final ILogger logger = IpuLoggerFactory.createLogger(NorthboundInterfaceUtil.class);
	@Value("${aap.iot.userCode}")
	private static String userCode;
	private String userCode;
	
	@Value("${aap.iot.passWord}")
	private static String passWord;
	private String passWord;
	
	@Value("${url.iot.login}")
	private static String iotLoginUrl;
	// 调用成功标识
	public static final String resultCode_succeed = "0";
	private String iotLoginUrl;
	
	@Value("${url.iot.service}")
	private String iotServiceUrl;
	
	// 定义静态存储map空间存放sign与sessionId
	private volatile static Map<String, String> cacheMap = new ConcurrentHashMap<String, String>();// 缓存map
	// set
	public static void setMapCache(Map<String, String> map) {
	public void setMapCache(Map<String, String> map) {
		Set<String> set = map.keySet();
		Iterator<String> it = set.iterator();
		while (it.hasNext()) {
@@ -49,13 +49,13 @@ public class NorthboundInterfaceUtil {
	}
	// get
	public static Map<String, String> getMapCache() {
	public Map<String, String> getMapCache() {
		return cacheMap;
	}
	// 清除cache
	public static void clear() {
	public void clear() {
		cacheMap.clear();
	}
@@ -67,22 +67,22 @@ public class NorthboundInterfaceUtil {
	 * @return
	 * @throws Exception
	 */
	public static Map<String, String> iotGetCallUtil(String url) throws Exception {
	public Map<String, String> iotGetCallUtil(String url) throws Exception {
		// 调用北向服务的接口
		logger.debug("GET调用北向接口");
		// 1.在缓存中获取sessionId与sign
		Map<String, String> mapCache = NorthboundInterfaceUtil.getMapCache();
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("sessionId") == null) {
		Map<String, String> mapCache = getMapCache();
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("session_id") == null) {
			// 2.如果没有调用登录接口从新获取
			NorthboundInterfaceUtil.iotLogin();
			iotLogin();
		}
		// 3.调用北向服务接口
		// (1)设置字符集
		Charset charset = Charset.forName("utf-8");
		// (2)调用接口
		String resultJson = HttpServiceUtil.sendGet(url, charset);
		String resultJson = HttpServiceUtil.sendGet(iotServiceUrl+url, charset);
		// (3)将参数转为Map<String,String>【将返回值统一为String】
		Map<String, String> resultMap = JSON.parseObject(resultJson, Map.class);
@@ -91,11 +91,11 @@ public class NorthboundInterfaceUtil {
			logger.info("调用北向接口失败，需重新登录");
			// 4.调用不成功可能是登录过期
			// (1)清除缓存
			NorthboundInterfaceUtil.clear();
			clear();
			// (2)重新登录
			NorthboundInterfaceUtil.iotLogin();
			iotLogin();
			// (3)再次调用接口
			String fianlresultJson = HttpServiceUtil.sendGet(url, charset);
			String fianlresultJson = HttpServiceUtil.sendGet(iotServiceUrl+url, charset);
			// (4)获取返回值
			resultMap = JSON.parseObject(fianlresultJson, Map.class);
		}
@@ -114,19 +114,19 @@ public class NorthboundInterfaceUtil {
	 * POST请求调用北向接口方法
	 * 
	 * @param url
	 * @param params
	 * @param paramsMap
	 * @return
	 * @throws Exception
	 */
	public static Map<String, String> iotPostCallUtil(String url, Map<String, Object> params) throws Exception {
	public Map<String, String> iotPostCallUtil(String url, Map<String, Object> paramsMap) throws Exception {
		// 调用北向服务的接口
		logger.debug("POSt调用北向接口");
		// 1.在缓存中获取sessionId与sign
		Map<String, String> mapCache = NorthboundInterfaceUtil.getMapCache();
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("sessionId") == null) {
		Map<String, String> mapCache = getMapCache();
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("session_id") == null) {
			// 2.如果没有调用登录接口从新获取
			NorthboundInterfaceUtil.iotLogin();
			iotLogin();
		}
		// 3.调用北向服务接口
@@ -136,7 +136,7 @@ public class NorthboundInterfaceUtil {
		Map<String, String> resultMap = null;
		try {
			// (2)调用接口
			String resultJson = HttpServiceUtil.sendPost(url, params, charset, getMapCache());
			String resultJson = HttpServiceUtil.sendPost(iotServiceUrl+url, paramsMap, charset, getMapCache());
			// (3)将参数转为Map<String,String>【将返回值统一为String】
			resultMap = JSON.parseObject(resultJson, Map.class);
		} catch (Exception e) {
@@ -153,11 +153,11 @@ public class NorthboundInterfaceUtil {
			logger.info("调用北向接口失败，需重新登录");
			// 4.调用不成功可能是登录过期
			// (1)清除缓存
			NorthboundInterfaceUtil.clear();
			clear();
			// (2)重新登录
			NorthboundInterfaceUtil.iotLogin();
			iotLogin();
			// (3)再次调用接口
			String fianlresultJson = HttpServiceUtil.sendPost(url, params, charset, getMapCache());
			String fianlresultJson = HttpServiceUtil.sendPost(iotServiceUrl+url, paramsMap, charset, getMapCache());
			// (4)获取返回值
			resultMap = JSON.parseObject(fianlresultJson, Map.class);
		}
@@ -177,7 +177,7 @@ public class NorthboundInterfaceUtil {
	 * 
	 * @return
	 */
	private static Map<String, String> iotLogin() {
	private Map<String, String> iotLogin() {
		logger.debug("登录北向接口");
		// 调用登录接口获取sessionId与sign
@@ -203,7 +203,7 @@ public class NorthboundInterfaceUtil {
			if ("0".equals(String.valueOf(mapType.get("resultCode")))) {
				logger.info("登录北向接口成功");
				// 将数据存到缓存中
				NorthboundInterfaceUtil.setMapCache(result);
				setMapCache(result);
			} else {
				logger.info("登录北向接口失败");
			}

ebc-sea-platform/src/main/resources/dev/application.properties

@@ -34,8 +34,8 @@ aap.gis.userName=EBC_PPRS
aap.gis.passwd=ITBS93wMYHosT
#gis\u7684token\u5730\u5740
url.gis.token = http://192.168.74.189:9999/gisIntf/account/gettoken
url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
url.iot.login = http://60.205.219.67:8300/sso/login
url.iot.login=http://60.205.219.67:8300/sso/login
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
url.iot.service = http://60.205.219.67:8300/dmp/terminalNorthApi
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/

ebc-sea-platform/src/main/resources/pro/application.properties

@@ -1,31 +1,38 @@
######设置服务器端口
######也可以通过启动命令行参数实现：java -jar myproject.jar --server.port=9084
######\u8bbe\u7f6e\u670d\u52a1\u5668\u7aef\u53e3
######\u4e5f\u53ef\u4ee5\u901a\u8fc7\u542f\u52a8\u547d\u4ee4\u884c\u53c2\u6570\u5b9e\u73b0\uff1ajava -jar myproject.jar --server.port=9084
server.port=unknown
#会影响拦截器的配置exclude-mapping
#\u4f1a\u5f71\u54cd\u62e6\u622a\u5668\u7684\u914d\u7f6eexclude-mapping
spring.mvc.static-path-pattern=/**
######context-path默认/
######context-path\u9ed8\u8ba4/
server.context-path=/ipu
######注册DispatcherServlet对应path，亦可通过dispatcherRegistration方法配置
######\u6ce8\u518cDispatcherServlet\u5bf9\u5e94path\uff0c\u4ea6\u53ef\u901a\u8fc7dispatcherRegistration\u65b9\u6cd5\u914d\u7f6e
#server.servlet-path=/ipu1
#使用maven中的变量替换
#\u4f7f\u7528maven\u4e2d\u7684\u53d8\u91cf\u66ff\u6362
logging.file=target/logs/${project.artifactId}.log
spring.application.name=${project.artifactId}
######session使用默认
######session\u4f7f\u7528\u9ed8\u8ba4
spring.session.store-type=none
#设置开启热部署
#\u8bbe\u7f6e\u5f00\u542f\u70ed\u90e8\u7f72
spring.devtools.restart.enabled=true
#重启目录
#\u91cd\u542f\u76ee\u5f55
spring.devtools.restart.additional-paths=src/main/java
spring.devtools.restart.exclude=WEB-INF/**
#北向登录账号和密码
#\u5317\u5411\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
aap.iot.userCode=IOT_ADMIN
aap.iot.passWord=123456
#gis登录账号和密码
#gis\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
aap.gis.userName=EBC_PPRS
aap.gis.passwd=ITBS93wMYHosT
aap.gis.passwd=ITBS93wMYHosT
#gis\u7684token\u5730\u5740
url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
url.iot.login=http://60.205.219.67:8300/sso/login
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/

ebc-sea-platform/src/main/resources/sql/ipu/AreaInOutRecordDao.xml

@@ -57,6 +57,35 @@
		]]>
	</sql>
	<sql name="getBeforeInAreaInfo">
		<![CDATA[
		<select id="queryNoCloseRescueLog" resultType="java.util.Map" >
	        SELECT a.RECORD_ID,a.MAP_TAG_ID,a.IN_DATE,a.DEVICE_ID,
	        m.MAP_TAG_NAME,m.MAP_TAG_TYPE,m.RESIDENCE_TIME_LENGTH
	        FROM LR_AREA_IN_OUT_RECORD a
	        LEFT JOIN LR_MAP_TAG m ON m.MAP_TAG_ID=a.MAP_TAG_ID
	        <where>
	        a.OUT_DATE IS NULL
	        
	        <if test="deviceId != null">
	        	AND a.DEVICE_ID = #{deviceId}
	        </if>
	        
	        <if test="mapTagTypeList != null">
	        	AND m.MAP_TAG_TYPE IN (
			
	    		<foreach collection="mapTagTypeList" item="item" separator=",">
	        		#{item}
	    		</foreach>
	    		
	    		)
	        </if>
	        
	        </where>
		</select>
		]]>
	</sql>
	<sql name="queryPageDayAttendanceCount">
		<![CDATA[
		<select id="queryPageDayAttendanceCount" resultType="java.util.Map">

ebc-sea-platform/src/main/resources/sql/ipu/DeviceManageDao.xml

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<sqls>
	<sql name="queryAllBindShip">
		<![CDATA[
		<select id="queryAllBindShip" resultType="java.util.Map" >
		
			SELECT FACILITY_ID ID,FACILITY_TYPE TYPE,FACILITY_CODE CODE,FACILITY_NAME NAME,DEVICE_ID
			FROM LR_FACILITY
			WHERE DEVICE_ID IS NOT NULL
			AND FACILITY_TYPE = #{shipProductId}
		
		</select>
		]]>
	</sql>
	
	<sql name="queryAllBindUser">
		<![CDATA[
		<select id="queryAllBindUser" resultType="java.util.Map" >
		
			SELECT PARTY_TERMINAL_ID ID,PARTY_TYPE TYPE,PARTY_CODE CODE,PARTY_NAME NAME,DEVICE_ID
			FROM LR_PARTY_TERMINAL
			WHERE DEVICE_ID IS NOT NULL
		
		</select>
		]]>
	</sql>
	
	<sql name="queryOneBindShip">
		<![CDATA[
		<select id="queryOneBindShip" resultType="java.util.Map" >
		
			SELECT FACILITY_ID ID,FACILITY_TYPE TYPE,FACILITY_CODE CODE,FACILITY_NAME NAME,DEVICE_ID
			FROM LR_FACILITY
			WHERE 1=1
			AND FACILITY_TYPE = #{shipProductId}
			<if test="deviceId != null">
				AND DEVICE_ID = #{deviceId}
			</if>
			<if test="bindCode != null">
				AND FACILITY_ID = #{bindCode}
				AND DEVICE_ID IS NOT NULL
			</if>
			
		</select>
		]]>
	</sql>
	
	<sql name="queryOneBindUser">
		<![CDATA[
		<select id="queryOneBindUser" resultType="java.util.Map" >
			
			SELECT PARTY_TERMINAL_ID ID,PARTY_TYPE TYPE,PARTY_CODE CODE,PARTY_NAME NAME,DEVICE_ID
			FROM LR_PARTY_TERMINAL
			WHERE 1=1
			<if test="deviceId != null">
				AND DEVICE_ID = #{deviceId}
			</if>
			<if test="bindCode != null">
				AND PARTY_CODE = #{bindCode}
				AND DEVICE_ID IS NOT NULL
			</if>
		
		</select>
		]]>
	</sql>
</sqls>

ebc-sea-platform/src/main/resources/sql/ipu/RescueDao.xml

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<sqls>
	<sql name="queryNoCloseRescueLog">
		<![CDATA[
		<select id="queryNoCloseRescueLog" resultType="java.util.Map" >
	        SELECT l.LOG_ID,l.CALLER_ID,l.DEVICE_ID,l.PARTY_TYPE,l.PARTY_CODE,
	        l.PARTY_NAME,l.ALARM_TYPE,l.CALLER_DATE,l.RESCUERS_DATE,l.REMARKS
	        FROM LR_RESCUE_LOG l
	        <where>
	        l.RESCUERS_DATE IS NULL
	        AND l.ALARM_TYPE <> #{offlineType}
	        AND l.DEVICE_ID IN (
			
    		<foreach collection="deviceIdsList" item="item" separator=",">
        		#{item}
    		</foreach>
    		
    		)
	        </where>
		</select>
		]]>
	</sql>
</sqls>

ebc-sea-platform/src/main/resources/test/application.properties

@@ -1,33 +1,38 @@
######设置服务器端口
######也可以通过启动命令行参数实现：java -jar myproject.jar --server.port=9084
######\u8bbe\u7f6e\u670d\u52a1\u5668\u7aef\u53e3
######\u4e5f\u53ef\u4ee5\u901a\u8fc7\u542f\u52a8\u547d\u4ee4\u884c\u53c2\u6570\u5b9e\u73b0\uff1ajava -jar myproject.jar --server.port=9084
server.port=unknown
#会影响拦截器的配置exclude-mapping
#\u4f1a\u5f71\u54cd\u62e6\u622a\u5668\u7684\u914d\u7f6eexclude-mapping
spring.mvc.static-path-pattern=/**
######context-path默认/
######context-path\u9ed8\u8ba4/
server.context-path=/ipu
######注册DispatcherServlet对应path，亦可通过dispatcherRegistration方法配置
######\u6ce8\u518cDispatcherServlet\u5bf9\u5e94path\uff0c\u4ea6\u53ef\u901a\u8fc7dispatcherRegistration\u65b9\u6cd5\u914d\u7f6e
#server.servlet-path=/ipu1
#使用maven中的变量替换
#\u4f7f\u7528maven\u4e2d\u7684\u53d8\u91cf\u66ff\u6362
logging.file=target/logs/${project.artifactId}.log
spring.application.name=${project.artifactId}
######session使用默认
######session\u4f7f\u7528\u9ed8\u8ba4
spring.session.store-type=none
#设置开启热部署
#\u8bbe\u7f6e\u5f00\u542f\u70ed\u90e8\u7f72
spring.devtools.restart.enabled=true
#重启目录
#\u91cd\u542f\u76ee\u5f55
spring.devtools.restart.additional-paths=src/main/java
spring.devtools.restart.exclude=WEB-INF/**
#北向登录账号和密码
#\u5317\u5411\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
aap.iot.userCode=IOT_ADMIN
aap.iot.passWord=123456
#gis登录账号和密码
#gis\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
aap.gis.userName=EBC_PPRS
aap.gis.passwd=ITBS93wMYHosT
url.gis.token = http://192.168.74.189:9999/gisIntf/account/gettoken
#gis\u7684token\u5730\u5740
url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
url.iot.login=http://60.205.219.67:8300/sso/login
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/