platform

sources/client/vrv-moblie/pages/dataCurve/dataCurve.vue

@@ -125,7 +125,7 @@
 
 				//温度
 				data: { //数据
-					categories: ["10:58:12", "11:58:12", "12:58:12", "13:58:12", "14:58:12"],
+					categories:  ['3时', '6时', '9时', '12时', '15时', '18时', '21时', '24时'],
 					series: [{
 						name: "温度实际值",
 
@@ -139,7 +139,7 @@
 
 				//湿度
 				data11: { //数据
-					categories11: ["10:58:12", "11:58:12", "12:58:12", "13:58:12", "14:58:12"],
+					categories11:   ['3时', '6时', '9时', '12时', '15时', '18时', '21时', '24时'],
 					series11: [{
 						name: "湿度实际值",
 						data: [40, 30, 36, 44, 38],

sources/client/vrv-moblie/pages/maintenanceRecord/maintenanceRecord.vue

@@ -6,7 +6,7 @@
 			<view class="content">
 				<text>变 量&nbsp;&nbsp;ID：{{item.variableId}}</text>
 				<text>提醒周期：{{item.promptInterval}}</text>
-				<text>上次提醒：</text>
+				<text>上次提醒：{{item.lastCreatTime | timeFilter}}</text>
 				<text>操&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;作：</text>
 
 			</view>
@@ -25,6 +25,14 @@
 				deviceAlarmRepairRecords: [],
 			}
 		},
+		filters: {
+			timeFilter(data) {
+				if(data!=='') {
+					let time = uni.$moment(data).format("YYYY-MM-DD HH:mm:ss")
+					return time
+				}
+			}
+		},
 		onLoad() {
 			uni.request({
 				url: 'http://127.0.0.1:9999/deviceAlarmRepairRecord/list',

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/dataCurve/dataCurve.js

@@ -282,7 +282,7 @@ var _default =
 
       //温度
       data: { //数据
-        categories: ["10:58:12", "11:58:12", "12:58:12", "13:58:12", "14:58:12"],
+        categories: ['3时', '6时', '9时', '12时', '15时', '18时', '21时', '24时'],
         series: [{
           name: "温度实际值",
 
@@ -296,7 +296,7 @@ var _default =
 
       //湿度
       data11: { //数据
-        categories11: ["10:58:12", "11:58:12", "12:58:12", "13:58:12", "14:58:12"],
+        categories11: ['3时', '6时', '9时', '12时', '15时', '18时', '21时', '24时'],
         series11: [{
           name: "湿度实际值",
           data: [40, 30, 36, 44, 38] },

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/maintenanceRecord/maintenanceRecord.js

@@ -99,6 +99,25 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var l0 = _vm.__map(_vm.deviceAlarmRepairRecords, function(item, __i0__) {
+    var $orig = _vm.__get_orig(item)
+
+    var f0 = _vm._f("timeFilter")(item.lastCreatTime)
+
+    return {
+      $orig: $orig,
+      f0: f0
+    }
+  })
+
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        l0: l0
+      }
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -159,6 +178,14 @@ var _default =
       deviceAlarmRepairRecords: [] };
 
   },
+  filters: {
+    timeFilter: function timeFilter(data) {
+      if (data !== '') {
+        var time = uni.$moment(data).format("YYYY-MM-DD HH:mm:ss");
+        return time;
+      }
+    } },
+
   onLoad: function onLoad() {var _this = this;
     uni.request({
       url: 'http://127.0.0.1:9999/deviceAlarmRepairRecord/list',

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -9,15 +9,8 @@
             "list": [
                 {
                     "name": "",
-                    "pathName": "pages/runningState/runningState",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/parameterSetting/parameterSetting",
-                    "query": "",
+                    "pathName": "pages/device/deviceInfo/deviceInfo",
+                    "query": "code=2d7b1ddcdb3d4567a85ea85de677c67b",
                     "launchMode": "default",
                     "scene": null
                 },

sources/client/vrv-platform/src/config/api.js

@@ -55,6 +55,7 @@ const api = {
             delete: `${root}/deviceParam/delete`,
             batchDelete: `${root}/deviceParam/batchDelete`,
             updateParam: `${root}/deviceParam/updateParam`,
+            getTimeData: `${root}/deviceParam/getTimeData`,
         },
         deviceAlarmRecord: {
             list: `${root}/deviceAlarmRecord/list`,

sources/client/vrv-platform/src/main.js

@@ -14,47 +14,21 @@ import 'element-ui/lib/theme-chalk/index.css';
 
 Vue.use(ElementUI);
 
-
-// //引入Fastboot UI库
-// import  FastbootUI from 'fastboot-ui/src/components';
-// import 'fastboot-ui/src/scss/element-theme.scss'
-
-
-// Vue.use(FastbootUI);
-
-
-// import FastbootAdmin from 'fastboot-admin';
-// import DictSelect from "fastboot-admin/src/components/DictSelect.vue";
-// import OrgCascader from "fastboot-admin/src/components/OrgCascader.vue";
-// import DictText from "fastboot-admin/src/components/DictText.vue";
-// import AreaCascader from "fastboot-admin/src/components/AreaCascader.vue";
-// import RoleSelect from "fastboot-admin/src/components/RoleSelect.vue";
-// Vue.component(DictSelect.name,DictSelect);
-// Vue.component(OrgCascader.name,OrgCascader);
-// Vue.component(AreaCascader.name,AreaCascader);
-// Vue.component(DictText.name,DictText);
-// Vue.component(RoleSelect.name,RoleSelect);
-
-
 //引入全局工具和配置
 import qs from 'qs'
 import axios from 'axios'
 
 //引入接口
 import api from './config/api'
-// let api = _.defaultsDeep(baseApi,FastbootAdmin.api);
-// router.addRoutes(FastbootAdmin.routes)
 
 import moment from 'moment'
 
-// import utils from './util/utils'
-
 Vue.prototype.$moment = moment;
 Vue.prototype.$api = api;
 Vue.prototype.$http = axios;
 Vue.prototype.$qs = qs;
 Vue.prototype.$echarts = echarts
-// Vue.prototype.$utils = utils;
+
 axios.defaults.withCredentials = true;
 
 Vue.config.productionTip = false

sources/client/vrv-platform/src/router/index.js

@@ -160,6 +160,13 @@ export default new Router({
                     meta: {title: '角色管理', tab: true, keepAlive: true},
                     component: () => import(/* webpackChunkName: "views" */ '../views/role/list'),
                 }
+                ,
+                {
+                    path: '/daping',
+                    name: 'daping',
+                    meta: {title: '数据可视化大屏', tab: true, keepAlive: true},
+                    component: () => import(/* webpackChunkName: "views" */ '../views/daping/dataCurve'),
+                }
             ]
         },
 

sources/client/vrv-platform/src/views/deviceAlarmRecord/detail.vue

@@ -139,8 +139,16 @@
             <el-table-column prop="alarmName" label="报警名称"></el-table-column>
             <el-table-column prop="alarmType" label="报警类型"></el-table-column>
             <el-table-column prop="content" label="告警内容"></el-table-column>
-            <el-table-column prop="startTime" label="开始时间"></el-table-column>
-            <el-table-column prop="endTime" label="结束时间"></el-table-column>
+            <el-table-column prop="startTime" label="开始时间">
+              <template slot-scope="scope">
+                {{ scope.row.startTime | timeFilter }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="endTime" label="结束时间">
+              <template slot-scope="scope">
+                {{ scope.row.endTime | timeFilter }}
+              </template>
+            </el-table-column>
 
             <el-table-column label="状态">
               <template slot-scope="scope">
@@ -187,11 +195,13 @@
 
 
 <script>
+import moment from 'moment'
 
 export default {
   name: 'deviceAlarmRecord',
   data() {
     return {
+      test: 1,
       rules: {
         operatorNumber: [
           {required: true, message: '请输入运营商编号', trigger: 'change'}
@@ -287,6 +297,17 @@ export default {
     this.loadData();
     this.getOperator();
     this.getVariableId();
+
+
+  },
+
+  filters: {
+    timeFilter(data) {
+      if (data !== '') {
+        let time = moment(data).format("YYYY-MM-DD HH:mm:ss")
+        return time
+      }
+    }
   },
 
   watch: {
@@ -453,8 +474,6 @@ export default {
 
           alarmName: this.searchFormData.alarmName,
           alarmType: this.searchFormData.alarmType,
-          startTime: this.searchFormData.startTime,
-          endTime: this.searchFormData.endTime,
 
           operatorNumber: this.searchFormData.operatorNumber,
           projectNumber: this.searchFormData.projectNumber,

sources/client/vrv-platform/src/views/deviceAlarmRecord/list.vue

@@ -139,8 +139,16 @@
             <el-table-column prop="alarmName" label="报警名称"></el-table-column>
             <el-table-column prop="alarmType" label="报警类型"></el-table-column>
             <el-table-column prop="content" label="告警内容"></el-table-column>
-            <el-table-column prop="startTime" label="开始时间"></el-table-column>
-            <el-table-column prop="endTime" label="结束时间"></el-table-column>
+            <el-table-column prop="startTime" label="开始时间">
+              <template slot-scope="scope">
+                {{ scope.row.startTime | timeFilter }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="endTime" label="结束时间">
+              <template slot-scope="scope">
+                {{ scope.row.endTime | timeFilter }}
+              </template>
+            </el-table-column>
 
             <el-table-column label="状态">
               <template slot-scope="scope">
@@ -187,11 +195,13 @@
 
 
 <script>
+import moment from 'moment'
 
 export default {
   name: 'deviceAlarmRecord',
   data() {
     return {
+      test: 1,
       rules: {
         operatorNumber: [
           {required: true, message: '请输入运营商编号', trigger: 'change'}
@@ -287,6 +297,17 @@ export default {
     this.loadData();
     this.getOperator();
     this.getVariableId();
+
+
+  },
+
+  filters: {
+    timeFilter(data) {
+      if (data !== '') {
+        let time = moment(data).format("YYYY-MM-DD HH:mm:ss")
+        return time
+      }
+    }
   },
 
   watch: {
@@ -453,8 +474,6 @@ export default {
 
           alarmName: this.searchFormData.alarmName,
           alarmType: this.searchFormData.alarmType,
-          startTime: this.searchFormData.startTime,
-          endTime: this.searchFormData.endTime,
 
           operatorNumber: this.searchFormData.operatorNumber,
           projectNumber: this.searchFormData.projectNumber,

sources/client/vrv-platform/src/views/deviceAlarmRepairRecord/list.vue

@@ -133,7 +133,11 @@
             <el-table-column prop="repairType" label="维保类型"></el-table-column>
             <el-table-column prop="variableId" label="变量名称"></el-table-column>
             <el-table-column prop="promptInterval" label="提醒周期"></el-table-column>
-            <el-table-column prop="lastCreateTime" label="上一次维保时间"></el-table-column>
+            <el-table-column prop="lastCreateTime" label="上一次维保时间">
+              <template slot-scope="scope">
+                {{ scope.row.lastCreatTime | timeFilter }}
+              </template>
+            </el-table-column>
 
 
             <el-table-column label="状态">
@@ -173,6 +177,8 @@
 
 <script>
 
+import moment from "moment/moment";
+
 export default {
   name: 'repairRecord',
   data() {
@@ -272,6 +278,15 @@ export default {
     }
   },
 
+  filters: {
+    timeFilter(data) {
+      if (data !== '') {
+        let time = moment(data).format("YYYY-MM-DD HH:mm:ss")
+        return time
+      }
+    }
+  },
+
   created: function () {
     this.loadData();
     this.getOperator();

sources/client/vrv-platform/src/views/login/login.vue

@@ -1,46 +1,47 @@
 <template>
   <div id="login" class="loginForm">
 
-      <el-form :model="form" :rules="formRules">
-        <el-form-item prop="account">
-          <el-input v-model="form.account"
-                    placeholder="请输入账号"
-                    prefix-icon="el-icon-user"
-                    style="width: 280px"></el-input>
-        </el-form-item>
-
-        <el-form-item prop="password">
-          <el-input v-model="form.password"
-                    prefix-icon="el-icon-lock"
-                    placeholder="请输入密码"
-                    type="password"
-                    style="width: 280px"></el-input>
-        </el-form-item>
-
-        <el-form-item prop="verifyCode">
-          <div>
-
-            <el-input v-model="form.verifyCode"
-                      prefix-icon="el-icon-circle-check"
-                      placeholder="请输入图形验证码"
-                      style="width: 140px;
+    <el-form :model="form" :rules="formRules">
+      <el-form-item prop="account">
+        <el-input v-model="form.account"
+                  placeholder="请输入账号"
+                  prefix-icon="el-icon-user"
+                  style="width: 280px"></el-input>
+      </el-form-item>
+
+      <el-form-item prop="password">
+        <el-input v-model="form.password"
+                  prefix-icon="el-icon-lock"
+                  placeholder="请输入密码"
+                  type="password"
+                  style="width: 280px"></el-input>
+      </el-form-item>
+
+      <el-form-item prop="verifyCode">
+        <div>
+
+          <el-input v-model="form.verifyCode"
+                    prefix-icon="el-icon-circle-check"
+                    placeholder="请输入图形验证码"
+                    style="width: 140px;
                       float: left;
                       margin-right: 10px"
-            ></el-input>
+          ></el-input>
 
-            <img @click="handleRefreshVerifyCode" class="verify-img" :src="verifyCodeUrl" style="cursor: pointer"
-                 alt="">
+          <img @click="handleRefreshVerifyCode" class="verify-img" :src="verifyCodeUrl" style="cursor: pointer"
+               alt="">
 
-          </div>
+        </div>
 
-        </el-form-item>
+      </el-form-item>
 
-        <div>
-          <el-button @click="login" type="primary" style="margin-left: 100px;background-color: lightslategrey;color: black">登录
-          </el-button>
-        </div>
+      <div>
+        <el-button @click="login" type="primary"
+                   style="margin-left: 100px;background-color: lightslategrey;color: black">登录
+        </el-button>
+      </div>
 
-      </el-form>
+    </el-form>
 
 
   </div>
@@ -107,10 +108,13 @@ export default {
             message: resp.data.desc
           });
 
+          var realname = resp.data.data.userBean.realname;
+
+          localStorage.setItem("realname", realname)
 
           vm.$router.push({
             path: '/menu',
-            query: {userBean: resp.data.data.userBean}
+            // query: {userBean: resp.data.data.userBean}
           });
 
         }
@@ -150,7 +154,7 @@ export default {
   height: 40px;
 }
 
-.loginForm{
+.loginForm {
   padding: 10px;
   width: 400px;
   height: 290px;

sources/client/vrv-platform/src/views/menu/menu.vue

@@ -2,8 +2,7 @@
   <div id="menu">
 
     <div style="width: 100%; height: 100%; display: flex;flex-direction: row">
-
-      <div style="height: 100vh;background-color: rgb(84,92,100); ">
+      <div style="" class="menu">
         <el-menu
             class="el-menu-vertical-demo"
             :collapse="isCollapse"
@@ -22,7 +21,7 @@
           </div>
 
 
-          <el-menu-item index="/">
+          <el-menu-item index="/daping">
             <i class="el-icon-location"></i>
             <span slot="title">数据可视化大屏</span>
           </el-menu-item>
@@ -92,7 +91,6 @@
         </el-menu>
       </div>
 
-
       <div style="width: 90% ; float: right">
         <el-header class="header" style="height: 80px;">
 
@@ -188,9 +186,16 @@ export default {
   created: function () {
     let vm = this;
 
-    var userBean = this.$route.query.userBean
+    // var userBean = this.$route.query.userBean
+
+    this.realname = localStorage.getItem("realname");
 
-    this.realname = userBean.realname
+    var tag = localStorage.getItem("realname")
+    if (tag == null) {
+      vm.$router.push({
+        path: '/',
+      });
+    }
 
     console.log(this.realname)
 
@@ -227,7 +232,9 @@ export default {
       vm.$http.get(vm.$api.auth.logout).then((resp) => {
         console.log(resp)
 
-        vm.$router.push('/login')
+        vm.$router.push('/')
+
+        localStorage.clear()
 
         this.$message({
           type: 'success',
@@ -332,13 +339,17 @@ export default {
   position: relative
 }
 
-/*.el-aside {*/
+.menu {
+  height: 100vh;
+  background-color: rgb(84, 92, 100);
+  overflow-y: auto;
+  overflow-x: hidden;
 
-/*  float: left;*/
-/*  background-color: #545c64;*/
-/*  text-color: #fff;*/
-/*  active-text-color: #993333*/
-/*}*/
+}
+
+::-webkit-scrollbar {
+  width: 1px;
+}
 
 .el-menu {
   float: left;
@@ -381,4 +392,5 @@ export default {
   margin-left: 30px;
 }
 
+
 </style>

sources/client/vrv-platform/src/views/paramSetting/paramSetting.vue

@@ -68,7 +68,7 @@
 
       </div>
 
-      <div style="padding: 0px;border: 1px solid #007AFF;margin-top: 16px">
+      <div style="padding: 0px;border: 1px solid #545c64;margin-top: 16px">
 
         <div>
           <div class="head">
@@ -101,6 +101,18 @@
             <span style="margin-right: 14px">{{ formData.PFJ_QT == 0 ? "停止" : "启动" }}</span>
           </div>
 
+          <div class="item">
+            <span>风 冷 主 机</span>
+            <el-button size="small" @click="shouZiDongFLZJ" :class="{'Active_button' :formData.FLZJ_SZXZ == 1}">
+              {{ formData.FLZJ_SZXZ == 0 ? '自动' : '手动' }}
+            </el-button>
+            <el-button size="small" @click="shouZiDongFLZJSD" :class="{'Active_button' :formData.FLZJ_SDQD == 1}"
+                       style="margin-right: 30px">
+              {{ formData.FLZJ_SDQD == 0 ? '启动' : '停止' }}
+            </el-button>
+            <span style="margin-right: 14px">{{ formData.FLZJ_QT == 0 ? "停止" : "启动" }}</span>
+          </div>
+
           <div class="item">
             <span>一级电加热</span>
             <el-button size="small" @click="shouZiDongYJDJRSS" :class="{'Active_button' :formData.YJDJR_SZXZ == 1}">
@@ -476,6 +488,9 @@ export default {
     this.getShouZiDongSFFSD()
     this.getShouZiDongPFF()
     this.getShouZiDongPFFSD()
+
+    this.getShouZiDongFLZJ()
+    this.getShouZiDongFLZJSD()
   },
 
   methods: {
@@ -723,6 +738,27 @@ export default {
       })
     },
 
+    getShouZiDongFLZJ() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '305'
+        }
+      }).then((res) => {
+        this.formData.FLZJ_SZXZ = res.data.data.deviceParam.value;
+      })
+    },
+    getShouZiDongFLZJSD() {
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.detail, {
+        params: {
+          id: '244'
+        }
+      }).then((res) => {
+        this.formData.FLZJ_SDQD = res.data.data.deviceParam.value;
+      })
+    },
+
     shouZiDongYJDJR() {
       const vm = this;
       vm.$http.get(vm.$api.deviceParam.detail, {
@@ -743,6 +779,8 @@ export default {
         this.formData.EJDJR_SZXZ = res.data.data.deviceParam.value;
       })
     },
+
+
     shouZiDongSJDJR() {
       const vm = this;
       vm.$http.get(vm.$api.deviceParam.detail, {
@@ -825,6 +863,7 @@ export default {
       })
     },
 
+
     dialog1() {
       this.dialogVisible1 = true;
 
@@ -1264,6 +1303,37 @@ export default {
       })
     },
 
+    shouZiDongFLZJ() {
+      this.formData.FLZJ_SZXZ == 1 ? this.formData.FLZJ_SZXZ = 0 : this.formData.FLZJ_SZXZ = 1;
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '305',
+          value: this.formData.FLZJ_SZXZ,
+          name: "FLZJ_SZXZ",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        console.log(res);
+      })
+    },
+
+    shouZiDongFLZJSD() {
+      this.formData.FLZJ_SDQD == 1 ? this.formData.FLZJ_SDQD = 0 : this.formData.FLZJ_SDQD = 1;
+      const vm = this;
+      vm.$http.get(vm.$api.deviceParam.updateParam, {
+        params: {
+          id: '244',
+          value: this.formData.FLZJ_SDQD,
+          name: "FLZJ_SDQD",
+          sn: "CK1"
+        }
+      }).then((res) => {
+        console.log(res);
+      })
+    },
+
+
     back() {
       let vm = this;
       vm.$router.back()
@@ -1280,12 +1350,12 @@ export default {
   justify-content: space-around;
   width: 100%;
   height: 46px;
-  background: #007AFF;
+  background: #545c64;
   color: white;
 }
 
 .item {
-  border-bottom: 1px solid #007AFF;
+  border-bottom: 1px solid #545c64;
   font-weight: 500;
   align-items: center;
   display: flex;

sources/client/vrv-platform/src/views/runningState/runningState.vue

@@ -10,7 +10,7 @@
       <div style="padding: 10px">
 
         <div style="float:left; width: 600px;">
-          <el-table :data="formData" :header-cell-style="{background:'#007AFF',color:'white'}">
+          <el-table :data="formData" :header-cell-style="{background:'#545c64',color:'white'}">
             <el-table-column prop="sn" label="设备名称"></el-table-column>
             <el-table-column prop="WD_1" label="温度（℃）"></el-table-column>
             <el-table-column prop="SD_1" label="湿度（%）"></el-table-column>
@@ -20,7 +20,7 @@
 
         <!--        设置表-->
         <div class="setTable">
-          <el-table :data="setTableData" :header-cell-style="{'text-align':'center',background:'#007AFF',color:'white'}"
+          <el-table :data="setTableData" :header-cell-style="{'text-align':'center',background:'#545c64',color:'white'}"
                     :cell-style="{'text-align':'center'}">
             <el-table-column prop="WD_SD" label="排风温度设定（℃）"></el-table-column>
             <el-table-column prop="SD_SD" label="排风湿度设定（%）"></el-table-column>
@@ -40,7 +40,7 @@
 
         <!--        状态表-->
         <div class="stateTable">
-          <el-table :data="stateTable" :header-cell-style="{'text-align':'center',background:'#007AFF',color:'white'}"
+          <el-table :data="stateTable" :header-cell-style="{'text-align':'center',background:'#545c64',color:'white'}"
                     :cell-style="{'text-align':'center'}">
             <el-table-column prop="RSF" label="热水阀"></el-table-column>
             <el-table-column prop="LSF" label="冷水阀"></el-table-column>

sources/server/vrv/run/application.pid

@@ -1 +1 @@
-6192
+9420

sources/server/vrv/vrv-core-api/src/main/java/com/kuyuntech/vrv/coreapi/bean/core/DeviceAlarmRecordBean.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.Builder;
 import lombok.ToString;
+
 import java.io.Serializable;
 
 import java.lang.Long;
@@ -13,63 +14,61 @@ import java.util.Date;
 import java.lang.String;
 
 /**
-* DeviceAlarmRecordBean
-*
-*/
+ * DeviceAlarmRecordBean
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
 @ToString
-public class DeviceAlarmRecordBean  implements Serializable {
-
+public class DeviceAlarmRecordBean implements Serializable {
 
-    private String deviceCode ;
 
-    private String sn ;
+    private String deviceCode;
 
-    private String operatorNumber ;
+    private String sn;
 
-    private String operatorCode ;
+    private String operatorNumber;
 
-    private String projectNumber ;
+    private String operatorCode;
 
-    private String projectCode ;
+    private String projectNumber;
 
-    private String gatewayNumber ;
+    private String projectCode;
 
-    private String gatewayCode ;
+    private String gatewayNumber;
 
-    private String alarmName ;
+    private String gatewayCode;
 
-    private String alarmType ;
+    private String alarmName;
 
-    private String variableId ;
+    private String alarmType;
 
-    private String recordCondition ;
+    private String variableId;
 
-    private String alarmConfigCode ;
+    private String recordCondition;
 
-    private String startTime ;
+    private String alarmConfigCode;
 
-    private String endTime ;
+    private Date startTime;
 
-    private String status ;
+    private Date endTime;
 
-    private String content ;
+    private String status;
 
-    private Long id ;
+    private String content;
 
-    private Long version ;
+    private Long id;
 
-    private String code ;
+    private Long version;
 
-    private Short valid ;
+    private String code;
 
-    private Date createTime ;
+    private Short valid;
 
-    private Date updateTime ;
+    private Date createTime;
 
+    private Date updateTime;
 
 
 }

sources/server/vrv/vrv-core-api/src/main/java/com/kuyuntech/vrv/coreapi/bean/core/DeviceAlarmRepairRecordBean.java

@@ -48,7 +48,7 @@ public class DeviceAlarmRepairRecordBean  implements Serializable {
 
     private String status ;
 
-    private String lastCreateTime ;
+    private Date lastCreateTime ;
 
     private String repairType ;
 

sources/server/vrv/vrv-core-api/src/main/java/com/kuyuntech/vrv/coreapi/service/core/DeviceParamService.java

@@ -46,6 +46,9 @@ public interface DeviceParamService {
      */
     DeviceParamBean find(DeviceParamBean deviceParamBean);
 
+
+    DeviceParamBean findTimeData(DeviceParamBean deviceParamBean);
+
     /**
      * 通过唯一标识查找记录
      *

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/DeviceAlarmRecordServiceImpl.java

@@ -236,12 +236,7 @@ public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<Device
             if (StringUtils.isNotBlank(deviceAlarmRecordBean.getRecordCondition())) {
                 detachedCriteria.add(Restrictions.like("recordCondition", deviceAlarmRecordBean.getRecordCondition(), MatchMode.ANYWHERE));
             }
-            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getStartTime())) {
-                detachedCriteria.add(Restrictions.like("startTime", deviceAlarmRecordBean.getStartTime(), MatchMode.ANYWHERE));
-            }
-            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getEndTime())) {
-                detachedCriteria.add(Restrictions.like("endTime", deviceAlarmRecordBean.getEndTime(), MatchMode.ANYWHERE));
-            }
+
             if (StringUtils.isNotBlank(deviceAlarmRecordBean.getStatus())) {
                 detachedCriteria.add(Restrictions.eq("status", deviceAlarmRecordBean.getStatus()));
             }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/DeviceAlarmRepairRecordServiceImpl.java

@@ -251,9 +251,7 @@ public class DeviceAlarmRepairRecordServiceImpl extends AbstractFastbootService<
              if (StringUtils.isNotBlank(deviceAlarmRepairRecordBean.getRepairType())) {
                  detachedCriteria.add(Restrictions.like("repairType", deviceAlarmRepairRecordBean.getRepairType(), MatchMode.ANYWHERE));
              }
-             if (StringUtils.isNotBlank(deviceAlarmRepairRecordBean.getLastCreateTime())) {
-                 detachedCriteria.add(Restrictions.eq("lastCreateTime", deviceAlarmRepairRecordBean.getLastCreateTime()));
-             }
+
              if (StringUtils.isNotBlank(deviceAlarmRepairRecordBean.getPromptInterval())) {
                  detachedCriteria.add(Restrictions.like("promptInterval", deviceAlarmRepairRecordBean.getPromptInterval(), MatchMode.ANYWHERE));
              }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/DeviceParamServiceImpl.java

@@ -5,12 +5,14 @@ import com.kuyuntech.vrv.coreapi.service.core.DeviceParamService;
 import com.kuyuntech.vrv.coreservice.dao.core.DeviceParamDao;
 import com.kuyuntech.vrv.coreservice.domain.core.DeviceParam;
 import org.apache.commons.lang3.StringUtils;
-import org.hibernate.criterion.MatchMode;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.kuyuntech.vrv.coreapi.bean.core.DeviceParamBean;
 import com.wbspool.fastboot.core.common.bean.PagerBean;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -100,6 +102,7 @@ public class DeviceParamServiceImpl extends AbstractFastbootService<DeviceParam,
         return deviceParamBean;
     }
 
+
     @Override
     public DeviceParamBean delete(DeviceParamBean deviceParamBean) {
 
@@ -142,6 +145,143 @@ public class DeviceParamServiceImpl extends AbstractFastbootService<DeviceParam,
         return deviceParamBean;
     }
 
+    @Override
+    public DeviceParamBean findTimeData(DeviceParamBean deviceParamBean) {
+        if (deviceParamBean == null) {
+            return null;
+        }
+
+
+        DeviceParam deviceParam = deviceParamDao.findByIdAndValid(deviceParamBean.getId(), VALID);
+
+        //获取数据时间
+        Date createTime = deviceParam.getCreateTime();
+        String creatTimeStr = createTime.toString();
+        String substring = creatTimeStr.substring(11, 13);
+
+        //获取当前时间
+        Date currentTime = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//定义新的日期格式
+        //format():将给定的 Date 格式化为日期/时间字符串。即：date--->String
+        String dateString = formatter.format(currentTime);
+        try {
+            Date updateTime = formatter.parse(dateString);//parse():String--->date
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        String nowSrtSub = dateString.substring(11, 13);
+
+//        System.out.println(creatTimeStr);
+//        System.out.println(substring);
+//        System.out.println("-----------------------------------");
+//        System.out.println(dateString);
+//        System.out.println(nowSrtSub);
+
+        if (substring.equals(nowSrtSub)) {
+
+            System.out.println("当前数据与当前时间相等！");
+
+            //更新温度数据
+            Long Id = deviceParamBean.getId();
+
+            if (Id <= 334) {
+                //新建一个bean用来查询温度实际
+                DeviceParam deviceParamData = new DeviceParam();
+                deviceParamData.setId(292L);
+
+                DeviceParam WD_SJData = deviceParamDao.findByIdAndValid(deviceParamData.getId(), VALID);
+
+                String value = WD_SJData.getValue();
+
+                //将温度实际的数据保存到对应的时间
+                deviceParam.setValue(value);
+
+                if (deviceParam == null) {
+                    return null;
+                }
+
+                deviceParamDao.save(deviceParam);
+
+                domainToBean(deviceParam, deviceParamBean, "id", "code", "version", "createTime", "updateTime", "valid", "deviceId");
+            }
+
+            if (Id > 334 && Id <= 358) {
+                //更新湿度数据
+                //新建一个bean用来查询温度实际
+                DeviceParam deviceParamData = new DeviceParam();
+                deviceParamData.setId(280L);
+
+                DeviceParam SD_SJData = deviceParamDao.findByIdAndValid(deviceParamData.getId(), VALID);
+
+                String value = SD_SJData.getValue();
+
+                //将温度实际的数据保存到对应的时间
+                deviceParam.setValue(value);
+
+                if (deviceParam == null) {
+                    return null;
+                }
+
+                deviceParamDao.save(deviceParam);
+
+                domainToBean(deviceParam, deviceParamBean, "id", "code", "version", "createTime", "updateTime", "valid", "deviceId");
+            }
+
+            if (Id > 358 && Id <= 382) {
+                //更新温度设定数据
+                //新建一个bean用来查询温度实际
+                DeviceParam deviceParamData = new DeviceParam();
+                deviceParamData.setId(296L);
+
+                DeviceParam SD_SJData = deviceParamDao.findByIdAndValid(deviceParamData.getId(), VALID);
+
+                String value = SD_SJData.getValue();
+
+                //将温度实际的数据保存到对应的时间
+                deviceParam.setValue(value);
+
+                if (deviceParam == null) {
+                    return null;
+                }
+
+                deviceParamDao.save(deviceParam);
+
+                domainToBean(deviceParam, deviceParamBean, "id", "code", "version", "createTime", "updateTime", "valid", "deviceId");
+            }
+
+            if (Id > 382 && Id <= 407) {
+                //更新湿度设定数据
+                //新建一个bean用来查询温度实际
+                DeviceParam deviceParamData = new DeviceParam();
+                deviceParamData.setId(231L);
+
+                DeviceParam SD_SJData = deviceParamDao.findByIdAndValid(deviceParamData.getId(), VALID);
+
+                String value = SD_SJData.getValue();
+
+                //将温度实际的数据保存到对应的时间
+                deviceParam.setValue(value);
+
+                if (deviceParam == null) {
+                    return null;
+                }
+
+                deviceParamDao.save(deviceParam);
+
+                domainToBean(deviceParam, deviceParamBean, "id", "code", "version", "createTime", "updateTime", "valid", "deviceId");
+            }
+
+
+        }
+
+        if (deviceParam == null) {
+            return null;
+        }
+        BeanUtils.copyProperties(deviceParam, deviceParamBean);
+        return deviceParamBean;
+    }
+
     @Override
     public DeviceParamBean find(String code) {
         return this.find(DeviceParamBean.builder().code(code).build());

sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/controller/core/DeviceParamController.java

@@ -119,7 +119,34 @@ public class DeviceParamController {
         return "send topic: " + "mqtt/335102012203A500/cmd" + ", message : " + sendData;
 
 //        return ResponseBean.success("操作成功！").addData("value", deviceParamBean.getValue());
+    }
+
+    /**
+     * 获取数据曲线的实时数据
+     * TODO 待实现
+     *
+     * @param deviceParamBean 获取数据曲线的实时数据
+     * @return
+     */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object getTimeData(@Validated(ValidGroup.Detail.class) DeviceParamBean deviceParamBean, Errors errors) {
 
+        deviceParamBean = this.deviceParamService.findTimeData(deviceParamBean);
+
+        if (deviceParamBean == null) {
+            return ResponseBean.serverError("该记录不存在!");
+        }
+
+        Map deviceParamMap = MapBuilder.newBuilder()
+                .put("sn", deviceParamBean.getSn())
+                .put("name", deviceParamBean.getName())
+                .put("value", deviceParamBean.getValue())
+                .put("createTime", deviceParamBean.getCreateTime())
+                .put("updateTime", deviceParamBean.getUpdateTime())
+                .build();
+
+        return ResponseBean.success("操作成功！").addData("deviceParam", deviceParamMap);
 
     }
 

sources/server/vrv/vrv-platform/src/main/resources/application.properties

@@ -8,7 +8,7 @@ mybatis.configuration.map-underscore-to-camel-case=true
 spring.pid.file=./run/application.pid
 fastboot.auto-mapping-packages=com.wbspool,com.kuyuntech
 spring.resources.static-locations=classpath:/static/
-server.port=8888
+server.port=9999
 
 #dubbo\u76F8\u5173\u914D\u7F6E\u4FE1\u606F
 #fastboot.dubbo.config.type=file