From 3680d8f2d54dcd3ac62fcf9730e3c5e82e1714c8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 29 九月 2025 17:07:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/db/business.warning_event.permissions.sql                                                          |    6 
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java               |  113 ++++++++++++
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WarningEventCloudController.java         |   91 ++++++++++
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WarningEventService.java          |   98 ++++++++++
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java |  175 +++++++++++++++++++
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/WarningEventMapper.java               |   12 +
 6 files changed, 495 insertions(+), 0 deletions(-)

diff --git a/server/db/business.warning_event.permissions.sql b/server/db/business.warning_event.permissions.sql
new file mode 100644
index 0000000..2f381c5
--- /dev/null
+++ b/server/db/business.warning_event.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:warningevent:create', '鏂板缓鎶ヨ浜嬩欢璁板綍鏃ュ織琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:warningevent:delete', '鍒犻櫎鎶ヨ浜嬩欢璁板綍鏃ュ織琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:warningevent:update', '淇敼鎶ヨ浜嬩欢璁板綍鏃ュ織琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:warningevent:query', '鏌ヨ鎶ヨ浜嬩欢璁板綍鏃ュ織琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:warningevent:exportExcel', '瀵煎嚭鎶ヨ浜嬩欢璁板綍鏃ュ織琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WarningEventCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WarningEventCloudController.java
new file mode 100644
index 0000000..50f52a3
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WarningEventCloudController.java
@@ -0,0 +1,91 @@
+package com.doumee.cloud.admin;
+
+import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.WarningEvent;
+import com.doumee.service.business.WarningEventService;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2025/09/29 11:20
+ */
+@Api(tags = "鎶ヨ浜嬩欢璁板綍鏃ュ織琛�")
+@RestController
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/warningEvent")
+public class WarningEventCloudController extends BaseController {
+
+    @Autowired
+    private WarningEventService warningEventService;
+
+    @PreventRepeat
+    @ApiOperation("鏂板缓")
+    @PostMapping("/create")
+    @CloudRequiredPermission("business:warningevent:create")
+    public ApiResponse create(@RequestBody WarningEvent warningEvent) {
+        return ApiResponse.success(warningEventService.create(warningEvent));
+    }
+
+    @ApiOperation("鏍规嵁ID鍒犻櫎")
+    @GetMapping("/delete/{id}")
+    @CloudRequiredPermission("business:warningevent:delete")
+    public ApiResponse deleteById(@PathVariable Integer id) {
+        warningEventService.deleteById(id);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鎵归噺鍒犻櫎")
+    @GetMapping("/delete/batch")
+    @CloudRequiredPermission("business:warningevent:delete")
+    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+        String [] idArray = ids.split(",");
+        List<Integer> idList = new ArrayList<>();
+        for (String id : idArray) {
+            idList.add(Integer.valueOf(id));
+        }
+        warningEventService.deleteByIdInBatch(idList);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鏍规嵁ID淇敼")
+    @PostMapping("/updateById")
+    @CloudRequiredPermission("business:warningevent:update")
+    public ApiResponse updateById(@RequestBody WarningEvent warningEvent) {
+        warningEventService.updateById(warningEvent);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    @PostMapping("/page")
+    @CloudRequiredPermission("business:warningevent:query")
+    public ApiResponse<PageData<WarningEvent>> findPage (@RequestBody PageWrap<WarningEvent> pageWrap) {
+        return ApiResponse.success(warningEventService.findPage(pageWrap));
+    }
+
+    @ApiOperation("瀵煎嚭Excel")
+    @PostMapping("/exportExcel")
+    @CloudRequiredPermission("business:warningevent:exportExcel")
+    public void exportExcel (@RequestBody PageWrap<WarningEvent> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(WarningEvent.class).export(warningEventService.findPage(pageWrap).getRecords(), "鎶ヨ浜嬩欢璁板綍鏃ュ織琛�", response);
+    }
+
+    @ApiOperation("鏍规嵁ID鏌ヨ")
+    @GetMapping("/{id}")
+    @CloudRequiredPermission("business:warningevent:query")
+    public ApiResponse findById(@PathVariable Integer id) {
+        return ApiResponse.success(warningEventService.findById(id));
+    }
+}
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
new file mode 100644
index 0000000..b0ab624
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/WarningEventMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.WarningEvent;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2025/09/29 11:20
+ */
+public interface WarningEventMapper extends BaseMapper<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
new file mode 100644
index 0000000..ee20fc4
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
@@ -0,0 +1,113 @@
+package com.doumee.dao.business.model;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 鎶ヨ浜嬩欢璁板綍鏃ュ織琛�
+ * @author 姹熻箘韫�
+ * @date 2025/09/29 11:20
+ */
+@Data
+@ApiModel("鎶ヨ浜嬩欢璁板綍鏃ュ織琛�")
+@TableName("`warning_event`")
+public class WarningEvent {
+
+    @ApiModelProperty(value = "涓婚敭", example = "1")
+    @ExcelColumn(name="涓婚敭")
+    private Integer id;
+
+    @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+    @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+    private Integer creator;
+
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @ExcelColumn(name="鍒涘缓鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createDate;
+
+    @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+    @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+    private Integer editor;
+
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+    @ExcelColumn(name="鏇存柊鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date editDate;
+
+    @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+    @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+    private Integer isdeleted;
+
+    @ApiModelProperty(value = "澶囨敞")
+    @ExcelColumn(name="澶囨敞")
+    private String info;
+
+    @ApiModelProperty(value = "浜嬩欢缂栫爜锛堝叧鑱攚arning)", example = "1")
+    @ExcelColumn(name="浜嬩欢缂栫爜锛堝叧鑱攚arning)")
+    private Integer warningId;
+
+    @ApiModelProperty(value = "浜嬩欢鏍囬")
+    @ExcelColumn(name="浜嬩欢鏍囬")
+    private String title;
+
+    @ApiModelProperty(value = "浜嬩欢鍐呭")
+    @ExcelColumn(name="浜嬩欢鍐呭")
+    private String content;
+
+    @ApiModelProperty(value = "鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�", example = "1")
+    @ExcelColumn(name="鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�")
+    private Integer status;
+
+    @ApiModelProperty(value = "鎵�鍦ㄤ綅缃�")
+    @ExcelColumn(name="鎵�鍦ㄤ綅缃�")
+    private String region;
+
+    @ApiModelProperty(value = "鍞竴鏍囪瘑")
+    @ExcelColumn(name="鍞竴鏍囪瘑")
+    private String eventId;
+
+    @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+    @ExcelColumn(name="浜嬩欢绫诲瀷")
+    private String eventType;
+
+    @ApiModelProperty(value = "浜嬩欢绛夌骇锛�             0-鏈厤缃�             1-浣�             2-涓�             3-楂�             娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷")
+    @ExcelColumn(name="浜嬩欢绛夌骇锛�             0-鏈厤缃�             1-浣�             2-涓�             3-楂�             娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷")
+    private String eventLevel;
+
+    @ApiModelProperty(value = "浜嬩欢鍙戠敓浜嬩欢")
+    @ExcelColumn(name="浜嬩欢鍙戠敓浜嬩欢")
+    private String happenTime;
+
+    @ApiModelProperty(value = "浜嬩欢鍥剧墖鏈嶅姟缂栧彿")
+    @ExcelColumn(name="浜嬩欢鍥剧墖鏈嶅姟缂栧彿")
+    private String imgServeCode;
+
+    @ApiModelProperty(value = "浜嬩欢鍥剧墖")
+    @ExcelColumn(name="浜嬩欢鍥剧墖")
+    private String imgurl;
+
+    @ApiModelProperty(value = "鎶ユ枃")
+    @ExcelColumn(name="鎶ユ枃")
+    private String jsonContent;
+
+    @ApiModelProperty(value = "浜嬩欢婧愬敮涓�鏍囪瘑")
+    @ExcelColumn(name="浜嬩欢婧愬敮涓�鏍囪瘑")
+    private String srcIndex;
+
+    @ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
+    @ExcelColumn(name="浜嬩欢婧愮被鍨�")
+    private String srcType;
+
+    @ApiModelProperty(value = "浜嬩欢婧愬悕绉�")
+    @ExcelColumn(name="浜嬩欢婧愬悕绉�")
+    private String srcName;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WarningEventService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WarningEventService.java
new file mode 100644
index 0000000..0cd0d1d
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WarningEventService.java
@@ -0,0 +1,98 @@
+package com.doumee.service.business;
+
+import com.doumee.dao.business.model.WarningEvent;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
+
+import java.util.List;
+
+/**
+ * 鎶ヨ浜嬩欢璁板綍鏃ュ織琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2025/09/29 11:20
+ */
+public interface WarningEventService {
+
+    /**
+     * 鍒涘缓
+     * 
+     * @param warningEvent 瀹炰綋瀵硅薄
+     * @return Integer
+     */
+    Integer create(WarningEvent warningEvent);
+
+    /**
+     * 涓婚敭鍒犻櫎
+     *
+     * @param id 涓婚敭
+     */
+    void deleteById(Integer id);
+
+    /**
+     * 鍒犻櫎
+     *
+     * @param warningEvent 瀹炰綋瀵硅薄
+     */
+    void delete(WarningEvent warningEvent);
+
+    /**
+     * 鎵归噺涓婚敭鍒犻櫎
+     *
+     * @param ids 涓婚敭闆�
+     */
+    void deleteByIdInBatch(List<Integer> ids);
+
+    /**
+     * 涓婚敭鏇存柊
+     *
+     * @param warningEvent 瀹炰綋瀵硅薄
+     */
+    void updateById(WarningEvent warningEvent);
+
+    /**
+     * 鎵归噺涓婚敭鏇存柊
+     *
+     * @param warningEvents 瀹炰綋闆�
+     */
+    void updateByIdInBatch(List<WarningEvent> warningEvents);
+
+    /**
+     * 涓婚敭鏌ヨ
+     *
+     * @param id 涓婚敭
+     * @return WarningEvent
+     */
+    WarningEvent findById(Integer id);
+
+    /**
+     * 鏉′欢鏌ヨ鍗曟潯璁板綍
+     *
+     * @param warningEvent 瀹炰綋瀵硅薄
+     * @return WarningEvent
+     */
+    WarningEvent findOne(WarningEvent warningEvent);
+
+    /**
+     * 鏉′欢鏌ヨ
+     *
+     * @param warningEvent 瀹炰綋瀵硅薄
+     * @return List<WarningEvent>
+     */
+    List<WarningEvent> findList(WarningEvent warningEvent);
+  
+    /**
+     * 鍒嗛〉鏌ヨ
+     *
+     * @param pageWrap 鍒嗛〉瀵硅薄
+     * @return PageData<WarningEvent>
+     */
+    PageData<WarningEvent> findPage(PageWrap<WarningEvent> pageWrap);
+
+    /**
+     * 鏉′欢缁熻
+     *
+     * @param warningEvent 瀹炰綋瀵硅薄
+     * @return long
+     */
+    long count(WarningEvent warningEvent);
+}
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
new file mode 100644
index 0000000..b9bd74b
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java
@@ -0,0 +1,175 @@
+package com.doumee.service.business.impl;
+
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.WarningEventMapper;
+import com.doumee.dao.business.model.WarningEvent;
+import com.doumee.service.business.WarningEventService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * 鎶ヨ浜嬩欢璁板綍鏃ュ織琛⊿ervice瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2025/09/29 11:20
+ */
+@Service
+public class WarningEventServiceImpl implements WarningEventService {
+
+    @Autowired
+    private WarningEventMapper warningEventMapper;
+
+    @Override
+    public Integer create(WarningEvent warningEvent) {
+        warningEventMapper.insert(warningEvent);
+        return warningEvent.getId();
+    }
+
+    @Override
+    public void deleteById(Integer id) {
+        warningEventMapper.deleteById(id);
+    }
+
+    @Override
+    public void delete(WarningEvent warningEvent) {
+        UpdateWrapper<WarningEvent> deleteWrapper = new UpdateWrapper<>(warningEvent);
+        warningEventMapper.delete(deleteWrapper);
+    }
+
+    @Override
+    public void deleteByIdInBatch(List<Integer> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        warningEventMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public void updateById(WarningEvent warningEvent) {
+        warningEventMapper.updateById(warningEvent);
+    }
+
+    @Override
+    public void updateByIdInBatch(List<WarningEvent> warningEvents) {
+        if (CollectionUtils.isEmpty(warningEvents)) {
+            return;
+        }
+        for (WarningEvent warningEvent: warningEvents) {
+            this.updateById(warningEvent);
+        }
+    }
+
+    @Override
+    public WarningEvent findById(Integer id) {
+        return warningEventMapper.selectById(id);
+    }
+
+    @Override
+    public WarningEvent findOne(WarningEvent warningEvent) {
+        QueryWrapper<WarningEvent> wrapper = new QueryWrapper<>(warningEvent);
+        return warningEventMapper.selectOne(wrapper);
+    }
+
+    @Override
+    public List<WarningEvent> findList(WarningEvent warningEvent) {
+        QueryWrapper<WarningEvent> wrapper = new QueryWrapper<>(warningEvent);
+        return warningEventMapper.selectList(wrapper);
+    }
+  
+    @Override
+    public PageData<WarningEvent> findPage(PageWrap<WarningEvent> pageWrap) {
+        IPage<WarningEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+        QueryWrapper<WarningEvent> queryWrapper = new QueryWrapper<>();
+        Utils.MP.blankToNull(pageWrap.getModel());
+        if (pageWrap.getModel().getId() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getId, pageWrap.getModel().getId());
+        }
+        if (pageWrap.getModel().getCreator() != null) {
+            queryWrapper.lambda().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()));
+        }
+        if (pageWrap.getModel().getEditor() != null) {
+            queryWrapper.lambda().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()));
+        }
+        if (pageWrap.getModel().getIsdeleted() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getIsdeleted, pageWrap.getModel().getIsdeleted());
+        }
+        if (pageWrap.getModel().getInfo() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getInfo, pageWrap.getModel().getInfo());
+        }
+        if (pageWrap.getModel().getWarningId() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getWarningId, pageWrap.getModel().getWarningId());
+        }
+        if (pageWrap.getModel().getTitle() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getTitle, pageWrap.getModel().getTitle());
+        }
+        if (pageWrap.getModel().getContent() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getContent, pageWrap.getModel().getContent());
+        }
+        if (pageWrap.getModel().getStatus() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getStatus, pageWrap.getModel().getStatus());
+        }
+        if (pageWrap.getModel().getRegion() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getRegion, pageWrap.getModel().getRegion());
+        }
+        if (pageWrap.getModel().getEventId() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getEventId, pageWrap.getModel().getEventId());
+        }
+        if (pageWrap.getModel().getEventType() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getEventType, pageWrap.getModel().getEventType());
+        }
+        if (pageWrap.getModel().getEventLevel() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getEventLevel, pageWrap.getModel().getEventLevel());
+        }
+        if (pageWrap.getModel().getHappenTime() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getHappenTime, pageWrap.getModel().getHappenTime());
+        }
+        if (pageWrap.getModel().getImgServeCode() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getImgServeCode, pageWrap.getModel().getImgServeCode());
+        }
+        if (pageWrap.getModel().getImgurl() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getImgurl, pageWrap.getModel().getImgurl());
+        }
+        if (pageWrap.getModel().getJsonContent() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getJsonContent, pageWrap.getModel().getJsonContent());
+        }
+        if (pageWrap.getModel().getSrcIndex() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getSrcIndex, pageWrap.getModel().getSrcIndex());
+        }
+        if (pageWrap.getModel().getSrcType() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getSrcType, pageWrap.getModel().getSrcType());
+        }
+        if (pageWrap.getModel().getSrcName() != null) {
+            queryWrapper.lambda().eq(WarningEvent::getSrcName, pageWrap.getModel().getSrcName());
+        }
+        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+                queryWrapper.orderByDesc(sortData.getProperty());
+            } else {
+                queryWrapper.orderByAsc(sortData.getProperty());
+            }
+        }
+        return PageData.from(warningEventMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public long count(WarningEvent warningEvent) {
+        QueryWrapper<WarningEvent> wrapper = new QueryWrapper<>(warningEvent);
+        return warningEventMapper.selectCount(wrapper);
+    }
+}

--
Gitblit v1.9.3