From 70bb41620daf71a9a94fe6ddd5a232ea422b9edd Mon Sep 17 00:00:00 2001
From: liuchengqian <liuchengqian666@gmail.com>
Date: Thu, 2 Jun 2022 14:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0VIP=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xkrs/controller/FirePointController.java  | 15 +++++++++++++++
 .../java/com/xkrs/model/entity/SysUserEntity.java | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/main/java/com/xkrs/controller/FirePointController.java b/src/main/java/com/xkrs/controller/FirePointController.java
index 16ef68e..df63859 100644
--- a/src/main/java/com/xkrs/controller/FirePointController.java
+++ b/src/main/java/com/xkrs/controller/FirePointController.java
@@ -3,9 +3,11 @@ package com.xkrs.controller;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
 import com.xkrs.common.tool.TokenUtil;
 import com.xkrs.dao.FirePointDao;
+import com.xkrs.dao.ShanDongFirePointDao;
 import com.xkrs.dao.SysUserDao;
 import com.xkrs.model.entity.FirePoint;
 import com.xkrs.model.entity.FirePointEntity;
+import com.xkrs.model.entity.ShanDongFirePointEntity;
 import com.xkrs.model.entity.SysUserEntity;
 import com.xkrs.model.qo.AuditFireTypeQo;
 import com.xkrs.model.qo.FirePointQo;
@@ -44,6 +46,9 @@ public class FirePointController {
     @Resource
     private FirePointDao firePointDao;
 
+    @Resource
+    private ShanDongFirePointDao shanDongFirePointDao;
+
     @Resource
     private StreetService streetService;
 
@@ -65,6 +70,16 @@ public class FirePointController {
         }
     }
 
+    @GetMapping("/queryshandongfirepointlist")
+    public String queryShanDongFirePointList() {
+        Locale locale = LocaleContextHolder.getLocale();
+        List<ShanDongFirePointEntity> shanDongFirePointList = shanDongFirePointDao.findAll();
+        if (shanDongFirePointList.isEmpty()) {
+            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时还没有火点数据", locale);
+        }
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, shanDongFirePointList, locale);
+    }
+
     /**
      * 根据火点编号更新审核状态
      * 操作1：将火点编号对应的火点从山东火点表转存到火点表
diff --git a/src/main/java/com/xkrs/model/entity/SysUserEntity.java b/src/main/java/com/xkrs/model/entity/SysUserEntity.java
index 8214360..8a4e403 100644
--- a/src/main/java/com/xkrs/model/entity/SysUserEntity.java
+++ b/src/main/java/com/xkrs/model/entity/SysUserEntity.java
@@ -104,6 +104,12 @@ public class SysUserEntity implements Serializable {
     @Column(columnDefinition = "varchar(1024)")
     private String userAgent;
 
+    /**
+     * 是否是VIP用户
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String isVip;
+
     public SysUserEntity() {
     }
 
@@ -275,6 +281,14 @@ public class SysUserEntity implements Serializable {
         this.userAgent = userAgent;
     }
 
+    public String getIsVip() {
+        return isVip;
+    }
+
+    public void setIsVip(String isVip) {
+        this.isVip = isVip;
+    }
+
     @Override
     public String toString() {
         return "SysUserEntity{" +
@@ -299,6 +313,7 @@ public class SysUserEntity implements Serializable {
                 ", loginNum=" + loginNum +
                 ", loginLastTime='" + loginLastTime + '\'' +
                 ", userAgent='" + userAgent + '\'' +
+                ", isVip='" + isVip + '\'' +
                 '}';
     }
 }