前端

in-cloud-ui/src/config/setting.config.js

@@ -13,7 +13,7 @@ const setting = {
   // 进行编译的依赖
   transpileDependencies: [],
   //标题 （包括初次加载雪花屏的标题 页面的标题 浏览器的标题）
-  title: 'vue-admin-better',
+  title: '一体化云端',
   //简写
   abbreviation: 'vab',
   //开发环境端口号

in-cloud-ui/src/layouts/components/VabAppMain/index.vue

@@ -8,7 +8,7 @@
     <footer v-show="footerCopyright" class="footer-copyright">
       Copyright
       <vab-icon :icon="['fas', 'copyright']"></vab-icon>
-      vue-admin-better 开源免费版 {{ fullYear }}
+      syjy-in-cloud
     </footer>
   </div>
 </template>

in-cloud-ui/src/layouts/components/VabAvatar/index.vue

@@ -1,8 +1,9 @@
 <template>
   <el-dropdown @command="handleCommand">
     <span class="avatar-dropdown">
-      <!--<el-avatar class="user-avatar" :src="avatar"></el-avatar>-->
-      <img class="user-avatar" :src="avatar" alt="" />
+<!--      <el-avatar class="user-avatar" :src="avatar"></el-avatar>-->
+      <img class="user-avatar" :src="require('@/assets/avatar_images/avatar.jpg')" alt="" />
+<!--      <el-image :src="require('@/assets/zfb_kf.jpg')">-->
       <div class="user-name">
         {{ username }}
         <i class="el-icon-arrow-down el-icon--right"></i>
@@ -10,11 +11,7 @@
     </span>
 
     <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item command="github">github地址</el-dropdown-item>
-      <el-dropdown-item command="gitee" divided>码云地址</el-dropdown-item>
-      <el-dropdown-item command="pro" divided>pro付费版地址</el-dropdown-item>
-      <el-dropdown-item command="plus" divided>plus付费版地址</el-dropdown-item>
-      <el-dropdown-item command="logout" divided>退出登录</el-dropdown-item>
+      <el-dropdown-item command="logout" >退出登录</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
 </template>

in-cloud-ui/src/layouts/components/VabThemeBar/index.vue

@@ -5,16 +5,13 @@
       :icon="['fas', 'palette']"
       @click="handleOpenThemeBar"
     />
-    <div class="theme-bar-setting">
+<!--    <div class="theme-bar-setting">
       <div @click="handleOpenThemeBar">
         <vab-icon :icon="['fas', 'palette']" />
         <p>主题配置</p>
       </div>
-      <div @click="handleGetCode">
-        <vab-icon :icon="['fas', 'laptop-code']"></vab-icon>
-        <p>拷贝源码</p>
-      </div>
-    </div>
+
+    </div>-->
 
     <el-drawer
       title="主题配置"

in-cloud-ui/src/router/index.js

@@ -136,27 +136,6 @@ export const asyncRoutes = [
     ],
   },
   {
-    path: '/error',
-    component: EmptyLayout,
-    redirect: 'noRedirect',
-    name: 'Error',
-    meta: { title: '错误页', icon: 'bug' },
-    children: [
-      {
-        path: '401',
-        name: 'Error401',
-        component: () => import('@/views/401'),
-        meta: { title: '401' },
-      },
-      {
-        path: '404',
-        name: 'Error404',
-        component: () => import('@/views/404'),
-        meta: { title: '404' },
-      },
-    ],
-  },
-  {
     path: '*',
     redirect: '/404',
     hidden: true,

in-cloud-ui/src/views/index/index.vue

@@ -117,13 +117,6 @@
             <a @click="handleChangeTheme">
               <el-button type="danger">修改主题和布局</el-button>
             </a>
-            <!--  <el-popover placement="top" width="250" trigger="hover">
-              <p>谢谢您愿意支持开源，加群获取文档，群内提供基础模板</p>
-              <el-image :src="require('@/assets/ewm.png')"></el-image>
-              <a slot="reference" target="_blank">
-                <el-button type="warning">文档</el-button>
-              </a>
-            </el-popover> -->
           </div>
           <table class="table">
             <tr>

in-cloud-ui/src/views/quartz/quartzInfo/index.vue

@@ -52,10 +52,11 @@
       <el-table-column type="expand">
         <template slot-scope="props">
           <el-form label-position="left" inline class="demo-table-expand">
-            <el-form-item label="最后执行时间:">
+
+            <el-form-item label="下次执行时间:">
               <span>{{ props.row.nextFireTime }}</span>
             </el-form-item>
-            <el-form-item label="下次执行时间:">
+            <el-form-item label="最后执行时间:">
               <span>{{ props.row.laetFireTime }}</span>
             </el-form-item>
           </el-form>

in-cloud-ui/src/views/record/index.vue

@@ -1,13 +1,26 @@
 <template>
   <div class="table-container">
     <vab-query-form>
+      <el-form
+        ref="searchForm"
+        :model="searchForm"
+        :inline="true"
+        @submit.native.prevent
+      >
       <vab-query-form-left-panel>
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          :inline="true"
-          @submit.native.prevent
-        >
+
+          <el-form-item>
+            <el-date-picker
+              v-model="times"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            ></el-date-picker>
+          </el-form-item>
+
           <el-form-item>
             <el-select
               v-model="searchForm.stationCode"
@@ -21,14 +34,9 @@
                 :value="item.stationCode"
               ></el-option>
             </el-select>
-
           </el-form-item>
           <el-form-item>
-            <el-select
-              v-model="searchForm.inCode"
-              clearable
-              placeholder="公司"
-            >
+            <el-select v-model="searchForm.inCode" clearable placeholder="公司">
               <el-option
                 v-for="item in companys"
                 :key="item.code"
@@ -37,18 +45,25 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item>
-            <el-button
-              icon="el-icon-search"
-              type="primary"
-              native-type="submit"
-              @click="handleQuery"
-            >
-              查询
-            </el-button>
-          </el-form-item>
-        </el-form>
+
+
       </vab-query-form-left-panel>
+
+
+      <vab-query-form-right-panel :span="1">
+        <el-form-item>
+          <el-button
+            icon="el-icon-search"
+            type="primary"
+            native-type="submit"
+            @click="handleQuery"
+          >
+            查询
+          </el-button>
+        </el-form-item>
+      </vab-query-form-right-panel>
+
+      </el-form>
     </vab-query-form>
 
     <el-table
@@ -79,17 +94,22 @@
         prop="stationCode"
         :formatter="formatStation"
       />
-      <el-table-column
-        show-overflow-tooltip
-        label="日志类型"
-        prop="type"
-
-      />
+      <el-table-column show-overflow-tooltip label="日志类型" prop="type" />
 
       <el-table-column show-overflow-tooltip label="状态" prop="state" />
       <el-table-column show-overflow-tooltip label="状态" prop="stateContent" />
-      <el-table-column show-overflow-tooltip label="时间" prop="time"  :formatter="formatDate"/>
-      <el-table-column show-overflow-tooltip label="创建时间" prop="createTime" :formatter="formatDate"/>
+      <el-table-column
+        show-overflow-tooltip
+        label="时间"
+        prop="time"
+        :formatter="formatDate"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        label="创建时间"
+        prop="createTime"
+        :formatter="formatDate"
+      />
     </el-table>
     <el-pagination
       :background="background"
@@ -116,7 +136,11 @@
         tableData: [],
         companys: [],
         stations: [],
-        searchForm:{},
+        searchForm: {},
+        times: [
+          this.dateFormat("yyyy-MM-dd HH:mm:ss",new Date(new Date().setHours(0, 0, 0, 0))),
+          this.dateFormat("yyyy-MM-dd HH:mm:ss",new Date(new Date().setHours(23, 59, 59, 59))),
+        ],
         listLoading: true,
         layout: 'total, sizes, prev, pager, next, jumper',
         total: 0,
@@ -163,6 +187,8 @@
       },
       async fetchData() {
         this.listLoading = true
+        this.searchForm.startTime = this.times[0]
+        this.searchForm.endTime = this.times[1]
         fetchList(
           Object.assign(
             {
@@ -208,17 +234,40 @@
           }
         }
       },
-      formatStation(row, column){
+      formatStation(row, column) {
         const selectedItem = this.stations.find((item) => {
           return item.stationCode === row.stationCode
         })
         return selectedItem.name
       },
-      formatDate(row, column){
+      formatDate(row, column) {
         let pro = column.property
-       console.log(row[pro])
+        console.log(row[pro])
         return row[pro]
       },
+
+      dateFormat(fmt, date) {
+        let ret
+        const opt = {
+          'y+': date.getFullYear().toString(), // 年
+          'M+': (date.getMonth() + 1).toString(), // 月
+          'd+': date.getDate().toString(), // 日
+          'H+': date.getHours().toString(), // 时
+          'm+': date.getMinutes().toString(), // 分
+          's+': date.getSeconds().toString(), // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
+        }
+        for (let k in opt) {
+          ret = new RegExp('(' + k + ')').exec(fmt)
+          if (ret) {
+            fmt = fmt.replace(
+              ret[1],
+              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+            )
+          }
+        }
+        return fmt
+      },
     },
   }
 </script>

in-cloud/src/main/java/com/jiayue/insu/incloud/compermisson/QNHLComPermisson.java

@@ -1,6 +1,7 @@
 package com.jiayue.insu.incloud.compermisson;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSON;
@@ -50,6 +51,9 @@ public class QNHLComPermisson implements GeneratePermisson{
         Record record = new Record();
         record.setStationCode(station.getStationCode());
         record.setType(CommonStant.RECORD_TYPE_COM_PERMISSON);
+        LocalDateTime localDateTime = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
+        record.setTime(localDateTime);
+        record.setCreateTime(LocalDateTime.now());
         boolean result = false;
         String username = station.getUsername();
         String password = station.getPassword();

in-cloud/src/main/java/com/jiayue/insu/incloud/controller/RecordController.java

@@ -1,5 +1,6 @@
 package com.jiayue.insu.incloud.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jiayue.insu.common.core.util.R;
@@ -34,7 +35,18 @@ public class RecordController {
 
     @GetMapping("/page")
     public R getStationPage(Page page, Record record) {
-        return R.ok(recordService.page(page, Wrappers.query(record)));
+        LambdaQueryWrapper<Record> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if(record.getStationCode()!=null){
+            lambdaQueryWrapper.eq(Record::getStationCode,record.getStationCode());
+        }
+        if(record.getInCode()!=null){
+            lambdaQueryWrapper.eq(Record::getInCode,record.getInCode());
+        }
+        if(record.getStartTime()!=null && record.getEndTime()!=null){
+            lambdaQueryWrapper.between(Record::getCreateTime,record.getStartTime(),record.getEndTime());
+        }
+
+        return R.ok(recordService.page(page, lambdaQueryWrapper));
     }
 
     @GetMapping("/all")

in-cloud/src/main/java/com/jiayue/insu/incloud/entity/Record.java

@@ -1,9 +1,9 @@
 package com.jiayue.insu.incloud.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
@@ -39,10 +39,14 @@ public class Record {
     /**
      *时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime time;
     /**
      *创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
     /**
      *状态
@@ -53,4 +57,13 @@ public class Record {
      */
     private String stateContent;
 
+
+    @TableField( exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+    @TableField( exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+
 }