From 9b74b477139659d69fcf321d160724aa1cd90ce0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 18:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ResourcesByParamsRequest.java | 33 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ResourcesByParamsResponse.java | 30 ++
admin/src/views/business/reportRecord.vue | 13 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java | 4
admin/src/views/business/admissionStatistics.vue | 223 +++++++++++++-----
admin/src/views/business/carStatistics.vue | 217 ++++++++++++-----
admin/src/views/index.vue | 8
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
admin/src/views/vehicle/cars.vue | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 12
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 46 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 18 +
admin/src/views/business/retentionCars.vue | 25 -
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 8
screen/src/views/FireFighting.vue | 26 +
16 files changed, 500 insertions(+), 173 deletions(-)
diff --git a/admin/src/views/business/admissionStatistics.vue b/admin/src/views/business/admissionStatistics.vue
index 86ce112..0488658 100644
--- a/admin/src/views/business/admissionStatistics.vue
+++ b/admin/src/views/business/admissionStatistics.vue
@@ -3,7 +3,7 @@
<div class="main_head">
<div class="main_head_title">
<span>鍏ュ洯浜哄憳缁熻鎬昏</span>
- <el-radio-group v-model="isGroupBy" size="mini" @change="getData(), getRataLists(), getReportLists()">
+ <el-radio-group v-model="isGroupBy" @change="getData(), getRataLists(), getReportLists()">
<el-radio-button :label="0">鎸変汉娆＄粺璁�</el-radio-button>
<el-radio-button :label="1">鎸変汉鍛樼粺璁�</el-radio-button>
</el-radio-group>
@@ -42,18 +42,17 @@
<div class="dept_wrap">
<div class="title">
<span>浜哄憳鍒嗙被缁熻</span>
- <el-radio-group style="margin-left: 20px;" v-model="dateType" size="mini" @change="changeDateType">
- <el-radio-button label="month">鏈�</el-radio-button>
- <el-radio-button label="year">骞�</el-radio-button>
+ <el-radio-group style="margin-left: 43px;" v-model="dateType" @change="changeDateType">
+ <el-radio-button label="month">鏈堝害</el-radio-button>
+ <el-radio-button label="year">骞村害</el-radio-button>
</el-radio-group>
<el-date-picker
v-model="value"
:type="dateType"
- size="mini"
:clearable="false"
@change="getRataLists()"
:value-format="dateType === 'month' ? 'yyyy-MM' : 'yyyy'"
- style="margin-left: 20px; width: 130px;"
+ style="margin-left: 10px; width: 130px;"
placeholder="璇烽�夋嫨">
</el-date-picker>
</div>
@@ -66,24 +65,23 @@
<div class="main_table">
<div class="main_table_list">
<div class="title" style="display: flex; align-items: center; justify-content: space-between;">
- <div>
+ <div style="display: flex; align-items: center;">
<span>鍏ュ洯浜哄憳缁熻琛�</span>
- <el-radio-group style="margin-left: 20px;" v-model="radio" size="mini" @change="changeBB">
- <el-radio-button label="month">鏈�</el-radio-button>
- <el-radio-button label="year">骞�</el-radio-button>
+ <el-radio-group style="margin-left: 43px;" v-model="radio" @change="changeBB">
+ <el-radio-button label="month">鏈堝害</el-radio-button>
+ <el-radio-button label="year">骞村害</el-radio-button>
</el-radio-group>
<el-date-picker
v-model="date1"
:type="radio"
:clearable="false"
- size="mini"
@change="getReportLists()"
:value-format="radio === 'month' ? 'yyyy-MM' : 'yyyy'"
- style="margin-left: 20px; width: 130px;"
+ style="margin-left: 10px; width: 130px;"
placeholder="璇烽�夋嫨">
</el-date-picker>
</div>
- <el-button type="primary" size="mini" style="margin-left: 20px;" @click="daochu">瀵煎嚭</el-button>
+ <el-button type="primary" icon="el-icon-upload2" style="margin-left: 20px;" @click="daochu">瀵煎嚭</el-button>
</div>
<div class="list_head">
<div class="list_head_item" v-for="(item, index) in column" :key="index">{{item}}</div>
@@ -216,10 +214,10 @@
let option = {
grid: {
- left: '5%',
- right: '10%',
- bottom: '0%',
- top: '20%',
+ left: '0%',
+ right: '5%',
+ bottom: '10%',
+ top: '10%',
containLabel: true
},
tooltip: {
@@ -235,7 +233,48 @@
series: [
{
data: datas,
- type: 'line'
+ type: 'line',
+ areaStyle: {
+ normal: {
+ color: {
+ x: 0,
+ y: 0,
+ x2: 0,
+ y2: 1,
+ colorStops: [{
+ offset: 0,
+ color: '#207FF7' // 0% 澶勭殑棰滆壊
+ }, {
+ offset: 1,
+ color: 'rgba(255,255,255,.2)' // 100% 澶勭殑棰滆壊
+ }],
+ globalCoord: false // 缂虹渷涓� false
+ }
+ }
+ },
+ lineStyle: { // 绾挎潯鏍峰紡
+ color: {
+ type: 'linear',
+ x: 0,
+ y: 0,
+ x2: 0,
+ y2: 1,
+ colorStops: [{
+ offset: 0, color: '#207FF7' // 0% 澶勭殑棰滆壊
+ }, {
+ offset: 1, color: '#207FF7' // 100% 澶勭殑棰滆壊
+ }]
+ },
+ width: 2 // 绾挎潯绮楃粏
+ },
+ symbol: 'circle',
+ symbolSize: 10,
+ itemStyle: {
+ borderWidth: 1,
+ borderColor: '#fff',
+ color: '#207FF7'
+ },
+ smooth: false
}
]
}
@@ -270,7 +309,24 @@
{
name: '璁块棶鏉ユ簮',
type: 'pie',
- radius: '55%',
+ radius: ['34%', '50%'],
+ labelLine: {
+ normal: {
+ length: 30,
+ length2: 100,
+ }
+ },
+ label: {
+ formatter: "{a|{b}} {d}%",
+ rich: {
+ a: {
+ color: '#333333',
+ fontSize: 14,
+ fontWeight: 500
+ }
+ },
+ padding: [0,-50,20,-100]
+ },
data: data
}
]
@@ -322,21 +378,24 @@
overflow-x: hidden;
padding: 15px;
box-sizing: border-box;
- background-color: #ffffff;
+ background-color: #F4F7FC;
.main_head {
width: 100%;
display: flex;
align-items: center;
flex-direction: column;
- margin-bottom: 20px;
+ margin-bottom: 10px;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
.main_head_title {
width: 100%;
display: flex;
align-items: center;
margin-bottom: 20px;
span {
- font-weight: 600;
- font-size: 16px;
+ font-weight: 500;
+ font-size: 18px;
color: #222222;
margin-right: 30px;
}
@@ -347,39 +406,40 @@
align-items: center;
justify-content: space-between;
.blue {
- border-left: 5px solid blue;
+ border-left: 8px solid #12BB8B;
}
.red {
- border-left: 5px solid red;
+ border-left: 8px solid #F6CF46;
}
.yellow {
- border-left: 5px solid yellow;
+ border-left: 8px solid #5DC9FB;
}
.orange {
- border-left: 5px solid orange;
+ border-left: 8px solid #FF9E56;
}
.darkBlue {
- border-left: 5px solid #0000a8;
+ border-left: 8px solid #6B6EFF;
}
.main_head_item {
width: 19%;
- height: 70px;
+ height: 112px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
box-sizing: border-box;
border-radius: 5px;
- background-color: #ffffff;
+ background-color: #F4F7FC;
span {
&:nth-child(1) {
- font-size: 22px;
- color: black;
- font-weight: bold;
+ font-weight: 600;
+ font-size: 30px;
+ color: #222222;
}
&:nth-child(2) {
- font-size: 16px;
- color: black;
+ font-weight: 400;
+ font-size: 14px;
+ color: #222222;
}
}
}
@@ -388,27 +448,31 @@
.main_table {
display: flex;
- align-items: center;
+ align-items: start;
justify-content: space-between;
- height: 300px;
+ margin-top: 10px;
.main_table_list {
- margin-left: 20px;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
flex: 1;
.title {
display: flex;
align-items: center;
span {
- font-weight: 600;
- font-size: 16px;
+ font-weight: 500;
+ font-size: 18px;
color: #222222;
}
}
.list_head {
width: 100%;
- height: 35px;
+ height: 50px;
display: flex;
align-items: center;
- background-color: #ececec;
+ background-color: #F7F7F7;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
margin-top: 15px;
.list_head_item {
flex: 1;
@@ -418,20 +482,25 @@
justify-content: center;
font-size: 13px;
color: #222222;
+ font-weight: 500;
+ border-right: 1px solid #DFE2E8;
}
}
.table_box {
width: 100%;
- height: 234px;
+ border-bottom: 1px solid #DFE2E8;
.list_content {
width: 100%;
- height: 40px;
+ height: 50px;
display: flex;
align-items: center;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
.list_head_item {
flex: 1;
height: 100%;
display: flex;
+ border-right: 1px solid #DFE2E8;
align-items: center;
justify-content: center;
font-size: 13px;
@@ -441,48 +510,64 @@
}
}
.main_table_list1 {
- margin-left: 20px;
- width: 300px;
+ margin-left: 10px;
+ width: 520px;
+ padding: 20px;
+ box-sizing: border-box;
flex-shrink: 0;
+ background-color: #ffffff;
.title {
- font-weight: 600;
- font-size: 16px;
+ font-weight: 500;
+ font-size: 18px;
color: #222222;
}
.list_head {
width: 100%;
- height: 35px;
+ height: 50px;
display: flex;
align-items: center;
- background-color: #ececec;
+ background-color: #F7F7F7;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
margin-top: 15px;
.list_head_item {
- flex: 1;
+ flex: 1.8;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
font-size: 13px;
color: #222222;
+ font-weight: 500;
+ border-right: 1px solid #DFE2E8;
+ &:last-child {
+ flex: 1;
+ }
}
}
.table_box {
width: 100%;
- height: 234px;
+ border-bottom: 1px solid #DFE2E8;
.list_content {
width: 100%;
- height: 40px;
+ height: 50px;
display: flex;
align-items: center;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
.list_head_item {
- flex: 1;
+ flex: 1.8;
height: 100%;
display: flex;
align-items: center;
+ border-right: 1px solid #DFE2E8;
justify-content: center;
text-align: center;
font-size: 13px;
color: #222222;
+ &:last-child {
+ flex: 1;
+ }
}
}
}
@@ -491,38 +576,42 @@
.main_content {
display: flex;
+ align-items: center;
+ justify-content: space-between;
height: 400px;
.title {
- font-weight: 600;
- font-size: 16px;
+ font-weight: 500;
+ font-size: 18px;
color: #222222;
- /*margin-bottom: 20px;*/
- margin-top: 20px;
}
.type_wrap {
- flex: 11;
- flex-shrink: 0;
- height: calc(100% - 20px);
+ flex: 1;
+ height: 100%;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
/*border-right: 12px solid #f7f7f7;*/
.echart1 {
width: 100%;
- height: calc(100% - 60px);
+ height: 100%;
}
}
.dept_wrap {
- flex: 8;
+ width: 520px;
flex-shrink: 0;
- height: calc(100% - 20px);
- padding-left: 20px;
-
+ height: 100%;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
+ margin-left: 10px;
.echart2 {
width: 100%;
- height: calc(100% - 60px);
+ height: 100%;
}
}
}
diff --git a/admin/src/views/business/carStatistics.vue b/admin/src/views/business/carStatistics.vue
index eab7479..6ada707 100644
--- a/admin/src/views/business/carStatistics.vue
+++ b/admin/src/views/business/carStatistics.vue
@@ -3,7 +3,7 @@
<div class="main_head">
<div class="main_head_title">
<span>鍏ュ洯杞﹁締缁熻鎬昏</span>
- <el-radio-group v-model="isGroupBy" size="mini" @change="getData(), getRataLists(), getReportLists()">
+ <el-radio-group v-model="isGroupBy" @change="getData(), getRataLists(), getReportLists()">
<el-radio-button :label="0">鎸夎溅娆＄粺璁�</el-radio-button>
<el-radio-button :label="1">鎸夎溅杈嗙粺璁�</el-radio-button>
</el-radio-group>
@@ -42,14 +42,13 @@
<div class="dept_wrap">
<div class="title">
<span>杞﹁締鍒嗙被缁熻</span>
- <el-radio-group style="margin-left: 20px;" v-model="dateType" size="mini" @change="changeDateType">
- <el-radio-button label="month">鏈�</el-radio-button>
- <el-radio-button label="year">骞�</el-radio-button>
+ <el-radio-group style="margin-left: 20px;" v-model="dateType" @change="changeDateType">
+ <el-radio-button label="month">鏈堝害</el-radio-button>
+ <el-radio-button label="year">骞村害</el-radio-button>
</el-radio-group>
<el-date-picker
v-model="value"
:type="dateType"
- size="mini"
:clearable="false"
@change="getRataLists()"
:value-format="dateType === 'month' ? 'yyyy-MM' : 'yyyy'"
@@ -66,16 +65,15 @@
<div class="main_table">
<div class="main_table_list">
<div class="title" style="display: flex; align-items: center; justify-content: space-between;">
- <div>
+ <div style="display: flex; align-items: center;">
<span>鍏ュ洯杞﹁締缁熻琛�</span>
- <el-radio-group style="margin-left: 20px;" v-model="radio" size="mini" @change="changeBB">
- <el-radio-button label="month">鏈�</el-radio-button>
- <el-radio-button label="year">骞�</el-radio-button>
+ <el-radio-group style="margin-left: 20px;" v-model="radio" @change="changeBB">
+ <el-radio-button label="month">鏈堝害</el-radio-button>
+ <el-radio-button label="year">骞村害</el-radio-button>
</el-radio-group>
<el-date-picker
v-model="date1"
:type="radio"
- size="mini"
:clearable="false"
@change="getReportLists()"
:value-format="radio === 'month' ? 'yyyy-MM' : 'yyyy'"
@@ -83,7 +81,7 @@
placeholder="璇烽�夋嫨">
</el-date-picker>
</div>
- <el-button type="primary" size="mini" style="margin-left: 20px;" @click="daochu">瀵煎嚭</el-button>
+ <el-button type="primary" style="margin-left: 20px;" icon="el-icon-upload2" @click="daochu">瀵煎嚭</el-button>
</div>
<div class="list_head">
<div class="list_head_item" v-for="(item, index) in column" :key="index">{{item}}</div>
@@ -227,9 +225,9 @@
left: 'left'
},
grid: {
- left: '5%',
- right: '10%',
- bottom: '0%',
+ left: '0%',
+ right: '5%',
+ bottom: '10%',
top: '20%',
containLabel: true
},
@@ -243,7 +241,48 @@
series: [
{
data: datas,
- type: 'line'
+ type: 'line',
+ areaStyle: {
+ normal: {
+ color: {
+ x: 0,
+ y: 0,
+ x2: 0,
+ y2: 1,
+ colorStops: [{
+ offset: 0,
+ color: '#207FF7' // 0% 澶勭殑棰滆壊
+ }, {
+ offset: 1,
+ color: 'rgba(255,255,255,.2)' // 100% 澶勭殑棰滆壊
+ }],
+ globalCoord: false // 缂虹渷涓� false
+ }
+ }
+ },
+ lineStyle: { // 绾挎潯鏍峰紡
+ color: {
+ type: 'linear',
+ x: 0,
+ y: 0,
+ x2: 0,
+ y2: 1,
+ colorStops: [{
+ offset: 0, color: '#207FF7' // 0% 澶勭殑棰滆壊
+ }, {
+ offset: 1, color: '#207FF7' // 100% 澶勭殑棰滆壊
+ }]
+ },
+ width: 2 // 绾挎潯绮楃粏
+ },
+ symbol: 'circle',
+ symbolSize: 10,
+ itemStyle: {
+ borderWidth: 1,
+ borderColor: '#fff',
+ color: '#207FF7'
+ },
+ smooth: false
}
]
}
@@ -278,7 +317,24 @@
{
name: '璁块棶鏉ユ簮',
type: 'pie',
- radius: '55%',
+ radius: ['34%', '50%'],
+ labelLine: {
+ normal: {
+ length: 30,
+ length2: 100,
+ }
+ },
+ label: {
+ formatter: "{a|{b}} {d}%",
+ rich: {
+ a: {
+ color: '#333333',
+ fontSize: 14,
+ fontWeight: 500
+ }
+ },
+ padding: [0,-50,20,-100]
+ },
data: data
}
]
@@ -330,21 +386,24 @@
overflow-x: hidden;
padding: 15px;
box-sizing: border-box;
- background-color: #ffffff;
+ background-color: #F4F7FC;
.main_head {
width: 100%;
display: flex;
align-items: center;
flex-direction: column;
- margin-bottom: 20px;
+ margin-bottom: 10px;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
.main_head_title {
width: 100%;
display: flex;
align-items: center;
margin-bottom: 20px;
span {
- font-weight: 600;
- font-size: 16px;
+ font-weight: 500;
+ font-size: 18px;
color: #222222;
margin-right: 30px;
}
@@ -355,39 +414,40 @@
align-items: center;
justify-content: space-between;
.blue {
- border-left: 5px solid blue;
+ border-left: 8px solid #12BB8B;
}
.red {
- border-left: 5px solid red;
+ border-left: 8px solid #F6CF46;
}
.yellow {
- border-left: 5px solid yellow;
+ border-left: 8px solid #5DC9FB;
}
.orange {
- border-left: 5px solid orange;
+ border-left: 8px solid #FF9E56;
}
.darkBlue {
- border-left: 5px solid #0000a8;
+ border-left: 8px solid #6B6EFF;
}
.main_head_item {
width: 19%;
- height: 70px;
+ height: 112px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
box-sizing: border-box;
border-radius: 5px;
- background-color: #ffffff;
+ background-color: #F4F7FC;
span {
&:nth-child(1) {
- font-size: 22px;
- color: black;
- font-weight: bold;
+ font-weight: 600;
+ font-size: 30px;
+ color: #222222;
}
&:nth-child(2) {
- font-size: 16px;
- color: black;
+ font-weight: 400;
+ font-size: 14px;
+ color: #222222;
}
}
}
@@ -396,27 +456,31 @@
.main_table {
display: flex;
- align-items: center;
+ align-items: start;
justify-content: space-between;
- height: 300px;
+ margin-top: 10px;
.main_table_list {
- margin-left: 20px;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
flex: 1;
.title {
display: flex;
align-items: center;
span {
- font-weight: 600;
- font-size: 16px;
+ font-weight: 500;
+ font-size: 18px;
color: #222222;
}
}
.list_head {
width: 100%;
- height: 35px;
+ height: 50px;
display: flex;
align-items: center;
- background-color: #ececec;
+ background-color: #F7F7F7;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
margin-top: 15px;
.list_head_item {
flex: 1;
@@ -426,20 +490,25 @@
justify-content: center;
font-size: 13px;
color: #222222;
+ font-weight: 500;
+ border-right: 1px solid #DFE2E8;
}
}
.table_box {
width: 100%;
- height: 234px;
+ border-bottom: 1px solid #DFE2E8;
.list_content {
width: 100%;
- height: 40px;
+ height: 50px;
display: flex;
align-items: center;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
.list_head_item {
flex: 1;
height: 100%;
display: flex;
+ border-right: 1px solid #DFE2E8;
align-items: center;
justify-content: center;
font-size: 13px;
@@ -449,48 +518,64 @@
}
}
.main_table_list1 {
- margin-left: 20px;
- width: 300px;
+ margin-left: 10px;
+ width: 520px;
+ padding: 20px;
+ box-sizing: border-box;
flex-shrink: 0;
+ background-color: #ffffff;
.title {
- font-weight: 600;
- font-size: 16px;
+ font-weight: 500;
+ font-size: 18px;
color: #222222;
}
.list_head {
width: 100%;
- height: 35px;
+ height: 50px;
display: flex;
align-items: center;
- background-color: #ececec;
+ background-color: #F7F7F7;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
margin-top: 15px;
.list_head_item {
- flex: 1;
+ flex: 1.8;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
font-size: 13px;
color: #222222;
+ font-weight: 500;
+ border-right: 1px solid #DFE2E8;
+ &:last-child {
+ flex: 1;
+ }
}
}
.table_box {
width: 100%;
- height: 234px;
+ border-bottom: 1px solid #DFE2E8;
.list_content {
width: 100%;
- height: 40px;
+ height: 50px;
display: flex;
align-items: center;
+ border-left: 1px solid #DFE2E8;
+ border-top: 1px solid #DFE2E8;
.list_head_item {
- flex: 1;
+ flex: 1.8;
height: 100%;
display: flex;
align-items: center;
+ border-right: 1px solid #DFE2E8;
justify-content: center;
text-align: center;
font-size: 13px;
color: #222222;
+ &:last-child {
+ flex: 1;
+ }
}
}
}
@@ -499,38 +584,42 @@
.main_content {
display: flex;
+ align-items: center;
+ justify-content: space-between;
height: 400px;
.title {
- font-weight: 600;
- font-size: 16px;
+ font-weight: 500;
+ font-size: 18px;
color: #222222;
- /*margin-bottom: 20px;*/
- margin-top: 20px;
}
.type_wrap {
- flex: 11;
- flex-shrink: 0;
- height: calc(100% - 20px);
+ flex: 1;
+ height: 100%;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
/*border-right: 12px solid #f7f7f7;*/
#echart1 {
width: 100%;
- height: calc(100% - 60px);
+ height: 100%;
}
}
.dept_wrap {
- flex: 8;
+ width: 520px;
flex-shrink: 0;
- height: calc(100% - 20px);
- padding-left: 20px;
-
+ height: 100%;
+ background-color: #ffffff;
+ padding: 20px;
+ box-sizing: border-box;
+ margin-left: 10px;
.echart_2 {
width: 100%;
- height: calc(100% - 60px);
+ height: 100%;
}
}
}
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index 1925e01..2fad862 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -142,6 +142,11 @@
filed: 'companyName',
type: 'input',
label: '鍏徃鍚嶇О'
+ },
+ {
+ filed: 'date',
+ type: 'daterange',
+ label: '璧峰鏃ユ湡'
}
],
online: true
@@ -234,6 +239,14 @@
},
getList (page) {
const { pagination, filters } = this
+ console.log(filters)
+ if (filters.date && filters.date.length === 2) {
+ filters.queryStarttime = filters.date[0]
+ filters.queryEndtime = filters.date[1]
+ } else {
+ filters.queryStarttime = ''
+ filters.queryEndtime = ''
+ }
pagination.page = page || pagination.page
fetchList({
model: { ...filters },
diff --git a/admin/src/views/business/retentionCars.vue b/admin/src/views/business/retentionCars.vue
index 815a2fa..0cdb7e7 100644
--- a/admin/src/views/business/retentionCars.vue
+++ b/admin/src/views/business/retentionCars.vue
@@ -11,16 +11,8 @@
<el-form-item label="缁勭粐" prop="companyName">
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="杞﹁締绫诲瀷" prop="carType">
- <el-select v-model="searchForm.carType" placeholder="璇烽�夋嫨">
- <el-option label="鍐呴儴杞﹁締" value="0"></el-option>
- <el-option label="鐩稿叧鏂硅溅杈�" value="1"></el-option>
- <el-option label="璁垮杞﹁締" value="2"></el-option>
- <el-option label="鍐呰繍鐗╂祦杞�" value="3"></el-option>
- <el-option label="澶栧崗杞﹁締" value="4"></el-option>
- <el-option label="甯傚叕鍙稿嵏璐ц溅" value="5"></el-option>
- <el-option label="鏈櫥璁拌溅杈�" value="6"></el-option>
- </el-select>
+ <el-form-item label="杞﹁締鍒嗙被" prop="categoryName">
+ <el-input v-model="searchForm.categoryName" placeholder="璇疯緭鍏ヨ溅杈嗗垎绫�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="璧锋鏃堕棿" prop="startTime">
<!-- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
@@ -58,17 +50,7 @@
<span>{{ row.companyName || row.visitCompanyName || '' }}</span>
</template>
</el-table-column>
- <el-table-column prop="carType" label="杞﹁締绫诲瀷" min-width="100px">
- <template slot-scope="{ row }">
- <span v-if="row.carType == 0">鍐呴儴杞﹁締</span>
- <span v-else-if="row.carType == 1">鐩稿叧鏂硅溅杈�</span>
- <span v-else-if="row.carType == 2">璁垮杞﹁締</span>
- <span v-else-if="row.carType == 3">鍐呰繍鐗╂祦杞�</span>
- <span v-else-if="row.carType == 4">澶栧崗杞﹁締</span>
- <span v-else-if="row.carType == 5">甯傚叕鍙稿嵏璐ц溅</span>
- <span v-else-if="row.carType == 6">鏈櫥璁拌溅杈�</span>
- </template>
- </el-table-column>
+ <el-table-column prop="categoryName" label="杞﹁締鍒嗙被" min-width="100px"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<!-- <el-table-column label="杩涘満闂ㄧ" min-width="100px">
@@ -108,6 +90,7 @@
keyWords: '',
startTime: '',
endTime: '',
+ categoryName: '',
radio: 0
},
time: []
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 135d2c6..bdc4cd3 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -359,11 +359,13 @@
getAppHeaderNav(4).then(res => {
window.open(res, '_blank')
})
+ return
}
- if (item.name == '椋熷爞娑堣垂鍏ュ彛') {
+ if (item.name == '椋熷爞娑堣垂') {
getAppHeaderNav(6).then(res => {
window.open(res, '_blank')
})
+ return
}
this.$router.push(item.path)
},
@@ -678,7 +680,7 @@
<div>${params[0].name}</div>
<div style="display: flex;align-items: center;">
<div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
- <span style="margin-left: 6px;">${params[0].value}</span>
+ <span style="margin-left: 6px;">${params[0].value || 0}</span>
<div>杈�</div>
</div>
</div>
@@ -1128,7 +1130,7 @@
width: 100%;
height: 100%;
overflow: auto;
- padding: 20px;
+ padding: 20px 20px 40px 20px;
padding-top: 92px;
.home_header {
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index ba3dde6..a4fcc63 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -212,9 +212,10 @@
this.$nextTick(() => {
this.$refs.operaCarsWindow.open(str, row)
if (row && row.id) {
- let form = { ...row, cateId: [] }
- if (row.catePId) { form.cateId.push(row.catePId) }
- if (row.cateId) { form.cateId.push(row.cateId) }
+ // let form = { ...row, cateId: [] }
+ let form = { ...row }
+ // if (row.catePId) { form.cateId.push(row.catePId) }
+ // if (row.cateId) { form.cateId.push(row.cateId) }
this.$refs.operaCarsWindow.form = form
this.$refs.operaCarsWindow.loadMember()
}
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index 96d6c56..e0f7382 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -351,11 +351,13 @@
const initWatergage = (id, item) => {
const myChart = echarts.init(document.getElementById(id))
var data_value = item.obj.value.replaceAll('Mpa', '')
- const startI = item.level.indexOf('-')
- const endI = item.level.indexOf('Mpa')
- let maxNum = item.level.slice(startI + 1, endI)
- let minNum = item.level.slice(0, startI)
- // let maxNum =
+ // const startI = item.level.indexOf('-')
+ // const endI = item.level.indexOf('Mpa')
+ // let maxNum = item.level.slice(startI + 1, endI)
+ // let minNum = item.level.slice(0, startI)
+ let maxNum = item.max
+ let minNum = item.min
+ // let maxNum =
const option = {
barMaxWidth: 3,
polar: {
@@ -517,10 +519,12 @@
}
const initLiquidlevel = (id, item) => {
const myChart = echarts.init(document.getElementById(id))
- const startI = item.level.indexOf('-')
- const endI = item.level.indexOf('M')
- let maxNum = item.level.slice(startI + 1, endI)
- let minNum = item.level.slice(0, startI)
+ // const startI = item.level.indexOf('-')
+ // const endI = item.level.indexOf('M')
+ // let maxNum = item.level.slice(startI + 1, endI)
+ // let minNum = item.level.slice(0, startI)
+ let maxNum = item.max
+ let minNum = item.min
let conNum = maxNum - minNum
let acNum = item.obj.value.replaceAll('M', '')
var data = (((acNum - minNum) / conNum) * 100).toFixed(0)
@@ -1119,7 +1123,7 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
-
+
}
.name {
@@ -1893,4 +1897,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index dd51620..73aecd0 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -151,6 +151,8 @@
public static final String SCREEN_SEVENT_ARRIVAL_STARTDATE = "SCREEN_SEVENT_ARRIVAL_STARTDATE";
public static final String EARLY_START_WX_NOTICE = "EARLY_START_WX_NOTICE";
public static final String OVER_NOTICE_WX = "OVER_NOTICE_WX";
+ public static final String PRESSURE_LEVEL_UNIT = "PRESSURE_LEVEL_UNIT";
+ public static final String LIQUID_LEVEL_UNIT ="LIQUID_LEVEL_UNIT" ;
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 6d540f1..bbbfaf8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -628,6 +628,7 @@
String[] regionDataRanking= new String[]{"/api/ecm/v1/energy/regionDataRanking","娑堥槻鐪嬫澘-4鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕-鑳借�楃湅鏉�"};//娑堥槻鐪嬫澘-鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕 - 鑳借�楃湅鏉�
String[] energyTotal= new String[]{"/api/ecm/v1/energy/energyTotal","娑堥槻鐪嬫澘-4鏍规嵁鏃堕棿鍜屾椂闂寸淮搴﹁幏鍙栧洯鍖鸿兘鑰楁暟鎹�"};//娑堥槻鐪嬫澘-鏍规嵁鏃堕棿鍜屾椂闂寸淮搴﹁幏鍙栧洯鍖鸿兘鑰楁暟鎹�
String[] findDeviceStatistics= new String[]{"/api/v1/device/findDeviceStatistics","鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁�"};// 鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁�
+ String[] resourcesByParams= new String[]{"/api/irds/v2/resource/resourcesByParams","銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃"};// 銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃
String[] iccmSignoff= new String[]{"/api/iccm/v1/signoff","iccm璁垮绛剧"};// iccm璁垮绛剧
}
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 8f3c266..d305617 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -908,6 +908,14 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.findDeviceStatistics,body);
}
/**
+ * 銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String resourcesByParams(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.resourcesByParams,body);
+ }
+ /**
*娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
* @param body
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ResourcesByParamsRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ResourcesByParamsRequest.java
new file mode 100644
index 0000000..e3276aa
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ResourcesByParamsRequest.java
@@ -0,0 +1,33 @@
+package com.doumee.core.haikang.model.param.request;
+
+import com.alibaba.fastjson.JSONArray;
+import com.doumee.core.haikang.model.param.BaseListPageRequest;
+import lombok.Data;
+
+/**
+ * {
+ * "name":"娑�",
+ * "regionIndexCodes": [
+ * "root000000"
+ * ],
+ * "isSubRegion": true,
+ * "resourceType": "fireSensor",
+ * "pageNo": 1,
+ * "pageSize": 20,
+ * "orderBy": "name",
+ * "orderType": "desc"
+ * }
+ */
+
+@Data
+public class ResourcesByParamsRequest extends BaseListPageRequest {
+private String name ;//String false 鍚嶇О锛屾ā绯婃悳绱紝鏈�澶ч暱搴�32锛岃嫢鍖呭惈涓枃锛屾渶澶ч暱搴︽寚涓嶈秴杩囨寜鐓ф寚瀹氱紪鐮佺殑瀛楄妭闀垮害锛屽嵆getBytes("utf-8").length
+private String[] regionIndexCodes;// Array false 鍖哄煙缂栧彿,鍙互涓虹┖;String[]锛屾敮鎸佹牴鎹尯鍩熸壒閲忔煡璇紱鍖哄煙缂栧彿涓暟<=1000涓紱鍗曚釜闀垮害<=64Byte锛涳紝鍙粠[鏌ヨ鍖哄煙鍒楄〃v2]@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-API鍒楄〃-璧勬簮鐩綍-鍖哄煙淇℃伅鎺ュ彛#鏌ヨ鍖哄煙鍒楄〃v2]鎺ュ彛鑾峰彇杩斿洖鍙傛暟indexCode
+private Boolean isSubRegion;// Boolean false true鏃讹紝鎼滅储regionIndexCodes鍙婂叾瀛愬瓩鍖哄煙鐨勮祫婧愶紱false鏃讹紝鍙悳绱� regionIndexCodes鐨勮祫婧�
+private String resourceType ;//String true 璧勬簮绫诲瀷锛岃瑙乕闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚姝ゅ鐨勮祫婧愮被鍨嬫寚璁惧璧勬簮锛屽闂ㄧ鎺у埗鍣ㄣ�侀棬绂佺偣锛涙敞锛氳祫婧恑asDevice\reader\floor鏃犻渶杩涜鏉冮檺鏍￠獙
+private String[] authCodes;// Array false 鏉冮檺鐮侀泦鍚堬紝璇﹁[闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚
+private String[] capabilitySet;// Array false 璁惧鑳藉姏闆�(鍚澶囦笂鐨勬櫤鑳借兘鍔�)锛岃瑙乕闄勫綍A.44 璁惧鑳藉姏闆哴@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.44 璁惧鑳藉姏闆哴
+ private String orderBy;// String false 鎺掑簭瀛楁,娉ㄦ剰锛氭帓搴忓瓧娈靛繀椤绘槸鏌ヨ鏉′欢锛屽惁鍒欒繑鍥炲弬鏁伴敊璇�
+private String orderType ;//String false 闄嶅簭鍗囧簭,闄嶅簭锛歞esc 鍗囧簭锛歛sc
+private JSONArray expressions ;//Array false 鏌ヨ琛ㄨ揪寮�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ResourcesByParamsResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ResourcesByParamsResponse.java
new file mode 100644
index 0000000..0f5cec0
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ResourcesByParamsResponse.java
@@ -0,0 +1,30 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ResourcesByParamsResponse {
+ private String indexCode ;//String false 闂ㄧ鐐瑰敮涓�鏍囪瘑
+ private String name;//String false 闂ㄧ鐐瑰悕绉�
+ private String resourceType;// String false 璧勬簮绫诲瀷锛岃瑙乕闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.3 璧勬簮绫诲瀷/璧勬簮鏉冮檺鐮乚
+ private String doorNo ;//Number false 闂ㄧ鐐圭紪鍙�
+ private String description;// String false 鎻忚堪
+ private String parentIndexCodes;// String false 鐖剁骇璧勬簮缂栧彿
+ private String regionIndexCode;// String false 鎵�灞炲尯鍩熷敮涓�鏍囪瘑
+ private String regionPath;// String false 鎵�灞炲尯鍩熻矾寰勶紝鐢卞敮涓�鏍囩ず缁勬垚锛屾渶澶�10绾э紝鏍煎紡锛� @鏍硅妭鐐笯瀛愬尯鍩�1@瀛愬尯鍩�2@
+ private String channelType ;//String false 閫氶亾绫诲瀷
+ private String channelNo;// String false 閫氶亾鍙�
+ private String installLocation;// String false 瀹夎浣嶇疆
+ private String capabilitySet;// String false 璁惧鑳藉姏闆嗭紝璇﹁[闄勫綍A.44 璁惧鑳藉姏闆哴@[杞欢浜у搧-缁煎悎瀹夐槻绠＄悊骞冲彴-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.44 璁惧鑳藉姏闆哴
+ private String controlOneId;// String false 涓�绾ф帶鍒跺櫒id
+ private String controlTwoId;// String false 浜岀骇鎺у埗鍣╥d
+ private String readerInId;// String false 璇诲崱鍣�1
+ private String readerOutId;// String false 璇诲崱鍣�2
+ private String comId;// String false 缁勪欢鏍囧織
+ private String createTime ;//String false 鍒涘缓鏃堕棿
+ private String updateTime;// String false 鏇存柊鏃堕棿
+ private String fireproChannelMaxvalue;//":"3.5鈥�
+ private String fireproChannelMinValue;//": 鈥�0.50".
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 4a93cf7..820d0bd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1989,6 +1989,24 @@
return null;
}
/**
+ *鏍规嵁鏉′欢鏌ヨ鐩綍涓嬫湁鏉冮檺鐨勮祫婧愬垪琛�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<ResourcesByParamsResponse>> resourcesByParams(ResourcesByParamsRequest param){
+ log.info("銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.resourcesByParams(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<ResourcesByParamsResponse> >>(){};
+ BaseResponse<BaseListPageResponse<ResourcesByParamsResponse> > result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
* @return
*/
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java
index ea6fc86..b94b800 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java
@@ -25,6 +25,10 @@
@ApiModelProperty(value = "灏忕被缂栧彿")
private String cateCode;
+// @ApiModelProperty(value = "闃堝��")
+// private String level;
+
+
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 83d0616..3a0dbe1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -1034,7 +1034,7 @@
carrecord.setInOrOut(Constants.ZERO);
}
//杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
- if(event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other)){
+ if(isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
//濡傛灉鏈瘑鍒埌杞﹀瀷锛屼笉鏄浐瀹氳溅 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
@@ -1089,7 +1089,7 @@
}
}
}
- if(carrecord.getInOrOut()!=null && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
+ if(isCarInOrOutEvent(request) && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
//褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
dealNotFkCarMemberBiz(event,request,carrecord,retentionList,inoutDayCount,inoutRecordList);
}
@@ -1097,6 +1097,14 @@
return event;
}
+ private boolean isCarInOrOutEvent(EventParkInfoRequest request) {
+ if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey() ||
+ Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
+ return true;
+ }
+ return false;
+ }
+
private void dealNotFkCarMemberBiz( CarEvent event ,EventParkInfoRequest request, InoutRecord carrecord,List<Retention> retentionList,InoutDayCount inoutDayCount,List<InoutRecord> inoutRecordList) {
//褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
carrecord.setCarBizType(event.getCarType()==null?Constants.RetentionCarType.other:event.getCarType());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index b22d16d..ab833f6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -647,6 +647,8 @@
}
/**
* 銆愭秷闃茬鎺с�戠湅鏉�-瀹炴椂鐩戞祴鏁版嵁
+ * 娑插帇鍥哄畾鍊硷細254001
+ * 姘村帇鍥哄畾鍊硷細253958
* @return
*
*/
@@ -665,6 +667,8 @@
BaseResponse<BaseListPageResponse<MonitorDataSearchResponse>> response = HKService.minitorDataSearch(param);
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();
if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
&& response.getData()!=null ) {
List<MonitorDataSearchResponse> r = response.getData().getList();
@@ -672,7 +676,8 @@
for(MonitorDataSearchResponse model : r){
MonitorDataVO m = new MonitorDataVO();
m.setName(model.getName());
- m.setLevel(Constants.equalsInteger(model.getType(),60)?liquid:pressure);
+// m.setLevel(Constants.equalsInteger(model.getType(),60)?liquid:pressure);
+ m.setLevel(getLevelDataByDeviceName(model.getName(),Constants.equalsInteger(model.getType(),60)?liquidUnit:pressureUnit));
m.setDataList(new ArrayList<>());
if(model.getValues()!=null){
List<MonitorDataInfoVO> dataList = new ArrayList<>();
@@ -686,7 +691,6 @@
vm.setCateName(v.getMonitorSpecificName());
vm.setCateCode(v.getMonitorTypeKey());
vm.setTypeCode(v.getMonitorTypeCode());
- vm.setTypeName(v.getMonitorTypeName());
dataList.add(vm);
}
}else{
@@ -711,6 +715,44 @@
return list;
}
+ private String getLevelDataByDeviceName(String name,String unit) {
+
+ /**
+ * {
+ * "name":"娑�",
+ * "regionIndexCodes": [
+ * "root000000"
+ * ],
+ * "isSubRegion": true,
+ * "resourceType": "fireSensor",
+ * "pageNo": 1,
+ * "pageSize": 20,
+ * "orderBy": "name",
+ * "orderType": "desc"
+ * }
+ */
+ String r = "";
+
+ ResourcesByParamsRequest param = new ResourcesByParamsRequest();
+ param.setName(name);
+ param.setIsSubRegion(Boolean.TRUE);
+ param.setRegionIndexCodes(new String[]{"root000000"});
+ param.setResourceType("fireSensor");
+ param.setOrderType("desc");
+ param.setOrderBy("name");
+ param.setPageNo(1);
+ param.setPageSize(20);
+ BaseResponse<BaseListPageResponse<ResourcesByParamsResponse>> response = HKService.resourcesByParams(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && 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;
+ }
+ return r;
+
+ }
+
/**
* 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅澶勭悊鍒嗘瀽闆嗗悎
--
Gitblit v1.9.3