From 9638a186728cafd9f35200ee5fec81538e8148af Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 29 九月 2025 18:02:06 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/api/business/warning.js | 2
admin/src/views/business/warningEvent.vue | 143 +++++++++++++++
admin/src/api/business/warningEvent.js | 40 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java | 66 ++++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java | 22 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java | 6
admin/src/api/business/warningPush.js | 2
admin/src/views/business/warningPush.vue | 21 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java | 72 +++++---
admin/src/api/business/warningRule.js | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/WarningEventMapper.java | 3
admin/src/components/business/OperaWarningEventWindow.vue | 122 +++++++++++++
12 files changed, 427 insertions(+), 74 deletions(-)
diff --git a/admin/src/api/business/warning.js b/admin/src/api/business/warning.js
index a18378e..b39ea7f 100644
--- a/admin/src/api/business/warning.js
+++ b/admin/src/api/business/warning.js
@@ -35,7 +35,7 @@
// 鍒犻櫎
export function deleteById (id) {
- return request.get(`/business/warning/delete/${id}`)
+ return request.get(`/visitsAdmin/cloudService/business/warning/delete/${id}`)
}
// 鎵归噺鍒犻櫎
diff --git a/admin/src/api/business/warningEvent.js b/admin/src/api/business/warningEvent.js
new file mode 100644
index 0000000..93f742a
--- /dev/null
+++ b/admin/src/api/business/warningEvent.js
@@ -0,0 +1,40 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/warningEvent/page', data, {
+ trim: true
+ })
+}
+
+// 瀵煎嚭Excel
+export function exportExcel (data) {
+ return request.post('/visitsAdmin/cloudService/business/warningEvent/exportExcel', data, {
+ trim: true,
+ download: true
+ })
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/warningEvent/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/warningEvent/updateById', data)
+}
+
+// 鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/warningEvent/delete/${id}`)
+}
+
+// 鎵归噺鍒犻櫎
+export function deleteByIdInBatch (ids) {
+ return request.get('/visitsAdmin/cloudService/business/warningEvent/delete/batch', {
+ params: {
+ ids
+ }
+ })
+}
diff --git a/admin/src/api/business/warningPush.js b/admin/src/api/business/warningPush.js
index 3bad017..67f42ce 100644
--- a/admin/src/api/business/warningPush.js
+++ b/admin/src/api/business/warningPush.js
@@ -27,7 +27,7 @@
// 鍒犻櫎
export function deleteById (id) {
- return request.get(`/business/warningPush/delete/${id}`)
+ return request.get(`/visitsAdmin/cloudService/business/warningPush/delete/${id}`)
}
// 鎵归噺鍒犻櫎
diff --git a/admin/src/api/business/warningRule.js b/admin/src/api/business/warningRule.js
index 16bf530..fb94a48 100644
--- a/admin/src/api/business/warningRule.js
+++ b/admin/src/api/business/warningRule.js
@@ -29,7 +29,7 @@
// 鍒犻櫎
export function deleteById (id) {
- return request.get(`/business/warningRule/delete/${id}`)
+ return request.get(`/visitsAdmin/cloudService/business/warningRule/delete/${id}`)
}
// 鎵归噺鍒犻櫎
diff --git a/admin/src/components/business/OperaWarningEventWindow.vue b/admin/src/components/business/OperaWarningEventWindow.vue
new file mode 100644
index 0000000..ee49d38
--- /dev/null
+++ b/admin/src/components/business/OperaWarningEventWindow.vue
@@ -0,0 +1,122 @@
+<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="info">
+ <el-input v-model="form.info" placeholder="璇疯緭鍏ュ娉�" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢缂栫爜锛堝叧鑱攚arning)" prop="warningId">
+ <el-input v-model="form.warningId" placeholder="璇疯緭鍏ヤ簨浠剁紪鐮侊紙鍏宠仈warning)" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鏍囬" prop="title">
+ <el-input v-model="form.title" placeholder="璇疯緭鍏ヤ簨浠舵爣棰�" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鍐呭" prop="content">
+ <el-input v-model="form.content" placeholder="璇疯緭鍏ヤ簨浠跺唴瀹�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�" prop="status">
+ <el-input v-model="form.status" placeholder="璇疯緭鍏ョ姸鎬� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鎵�鍦ㄤ綅缃�" prop="region">
+ <el-input v-model="form.region" placeholder="璇疯緭鍏ユ墍鍦ㄤ綅缃�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍞竴鏍囪瘑" prop="eventId">
+ <el-input v-model="form.eventId" placeholder="璇疯緭鍏ュ敮涓�鏍囪瘑" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
+ <el-input v-model="form.eventType" placeholder="璇疯緭鍏ヤ簨浠剁被鍨�" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绛夌骇锛� 0-鏈厤缃� 1-浣� 2-涓� 3-楂� 娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷" prop="eventLevel">
+ <el-input v-model="form.eventLevel" placeholder="璇疯緭鍏ヤ簨浠剁瓑绾э細 0-鏈厤缃� 1-浣� 2-涓� 3-楂� 娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鍙戠敓浜嬩欢" prop="happenTime">
+ <el-input v-model="form.happenTime" placeholder="璇疯緭鍏ヤ簨浠跺彂鐢熶簨浠�" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鍥剧墖鏈嶅姟缂栧彿" prop="imgServeCode">
+ <el-input v-model="form.imgServeCode" placeholder="璇疯緭鍏ヤ簨浠跺浘鐗囨湇鍔＄紪鍙�" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鍥剧墖" prop="imgurl">
+ <el-input v-model="form.imgurl" placeholder="璇疯緭鍏ヤ簨浠跺浘鐗�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鎶ユ枃" prop="jsonContent">
+ <el-input v-model="form.jsonContent" placeholder="璇疯緭鍏ユ姤鏂�" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢婧愬敮涓�鏍囪瘑" prop="srcIndex">
+ <el-input v-model="form.srcIndex" placeholder="璇疯緭鍏ヤ簨浠舵簮鍞竴鏍囪瘑" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢婧愮被鍨�" prop="srcType">
+ <el-input v-model="form.srcType" placeholder="璇疯緭鍏ヤ簨浠舵簮绫诲瀷" v-trim/>
+ </el-form-item>
+ <el-form-item label="浜嬩欢婧愬悕绉�" prop="srcName">
+ <el-input v-model="form.srcName" 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: 'OperaWarningEventWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ creator: '',
+ createDate: '',
+ editor: '',
+ editDate: '',
+ isdeleted: '',
+ info: '',
+ warningId: '',
+ title: '',
+ content: '',
+ status: '',
+ region: '',
+ eventId: '',
+ eventType: '',
+ eventLevel: '',
+ happenTime: '',
+ imgServeCode: '',
+ imgurl: '',
+ jsonContent: '',
+ srcIndex: '',
+ srcType: '',
+ srcName: ''
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ }
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/warningEvent',
+ 'field.id': 'id'
+ })
+ }
+}
+</script>
diff --git a/admin/src/views/business/warningEvent.vue b/admin/src/views/business/warningEvent.vue
new file mode 100644
index 0000000..87cd6bf
--- /dev/null
+++ b/admin/src/views/business/warningEvent.vue
@@ -0,0 +1,143 @@
+<template>
+ <TableLayout :permissions="['business:warningevent:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="鎶ヨ鍒嗙被" prop="warningType">
+ <el-select v-model="searchForm.warningType" placeholder="璇烽�夋嫨" clearable @change="search">
+ <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-select>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷" prop="title">
+ <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ヤ簨浠剁被鍨�" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鎶ヨ鍒嗙被" prop="warningLevel" >
+ <el-select v-model="searchForm.warningLevel" placeholder="璇烽�夋嫨" clearable @change="search">
+ <el-option label="浣�" value="0"></el-option>
+ <el-option label="涓�" value="1"></el-option>
+ <el-option label="楂�" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎵�鍦ㄤ綅缃�" prop="region">
+ <el-input v-model="searchForm.region" placeholder="璇疯緭鍏ユ墍鍦ㄤ綅缃�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鍙戠敓鏃堕棿" prop="date">
+ <el-date-picker
+ v-model="searchForm.queryStarttime"
+ type="datetime"
+ clearable
+ value-format="yyyy-MM-dd HH:mm:ss"
+ class="w200"
+ placeholder="寮�濮嬫椂闂�" /> 鑷�
+ <el-date-picker
+ v-model="searchForm.queryEndtime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ class="w200"
+ clearable
+ placeholder="缁撴潫鏃堕棿" />
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:warningevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <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="happenTime" label="鍙戠敓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="title" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
+ <el-table-column prop="warningType" label="鎶ヨ鍒嗙被" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.warningType === 0">瀹夐槻浜嬩欢</span>
+ <span v-if="row.warningType === 1" >娑堥槻浜嬩欢</span>
+ <span v-if="row.warningType === 2" >杞﹁浇浜嬩欢</span>
+ <span v-if="row.warningType === 3" >閽ュ寵鏌滀簨浠�</span>
+ <span v-if="row.warningType === 4" >澶╂皵棰勮</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="warningLevel" label="鎶ヨ绛夌骇" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.warningLevel === 0" class="status-grey">浣�</span>
+ <span v-if="row.warningLevel === 1" class="status-yellow" >涓�</span>
+ <span v-if="row.warningLevel === 2" class="status-red">楂�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="region" label="鎵�鍦ㄤ綅缃�" min-width="100px"></el-table-column>
+ <el-table-column prop="eventType" label="浜嬩欢缂栫爜" min-width="100px"></el-table-column>
+ <el-table-column
+ v-if="containPermissions(['business:warningevent:update', 'business:warningevent:delete'])"
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:warningevent:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaWarningEventWindow ref="operaWarningEventWindow" @success="handlePageChange"/>
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaWarningEventWindow from '@/components/business/OperaWarningEventWindow'
+export default {
+ name: 'WarningEvent',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaWarningEventWindow },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ warningType: null,
+ title: '',
+ region: '',
+ eventType: '',
+ warningLevel: '',
+ queryStarttime:null,
+ queryEndtime:null
+ }
+ }
+ },
+ created () {
+ this.config({
+ module: '鎶ヨ浜嬩欢璁板綍鏃ュ織琛�',
+ api: '/business/warningEvent',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ },
+ methods:{
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.queryStarttime = ''
+ this.searchForm.queryEndtime = ''
+ this.search()
+ }
+ }
+}
+</script>
diff --git a/admin/src/views/business/warningPush.vue b/admin/src/views/business/warningPush.vue
index ff1d735..170d433 100644
--- a/admin/src/views/business/warningPush.vue
+++ b/admin/src/views/business/warningPush.vue
@@ -34,7 +34,7 @@
clearable
value-format="yyyy-MM-dd HH:mm:ss"
class="w200"
- placeholder="寮�濮嬫椂闂�" />
+ placeholder="寮�濮嬫椂闂�" /> 鑷�
<el-date-picker
v-model="searchForm.queryEndtime"
type="datetime"
@@ -51,10 +51,10 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:warningpush:create', 'business:warningpush:delete']">
+<!-- <ul class="toolbar" v-permissions="['business:warningpush:create', 'business:warningpush:delete']">
<li><el-button type="primary" @click="$refs.operaWarningPushWindow.open('鏂板缓鎶ヨ鎺ㄩ�佽褰�')" icon="el-icon-plus" v-permissions="['business:warningpush:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:warningpush:delete']">鍒犻櫎</el-button></li>
- </ul>
+ </ul>-->
<el-table
:height="tableHeightNew"
v-loading="isWorking.search"
@@ -62,8 +62,7 @@
stripe
@selection-change="handleSelectionChange"
>
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="createDate" label="鍙戠敓鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="createDate" label="鍙戠敓鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="warningName" label="鎶ヨ绫诲瀷" min-width="120px" show-tooltip-when-overflow></el-table-column>
<el-table-column prop="warningType" label="鎶ヨ鍒嗙被" min-width="100px">
<template slot-scope="{row}">
@@ -135,7 +134,9 @@
warningType: null,
title: '',
content: '',
- status: ''
+ status: '',
+ queryEndtime:null,
+ queryStarttime:null
}
}
},
@@ -147,6 +148,14 @@
'field.main': 'id'
})
this.search()
+ },
+ methods:{
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.queryStarttime = ''
+ this.searchForm.queryEndtime = ''
+ this.search()
+ }
}
}
</script>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/WarningEventMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/WarningEventMapper.java
index b0ab624..8677672 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/WarningEventMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/WarningEventMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.WarningEvent;
+import com.github.yulichang.base.MPJBaseMapper;
/**
* @author 姹熻箘韫�
* @date 2025/09/29 11:20
*/
-public interface WarningEventMapper extends BaseMapper<WarningEvent> {
+public interface WarningEventMapper extends MPJBaseMapper<WarningEvent> {
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
index ee20fc4..4644525 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,93 +22,114 @@
public class WarningEvent {
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
+ //@ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ //@ExcelColumn(name="鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
+ //@ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ //@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ //@ExcelColumn(name="澶囨敞")
private String info;
@ApiModelProperty(value = "浜嬩欢缂栫爜锛堝叧鑱攚arning)", example = "1")
- @ExcelColumn(name="浜嬩欢缂栫爜锛堝叧鑱攚arning)")
+ //@ExcelColumn(name="浜嬩欢缂栫爜锛堝叧鑱攚arning)")
private Integer warningId;
@ApiModelProperty(value = "浜嬩欢鏍囬")
- @ExcelColumn(name="浜嬩欢鏍囬")
+ @ExcelColumn(name="浜嬩欢绫诲瀷",width=10,index = 2)
private String title;
@ApiModelProperty(value = "浜嬩欢鍐呭")
- @ExcelColumn(name="浜嬩欢鍐呭")
+ //@ExcelColumn(name="浜嬩欢鍐呭")
private String content;
@ApiModelProperty(value = "鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�", example = "1")
- @ExcelColumn(name="鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�")
+ //@ExcelColumn(name="鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�")
private Integer status;
@ApiModelProperty(value = "鎵�鍦ㄤ綅缃�")
- @ExcelColumn(name="鎵�鍦ㄤ綅缃�")
+ @ExcelColumn(name="鎵�鍦ㄤ綅缃�",width=10,index = 5)
private String region;
@ApiModelProperty(value = "鍞竴鏍囪瘑")
- @ExcelColumn(name="鍞竴鏍囪瘑")
+ //@ExcelColumn(name="鍞竴鏍囪瘑")
private String eventId;
@ApiModelProperty(value = "浜嬩欢绫诲瀷")
- @ExcelColumn(name="浜嬩欢绫诲瀷")
+ //@ExcelColumn(name="浜嬩欢绫诲瀷")
private String eventType;
@ApiModelProperty(value = "浜嬩欢绛夌骇锛� 0-鏈厤缃� 1-浣� 2-涓� 3-楂� 娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷")
- @ExcelColumn(name="浜嬩欢绛夌骇锛� 0-鏈厤缃� 1-浣� 2-涓� 3-楂� 娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷")
+ //@ExcelColumn(name="浜嬩欢绛夌骇锛� 0-鏈厤缃� 1-浣� 2-涓� 3-楂� 娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷")
private String eventLevel;
@ApiModelProperty(value = "浜嬩欢鍙戠敓浜嬩欢")
- @ExcelColumn(name="浜嬩欢鍙戠敓浜嬩欢")
+ @ExcelColumn(name="鍙戠敓鏃堕棿",width=10,index = 1)
private String happenTime;
@ApiModelProperty(value = "浜嬩欢鍥剧墖鏈嶅姟缂栧彿")
- @ExcelColumn(name="浜嬩欢鍥剧墖鏈嶅姟缂栧彿")
+ //@ExcelColumn(name="浜嬩欢鍥剧墖鏈嶅姟缂栧彿")
private String imgServeCode;
@ApiModelProperty(value = "浜嬩欢鍥剧墖")
- @ExcelColumn(name="浜嬩欢鍥剧墖")
+ //@ExcelColumn(name="浜嬩欢鍥剧墖")
private String imgurl;
@ApiModelProperty(value = "鎶ユ枃")
- @ExcelColumn(name="鎶ユ枃")
+ //@ExcelColumn(name="鎶ユ枃")
private String jsonContent;
@ApiModelProperty(value = "浜嬩欢婧愬敮涓�鏍囪瘑")
- @ExcelColumn(name="浜嬩欢婧愬敮涓�鏍囪瘑")
+ //@ExcelColumn(name="浜嬩欢婧愬敮涓�鏍囪瘑")
private String srcIndex;
@ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
- @ExcelColumn(name="浜嬩欢婧愮被鍨�")
+ //@ExcelColumn(name="浜嬩欢婧愮被鍨�")
private String srcType;
@ApiModelProperty(value = "浜嬩欢婧愬悕绉�")
- @ExcelColumn(name="浜嬩欢婧愬悕绉�")
+ //@ExcelColumn(name="浜嬩欢婧愬悕绉�")
private String srcName;
+ @ApiModelProperty(value = "浜嬩欢鍒嗙被 0=瀹夐槻浜嬩欢锛�1=娑堥槻浜嬩欢锛�2=杞﹁浇浜嬩欢锛�3=閽ュ寵鏌滀簨浠讹紱 4=澶╂皵棰勮锛�", example = "1")
+ @ExcelColumn(name="浜嬩欢鍒嗙被",valueMapping = "0=瀹夐槻浜嬩欢;1=娑堥槻浜嬩欢;2=杞﹁浇浜嬩欢;3=閽ュ寵鏌滀簨浠�;4=澶╂皵棰勮;",width=10,index = 3)
+ @TableField(exist = false)
+ private Integer warningType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷", example = "1")
+// @ExcelColumn(name="浜嬩欢绫诲瀷",width=10,index = 2)
+ @TableField(exist = false)
+ private String warningName;
+ @ApiModelProperty(value = "浜嬩欢绛夌骇 0浣� 1涓� 2楂�", example = "1")
+ @ExcelColumn(name="浜嬩欢绛夌骇",valueMapping = "0=浣�;1=涓�;2=楂�;",width=10,index = 4)
+ @TableField(exist = false)
+ private Integer warningLevel;
+
+
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮� ")
+ @TableField(exist = false)
+ private Date queryStarttime;
+
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫 ")
+ @TableField(exist = false)
+ private Date queryEndtime;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java
index b21a53d..fa34a7c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java
@@ -31,7 +31,7 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍙戠敓浜嬩欢",dateFormat = "yyyy-MM-dd HH:mm:ss",index = 1)
+ @ExcelColumn(name="鍙戠敓浜嬩欢",dateFormat = "yyyy-MM-dd HH:mm:ss",width=10,index = 1)
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -67,7 +67,7 @@
private String content;
@ApiModelProperty(value = "鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�", example = "1")
- @ExcelColumn(name="閫氱煡鐘舵��",valueMapping = "0=鏈�氱煡;1=閫氱煡鎴愬姛;2=閫氱煡澶辫触;",index = 8)
+ @ExcelColumn(name="閫氱煡鐘舵��",valueMapping = "0=鏈�氱煡;1=閫氱煡鎴愬姛;2=閫氱煡澶辫触;",width=10,index = 8)
private Integer status;
@ApiModelProperty(value = "鎺ㄩ�佺粨鏋�", example = "1")
@@ -82,7 +82,7 @@
//@ExcelColumn(name="鎺ㄩ�佹爣璇�")
private String pushId;
@ApiModelProperty(value = "鎺ㄩ�佹爣璇�")
- @ExcelColumn(name="鎵�鍦ㄤ綅缃�",index = 5)
+ @ExcelColumn(name="鎵�鍦ㄤ綅缃�",width=10,index = 5)
private String region;
@ApiModelProperty(value = "鎺ㄩ�佹椂闂�")
@@ -94,35 +94,33 @@
private Integer pushType;
@ApiModelProperty(value = "浜嬩欢鍒嗙被 0=瀹夐槻浜嬩欢锛�1=娑堥槻浜嬩欢锛�2=杞﹁浇浜嬩欢锛�3=閽ュ寵鏌滀簨浠讹紱 4=澶╂皵棰勮锛�", example = "1")
- @ExcelColumn(name="浜嬩欢鍒嗙被",valueMapping = "0=瀹夐槻浜嬩欢;1=娑堥槻浜嬩欢;2=杞﹁浇浜嬩欢;3=閽ュ寵鏌滀簨浠�;4=澶╂皵棰勮;",index = 3)
+ @ExcelColumn(name="浜嬩欢鍒嗙被",valueMapping = "0=瀹夐槻浜嬩欢;1=娑堥槻浜嬩欢;2=杞﹁浇浜嬩欢;3=閽ュ寵鏌滀簨浠�;4=澶╂皵棰勮;",width=10,index = 3)
@TableField(exist = false)
private Integer warningType;
@ApiModelProperty(value = "浜嬩欢绫诲瀷", example = "1")
- @ExcelColumn(name="浜嬩欢绫诲瀷",index = 2)
+ @ExcelColumn(name="浜嬩欢绫诲瀷",width=10,index = 2)
@TableField(exist = false)
private String warningName;
@ApiModelProperty(value = "浜嬩欢绛夌骇 0浣� 1涓� 2楂�", example = "1")
- @ExcelColumn(name="浜嬩欢绛夌骇",valueMapping = "0=浣�;1=涓�;2=楂�;",index = 4)
+ @ExcelColumn(name="浜嬩欢绛夌骇",valueMapping = "0=浣�;1=涓�;2=楂�;",width=10,index = 4)
@TableField(exist = false)
private Integer warningLevel;
@ApiModelProperty(value = "閫氱煡浜哄憳", example = "1")
- @ExcelColumn(name="閫氱煡浜哄憳",index = 6)
+ @ExcelColumn(name="閫氱煡浜哄憳",width=10,index = 6)
@TableField(exist = false)
private String memberName;
@ApiModelProperty(value = "浜哄憳閮ㄩ棬", example = "1")
- @ExcelColumn(name="浜哄憳閮ㄩ棬",index = 7)
+ @ExcelColumn(name="浜哄憳閮ㄩ棬",width=10,index = 7)
@TableField(exist = false)
private String companyName;
- @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮� 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮� ")
@TableField(exist = false)
private Date queryStarttime;
- @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫 ")
@TableField(exist = false)
private Date queryEndtime;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java
index b9bd74b..53b7ea3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java
@@ -1,8 +1,9 @@
package com.doumee.service.business.impl;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WarningEventMapper;
-import com.doumee.dao.business.model.WarningEvent;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.WarningEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -10,11 +11,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鎶ヨ浜嬩欢璁板綍鏃ュ織琛⊿ervice瀹炵幇
@@ -87,75 +91,86 @@
@Override
public PageData<WarningEvent> findPage(PageWrap<WarningEvent> pageWrap) {
IPage<WarningEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<WarningEvent> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<WarningEvent> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.selectAll(WarningEvent.class )
+ .selectAs(Warning::getName,WarningEvent::getWarningName)
+ .selectAs(Warning::getType,WarningEvent::getWarningType)
+ .selectAs(Warning::getLevel,WarningEvent::getWarningLevel)
+ .leftJoin(Warning.class,Warning::getId,WarningEvent::getWarningId);
+ queryWrapper.eq(pageWrap.getModel().getWarningType()!=null,Warning::getType, pageWrap.getModel().getWarningType());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getWarningName()),Warning::getName, pageWrap.getModel().getWarningName());
+ queryWrapper.eq(pageWrap.getModel().getWarningLevel()!=null,Warning::getLevel, pageWrap.getModel().getWarningLevel());
+ queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()), WarningEvent::getCreateDate, pageWrap.getModel().getQueryStarttime());
+ queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),WarningEvent::getCreateDate, pageWrap.getModel().getQueryEndtime());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(WarningEvent::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(WarningEvent::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(WarningEvent::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(WarningEvent::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(WarningEvent::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(WarningEvent::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(WarningEvent::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(WarningEvent::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(WarningEvent::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(WarningEvent::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(WarningEvent::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(WarningEvent::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(WarningEvent::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(WarningEvent::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(WarningEvent::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(WarningEvent::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(WarningEvent::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.eq(WarningEvent::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getWarningId() != null) {
- queryWrapper.lambda().eq(WarningEvent::getWarningId, pageWrap.getModel().getWarningId());
+ queryWrapper.eq(WarningEvent::getWarningId, pageWrap.getModel().getWarningId());
}
if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(WarningEvent::getTitle, pageWrap.getModel().getTitle());
+ queryWrapper.like(WarningEvent::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(WarningEvent::getContent, pageWrap.getModel().getContent());
+ queryWrapper.eq(WarningEvent::getContent, pageWrap.getModel().getContent());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(WarningEvent::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(WarningEvent::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getRegion() != null) {
- queryWrapper.lambda().eq(WarningEvent::getRegion, pageWrap.getModel().getRegion());
+ queryWrapper.eq(WarningEvent::getRegion, pageWrap.getModel().getRegion());
}
if (pageWrap.getModel().getEventId() != null) {
- queryWrapper.lambda().eq(WarningEvent::getEventId, pageWrap.getModel().getEventId());
+ queryWrapper.eq(WarningEvent::getEventId, pageWrap.getModel().getEventId());
}
if (pageWrap.getModel().getEventType() != null) {
- queryWrapper.lambda().eq(WarningEvent::getEventType, pageWrap.getModel().getEventType());
+ queryWrapper.eq(WarningEvent::getEventType, pageWrap.getModel().getEventType());
}
if (pageWrap.getModel().getEventLevel() != null) {
- queryWrapper.lambda().eq(WarningEvent::getEventLevel, pageWrap.getModel().getEventLevel());
+ queryWrapper.eq(WarningEvent::getEventLevel, pageWrap.getModel().getEventLevel());
}
if (pageWrap.getModel().getHappenTime() != null) {
- queryWrapper.lambda().eq(WarningEvent::getHappenTime, pageWrap.getModel().getHappenTime());
+ queryWrapper.eq(WarningEvent::getHappenTime, pageWrap.getModel().getHappenTime());
}
if (pageWrap.getModel().getImgServeCode() != null) {
- queryWrapper.lambda().eq(WarningEvent::getImgServeCode, pageWrap.getModel().getImgServeCode());
+ queryWrapper.eq(WarningEvent::getImgServeCode, pageWrap.getModel().getImgServeCode());
}
if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(WarningEvent::getImgurl, pageWrap.getModel().getImgurl());
+ queryWrapper.eq(WarningEvent::getImgurl, pageWrap.getModel().getImgurl());
}
if (pageWrap.getModel().getJsonContent() != null) {
- queryWrapper.lambda().eq(WarningEvent::getJsonContent, pageWrap.getModel().getJsonContent());
+ queryWrapper.eq(WarningEvent::getJsonContent, pageWrap.getModel().getJsonContent());
}
if (pageWrap.getModel().getSrcIndex() != null) {
- queryWrapper.lambda().eq(WarningEvent::getSrcIndex, pageWrap.getModel().getSrcIndex());
+ queryWrapper.eq(WarningEvent::getSrcIndex, pageWrap.getModel().getSrcIndex());
}
if (pageWrap.getModel().getSrcType() != null) {
- queryWrapper.lambda().eq(WarningEvent::getSrcType, pageWrap.getModel().getSrcType());
+ queryWrapper.eq(WarningEvent::getSrcType, pageWrap.getModel().getSrcType());
}
if (pageWrap.getModel().getSrcName() != null) {
- queryWrapper.lambda().eq(WarningEvent::getSrcName, pageWrap.getModel().getSrcName());
+ queryWrapper.eq(WarningEvent::getSrcName, pageWrap.getModel().getSrcName());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -164,7 +179,10 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(warningEventMapper.selectPage(page, queryWrapper));
+
+ queryWrapper.orderByDesc(WarningEvent::getCreateDate);
+ IPage<WarningEvent> result = warningEventMapper.selectJoinPage(page, WarningEvent.class,queryWrapper);
+ return PageData.from(result);
}
@Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java
index c823b67..4a7794d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java
@@ -104,11 +104,11 @@
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.leftJoin(Warning.class,Warning::getId,WarningPush::getWarningId);
queryWrapper.eq(pageWrap.getModel().getWarningType()!=null,Warning::getType, pageWrap.getModel().getWarningType());
- queryWrapper.eq(pageWrap.getModel().getWarningLevel()!=null,Warning::getLevel, pageWrap.getModel().getWarningLevel());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getWarningName()),Warning::getName, pageWrap.getModel().getWarningName());
queryWrapper.eq(pageWrap.getModel().getWarningLevel()!=null,Warning::getLevel, pageWrap.getModel().getWarningLevel());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName, pageWrap.getModel().getMemberName());
- queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()), WarningPush::getCreateDate,Utils.Date.getStart(pageWrap.getModel().getQueryStarttime()));
- queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),WarningPush::getCreateDate,Utils.Date.getEnd(pageWrap.getModel().getQueryEndtime()));
+ queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()), WarningPush::getCreateDate, pageWrap.getModel().getQueryStarttime());
+ queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),WarningPush::getCreateDate, pageWrap.getModel().getQueryEndtime());
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(WarningPush::getId, pageWrap.getModel().getId());
}
--
Gitblit v1.9.3