最新版本541200007

jiangping

2025-05-07 55075b2bbf2b6c41ec6ce831fb2b08666dbf4bf5

最新版本541200007

 admin/src/api/business/inoutRecord.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
import request from '../../utils/request'

// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/business/inoutRecord/page', data, {
    trim: true
  })
}

// å¯¼å‡ºExcel
export function exportExcel (data) {
  return request.post('/visitsAdmin/cloudService/business/inoutRecord/exportExcel', data, {
    trim: true,
    download: true
  })
}

// åˆ›å»º
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/inoutRecord/create', data)
}

// ä¿®æ”¹
export function updateById (data) {
  return request.post('/visitsAdmin/cloudService/business/inoutRecord/updateById', data)
}

// åˆ é™¤
export function deleteById (id) {
  return request.get(`/business/inoutRecord/delete/${id}`)
}

// æ‰¹é‡åˆ é™¤
export function deleteByIdInBatch (ids) {
  return request.get('/visitsAdmin/cloudService/business/inoutRecord/delete/batch', {
    params: {
      ids
    }
  })
}

 admin/src/components/business/OperaInoutRecordWindow.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,146 @@
<template>
  <GlobalWindow
    :title="title"
    :visible.sync="visible"
    :confirm-working="isWorking"
    @confirm="confirm"
  >
    <el-form :model="form" ref="form" :rules="rules">
      <el-form-item label="创建人编码" prop="creator">
        <el-input v-model="form.creator" placeholder="请输入创建人编码" v-trim/>
      </el-form-item>
      <el-form-item label="创建时间" prop="createDate">
        <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="请输入创建时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="更新人编码" prop="editor">
        <el-input v-model="form.editor" placeholder="请输入更新人编码" v-trim/>
      </el-form-item>
      <el-form-item label="更新时间" prop="editDate">
        <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="请输入更新时间"></el-date-picker>
      </el-form-item>
      <el-form-item label="是否删除0否 1是" prop="isdeleted">
        <el-input v-model="form.isdeleted" placeholder="请输入是否删除0否 1是" v-trim/>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <el-input v-model="form.remark" placeholder="请输入备注" v-trim/>
      </el-form-item>
      <el-form-item label="对象类型 0车辆 1人员" prop="type">
        <el-input v-model="form.type" placeholder="请输入对象类型 0车辆 1人员" v-trim/>
      </el-form-item>
      <el-form-item label="海康事件编码" prop="hkEventId">
        <el-input v-model="form.hkEventId" placeholder="请输入海康事件编码" v-trim/>
      </el-form-item>
      <el-form-item label="海康事件对象编码" prop="hkId">
        <el-input v-model="form.hkId" placeholder="请输入海康事件对象编码" v-trim/>
      </el-form-item>
      <el-form-item label="关联人员编码（关联member)" prop="memberId">
        <el-input v-model="form.memberId" placeholder="请输入关联人员编码（关联member)" v-trim/>
      </el-form-item>
      <el-form-item label="关联人员编码（关联cars)" prop="carId">
        <el-input v-model="form.carId" placeholder="请输入关联人员编码（关联cars)" v-trim/>
      </el-form-item>
      <el-form-item label="关联分类编码（关联category)" prop="categoryId">
        <el-input v-model="form.categoryId" placeholder="请输入关联分类编码（关联category)" v-trim/>
      </el-form-item>
      <el-form-item label="关联分类名称" prop="categoryName">
        <el-input v-model="form.categoryName" placeholder="请输入关联分类名称" v-trim/>
      </el-form-item>
      <el-form-item label="" prop="carBizType">
        <el-input v-model="form.carBizType" placeholder="请输入" v-trim/>
      </el-form-item>
      <el-form-item label="用户类型  0访客 1内部人员 2相关方人员 3货运司机" prop="memberType">
        <el-input v-model="form.memberType" placeholder="请输入用户类型  0访客 1内部人员 2相关方人员 3货运司机" v-trim/>
      </el-form-item>
      <el-form-item label="人员名称" prop="memberName">
        <el-input v-model="form.memberName" placeholder="请输入人员名称" v-trim/>
      </el-form-item>
      <el-form-item label="车牌号" prop="carCode">
        <el-input v-model="form.carCode" placeholder="请输入车牌号" v-trim/>
      </el-form-item>
      <el-form-item label="关联对象类型 0车辆 1人员 2访客申请记录 3访客报备申请记录 4月台作业记录" prop="objType">
        <el-input v-model="form.objType" placeholder="请输入关联对象类型 0车辆 1人员 2访客申请记录 3访客报备申请记录 4月台作业记录" v-trim/>
      </el-form-item>
      <el-form-item label="关联对象编码" prop="objId">
        <el-input v-model="form.objId" placeholder="请输入关联对象编码" v-trim/>
      </el-form-item>
      <el-form-item label="进出类型 0进 1出" prop="inOrOut">
        <el-input v-model="form.inOrOut" placeholder="请输入进出类型 0进 1出" v-trim/>
      </el-form-item>
      <el-form-item label="进出设备名称" prop="deviceName">
        <el-input v-model="form.deviceName" placeholder="请输入进出设备名称" v-trim/>
      </el-form-item>
      <el-form-item label="组织名称" prop="companyName">
        <el-input v-model="form.companyName" placeholder="请输入组织名称" v-trim/>
      </el-form-item>
      <el-form-item label="关联组织编码" prop="companyId">
        <el-input v-model="form.companyId" placeholder="请输入关联组织编码" v-trim/>
      </el-form-item>
      <el-form-item label="统计日期（2024-10-12）" prop="timeInfo">
        <el-date-picker v-model="form.timeInfo" value-format="yyyy-MM-dd" placeholder="请输入统计日期（2024-10-12）"></el-date-picker>
      </el-form-item>
      <el-form-item label="关联父级分类编码（关联category)" prop="categoryParentId">
        <el-input v-model="form.categoryParentId" placeholder="请输入关联父级分类编码（关联category)" v-trim/>
      </el-form-item>
      <el-form-item label="关联父级分类名称" prop="categoryParentName">
        <el-input v-model="form.categoryParentName" placeholder="请输入关联父级分类名称" v-trim/>
      </el-form-item>
      <el-form-item label="人员手机号" prop="memberPhone">
        <el-input v-model="form.memberPhone" placeholder="请输入人员手机号" v-trim/>
      </el-form-item>
    </el-form>
  </GlobalWindow>
</template>

<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
export default {
  name: 'OperaInoutRecordWindow',
  extends: BaseOpera,
  components: { GlobalWindow },
  data () {
    return {
      // è¡¨å•æ•°æ®
      form: {
        id: null,
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        remark: '',
        type: '',
        hkEventId: '',
        hkId: '',
        memberId: '',
        carId: '',
        categoryId: '',
        categoryName: '',
        carBizType: '',
        memberType: '',
        memberName: '',
        carCode: '',
        objType: '',
        objId: '',
        inOrOut: '',
        deviceName: '',
        companyName: '',
        companyId: '',
        timeInfo: '',
        categoryParentId: '',
        categoryParentName: '',
        memberPhone: ''
      },
      // éªŒè¯è§„则
      rules: {
      }
    }
  },
  created () {
    this.config({
      api: '/business/inoutRecord',
      'field.id': 'id'
    })
  }
}
</script>

 admin/src/views/business/deviceEvent.vue

@@ -80,8 +80,7 @@
        <el-table-column prop="devName" label="门禁名称" min-width="100px"></el-table-column>
        <el-table-column prop="srcName" label="门禁点" min-width="110px"></el-table-column>
        <el-table-column prop="eventTypeName" label="事件类型" min-width="100px"></el-table-column>
        <el-table-column label="出入类型" min-width="100px">WMS作业已完成

        <el-table-column label="出入类型" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.extEventInOut === 1">进</span>
            <span v-if="row.extEventInOut != 1">出</span>

 admin/src/views/business/inoutRecord.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,213 @@
<template>
  <TableLayout :permissions="['business:inoutrecord:query']">
    <!-- æœç´¢è¡¨å• -->
    <div slot="search-form">
      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
        <el-form-item label="" prop="inOrOut">
          <el-select v-model="searchForm.inOrOut"  style="width: 130px" clearable @change="search" placeholder="进出类型">
            <el-option label="进" value="0"></el-option>
            <el-option label="出" value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="memberType">
          <el-select v-model="searchForm.memberType" style="width: 130px" clearable @change="search" placeholder="人员类型">
            <el-option label="访客" value="1"></el-option>
            <el-option label="内部人员" value="2"></el-option>
            <el-option label="相关方人员" value="4"></el-option>
            <el-option label="货运司机" value="5"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="memberName">
          <el-input v-model="searchForm.memberName" placeholder="人员名称/手机号" clearable @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="companyName">
          <el-input v-model="searchForm.companyName" placeholder="组织名称" clearable @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="carCode">
          <el-input v-model="searchForm.carCode" placeholder="车牌号"  clearable @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="categoryName">
          <el-input v-model="searchForm.categoryName" placeholder="车辆分类名称" clearable @keypress.enter.native="search"></el-input>
        </el-form-item>
<!--        <el-form-item label="" prop="carBizType">
          <el-select v-model="searchForm.carBizType" clearable style="width: 180px"   placeholder="车辆业务类型">
            <el-option v-for="op in bizTypeList" :key="op.key" :label="op.name" :value="op.key"  ></el-option>
          </el-select>
        </el-form-item>-->
        <el-form-item label="" prop="deviceName">
          <el-input v-model="searchForm.deviceName" placeholder="出入口名称" clearable @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="起止时间" prop="startDate">
          <el-date-picker type="datetime" v-model="searchForm.startDate" value-format="yyyy-MM-dd HH:mm:ss"
                          placeholder="请选择开始时间" @change="changeRadio" />
          <el-date-picker type="datetime" v-model="searchForm.endDate" value-format="yyyy-MM-dd HH:mm:ss"
                          placeholder="请选择结束时间" @change="changeRadio" />
        </el-form-item>
        <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
          <el-radio-button label="0">当天</el-radio-button>
          <el-radio-button label="1">近7天</el-radio-button>
          <el-radio-button label="2">近30天</el-radio-button>
        </el-radio-group>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
      </el-form>
    </div>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:inoutrecord:exportExcel' ]">
        <li>
          <el-button type="primary" :loading="isWorking.export" v-permissions="['business:inoutrecord:exportExcel']"
                     @click="exportExcel">导出</el-button>
        </li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="memberName" label="人员名称" min-width="100px"></el-table-column>
        <el-table-column prop="memberPhone" label="人员手机号" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" label="组织名称" min-width="100px"></el-table-column>
        <el-table-column prop="memberType" label="用户类型" min-width="100px">
          <template slot-scope="{row}">
            <span  v-if="row.memberType ==1">访客</span>
            <span  v-else-if="row.memberType ==2">内部人员</span>
            <span  v-else-if="row.memberType ==4">相关方人员</span>
            <span  v-else-if="row.memberType ==5">货运司机</span>
            <span  v-else ></span>
          </template>
        </el-table-column>
        <el-table-column prop="carCode" label="车牌号" min-width="100px"></el-table-column>
<!--        <el-table-column prop="carBizType" label="车辆业务类型" min-width="100px">
          <template slot-scope="{row}">
            <template v-if="row.carCode">
              <span  v-if="row.carBizType ==0">访客车辆</span>
              <span  v-else-if="row.carBizType ==1">外协运输车辆</span>
              <span  v-else-if="row.carBizType ==2">市公司卸货车辆</span>
              <span  v-else-if="row.carBizType ==3">加工烟卸货车辆</span>
              <span  v-else-if="row.carBizType ==4">安泰物流公务用车</span>
              <span  v-else-if="row.carBizType ==5">安泰物流货运车辆</span>
              <span  v-else >未知车辆</span>
            </template>
          </template>
        </el-table-column>-->
        <el-table-column prop="categoryName" label="车辆分类" min-width="100px">
          <template slot-scope="{row}">
<!--
            <span  v-if="row.categoryParentName!= row.categoryName">  {{(row.categoryParentName || '') +row.categoryName}}</span>
-->
            <span  v-if="row.carCode"  >{{ row.categoryName }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="inOrOut" label="进出类型" min-width="100px">
          <template slot-scope="{row}">
            <span  v-if="row.inOrOut ==1">出</span>
            <span  v-else >进</span>
          </template>
        </el-table-column>
        <el-table-column prop="deviceName" label="进出口名称" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
        <el-table-column prop="remark" label="备注" min-width="100px"></el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      </pagination>
    </template>
    <!-- æ–°å»º/修改 -->
    <OperaInoutRecordWindow ref="operaInoutRecordWindow" @success="handlePageChange"/>
  </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import SearchFormCollapse from '@/components/common/SearchFormCollapse'
import Pagination from '@/components/common/Pagination'
import OperaInoutRecordWindow from '@/components/business/OperaInoutRecordWindow'
import { timeForMat } from '@/utils/util'
export default {
  name: 'InoutRecord',
  extends: BaseTable,
  components: { SearchFormCollapse, TableLayout, Pagination, OperaInoutRecordWindow },
  data () {
    return {
      // æœç´¢
      searchForm: {
        categoryName: '',
        carBizType: '',
        memberType: '',
        memberName: '',
        carCode: '',
        inOrOut: '',
        companyName: '',
        startDate: null,
        endDate: null,
        radio: '0'
      },
      time: [],
      bizTypeList: [{ key: 0, name: '访客车辆' },
        { key: 1, name: '外协运输车辆' },
        { key: 2, name: '市公司卸货车辆' },
        { key: 3, name: '加工烟卸货车辆' },
        { key: 4, name: '安泰物流公务用车' },
        { key: 5, name: '安泰物流货运车辆' },
        { key: 6, name: '未知车辆' }
      ]
    }
  },
  created () {
    this.config({
      module: '出入场人次车次每日统计表',
      api: '/business/inoutRecord',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.search()
    this.changeRadio('0')
  },
  methods: {
    changeRadio (e) {
      if (e === '0') {
        this.searchForm.startDate = timeForMat(0)[0]
        this.searchForm.endDate = timeForMat(0)[1]
      } else if (e === '1') {
        this.searchForm.startDate = timeForMat(6)[0]
        this.searchForm.endDate = timeForMat(6)[1]
      } else if (e === '2') {
        this.searchForm.startDate = timeForMat(29)[0]
        this.searchForm.endDate = timeForMat(29)[1]
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startDate && this.searchForm.endDate && new Date(this.searchForm.startDate).getTime() > new Date(this.searchForm.endDate).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startDate = ''
        return
      }
      this.search()
    },
    seleTime (e) {
      this.searchForm.startDate = e[0]
      this.searchForm.endDate = e[1]
      this.searchForm.radio = null
      this.search()
    },
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchForm.startDate = ''
      this.searchForm.endDate = ''
      this.searchForm.radio = ''
      this.time = []
      this.search()
    }
  }
}
</script>

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -438,6 +438,7 @@
         int atwlgwCar = 4;//安泰公务车：公务车-安泰物流公务用车
         int atwlzyCar = 5;//安泰自有车：货运车辆-安泰物流货运车辆
         int other = 6;//未知车辆
         int self = 7;//自有车
    }

    /**

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java

@@ -17,10 +17,18 @@

    @ApiModelProperty(value = "设备或者传感器名称")
    private String name;
    @ApiModelProperty(value = "设备类型 60液位 61水压")
    private Integer type;

    @ApiModelProperty(value = "阈值")
    private String level;
    
    @ApiModelProperty(value = "阈值最小值")
    private String min;

    @ApiModelProperty(value = "阈值最大值")
    private String max;

    @ApiModelProperty(value = "监测数据集合")
    private List<MonitorDataInfoVO> dataList;


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -239,12 +239,13 @@
            record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
            record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
            record.setType(Constants.ONE);//人员
            record.setDeviceName(request.getSrcName());
            record.setMemberType(Constants.RetentionMemberType.fk);//默认为未知人员（访客）
            record.setIsdeleted(Constants.ZERO);
            record.setHkEventId(request.getEventId());
            record.setHkId(userNo);
            if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
                if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){
                if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){
                    //如果是进门，录入人员的在场数据记录
                    record.setInOrOut(Constants.ZERO);
                    inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//入场人次
@@ -567,6 +568,8 @@
                //如果人员信息存在，切是访客通行，则删除之前的所有进场数据（无论此次推送是进厂还是出场推送事件）
                delRetentionLis.add(visits.getMemberId());
                InoutRecord record = new InoutRecord();
                record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
                        request.getData().getParamValues().getSrcName():request.getSrcName());
                record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
                record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
                record.setType(Constants.ONE);//人员
@@ -899,6 +902,7 @@
            carrecord.setType(Constants.ZERO);//车辆
            carrecord.setIsdeleted(Constants.ZERO);
            carrecord.setObjType(Constants.ZERO);
            carrecord.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());//停车场和出入口
            carrecord.setHkEventId(request.getEventId());
            carrecord.setCarCode(event.getPlateNos());
            Cars carModel = carsMapper.selectJoinOne(Cars.class,new MPJLambdaWrapper<Cars>()
@@ -928,7 +932,7 @@
                event.setMemberId(carModel.getMemberId());
                event.setCompanyId(carModel.getGroupId());
                //-----------------20250429改造----start---------------
                event.setCarType(carModel.getBizType());//车辆业务类型
                event.setCarType(carModel.getBizType()==null?Constants.RetentionCarType.self : carModel.getBizType());//车辆业务类型
                carrecord.setObjType(Constants.FOUR);
                carrecord.setMemberName(carModel.getMemberName());//司机
                carrecord.setMemberPhone(carModel.getMemberPhone());//司机
@@ -1031,7 +1035,7 @@
                delRetentionList.add(event.getPlateNos());
                delMemberRetentionList.add(event.getMemberId());
                inoutDayCount.setOutCarNum(Constants.formatIntegerNum(inoutDayCount.getOutCarNum())+1);
                carrecord.setInOrOut(Constants.ZERO);
                carrecord.setInOrOut(Constants.ONE);
            }
            //车辆进入记录对应业务类型
            if(isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
@@ -1124,7 +1128,7 @@
                }
                //统计今日入园总人次
                inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);
            }else   if(carrecord.getMemberId()!=null &&  Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)) {
            }else if( Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)) {
                //如果是出园区
                if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)){
                    //如果是相关方，统计今日累计数
@@ -1137,13 +1141,11 @@
                inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);
            }
        }
        if(carrecord.getInOrOut() !=null) {//如果是出入记录
            if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
                carrecord.setCategoryName("未知车辆");//默认未知车辆
                carrecord.setCategoryParentName("未知车辆");//默认未知车辆
            }
            inoutRecordList.add(carrecord);//录入车辆以及携带人员的入园明细记录（非访客）
        }
    }

    private Category findCategoryByBizType(Integer carType,String tempname, String pName,List<Category> categoryList) {
@@ -1232,7 +1234,6 @@
        event.setSrcName(request.getSrcName());
        event.setSrcIndex(request.getSrcIndex());
        event.setRoadwayType(request.getData().getRoadwayType());
        event.setRoadwayName(request.getData().getRoadwayName());
        event.setRoadwayIndex(request.getData().getRoadwayIndex());
        event.setPlateType(request.getData().getPlateType());
        event.setTimeout(request.getTimeout());
@@ -1245,6 +1246,7 @@
        event.setInoutType(request.getData().getInoutType());
        event.setHappenTime(request.getHappenTime());
        event.setGateName(request.getData().getGateName());
        event.setRoadwayName(request.getData().getRoadwayName());
        event.setGateIndex(request.getData().getGateIndex());
        event.setEventType(request.getEventType());
        event.setEventIndex(request.getData().getEventIndex());

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -668,7 +668,7 @@
        String pressure = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_PRESSURE_LEVEL).getCode();
        String liquid = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_LIQUID_LEVEL).getCode();
        String pressureUnit = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.PRESSURE_LEVEL_UNIT).getCode();
        String liquidUnit = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.LIQUID_LEVEL_UNIT).getCode();
        String liquidUnit = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LIQUID_LEVEL_UNIT).getCode();
        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
                && response.getData()!=null ) {
            List<MonitorDataSearchResponse> r = response.getData().getList();
@@ -676,8 +676,9 @@
                for(MonitorDataSearchResponse model : r){
                    MonitorDataVO m = new MonitorDataVO();
                    m.setName(model.getName());
                    m.setType(model.getType());
//                    m.setLevel(Constants.equalsInteger(model.getType(),60)?liquid:pressure);
                    m.setLevel(getLevelDataByDeviceName(model.getName(),Constants.equalsInteger(model.getType(),60)?liquidUnit:pressureUnit));
                    m.setLevel(getLevelDataByDeviceName(m,model.getName(),Constants.equalsInteger(model.getType(),60)?liquidUnit:pressureUnit));
                    m.setDataList(new ArrayList<>());
                    if(model.getValues()!=null){
                        List<MonitorDataInfoVO> dataList = new ArrayList<>();
@@ -715,7 +716,7 @@
        return  list;
    }

    private String getLevelDataByDeviceName(String name,String unit) {
    private String getLevelDataByDeviceName(MonitorDataVO m,String name,String unit) {

        /**
         *   {
@@ -747,7 +748,9 @@
                && response.getData()!=null ) {
            String min  = response.getData().getList().get(0).getFireproChannelMinValue();
            String max  = response.getData().getList().get(0).getFireproChannelMaxvalue();
            r  =StringUtils.defaultString(min,"-")+"~"+StringUtils.defaultString(max,"-") +unit;
            m.setMax(max);
            m.setMin(min);
            r  =StringUtils.defaultString(min,"-")+"～"+StringUtils.defaultString(max,"-") +unit;
        }
        return  r;