.

只设置
DayNum-几天后过期
不设置
VipTimeRangeJson VIP时间范围

pom.xml

@@ -9,9 +9,9 @@
         <relativePath/>
     </parent>
     <groupId>com.xkrs</groupId>
-    <artifactId>fire_point</artifactId>
+    <artifactId>straw_fire_point</artifactId>
     <version>0.0.1</version>
-    <name>fire_point</name>
+    <name>straw_fire_point</name>
     <description>火点项目</description>
     <properties>
         <yauaa.version>5.19</yauaa.version>
@@ -35,6 +35,7 @@
         <dysmsapi20170525.version>2.0.4</dysmsapi20170525.version>
         <hutool-all.version>4.4.3</hutool-all.version>
         <tus-client.version>0.4.0</tus-client.version>
+        <geotools.version>28.2</geotools.version>
     </properties>
 
     <dependencies>
@@ -62,11 +63,6 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-messaging</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-            <!--            <scope>provided</scope>-->
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
@@ -253,8 +249,104 @@
             <version>1.1.1</version>
         </dependency>
 
+        <!--爬虫依赖-->
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.13.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-xml</artifactId>
+            <version>${geotools.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-shapefile</artifactId>
+            <version>${geotools.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-main</artifactId>
+            <version>${geotools.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jts-core</artifactId>
+                    <groupId>org.locationtech.jts</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools.xsd</groupId>
+            <artifactId>gt-xsd-sld</artifactId>
+            <version>${geotools.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-swing</artifactId>
+            <version>${geotools.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jts-core</artifactId>
+                    <groupId>org.locationtech.jts</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-geojson</artifactId>
+            <version>${geotools.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-epsg-hsql</artifactId>
+            <version>${geotools.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools.jdbc</groupId>
+            <artifactId>gt-jdbc-postgis</artifactId>
+            <version>${geotools.version}</version>
+        </dependency>
+
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>osgeo</id>
+            <name>OSGeo Release Repository</name>
+            <url>https://repo.osgeo.org/repository/release/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>osgeo-snapshot</id>
+            <name>OSGeo Snapshot Repository</name>
+            <url>https://repo.osgeo.org/repository/snapshot/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
     <build>
         <resources>
             <resource>

src/main/java/com/xkrs/FirePointApplication.java

@@ -4,17 +4,11 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.StandardCharsets;
-import java.util.List;
 
-/**
- * @author XinYi Song
- */
 @SpringBootApplication
 public class FirePointApplication {
 
@@ -29,5 +23,5 @@ public class FirePointApplication {
         restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
         return restTemplate;
     }
-//
+
 }

src/main/java/com/xkrs/common/StaticScheduleTask.java

@@ -1,36 +1,39 @@
 package com.xkrs.common;
 
-import com.xkrs.model.qo.SettingQo;
+import com.xkrs.fireseason.FireSeasonConfigService;
-import com.xkrs.service.SettingService;
+import com.xkrs.utilsnew.DateTimeUtils;
+import com.xkrs.utilsnew.WeiXinMessageUtils;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 
 /**
- * 火点审核开关计划任务
+ * 定时任务
  */
 @Configuration
 @EnableScheduling
 public class StaticScheduleTask {
 
     @Resource
-    private SettingService settingService;
+    private FireSeasonConfigService fireSeasonConfigService;
 
-    //早上八点打开火点审核开关
+    //每小时更新一次订阅
-    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 0 * * * ?")
-    private void openVerifySwitch() {
+    private void syncSubscribe() {
-        SettingQo settingQo = new SettingQo();
+        fireSeasonConfigService.updateFireSeasonConfig();
-        settingQo.setSwitchState("1");
+    }
-        settingService.updateSwitchState(settingQo);
+
+    //每天中午12点测试一次微信消息推送
+    @Scheduled(cron = "0 0 */12 * * ?")
+    private void testPushWeiXinMessage() {
+        try {
+            WeiXinMessageUtils.sendMsg("18447024917@chatroom", "微信发消息测试 " + DateTimeUtils.localDateTimeToString(LocalDateTime.now()), 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
-//    //晚上十点关闭火点审核开关
-//    @Scheduled(cron = "0 0 22 * * ?")
-//    private void closeVerifySwitch() {
-//        SettingQo settingQo = new SettingQo();
-//        settingQo.setSwitchState("0");
-//        settingService.updateSwitchState(settingQo);
-//    }
 }

src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java

@@ -5,7 +5,7 @@ import com.xkrs.model.entity.SysUserEntity;
 import com.xkrs.service.SysAuthorityService;
 import com.xkrs.service.SysRoleService;
 import com.xkrs.service.SysUserService;
-import com.xkrs.utils.DateTimeUtil;
+import com.xkrs.utilsold.DateTimeUtil;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.DisabledException;
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.xkrs.utils.EncryptDecryptUtil.encry256;
+import static com.xkrs.utilsnew.EncryptDecryptUtil.encry256;
 
 /**
  * 自定义认证Provider
@@ -70,17 +70,11 @@ public class CustomAuthenticationProvider implements AuthenticationProvider {
 
         // 检查用户是否存在
         if (userEntity == null) {
-            throw new BadCredentialsException("账号不存在或错误，请您确认注册");
+            throw new BadCredentialsException("您的账号不存在，请您前往注册。");
         }
-
         // 检查用户是否激活
         if (userEntity.getActiveFlag() != 0) {
-            throw new DisabledException("该账号还未激活，请联系管理员");
+            throw new DisabledException("您的账号未激活，详情请联系客服人员。");
-        }
-
-        //检查用户状态是否正常
-        if (userEntity.getStatusCode() != 0) {
-            throw new DisabledException("用户状态不正常，请联系管理员");
         }
 
         // 认证逻辑
@@ -88,16 +82,15 @@ public class CustomAuthenticationProvider implements AuthenticationProvider {
         if (encryptPassword.equals(userEntity.getPassword())) {
             // 设置权限列表
             ArrayList<GrantedAuthority> permissions = new ArrayList<>();
-            List<Integer> integers = customAuthenticationProvider.sysAuthorityService.selectAuthorityByUserId(userEntity.getId());
+            List<Long> longs = customAuthenticationProvider.sysAuthorityService.selectAuthorityByUserId(userEntity.getId());
-            List<SysAuthorityEntity> permissionList = customAuthenticationProvider.sysAuthorityService.findAllByIdIn(integers);
+            List<SysAuthorityEntity> permissionList = customAuthenticationProvider.sysAuthorityService.findAllByIdIn(longs);
             for (SysAuthorityEntity sysAuthorityEntity : permissionList) {
                 permissions.add(new GrantedAuthorityImpl(sysAuthorityEntity.getAuthorityName()));
             }
             customAuthenticationProvider.sysUserService.updateLoginNum(userEntity.getId(), userEntity.getLoginNum() + 1);
             customAuthenticationProvider.sysUserService.updateLoginLastTime(userEntity.getId(), DateTimeUtil.dateTimeToString(LocalDateTime.now()));
             // 生成令牌
-            Authentication authToken = new UsernamePasswordAuthenticationToken(userName, encryptPassword, permissions);
+            return new UsernamePasswordAuthenticationToken(userName, encryptPassword, permissions);
-            return authToken;
         } else {
             throw new BadCredentialsException("用户密码错误，请重新输入");
         }

src/main/java/com/xkrs/common/account/JwtLoginFilter.java

@@ -2,9 +2,8 @@ package com.xkrs.common.account;
 
 import com.xkrs.common.encapsulation.OutputEncapsulation;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.model.vo.SysUserVo;
+import com.xkrs.model.entity.SysUserEntity;
 import com.xkrs.service.SysUserService;
-import com.xkrs.utils.IpUtil;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -76,9 +75,7 @@ public class JwtLoginFilter extends AbstractAuthenticationProcessingFilter {
             WebApplicationContext webApplicationContext = WebApplicationContextUtils.getWebApplicationContext(servletContext);
             sysUserService = webApplicationContext.getBean(SysUserService.class);
         }
-        //更新用户登录信息
+        SysUserEntity userByUserName = sysUserService.getUserByUserName(auth.getName());
-        sysUserService.updateSysUserLogin(auth.getName(), IpUtil.getIpAddr(req));
-        SysUserVo userByUserName = sysUserService.getUserByUserName(auth.getName());
         response.setHeader("Access-Control-Allow-Origin", "*");
         response.setHeader("Access-Control-Allow-Credentials", "false");
         response.setContentType("application/json");

src/main/java/com/xkrs/common/account/TokenAuthenticationService.java

@@ -2,7 +2,8 @@ package com.xkrs.common.account;
 
 import com.xkrs.common.encapsulation.OutputEncapsulation;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.model.vo.SysUserVo;
+import com.xkrs.model.entity.SysUserEntity;
+import com.xkrs.utilsnew.SysUserConvertUtils;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
@@ -52,7 +53,7 @@ public class TokenAuthenticationService {
      * @param userName
      * @param authorities
      */
-    static void addAuthentication(HttpServletResponse response, String userName, Collection<? extends GrantedAuthority> authorities, SysUserVo sysUserEntity) {
+    static void addAuthentication(HttpServletResponse response, String userName, Collection<? extends GrantedAuthority> authorities, SysUserEntity sysUserEntity) {
 
         Locale locale = new Locale("zh", "CN");
         Map map = new HashMap(3);
@@ -80,7 +81,7 @@ public class TokenAuthenticationService {
                 // 签名设置
                 .signWith(key).compact();
         map.put("token", jwt);
-        map.put("user", sysUserEntity);
+        map.put("user", SysUserConvertUtils.convert(sysUserEntity));
         // 将 JWT 写入 body
         PrintWriter out = null;
         try {

src/main/java/com/xkrs/common/config/WebSecurityConfig.java

@@ -29,44 +29,26 @@ class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         http.csrf().disable()
                 // 对请求进行认证
                 .authorizeRequests()
-                // 所有 / 的所有请求 都放行
-                //.antMatchers("/").permitAll()
                 // 所有OPTIONS请求都放行
                 .antMatchers(HttpMethod.OPTIONS).permitAll()
-                .antMatchers("/global/configuration/**").permitAll()
                 .antMatchers("/push/**").permitAll()
-                .antMatchers("/queryFirePoint").permitAll()
+                .antMatchers("/insertFirePoint").permitAll()
-                .antMatchers(HttpMethod.POST, "/api/user/updateSysUser").permitAll()
+                .antMatchers("/updateFirePoint").permitAll()
-                .antMatchers(HttpMethod.GET, "/selectGlobalConfigDict").permitAll()
+                .antMatchers("/queryFirePointBroadcast").permitAll()
-                .antMatchers(HttpMethod.GET, "/selectGlobalConfigValue").permitAll()
+                .antMatchers("/autoSync").permitAll()
-                .antMatchers(HttpMethod.GET, "/selectGlobalConfig").permitAll()
+                .antMatchers("/debug").permitAll()
-                .antMatchers(HttpMethod.POST, "/globalConfig").permitAll()
+                .antMatchers("/queryNotice").permitAll()//查询通知
-                .antMatchers(HttpMethod.POST, "/globalConfigDict").permitAll()
+                .antMatchers(HttpMethod.POST, "/api/user/add").permitAll()//新增用户
-                .antMatchers(HttpMethod.POST, "/api/user/add").permitAll()
+                .antMatchers(HttpMethod.POST, "/api/user/add2").permitAll()//新增用户（直接注册）
                 .antMatchers(HttpMethod.POST, "/api/user/check/duplicate").permitAll()
                 .antMatchers(HttpMethod.POST, "/api/login").permitAll()
-                // 所有 app 用户注册 的POST请求 都放行
-                .antMatchers(HttpMethod.POST, "/api/person-investigator/add").permitAll()
-                .antMatchers("/ws/asset").permitAll()
                 .antMatchers(HttpMethod.GET, "/api/user/booleanUserName").permitAll()
-                .antMatchers(HttpMethod.GET, "/queryzzhd").permitAll()
-                .antMatchers(HttpMethod.POST, "/insertFirePoint").permitAll()
-                .antMatchers(HttpMethod.POST, "/insertAppTask").permitAll()
-                .antMatchers(HttpMethod.GET, "/selectAppTask").permitAll()
-                .antMatchers(HttpMethod.GET, "/selectFirePointBetweenSeven").permitAll()
-                .antMatchers(HttpMethod.GET, "/selectFirePointNum").permitAll()
-                .antMatchers(HttpMethod.GET, "/selectCityName").permitAll()
                 .antMatchers(HttpMethod.GET, "/weather/cityName").permitAll()
                 .antMatchers(HttpMethod.GET, "/weather/cityId").permitAll()
-                .antMatchers(HttpMethod.GET, "/selectFirePointByCode").permitAll()
                 .antMatchers(HttpMethod.GET, "/api/user/verificationCode").permitAll()
-                .antMatchers(HttpMethod.GET, "/api/user/selectAgentOrgList").permitAll()//获取代理组织列表
-                .antMatchers(HttpMethod.POST, "/uploadFileMore").permitAll()
-                .antMatchers(HttpMethod.POST, "/uploadFile").permitAll()
                 .antMatchers(HttpMethod.GET, "/api/user/verificationCodeUpdate").permitAll()
                 .antMatchers(HttpMethod.GET, "/api/user/getVerificationCode").permitAll()
                 .antMatchers(HttpMethod.POST, "/api/user/userUnRememberPassword").permitAll()
-                .antMatchers(HttpMethod.POST, "/updateBeforeFireAndAfterFireImage").permitAll()
                 .antMatchers(HttpMethod.GET, "/getProvinceList").permitAll()//获取省列表
                 .antMatchers(HttpMethod.GET, "/getCityList").permitAll()//根据省编号获取市列表
                 .antMatchers(HttpMethod.GET, "/getCountyList").permitAll()//根据市编号获取区县列表
@@ -75,9 +57,8 @@ class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers(HttpMethod.GET, "/api/adm/getCityList").permitAll()//根据省编号获取市列表
                 .antMatchers(HttpMethod.GET, "/api/adm/getCountyList").permitAll()//根据市编号获取区县列表
                 .antMatchers(HttpMethod.GET, "/api/adm/getStreetList").permitAll()//根据区县编号获取街道列表
-                .antMatchers(HttpMethod.GET, "/updateFirePointStreetCode").permitAll()
+                .antMatchers(HttpMethod.GET, "/queryVectorBoundary").permitAll()//获取城市矢量边界
-                .antMatchers(HttpMethod.GET, "/selectTodayFirePoint").permitAll()
+                .antMatchers(HttpMethod.POST, "/sendSmsToUser").permitAll()//给用户发送短信
-                .antMatchers(HttpMethod.GET, "/api/user/selectVipUser").permitAll()
                 // 所有其它请求需要身份认证
                 .anyRequest().authenticated()
                 .and()

src/main/java/com/xkrs/common/config/WebSocketSecurityConfig.java

@@ -1,25 +0,0 @@
-package com.xkrs.common.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.messaging.MessageSecurityMetadataSourceRegistry;
-import org.springframework.security.config.annotation.web.socket.AbstractSecurityWebSocketMessageBrokerConfigurer;
-
-import static org.springframework.messaging.simp.SimpMessageType.MESSAGE;
-import static org.springframework.messaging.simp.SimpMessageType.SUBSCRIBE;
-
-
-/**
- * @author xkrs
- */
-@Configuration
-public class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBrokerConfigurer {
-    @Override
-    protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
-        messages
-                .nullDestMatcher().authenticated()
-                .simpSubscribeDestMatchers("/user/queue/errors").permitAll()
-                .simpTypeMatchers(MESSAGE, SUBSCRIBE).denyAll()
-                .anyMessage().denyAll();
-
-    }
-}

src/main/java/com/xkrs/common/tool/CompareVersion.java

@@ -1,33 +0,0 @@
-package com.xkrs.common.tool;
-
-/**
- * CompareVersion 比较版本号
- * @author tajochen
- */
-public class CompareVersion {
-
-    /**
-     * 比较三位版本号 ，若 版本1>版本2 返回 1，若版本1<版本2 返回 -1，否则返回0
-     * @param version1 版本1
-     * @param version2 版本2
-     * @return
-     */
-    public static int compareVersion(String version1, String version2) {
-        String[] v1 = version1.split("\\.");
-        String[] v2 = version2.split("\\.");
-        int n = Math.max(v1.length, v2.length);
-        for (int i = 0; i < n; i++) {
-            int v1Int = i < v1.length ? Integer.parseInt(v1[i]) : 0;
-            int v2Int = i < v2.length ? Integer.parseInt(v2[i]) : 0;
-            if (v1Int == v2Int) {
-                continue;
-            }
-            if (v1Int > v2Int){
-                return 1;
-            } else {
-                return -1;
-            }
-        }
-        return 0;
-    }
-}

src/main/java/com/xkrs/common/tool/EntityUtil.java

@@ -1,98 +0,0 @@
-package com.xkrs.common.tool;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * dao接口类处理工具
- * @author tajochen
- */
-public class EntityUtil {
-    private static final Logger logger = LoggerFactory.getLogger(EntityUtil.class);
-
-    /**
-     * 将数组数据转换为实体类
-     * 此处数组元素的顺序必须与实体类构造函数中的属性顺序一致
-     * @param list           数组对象集合
-     * @param clazz          实体类
-     * @param <T>            实体类
-     * @param model          实例化的实体类
-     * @return 实体类集合
-     */
-    public static <T> List<T> castEntity(List<Object[]> list, Class<T> clazz, Object model) {
-        List<T> returnList = new ArrayList<T>();
-        if (list.isEmpty()) {
-            return returnList;
-        }
-        //获取每个数组集合的元素个数
-        Object[] co = list.get(0);
-
-        //获取当前实体类的属性名、属性值、属性类别
-        List<Map> attributeInfoList = getFiledsInfo(model);
-        //创建属性类别数组
-        Class[] c2 = new Class[attributeInfoList.size()];
-        //如果数组集合元素个数与实体类属性个数不一致则发生错误
-        if (attributeInfoList.size() != co.length) {
-            return returnList;
-        }
-        //确定构造方法
-        for (int i = 0; i < attributeInfoList.size(); i++) {
-            c2[i] = (Class) attributeInfoList.get(i).get("type");
-        }
-        try {
-            for (Object[] o : list) {
-                Constructor<T> constructor = clazz.getConstructor(c2);
-                returnList.add(constructor.newInstance(o));
-            }
-        } catch (Exception ex) {
-            logger.error("实体数据转化为实体类发生异常：异常信息：{}", ex.getMessage());
-            return returnList;
-        }
-        return returnList;
-    }
-
-    /**
-     * 根据属性名获取属性值
-     * @param fieldName 属性名
-     * @param modle     实体类
-     * @return 属性值
-     */
-    private static Object getFieldValueByName(String fieldName, Object modle) {
-        try {
-            String firstLetter = fieldName.substring(0, 1).toUpperCase();
-            String getter = "get" + firstLetter + fieldName.substring(1);
-            Method method = modle.getClass().getMethod(getter, new Class[]{});
-            Object value = method.invoke(modle, new Object[]{});
-            return value;
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     * 获取属性类型(type)，属性名(name)，属性值(value)的map组成的list
-     * @param model 实体类
-     * @return list集合
-     */
-    private static List<Map> getFiledsInfo(Object model) {
-        Field[] fields = model.getClass().getDeclaredFields();
-        List<Map> list = new ArrayList(fields.length);
-        Map infoMap = null;
-        for (int i = 0; i < fields.length; i++) {
-            infoMap = new HashMap(3);
-            infoMap.put("type", fields[i].getType());
-            infoMap.put("name", fields[i].getName());
-            infoMap.put("value", getFieldValueByName(fields[i].getName(), model));
-            list.add(infoMap);
-        }
-        return list;
-    }
-}

src/main/java/com/xkrs/common/tool/TokenUtil.java

@@ -1,51 +0,0 @@
-package com.xkrs.common.tool;
-
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.security.Keys;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.AuthorityUtils;
-
-import javax.crypto.SecretKey;
-import java.util.List;
-
-/**
- * token工具
- * @author tajochen
- */
-public class TokenUtil {
-    /**
-     * Token前缀
-     */
-    static public final String TOKEN_PREFIX = "Bearer";
-
-    static public final String SECRETKEY = "0Y9H364Q9Y908262F25LMXGIKIN5N858XM3674GWL2DD8X1DS4W6I722IRY8PS4XPNB6U30345" +
-            "HBVCUL94STG8C3Z53T7A09JJ100I56YE9894CI11PX9J71HIZ8L5Y2O504C4E2K8276425UA8734833F45K36878FXAG799QV9LXUJ" +
-            "OI3XA2046UPG8TB2OT84R5T6ZB127N9ZPJ7AJMC41JVHB2WK2B6H8NL45LZNAZ666KHZH3QUT65UX6F8";
-
-    static SecretKey key = Keys.hmacShaKeyFor(SECRETKEY.getBytes());
-
-    public static String getTokenUserName(String token) {
-        String userName = "";
-        if (token != null) {
-            try {
-                // 解析 Token
-                Claims claims = Jwts.parserBuilder()
-                        .setSigningKey(key).build()
-                        // 去掉 Bearer
-                        .parseClaimsJws(token.replace(TOKEN_PREFIX, ""))
-                        .getBody();
-                // 获取用户名
-                userName = claims.getSubject();
-                // 获取权限
-                List<GrantedAuthority> authorities = AuthorityUtils.commaSeparatedStringToAuthorityList((String) claims.get("auths"));
-            } catch(Exception e) {
-                // the sub field was missing or did not have a 'jsmith' value
-                return null;
-            }
-        } else {
-            return null;
-        }
-        return userName;
-    }
-}

src/main/java/com/xkrs/controller/ConfigGlobalController.java

@@ -1,53 +0,0 @@
-package com.xkrs.controller;
-
-import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.model.qo.GlobalConfigDictQo;
-import com.xkrs.service.GlobalConfigService;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.lang.Nullable;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Locale;
-import java.util.Map;
-
-import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-
-/**
- * 全局配置服务
- */
-@RestController
-public class ConfigGlobalController {
-
-    private final Locale locale = LocaleContextHolder.getLocale();
-
-    @Resource
-    private GlobalConfigService globalConfigService;
-
-    @GetMapping("/selectGlobalConfigDict")
-    public String selectGlobalConfigDict() {
-        return globalConfigService.selectGlobalConfigDict();
-    }
-
-    @GetMapping("/selectGlobalConfigValue")
-    public String selectGlobalConfigValue(@RequestParam(value = "code") Long code) {
-        Long value = globalConfigService.selectGlobalConfigValue(code);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, value, locale);
-    }
-
-    @GetMapping("/selectGlobalConfig")
-    public String selectGlobalConfig(@RequestParam(required = false, value = "code") Long code) {
-        return globalConfigService.selectGlobalConfig(code);
-    }
-
-    @PostMapping("/globalConfig")
-    public String globalConfig(@Nullable @RequestBody Map<Long, Long> configMap) {
-        return globalConfigService.globalConfig(configMap);
-    }
-
-    @PostMapping("/globalConfigDict")
-    public String globalConfigDict(@RequestBody GlobalConfigDictQo globalConfigDictQo) {
-        return globalConfigService.globalConfigDict(globalConfigDictQo);
-    }
-
-}

src/main/java/com/xkrs/controller/DispatchFirePointController.java

@@ -0,0 +1,129 @@
+package com.xkrs.controller;
+
+import com.xkrs.common.encapsulation.PromptMessageEnum;
+import com.xkrs.dao.FirePointOrdinaryDao;
+import com.xkrs.dao.StreetDao;
+import com.xkrs.dao.SysUserDao;
+import com.xkrs.fireseason.FireSeasonConfigService;
+import com.xkrs.model.entity.SysUserEntity;
+import com.xkrs.model.qo.AllFirePointQo;
+import com.xkrs.model.qo.UpdateFirePointQo;
+import com.xkrs.service.DispatchFirePointService;
+import com.xkrs.service.impl.FirePointServiceImpl;
+import com.xkrs.utilsnew.SMSUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
+
+@RestController
+public class DispatchFirePointController {
+
+    public static Logger log = LoggerFactory.getLogger(FirePointServiceImpl.class);
+    @Resource
+    private SysUserDao sysUserDao;
+    @Resource
+    private DispatchFirePointService firePointService;
+    @Resource
+    private FireSeasonConfigService fireSeasonConfigService;
+    @Resource
+    private FirePointOrdinaryDao firePointOrdinaryDao;
+    @Resource
+    private StreetDao streetDao;
+    private final Locale locale = LocaleContextHolder.getLocale();
+
+    @GetMapping("/debug")
+    public String debug() {
+
+//        System.out.println("开始更新用户VIP时间范围");
+//
+//        List<SysUserEntity> sysUserEntityList = sysUserDao.findAll();
+//        for (SysUserEntity sysUserEntity : sysUserEntityList) {
+//            String addTime = sysUserEntity.getAddTime();
+//            String vipTimeRangeJson = sysUserEntity.getVipTimeRangeJson();
+//            if (!DateTimeUtil.isValidDateTime(addTime)) {
+//                return sysUserEntity.getUserName();
+//            }
+//            if (!DateTimeUtil.isValidDateTime(vipTimeRangeJson)) {
+//                return sysUserEntity.getUserName();
+//            }
+//            VipTimeRangeBean.VipTimeRangeItemBean vipTimeRangeItemBean = new VipTimeRangeBean.VipTimeRangeItemBean();
+//            vipTimeRangeItemBean.setStartTime(addTime);
+//            vipTimeRangeItemBean.setEndTime(vipTimeRangeJson);
+//            List<VipTimeRangeBean.VipTimeRangeItemBean> list = new ArrayList<>();
+//            list.add(vipTimeRangeItemBean);
+//            VipTimeRangeBean vipTimeRangeBean = new VipTimeRangeBean();
+//            vipTimeRangeBean.setList(list);
+//            String serialize = JsonUtils.<VipTimeRangeBean>serialize(vipTimeRangeBean);
+//            System.out.println("serialize = " + serialize);
+//            sysUserEntity.setVipTimeRangeJson(serialize);
+//            sysUserDao.save(sysUserEntity);
+//        }
+
+//        for (int i = 0; i < 10000; i++) {
+//            firePointOrdinaryDao.updateProCityCode(i * 310L, (i + 1) * 310L);
+//            firePointOrdinaryDao.updateProCityName(i * 310L, (i + 1) * 310L);
+//            System.out.println(i + "/" + 10000);
+//        }
+
+        //群发短信-start
+        int groupCount = 50;
+        List<SysUserEntity> sysUserList = sysUserDao.findAll();
+        Map<Integer, List<SysUserEntity>> sysUserMap = new HashMap<>();
+        for (int i = 0; i < sysUserList.size(); i++) {
+            SysUserEntity sysUser = sysUserList.get(i);
+            int groupIndex = i / groupCount;
+            if (sysUserMap.containsKey(groupIndex)) {
+                List<SysUserEntity> groupSysUserList = sysUserMap.get(groupIndex);
+                groupSysUserList.add(sysUser);
+            } else {
+                List<SysUserEntity> groupSysUserList = new ArrayList<>();
+                groupSysUserList.add(sysUser);
+                sysUserMap.put(groupIndex, groupSysUserList);
+            }
+        }
+        for (Map.Entry<Integer, List<SysUserEntity>> entry : sysUserMap.entrySet()) {
+            List<SysUserEntity> smsReceiverList = entry.getValue();
+            String[] telephoneArray = new String[smsReceiverList.size()];
+            for (int i = 0; i < smsReceiverList.size(); i++) {
+                telephoneArray[i] = "86" + smsReceiverList.get(i).getUserName();
+            }
+            int resValue = SMSUtils.sendSmsToUser(telephoneArray, "1932636", new String[]{});
+            System.out.println("resValue = " + resValue);
+        }
+//        int resValue = SMSUtils.sendSmsToUser(new String[]{"8615764226530"}, "1932636", new String[]{});
+//        System.out.println("resValue = " + resValue);
+        //群发短信-end
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "OKKKK", locale);
+    }
+
+    @GetMapping("/autoSync")
+    public String autoSync() {
+        return fireSeasonConfigService.updateFireSeasonConfig();
+    }
+
+    /**
+     * 推送火点到秸秆系统
+     */
+    @PostMapping("/insertFirePoint")
+    public String insertFirePoint(@RequestBody AllFirePointQo firePointQo) {
+        return firePointService.insertFirePoint(firePointQo);
+    }
+
+    /**
+     * 更新火点状态
+     */
+    @PostMapping("/updateFirePoint")
+    public String updateFirePoint(@RequestBody UpdateFirePointQo updateFirePointQo) {
+        return firePointService.updateFirePoint(updateFirePointQo);
+    }
+
+}

src/main/java/com/xkrs/controller/FileController.java

@@ -1,118 +0,0 @@
-package com.xkrs.controller;
-
-import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.dao.FilePathDao;
-import com.xkrs.model.entity.FilePath;
-import com.xkrs.utils.FileFastDfs;
-import com.xkrs.utils.FileUtil;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-import static com.xkrs.utils.FileUtil.getUploadInfo;
-
-/**
- * @author XinYi Song
- * 文件上传
- */
-@RestController
-public class FileController {
-
-    @Resource
-    private FileFastDfs fileFastDfs;
-
-    @Resource
-    private FilePathDao filePathDao;
-
-    /**
-     * 上传多张图片
-     * @param files
-     * @return
-     */
-    @PostMapping("/uploadFileMore")
-    public String uploadFileMore(MultipartFile[] files) throws Exception {
-        Locale locale = LocaleContextHolder.getLocale();
-        if (null == files || files.length == 0){
-            return outputEncapsulationObject(PromptMessageEnum.PARAM_NULL, "result or fileType is null", locale);
-        }
-        List list = new ArrayList();
-        for (MultipartFile file :
-                files) {
-            boolean m = FileUtil.checkFileSize(file.getSize(), 100, "M");
-            if(m == false){
-                return outputEncapsulationObject(PromptMessageEnum.DATA_WRONG, "图片大小不能超过100M", locale);
-            }
-            File file1 = fileFastDfs.multipartFileToFile(file);
-            String dir = "fire_point";
-            String info = fileFastDfs.uploadFile(file1, dir);
-            Map<String, String> map = getUploadInfo(info);
-            file1.delete();
-            FilePath filePath = new FilePath();
-            filePath.setFilePath(map.get("path"));
-            filePath.setFileName(map.get("fileName"));
-            filePath.setSize(map.get("size"));
-            filePath.setMtime(map.get("mtime"));
-            filePath.setUrl(map.get("url"));
-            filePath.setMd5(map.get("md5"));
-            filePath.setScene(map.get("scene"));
-            filePathDao.save(filePath);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "上传成功！", locale);
-    }
-
-    /**
-     * 上传单张图片
-     * @param file
-     * @return
-     */
-    @PostMapping("/uploadFile")
-    public String uploadFile(MultipartFile file) throws Exception {
-        Locale locale = LocaleContextHolder.getLocale();
-        if (null == file){
-            return outputEncapsulationObject(PromptMessageEnum.PARAM_NULL, "result or fileType is null", locale);
-        }
-        boolean m = FileUtil.checkFileSize(file.getSize(), 100, "M");
-        if(m == false){
-            return outputEncapsulationObject(PromptMessageEnum.DATA_WRONG, "图片大小不能超过100M", locale);
-        }
-        File file1 = fileFastDfs.multipartFileToFile(file);
-        String dir = "fire_point";
-        String info = fileFastDfs.uploadFile(file1, dir);
-        Map<String, String> map = getUploadInfo(info);
-        file1.delete();
-        FilePath filePath = new FilePath();
-        filePath.setFilePath(map.get("path"));
-        filePath.setFileName(map.get("fileName"));
-        filePath.setSize(map.get("size"));
-        filePath.setMtime(map.get("mtime"));
-        filePath.setUrl(map.get("url"));
-        filePath.setMd5(map.get("md5"));
-        filePath.setScene(map.get("scene"));
-        filePathDao.save(filePath);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "上传成功！", locale);
-    }
-
-    /**
-     * 查询火点图片路径
-     * @return
-     */
-    @GetMapping("/findPath")
-    public String findPath(){
-        Locale locale = LocaleContextHolder.getLocale();
-        List<Map<String, String>> path = filePathDao.findPath();
-        if(path == null || path.size() == 0){
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "还未上传任何图片信息！", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, path, locale);
-    }
-}

src/main/java/com/xkrs/controller/FirePointController.java

@@ -1,33 +1,17 @@
 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.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;
-import com.xkrs.model.qo.ShanDongFirePointVerifyStateQo;
 import com.xkrs.service.FirePointService;
 import com.xkrs.service.StreetService;
 import com.xkrs.service.impl.FirePointServiceImpl;
-import com.xkrs.utils.FirePointQueryHelper;
+import com.xkrs.utilsnew.ReptileUtils;
-import org.apache.hc.core5.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.persistence.criteria.Predicate;
+import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -45,248 +29,50 @@ public class FirePointController {
     @Resource
     private FirePointService firePointService;
 
-    @Resource
-    private SysUserDao sysUserDao;
-
-    @Resource
-    private FirePointDao firePointDao;
-
-    @Resource
-    private ShanDongFirePointDao shanDongFirePointDao;
-
     @Resource
     private StreetService streetService;
 
-    @Resource
-    private FirePointQueryHelper firePointQueryHelper;
-
-    @GetMapping("/queryzzhd")
-    public String queryzzhd() {
-        List<FirePointEntity> firePointEntities1 = firePointQueryHelper.queryZZHD("371482", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
-        List<FirePointEntity> firePointEntities2 = firePointQueryHelper.queryZZHD("371403", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
-        List<FirePointEntity> firePointEntities3 = firePointQueryHelper.queryZZHD("371426", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
-        List<FirePointEntity> firePointEntities4 = firePointQueryHelper.queryZZHD("371424", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
-        List<FirePointEntity> firePointEntities5 = firePointQueryHelper.queryZZHD("371526", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
-        List<FirePointEntity> firePointEntities6 = firePointQueryHelper.queryZZHD("371425", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
-        List<FirePointEntity> firePointEntities7 = firePointQueryHelper.queryZZHD("371503", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
-
-        List<FirePointEntity> firePointList = new ArrayList<>();
-        firePointList.addAll(firePointEntities1);
-        firePointList.addAll(firePointEntities2);
-        firePointList.addAll(firePointEntities3);
-        firePointList.addAll(firePointEntities4);
-        firePointList.addAll(firePointEntities5);
-        firePointList.addAll(firePointEntities6);
-        firePointList.addAll(firePointEntities7);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale);
-    }
-
     /**
-     * 添加火点数据
+     * 查询火点播报（无token）
      *
-     * @param firePointQo
+     * @param limit 最大数量
-     * @return
      */
-    @PostMapping("/insertFirePoint")
+    @GetMapping("/queryFirePointBroadcast")
-    public String insertFirePoint(@RequestBody FirePointQo firePointQo) {
+    public String queryFirePointBroadcast(@RequestParam(value = "limit", required = false) Integer limit) {
-        log.info("insertFirePoint 接收到火点信息：" + firePointQo.toString());
+        return firePointService.queryFirePointBroadcast(limit);
-        boolean success = firePointService.insertFirePoint(firePointQo);
-        if (success) {
-            return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功", locale);
-        } else {
-            return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "添加失败", locale);
-        }
-    }
-
-    /**
-     * 查询山东临时火点表
-     *
-     * @return
-     */
-    @GetMapping("/queryshandongfirepointlist")
-    public String queryShanDongFirePointList() {
-        List<ShanDongFirePointEntity> shanDongFirePointList = shanDongFirePointDao.findAll(Sort.by(Sort.Direction.DESC, "satelliteTime"));
-        if (shanDongFirePointList.isEmpty()) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时还没有火点数据", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, shanDongFirePointList, locale);
-    }
-
-    /**
-     * 将山东临时火点表中的火点根据火点编号更新审核状态
-     * 操作1：如果verifyState==1，将火点编号对应的火点从山东火点表转存到火点表
-     * 操作2：将山东火点表中的这个火点的审核状态更新
-     */
-    @PostMapping("/updateverifystatebyfirecode")
-    public String updateVerifyStateByFireCode(@RequestBody ShanDongFirePointVerifyStateQo shanDongFirePointVerifyStateQo) {
-        String fireCode = shanDongFirePointVerifyStateQo.getFireCode();
-        String verifyState = shanDongFirePointVerifyStateQo.getVerifyState();
-        return firePointService.updateVerifyStateByFireCode(fireCode, verifyState);
-    }
-
-    /**
-     * 在全国火点表中根据火点编码修改审核火点状态
-     */
-    @Transactional(rollbackOn = Exception.class)
-    @PostMapping("/updateauditfiretype")
-    public String updateAuditFireType(@RequestBody AuditFireTypeQo auditFireTypeQo) {
-        String fireCode = auditFireTypeQo.getFireCode();
-        String auditFireType = auditFireTypeQo.getAuditFireType();
-        FirePointEntity firePointByFireCode = firePointDao.findByFireCode(fireCode);
-        if (firePointByFireCode == null) {
-            return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "修改失败，没有指定的火点编号", locale);
-        }
-        firePointDao.updateAuditFireTypeByFireCode(fireCode, auditFireType);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功", locale);
-    }
-
-    @GetMapping("/queryshandongfirepointbytime")
-    public String queryShanDongFirePointByTime(@RequestParam(required = false, value = "startTime") String startTime, @RequestParam(required = false, value = "endTime") String endTime) {
-        Specification<ShanDongFirePointEntity> specification = (root, criteriaQuery, criteriaBuilder) -> {
-            List<Predicate> list = new ArrayList<>();
-            if (startTime != null && !"".equals(startTime)) {
-                list.add(criteriaBuilder.greaterThanOrEqualTo(root.get("satelliteTime").as(String.class), startTime));
-            }
-            if (endTime != null && !"".equals(endTime)) {
-                list.add(criteriaBuilder.lessThanOrEqualTo(root.get("satelliteTime").as(String.class), endTime));
-            }
-            Predicate[] predicates = new Predicate[list.size()];
-            return criteriaBuilder.and(list.toArray(predicates));
-        };
-        List<ShanDongFirePointEntity> shanDongFirePointList = shanDongFirePointDao.findAll(specification, Sort.by(Sort.Direction.DESC, "satelliteTime"));
-        if (shanDongFirePointList.isEmpty()) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时还没有火点数据", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, shanDongFirePointList, locale);
-    }
-
-    @RequestMapping(value = "/download/vipuserfirepoint", method = RequestMethod.GET)
-    public String downloadVipUserFirePoint(HttpServletResponse response, HttpServletRequest request) {
-        return firePointService.downloadVipUserFilePoint(request, response);
-    }
-
-    @RequestMapping(value = "/download/firepoint", method = RequestMethod.GET)
-    public String downloadFirePoint(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "ids") String ids) {
-        return firePointService.downloadFirePoint(request, response, ids);
     }
 
     /**
      * 动态多条件查询火点列表
-     *
-     * @param code          区划编码，可以是省市区县街道任意编码，如果传需要至少两位。不传代表查询全国火点
-     * @param startTime     过滤火点开始卫星时间，不传代表不指定开始时间。后台会有限制。
-     * @param endTime       过滤火点结束卫星时间，不传代表不指定结束时间。
-     * @param satelliteType 过滤传感器类型，不传代表查询全部类型的传感器
-     * @param landType      过滤地物类型，不传代表查询全部地物类型
      */
     @GetMapping("/queryFirePoint")
-    public String queryFirePoint(@RequestParam(value = "code", required = false) String code, @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime, @RequestParam(value = "satelliteType", required = false) String satelliteType, @RequestParam(value = "landType", required = false) String landType) {
+    public String queryFirePoint(@RequestHeader(value = "Authorization") String token, @RequestParam(value = "code", required = false) String code, @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime, @RequestParam(value = "satelliteType", required = false) String satelliteType, @RequestParam(value = "landType", required = false) String landType) {
-        List<FirePointEntity> firePointList = firePointService.queryFirePoint(code, startTime, endTime, satelliteType, landType);
+        return firePointService.queryFirePoint(token, code, startTime, endTime, satelliteType, landType);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale);
-    }
-
-    /**
-     * 测试
-     *
-     * @param token
-     * @return
-     */
-    @GetMapping("/selectUserName")
-    public String selectUserName(@RequestHeader(value = "Authorization") String token) {
-        // 验证token
-        String tokenUserName = TokenUtil.getTokenUserName(token);
-        SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName);
-        if (sysUserEntity == null) {
-            return outputEncapsulationObject(PromptMessageEnum.USER_LOGIN_ERROR, "您还没有注册登录，请先注册登录", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, sysUserEntity.getUserName(), locale);
     }
 
     /**
      * 查询今天的火点信息
-     *
-     * @return
      */
     @GetMapping("/selectTodayFirePoint")
-    public String selectTodayFirePoint(@RequestParam("countyCode") String countyCode) {
+    public String selectTodayFirePoint(@RequestHeader(value = "Authorization") String token, @RequestParam("countyCode") String countyCode) {
-        List<FirePointEntity> firePointList = firePointService.selectTodayFirePoint(countyCode);
+        return firePointService.selectTodayFirePoint(token, countyCode);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale);
     }
 
     /**
      * 动态多条件查询火点信息
      */
     @PostMapping("/selectFirePoint")
-    public String selectFirePoint(@RequestBody Map map, @RequestHeader(value = "Authorization") String token) {
+    public String selectFirePoint(@RequestHeader(value = "Authorization") String token, @RequestBody Map map) {
-        // 区县编码
+        String code = (String) map.get("cityCode");
-        String cityCode = (String) map.get("cityCode");
-        // 开始时间
         String startTime = (String) map.get("startTime");
-        // 结束时间
         String endTime = (String) map.get("endTime");
-        // 卫星类型
         String satelliteType = (String) map.get("satelliteType");
-        // 植被类型
         String landType = (String) map.get("landType");
-        // 验证token
+        return firePointService.queryFirePoint(token, code, startTime, endTime, satelliteType, landType);
-        String tokenUserName = TokenUtil.getTokenUserName(token);
-        SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName);
-        // 用于查询的区划编码，可能是省市区县街道任意级别
-        String queryCode = TextUtils.isEmpty(cityCode) ? sysUserEntity.getCountyCode() : cityCode;
-        List<FirePointEntity> firePointList = firePointQueryHelper.queryFirePoint(queryCode, startTime, endTime, satelliteType, landType);
-        if (firePointList == null || firePointList.size() == 0) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时还没有火点数据", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale);
-    }
-
-    /**
-     * 查询近一周的火点信息
-     */
-    @GetMapping("/selectFirePointBetweenSeven")
-    public String selectFirePointBetweenSeven() {
-        List<FirePointEntity> firePointEntities = firePointService.selectFirePointBetweenSeven();
-        if (firePointEntities == null || firePointEntities.size() == 0) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有火点数据", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointEntities, locale);
-    }
-
-    /**
-     * 查询近一个月的火点信息
-     */
-    @GetMapping("/selectFirePointByMonth")
-    public String selectFirePointByMonth(@RequestHeader(value = "Authorization") String token) {
-        // 验证token
-        String tokenUserName = TokenUtil.getTokenUserName(token);
-        SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName);
-        List<FirePointEntity> firePointEntities = firePointService.selectFirePointByMonth(sysUserEntity.getCountyCode());
-        if (firePointEntities == null || firePointEntities.size() == 0) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有火点数据", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointEntities, locale);
-    }
-
-    /**
-     * 查询火点数量
-     */
-    @GetMapping("/selectFirePointNum")
-    public String selectFirePointNum(@RequestParam("keepType") String keepType) {
-        // keepType为1时，查询近一天的火点数量
-        if ("1".equals(keepType)) {
-            return firePointService.selectFirePointNumDay();
-            // keepType为2时,查询近一周的火点数量
-        } else if ("2".equals(keepType)) {
-            return firePointService.selectFirePointNumWeek();
-        } else {
-            return firePointService.selectFirePointNumMonth();
-        }
     }
 
     /**
      * 查询该省所有的市
-     *
-     * @return
      */
     @GetMapping("/selectCityName")
     public String selectCityName(@RequestParam("code") String countyCode) {
@@ -307,14 +93,23 @@ public class FirePointController {
 
     /**
      * 根据火点编码查询火点信息
-     *
-     * @param fireCode
-     * @return
      */
     @GetMapping("/selectFirePointByCode")
-    public String selectFirePoint(@RequestParam("fireCode") String fireCode) {
+    public String selectFirePointByCode(@RequestParam("fireCode") String fireCode) {
-        FirePointEntity byFireCode = firePointDao.findByFireCode(fireCode);
+        return firePointService.selectFirePointByCode(fireCode);
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, byFireCode, locale);
+    }
+
+    /**
+     * 云图
+     */
+    @GetMapping("/cloudCharts")
+    public String cloudCharts() {
+        try {
+            return outputEncapsulationObject(PromptMessageEnum.SUCCESS, ReptileUtils.reptileBatch(), locale);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, null, locale);
     }
 
 }

src/main/java/com/xkrs/controller/GaoDeApiController.java

@@ -16,8 +16,8 @@ import java.util.List;
 import java.util.Locale;
 
 import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-import static com.xkrs.utils.CommonConstant.*;
+import static com.xkrs.utilsnew.CommonConstant.*;
-import static com.xkrs.utils.HttpClientUtils.sendHttpsGet;
+import static com.xkrs.utilsold.HttpClientUtils.sendHttpsGet;
 
 /**
  * @author wudong
@@ -26,8 +26,8 @@ import static com.xkrs.utils.HttpClientUtils.sendHttpsGet;
  */
 @RestController
 @RequestMapping(value = "/gaode")
-public class GaodeApiController {
+public class GaoDeApiController {
-    private static final Logger log = LoggerFactory.getLogger(GaodeApiController.class);
+    private static final Logger log = LoggerFactory.getLogger(GaoDeApiController.class);
     Locale locale = LocaleContextHolder.getLocale();
 
     @RequestMapping(value = "/weather", method = RequestMethod.GET)

src/main/java/com/xkrs/controller/GlobalConfigurationController.java

@@ -1,53 +0,0 @@
-package com.xkrs.controller;
-
-import com.xkrs.model.entity.GlobalConfigurationEntity;
-import com.xkrs.service.GlobalConfigurationService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping(value = "/global/configuration")
-public class GlobalConfigurationController {
-
-    @Resource
-    private GlobalConfigurationService globalConfigurationService;
-
-    /**
-     * 新增全局配置
-     */
-    @PostMapping("/insert")
-    public String insertGlobalConfiguration(@RequestBody GlobalConfigurationEntity globalConfiguration) {
-        return globalConfigurationService.insertGlobalConfiguration(globalConfiguration);
-    }
-
-    /**
-     * 删除全局配置
-     */
-    @PostMapping("/delete")
-    public String deleteGlobalConfiguration(@RequestBody GlobalConfigurationEntity globalConfiguration) {
-        return globalConfigurationService.deleteGlobalConfiguration(globalConfiguration);
-    }
-
-    /**
-     * 修改全局配置
-     */
-    @PostMapping("/update")
-    public String updateGlobalConfiguration(@RequestBody GlobalConfigurationEntity globalConfiguration) {
-        return globalConfigurationService.updateGlobalConfiguration(globalConfiguration);
-    }
-
-    /**
-     * 查询全局配置
-     */
-    @GetMapping("/query")
-    public String queryGlobalConfiguration(@RequestParam(required = false, value = "id") Long id, @RequestParam(required = false, value = "group") String group, @RequestParam(required = false, value = "key") String key, @RequestParam(required = false, value = "value") String value, @RequestParam(required = false, value = "remark") String remark) {
-        GlobalConfigurationEntity globalConfiguration = new GlobalConfigurationEntity();
-        globalConfiguration.setId(id);
-        globalConfiguration.setBelongGroup(group);
-        globalConfiguration.setKey(key);
-        globalConfiguration.setValue(value);
-        globalConfiguration.setRemark(remark);
-        return globalConfigurationService.queryGlobalConfiguration(globalConfiguration);
-    }
-}

src/main/java/com/xkrs/controller/NoticeController.java

@@ -0,0 +1,63 @@
+package com.xkrs.controller;
+
+import com.xkrs.model.entity.NoticeEntity;
+import com.xkrs.service.NoticeService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+public class NoticeController {
+
+    @Resource
+    private NoticeService noticeService;
+
+    /**
+     * 添加通知
+     */
+    @PostMapping("/insertNotice")
+    public String insertNotice(@RequestHeader(value = "Authorization") String token, @RequestBody NoticeEntity insertQo) {
+        return noticeService.insertNotice(token, insertQo);
+    }
+
+    /**
+     * 删除通知
+     */
+    @PostMapping("/deleteNotice")
+    public String deleteNotice(@RequestHeader(value = "Authorization") String token, @RequestBody Long id) {
+        return noticeService.deleteNotice(token, id);
+    }
+
+    /**
+     * 更新通知
+     */
+    @PostMapping("/updateNotice")
+    public String updateNotice(@RequestHeader(value = "Authorization") String token, @RequestBody NoticeEntity updateQo) {
+        return noticeService.updateNotice(token, updateQo);
+    }
+
+//    /**
+//     * 查询通知
+//     */
+//    @GetMapping("/queryNotice")
+//    public String queryNotice(@RequestHeader(value = "Authorization") String token) {
+//        return noticeService.queryNotice(token);
+//    }
+
+    /**
+     * 查询通知
+     */
+    @GetMapping("/queryNotice")
+    public String queryNotice() {
+        return noticeService.queryNotice();
+    }
+
+    /**
+     * 已读通知
+     */
+    @PostMapping("/readNotice")
+    public String readNotice(@RequestHeader(value = "Authorization") String token, @RequestBody Long id) {
+        return noticeService.readNotice(token, id);
+    }
+
+}

src/main/java/com/xkrs/controller/PushController.java

@@ -1,10 +1,10 @@
 package com.xkrs.controller;
 
 import com.xkrs.common.encapsulation.PromptMessageEnum;
+import com.xkrs.model.qo.SysUserPushIdQo;
 import com.xkrs.dao.SysUserDao;
 import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.model.qo.SysUserPushAccountQo;
+import com.xkrs.model.helper.PushHelper;
-import com.xkrs.sms.PushHelper;
 import org.apache.hc.core5.util.TextUtils;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.*;
@@ -30,10 +30,9 @@ public class PushController {
     private PushHelper pushHelper;
 
     @PostMapping("/bindUserPushInfo")
-    public String bindUserPushInfo(@RequestBody SysUserPushAccountQo sysUserPushAccountQo) {
+    public String bindUserPushInfo(@RequestBody SysUserPushIdQo sysUserPushIdQo) {
-        Integer id = sysUserPushAccountQo.getId();
+        Long id = sysUserPushIdQo.getId();
-        String regID = sysUserPushAccountQo.getRegID();
+        String pushId = sysUserPushIdQo.getPushId();
-        String userAccount = sysUserPushAccountQo.getUserAccount();
         if (null == id) {
             return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "绑定失败，id == null", locale);
         }
@@ -41,17 +40,12 @@ public class PushController {
         if (targetSysUserOptional.isEmpty()) {
             return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "绑定失败，id不存在", locale);
         }
-        if (TextUtils.isEmpty(regID)) {
+        if (TextUtils.isEmpty(pushId)) {
-            return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "绑定失败，regID == null", locale);
+            return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "绑定失败，pushId == null", locale);
-        }
-        if (TextUtils.isEmpty(userAccount)) {
-            return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "绑定失败，userAccount == null", locale);
         }
         SysUserEntity targetSysUser = targetSysUserOptional.get();
-        // 更新 regID
+        // 更新 pushId
-        targetSysUser.setPushRegID(regID);
+        targetSysUser.setPushId(pushId);
-        // 更新 userAccount
-        targetSysUser.setPushUserAccount(userAccount);
         sysUserDao.save(targetSysUser);
         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "绑定成功", locale);
     }

src/main/java/com/xkrs/controller/SMSController.java

@@ -0,0 +1,36 @@
+package com.xkrs.controller;
+
+import com.xkrs.model.bean.SendSmsBean;
+import com.xkrs.utilsnew.SMSUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class SMSController {
+
+    /**
+     * 给用户发送短信
+     */
+    @PostMapping("/sendSmsToUser")
+    public String sendSmsToUser(@RequestBody SendSmsBean sendSmsBean) {
+        List<String> phoneNumbers = sendSmsBean.getPhoneNumbers();
+        String templateId = sendSmsBean.getTemplateId();
+        List<String> templateParams = sendSmsBean.getTemplateParams();
+
+        String[] phoneNumberArray = new String[phoneNumbers.size()];
+        for (int i = 0; i < phoneNumbers.size(); i++) {
+            String phoneNumber = phoneNumbers.get(i);
+            if (phoneNumber.startsWith("86")) {
+                phoneNumberArray[i] = phoneNumber;
+            } else {
+                phoneNumberArray[i] = "86" + phoneNumber;
+            }
+        }
+        int sendSmsToUser = SMSUtils.sendSmsToUser(phoneNumberArray, templateId, templateParams.toArray(new String[templateParams.size()]));
+        return "发送完毕" + sendSmsToUser;
+    }
+
+}

src/main/java/com/xkrs/controller/SettingController.java

@@ -1,37 +0,0 @@
-package com.xkrs.controller;
-
-import com.xkrs.model.qo.SettingQo;
-import com.xkrs.service.SettingService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * 设置审核开关状态
- */
-@RestController
-public class SettingController {
-
-    @Resource
-    private SettingService settingService;
-
-    /**
-     * 更新审核开关状态
-     */
-    @PostMapping("/updateswitchstate")
-    public String updateSwitchState(@RequestBody SettingQo settingQo) {
-        return settingService.updateSwitchState(settingQo);
-    }
-
-    /**
-     * 查询审核开关状态
-     */
-    @GetMapping("/queryswitchstate")
-    public String querySwitchState() {
-        return settingService.querySwitchState();
-    }
-
-}

src/main/java/com/xkrs/controller/SysUserController.java

@@ -1,40 +1,36 @@
 package com.xkrs.controller;
 
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
-import com.xkrs.common.tool.TokenUtil;
-import com.xkrs.dao.AgentOrgDao;
 import com.xkrs.dao.SysUserDao;
-import com.xkrs.model.entity.AgentOrgEntity;
 import com.xkrs.model.entity.SysUserEntity;
 import com.xkrs.model.qo.SysUserQo;
 import com.xkrs.model.qo.SysUserReceiveSmsQo;
-import com.xkrs.model.qo.SysUserRemarkQo;
+import com.xkrs.model.va.SysUserQoInsert;
-import com.xkrs.model.qo.SysUserVipLevelQo;
+import com.xkrs.model.va.SysUserQoUpdate;
-import com.xkrs.model.validation.SysUserQoInsert;
-import com.xkrs.model.validation.SysUserQoUpdate;
 import com.xkrs.model.vo.SysUserVo;
 import com.xkrs.service.RedisService;
 import com.xkrs.service.SysUserService;
-import com.xkrs.sms.SMSHelper;
+import com.xkrs.utilsnew.*;
-import com.xkrs.utils.FirePointCodeUtils;
-import com.xkrs.utils.ListUtils;
-import com.xkrs.utils.RandomUtil;
 import org.apache.hc.core5.util.TextUtils;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationErrorList;
 import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
-import static com.xkrs.utils.EncryptDecryptUtil.encry256;
+import static com.xkrs.utilsnew.EncryptDecryptUtil.encry256;
 
 /**
  * 系统用户Controller
@@ -54,20 +50,6 @@ public class SysUserController {
     @Resource
     private RedisService redisService;
 
-    @Resource
-    private AgentOrgDao agentOrgDao;
-
-    @Resource
-    private SMSHelper smsHelper;
-
-    /**
-     * 查询Vip用户
-     */
-    @GetMapping("/selectVipUser")
-    public String selectVipUser() {
-        return sysUserService.selectVipUser();
-    }
-
     /**
      * 更新（批量）系统用户信息
      *
@@ -76,7 +58,7 @@ public class SysUserController {
      */
     @Transactional(rollbackFor = Exception.class)
     @RequestMapping(value = "/updateSysUser", method = RequestMethod.POST)
-    public String updateSysUser(@RequestBody Map<String, String> paramMap) {
+    public String updateSysUser(@RequestHeader(value = "Authorization") String token, @RequestBody Map<String, String> paramMap) {
         String userIdArray = paramMap.get("userIdArray");
         String overTime = paramMap.get("overTime");
         String remark = paramMap.get("remark");
@@ -88,11 +70,16 @@ public class SysUserController {
         List<String> failureIdList = new ArrayList<>();//操作失败的ID集合
         for (String userId : userIdList) {
             try {
-                Optional<SysUserEntity> targetEntityOptional = sysUserDao.findById(Integer.parseInt(userId));
+                Optional<SysUserEntity> targetEntityOptional = sysUserDao.findById(Long.parseLong(userId));
                 if (targetEntityOptional.isPresent()) {
                     SysUserEntity targetEntity = targetEntityOptional.get();
                     if (!TextUtils.isEmpty(overTime)) {
-                        targetEntity.setOverTime(overTime);
+                        //获取LocalDateTime格式的过期时间
+                        LocalDateTime newLocalDateTime = LocalDateTime.parse(overTime, DateTimeUtils.DATE_TIME_FORMATTER_1);
+                        //生成新的VIP时间范围Json内容
+                        String newVipTimeRangeJson = VipTimeRangeUtils.obtainNewVipTimeRangeJson(targetEntity.getVipTimeRangeJson(), newLocalDateTime);
+                        //更新字段
+                        targetEntity.setVipTimeRangeJson(newVipTimeRangeJson);
                     }
                     if (!TextUtils.isEmpty(remark)) {
                         targetEntity.setRemark(remark);
@@ -118,30 +105,6 @@ public class SysUserController {
         return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "修改失败，" + builder, locale);
     }
 
-    /**
-     * 修改vip等级
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @RequestMapping(value = "/updateviplevel", method = RequestMethod.POST)
-    public String updateVipLevel(@RequestBody SysUserVipLevelQo sysUserVipLevelQo) {
-        String ids = sysUserVipLevelQo.getIds();
-        List<Integer> idList = new ArrayList<>();
-        if (ids.contains(",")) {
-            String[] splits = ids.split(",");
-            if (splits != null && splits.length > 0) {
-                for (String split : splits) {
-                    idList.add(Integer.parseInt(split));
-                }
-            }
-        } else {
-            idList.add(Integer.parseInt(ids));
-        }
-        for (Integer id : idList) {
-            sysUserDao.updateVipLevel(id, sysUserVipLevelQo.getVipLevel());
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功", locale);
-    }
-
     /**
      * 修改是否接收短信
      */
@@ -149,35 +112,21 @@ public class SysUserController {
     @RequestMapping(value = "/updatereceivesms", method = RequestMethod.POST)
     public String updateReceiveSms(@RequestBody SysUserReceiveSmsQo sysUserReceiveSmsQo) {
         String ids = sysUserReceiveSmsQo.getIds();
-        List<Integer> idList = new ArrayList<>();
+        List<Long> idList = new ArrayList<>();
         if (ids.contains(",")) {
             String[] splits = ids.split(",");
-            if (splits != null && splits.length > 0) {
             for (String split : splits) {
-                    idList.add(Integer.parseInt(split));
+                idList.add(Long.parseLong(split));
-                }
             }
         } else {
-            idList.add(Integer.parseInt(ids));
+            idList.add(Long.parseLong(ids));
         }
-        for (Integer id : idList) {
+        for (Long id : idList) {
             sysUserDao.updateReceiveSms(id, sysUserReceiveSmsQo.getReceiveSms());
         }
         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功", locale);
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    @RequestMapping(value = "/updateremark", method = RequestMethod.POST)
-    public String updateRemark(@RequestBody SysUserRemarkQo sysUserRemarkQo) {
-        Integer id = sysUserRemarkQo.getId();
-        Optional<SysUserEntity> optionalById = sysUserDao.findById(id);
-        if (optionalById.isEmpty()) {
-            return outputEncapsulationObject(PromptMessageEnum.PARAM_ILLEGAL, "修改失败，用户找不到", locale);
-        }
-        sysUserDao.updateRemark(id, sysUserRemarkQo.getRemark());
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功", locale);
-    }
-
     /**
      * 登录用户Token验证
      */
@@ -196,12 +145,6 @@ public class SysUserController {
         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "OK", locale);
     }
 
-    @GetMapping("/selectAgentOrgList")
-    public String selectAgentOrgList() {
-        List<AgentOrgEntity> agentOrgList = agentOrgDao.findAll(Sort.by(Sort.Direction.ASC, "id"));
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, agentOrgList, locale);
-    }
-
     /**
      * 注册系统用户
      */
@@ -219,6 +162,19 @@ public class SysUserController {
         return sysUserService.addUser(userQo, servletRequest);
     }
 
+    /**
+     * 注册系统用户
+     */
+    @RequestMapping(value = "/add2", method = RequestMethod.POST)
+    public String addUser2(@Validated({SysUserQoInsert.class}) @RequestBody SysUserQo userQo) {
+        // 验证用户名是否重复
+        if (!sysUserService.checkUserName(userQo.getUserName())) {
+            return outputEncapsulationObject(PromptMessageEnum.PARAM_ILLEGAL, "该账号已经注册，请勿重复注册", locale);
+        }
+        // 添加新用户
+        return sysUserService.addUser2(userQo);
+    }
+
     /**
      * 删除系统用户
      */
@@ -227,20 +183,6 @@ public class SysUserController {
         return sysUserService.deleteSysUser(userName);
     }
 
-    /**
-     * 软删除指定id的普通用户
-     */
-    @RequestMapping(value = "/general/delete", method = RequestMethod.DELETE)
-    public String deleteCustomUser(@RequestParam(value = "userId", required = false) int id) {
-        // 验证数据合法性
-        int res = sysUserService.softDeleteGeneralUser(id);
-        if (res == 1) {
-            return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "", locale);
-        } else {
-            return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "", locale);
-        }
-    }
-
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public String updateUser(@Validated({SysUserQoUpdate.class}) @RequestBody SysUserQo userQo, BindingResult bindingResult) {
         // 验证数据合法性
@@ -274,16 +216,17 @@ public class SysUserController {
     @GetMapping("/selectAllUser")
     public String selectAllUser(@RequestHeader(value = "Authorization") String token) {
         // 验证token
-        String tokenUserName = TokenUtil.getTokenUserName(token);
+        String tokenUserName = TokenUtil.obtainUserNameByToken(token);
         SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName);
         if (sysUserEntity == null) {
             return outputEncapsulationObject(PromptMessageEnum.USER_LOGIN_ERROR, "您还没有注册登录，请先注册登录", locale);
         }
-        List<SysUserVo> sysUserVos = sysUserService.selectAllUser();
+        List<SysUserEntity> sysUserEntityList = sysUserDao.findAll(Sort.by(Sort.Direction.DESC, "id"));
-        if (sysUserVos == null || sysUserVos.size() == 0) {
+        List<SysUserVo> sysUserVoList = new ArrayList<>();
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时还没有任何用户数据", locale);
+        for (SysUserEntity sysUser : sysUserEntityList) {
+            sysUserVoList.add(SysUserConvertUtils.convert(sysUser));
         }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, sysUserVos, locale);
+        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, sysUserVoList, locale);
     }
 
     /**
@@ -294,17 +237,17 @@ public class SysUserController {
         Integer userId = (Integer) map.get("userId");
         String keepType = (String) map.get("keepType");
         // 验证token
-        String tokenUserName = TokenUtil.getTokenUserName(token);
+        String tokenUserName = TokenUtil.obtainUserNameByToken(token);
         SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName);
         if (sysUserEntity == null) {
             return outputEncapsulationObject(PromptMessageEnum.USER_LOGIN_ERROR, "您还没有注册登录，请先注册登录", locale);
         }
         // 如果keepType等于1进行启用操作
         if ("1".equals(keepType)) {
-            sysUserService.updateEnable(userId);
+            sysUserService.updateEnable(Long.valueOf(userId));
             return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "启用成功", locale);
         } else {
-            sysUserService.updateDisable(userId);
+            sysUserService.updateDisable(Long.valueOf(userId));
             return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "禁用成功", locale);
         }
     }
@@ -318,7 +261,7 @@ public class SysUserController {
         String newPassword = (String) map.get("newPassword");
         String confirmPassword = (String) map.get("confirmPassword");
         // 验证token
-        String tokenUserName = TokenUtil.getTokenUserName(token);
+        String tokenUserName = TokenUtil.obtainUserNameByToken(token);
         SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName);
         if (sysUserEntity == null) {
             return outputEncapsulationObject(PromptMessageEnum.USER_LOGIN_ERROR, "您还没有注册登录，请先注册登录", locale);
@@ -336,12 +279,12 @@ public class SysUserController {
         String newPassword = (String) map.get("newPassword");
         String confirmPassword = (String) map.get("confirmPassword");
         // 验证token
-        String tokenUserName = TokenUtil.getTokenUserName(token);
+        String tokenUserName = TokenUtil.obtainUserNameByToken(token);
         SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName);
         if (sysUserEntity == null) {
             return outputEncapsulationObject(PromptMessageEnum.USER_LOGIN_ERROR, "您还没有注册登录，请先注册登录", locale);
         }
-        return sysUserService.adminUpdatePassword(userId, newPassword, confirmPassword);
+        return sysUserService.adminUpdatePassword(Long.valueOf(userId), newPassword, confirmPassword);
     }
 
     /**
@@ -369,13 +312,10 @@ public class SysUserController {
      * 发送验证码
      */
     @GetMapping("/verificationCode")
-    public String verificationCode(@RequestParam("phone") String phone, @RequestParam(value = "agentOrgId", required = false) String agentOrgId) throws Exception {
+    public String verificationCode(@RequestParam("phone") String phone) throws Exception {
-        Long finalAgentOrgId = Long.parseLong(TextUtils.isEmpty(agentOrgId) ? "1" : agentOrgId);
-        List<AgentOrgEntity> agentOrgList = agentOrgDao.findAll();
-        String targetAgentOrgName = FirePointCodeUtils.getTargetAgentOrgName(finalAgentOrgId, agentOrgList);
         String optCode = String.valueOf(RandomUtil.returnCode());
         redisService.set(phone, optCode, 10, TimeUnit.MINUTES);
-        smsHelper.dispatchSMSCode(targetAgentOrgName, phone, optCode);
+        SendSmsResponse response = AliYunSmsUtils.sendCode(phone, optCode);
         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "", locale);
     }
 
@@ -384,15 +324,20 @@ public class SysUserController {
      */
     @GetMapping("/verificationCodeUpdate")
     public String verificationCodeUpdate(@RequestParam("phone") String phone) throws Exception {
-        SysUserVo sysUserVo = sysUserDao.selectUserByUserName(phone);
+        Specification<SysUserEntity> specification = (root, criteriaQuery, criteriaBuilder) -> {
-        if (sysUserVo == null) {
+            //查询条件集合
+            List<Predicate> predicateList = new ArrayList<>();
+            predicateList.add(criteriaBuilder.equal(root.get("userName").as(String.class), phone));
+            Predicate[] predicateArray = new Predicate[predicateList.size()];
+            return criteriaBuilder.and(predicateList.toArray(predicateArray));
+        };
+        List<SysUserEntity> sysUserEntityList = sysUserDao.findAll(specification, Sort.by(Sort.Direction.DESC, "id"));
+        if (sysUserEntityList.size() == 0) {
             return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "手机号错误，请使用您注册的手机号", locale);
         }
-        List<AgentOrgEntity> agentOrgList = agentOrgDao.findAll();
-        String targetAgentOrgName = FirePointCodeUtils.getTargetAgentOrgName(sysUserVo.getAgentOrgId(), agentOrgList);
         String optCode = String.valueOf(RandomUtil.returnCode());
         redisService.set(phone, optCode, 10, TimeUnit.MINUTES);
-        smsHelper.dispatchSMSCode(targetAgentOrgName, phone, optCode);
+        SendSmsResponse response = AliYunSmsUtils.sendCode(phone, optCode);
         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "", locale);
     }
 
@@ -401,43 +346,14 @@ public class SysUserController {
      */
     @GetMapping("/getVerificationCode")
     public String getVerificationCode(@RequestParam("phone") String phone, @RequestParam("verificationCode") String verificationCode) {
-        String o = (String) redisService.get(phone);
+        String code = (String) redisService.get(phone);
-        if ("".equals(o) || o == null) {
+        if (TextUtils.isEmpty(code)) {
             return outputEncapsulationObject(PromptMessageEnum.DATA_WRONG, "请先发送验证码！", locale);
         }
-        if (!redisService.get(phone).equals(verificationCode)) {
+        if (!code.equals(verificationCode)) {
             return outputEncapsulationObject(PromptMessageEnum.DATA_WRONG, "验证码错误，请重新输入！", locale);
         }
         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "true", locale);
     }
 
-    /**
-     * 更改账号过期时间
-     */
-    @PostMapping("/updateExpireDate")
-    public String updateExpireDate(@RequestBody Map map, @RequestHeader(value = "Authorization") String token) {
-        Integer userId = (Integer) map.get("userId");
-        Integer timeNum = (Integer) map.get("timeNum");
-        String keepType = (String) map.get("keepType");
-        if ("1".equals(keepType)) {
-            return sysUserService.updateExpireDateDay(userId, timeNum);
-        } else if ("2".equals(keepType)) {
-            return sysUserService.updateExpireDateMonth(userId, timeNum);
-        } else if ("3".equals(keepType)) {
-            return sysUserService.updateExpireDateYear(userId, timeNum);
-        } else {
-            return sysUserService.updatePermanent(userId);
-        }
-    }
-
-    /**
-     * 修改账号到期时间
-     */
-    @PostMapping("/updateOverTime")
-    public String updateOverTime(@RequestBody Map map, @RequestHeader(value = "Authorization") String token) {
-        Integer userId = (Integer) map.get("userId");
-        String overTime = (String) map.get("overTime");
-        return sysUserService.updateOverTime(userId, overTime);
-    }
-
 }

src/main/java/com/xkrs/controller/VectorBoundaryController.java

@@ -0,0 +1,33 @@
+package com.xkrs.controller;
+
+import com.xkrs.utilsold.HttpClientUtils;
+import org.apache.hc.core5.util.TextUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class VectorBoundaryController {
+
+    @GetMapping("/queryVectorBoundary")
+    public String queryVectorBoundary(@RequestParam(value = "tk", required = false) String tk,
+                                      @RequestParam(value = "lon") Double lon,
+                                      @RequestParam(value = "lat") Double lat,
+                                      @RequestParam(value = "scale") Double scale,
+                                      @RequestParam(value = "bgeo", required = false) Boolean bgeo) throws Exception {
+        String defaultTk = "9cc3e9deb3cf643b6f133717c333d16d";
+        Boolean defaultBgeo = true;
+        String finalTk = (TextUtils.isEmpty(tk)) ? defaultTk : tk;
+        Boolean finalBgeo = (bgeo == null) ? defaultBgeo : bgeo;
+
+        StringBuilder builder = new StringBuilder("https://service.sdmap.gov.cn/citysearch");
+        builder.append("?tk=").append(finalTk);
+        builder.append("&lon=").append(lon);
+        builder.append("&lat=").append(lat);
+        builder.append("&scale=").append(scale);
+        builder.append("&bgeo=").append(finalBgeo);
+        String url = builder.toString();
+        return HttpClientUtils.sendHttpsGetCustom(url);
+    }
+
+}

src/main/java/com/xkrs/dao/FilePathDao.java

@@ -1,21 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.FilePath;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author XinYi Song
- */
-public interface FilePathDao extends JpaRepository<FilePath,Long> {
-
-    /**
-     * 查询全部路径
-     * @return
-     */
-    @Query(value = "select file_path filepath from file_path",nativeQuery = true)
-    List<Map<String,String>> findPath();
-}

src/main/java/com/xkrs/dao/FirePointDao.java

@@ -1,46 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.FirePointEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-@Component
-public interface FirePointDao extends JpaRepository<FirePointEntity, Long>, JpaSpecificationExecutor<FirePointEntity> {
-
-    /**
-     * 根据火点编码查询火点信息
-     */
-    FirePointEntity findByFireCode(String fireCode);
-
-    @Query(value = "SELECT * FROM fire_point WHERE longitude = ?1 AND latitude = ?2 AND street_code = ?3 AND satellite_time = ?4 AND satellite_type = ?5 AND land_type = ?6", nativeQuery = true)
-    List<FirePointEntity> findDuplicatedData(double longitude, double latitude, String streetCode, String satelliteTime, String satelliteType, String landType);
-
-    /**
-     * 根据火点编码修改审核火点状态
-     */
-    @Modifying(clearAutomatically = true)
-    @Query(value = "UPDATE fire_point SET audit_fire_type = ?2 WHERE fire_code = ?1", nativeQuery = true)
-    void updateAuditFireTypeByFireCode(String fireCode, String auditFireType);
-
-    /**
-     * 查询时间段内各植被类型的火点数量
-     */
-    @Query(value = "select la.land_name landname,count(fp.id) as num from land la left join fire_point fp on fp.land_type = la.land_name AND fp.satellite_time BETWEEN ?1 AND ?2 group by la.land_name", nativeQuery = true)
-    List<Map<String, Object>> selectNumByLandType(String startTime, String endTime);
-
-    /**
-     * 查询时间段内各地区的火点数量
-     */
-    @Query(value = "select ci.city_name cityname,count(fp.id) from street ci left join fire_point fp on fp.county_code like concat('%',ci.city_code,'%') AND fp.satellite_time BETWEEN ?1 AND ?2 group by ci.city_name", nativeQuery = true)
-    List<Map<String, Object>> selectNumByArea(String startTime, String endTime);
-
-    @Query(value = "select a.really_name 姓名, a.county_name 所在市, a.telephone 手机号, a.vip_level vip, b.satellite_time 扫描时间, " + "round(cast(b.longitude as numeric) ,6) 经度, round(cast(b.latitude as numeric) ,6) 纬度, b.fire_point_address 详细地址  from sys_user a left join fire_point b on " + "case when left(a.county_code, 4) = '0000' then left(b.county_code, 4) = left(a.county_code, 4) " + "when left(a.county_code, 2) = '00' then left(b.county_code, 2) = left(a.county_code, 2) " + "else left(b.county_code, 2) = left(a.county_code, 2) end where a.vip_level > 0 and satellite_time > ?1", nativeQuery = true)
-    List<Map<String, String>> downloadFirePointByVip(String yesterday);
-
-}

src/main/java/com/xkrs/dao/FirePointOrdinaryDao.java

@@ -0,0 +1,24 @@
+package com.xkrs.dao;
+
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Component
+public interface FirePointOrdinaryDao extends JpaRepository<FirePointOrdinaryEntity, Long>, JpaSpecificationExecutor<FirePointOrdinaryEntity> {
+
+    @Query(value = "UPDATE fire_point_ordinary SET pro_code = concat(left(county_code, 2), '0000'), city_code = concat(left(county_code, 4), '00') WHERE id BETWEEN ?1 AND ?2", nativeQuery = true)
+    @Modifying(clearAutomatically = true)
+    @Transactional(rollbackFor = Exception.class)
+    void updateProCityCode(Long startId, Long endId);
+
+    @Query(value = "UPDATE fire_point_ordinary AS f SET pro_name = (SELECT s.pro_name AS proname FROM street AS s WHERE s.pro_code = f.pro_code LIMIT 1), city_name = (SELECT s.city_name AS cityname FROM street AS s WHERE s.city_code = f.city_code LIMIT 1) WHERE id BETWEEN ?1 AND ?2", nativeQuery = true)
+    @Modifying(clearAutomatically = true)
+    @Transactional(rollbackFor = Exception.class)
+    void updateProCityName(Long startId, Long endId);
+
+}

src/main/java/com/xkrs/dao/GlobalConfigDao.java

@@ -1,15 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.GlobalConfigEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Component;
-
-import java.util.Optional;
-
-@Component
-public interface GlobalConfigDao extends JpaRepository<GlobalConfigEntity, Long>, JpaSpecificationExecutor<GlobalConfigEntity> {
-
-    Optional<GlobalConfigEntity> findByCode(Long code);
-
-}

src/main/java/com/xkrs/dao/GlobalConfigDictDao.java

@@ -1,15 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.GlobalConfigDictEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Component;
-
-import java.util.Optional;
-
-@Component
-public interface GlobalConfigDictDao extends JpaRepository<GlobalConfigDictEntity, Long>, JpaSpecificationExecutor<GlobalConfigDictEntity> {
-
-    Optional<GlobalConfigDictEntity> findByCode(Long code);
-
-}

src/main/java/com/xkrs/dao/GlobalConfigurationDao.java

@@ -1,15 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.GlobalConfigurationEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public interface GlobalConfigurationDao extends JpaRepository<GlobalConfigurationEntity, Long>, JpaSpecificationExecutor<GlobalConfigurationEntity> {
-
-    List<GlobalConfigurationEntity> findByKey(String key);
-
-}

src/main/java/com/xkrs/dao/NoticeDao.java

@@ -1,11 +1,10 @@
 package com.xkrs.dao;
 
-import com.xkrs.model.entity.AgentOrgEntity;
+import com.xkrs.model.entity.NoticeEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;
 
 @Component
-public interface AgentOrgDao extends JpaRepository<AgentOrgEntity, Long>, JpaSpecificationExecutor<AgentOrgEntity> {
+public interface NoticeDao extends JpaRepository<NoticeEntity, Long>, JpaSpecificationExecutor<NoticeEntity> {
-
 }

src/main/java/com/xkrs/dao/NoticeRelaDao.java

@@ -1,11 +1,10 @@
 package com.xkrs.dao;
 
-import com.xkrs.model.entity.GlobalSettingEntity;
+import com.xkrs.model.entity.NoticeRelaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;
 
 @Component
-public interface GlobalSettingDao extends JpaRepository<GlobalSettingEntity, Long>, JpaSpecificationExecutor<GlobalSettingEntity> {
+public interface NoticeRelaDao extends JpaRepository<NoticeRelaEntity, Long>, JpaSpecificationExecutor<NoticeRelaEntity> {
-
 }

src/main/java/com/xkrs/dao/RelRoleAuthorityDao.java

@@ -5,24 +5,17 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
-/**
+@Component
- * @author XinYi Song
- */
 public interface RelRoleAuthorityDao extends JpaRepository<RelRoleAuthorityEntity, Long>, JpaSpecificationExecutor<RelRoleAuthorityEntity> {
 
     /**
      * 根据userId查询出权限的id
-     *
-     * @param userId
-     * @return
      */
     @Query(value = "select authority_id from rel_role_authority where user_id = ?", nativeQuery = true)
-    List<Integer> selectAuthorityByUserId(@Param("userId") Integer userId);
+    List<Long> selectAuthorityByUserId(@Param("userId") Long userId);
-
-    @Query(value = "SELECT * FROM rel_role_authority WHERE authority_id = ?1", nativeQuery = true)
-    List<RelRoleAuthorityEntity> selectByAuthorityId(Integer authorityId);
 
 }

src/main/java/com/xkrs/dao/RelUserRoleDao.java

@@ -3,10 +3,9 @@ package com.xkrs.dao;
 import com.xkrs.model.entity.RelUserRoleEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Component;
 
-/**
+@Component
- * @author XinYi Song
- */
 public interface RelUserRoleDao extends JpaRepository<RelUserRoleEntity, Long>, JpaSpecificationExecutor<RelUserRoleEntity> {
 
 }

src/main/java/com/xkrs/dao/SettingDao.java

@@ -1,20 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.SettingEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Component;
-
-/**
- * @author xkrs
- */
-@Component
-public interface SettingDao extends JpaRepository<SettingEntity, Long>, JpaSpecificationExecutor<SettingEntity> {
-
-    @Modifying(clearAutomatically = true)
-    @Query(value = "UPDATE setting SET switch_state = ?2 where id = ?1", nativeQuery = true)
-    void updateSwitchStateById(Long id, String switchState);
-
-}

src/main/java/com/xkrs/dao/ShanDongFirePointDao.java

@@ -1,33 +0,0 @@
-package com.xkrs.dao;
-
-import com.xkrs.model.entity.ShanDongFirePointEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public interface ShanDongFirePointDao extends JpaRepository<ShanDongFirePointEntity, Long>, JpaSpecificationExecutor<ShanDongFirePointEntity> {
-
-    /**
-     * 根据火点编码查询火点信息
-     *
-     * @param fireCode
-     * @return
-     */
-    ShanDongFirePointEntity findByFireCode(String fireCode);
-
-    @Query(value = "SELECT * FROM fire_point_shandong WHERE longitude = ?1 AND latitude = ?2 AND street_code = ?3 AND satellite_time = ?4 AND satellite_type = ?5 AND land_type = ?6", nativeQuery = true)
-    List<ShanDongFirePointEntity> findDuplicatedData(double longitude, double latitude, String streetCode, String satelliteTime, String satelliteType, String landType);
-
-    /**
-     * 在山东临时火点表中根据火点编码修改审核状态
-     */
-    @Modifying(clearAutomatically = true)
-    @Query(value = "UPDATE fire_point_shandong SET verify_state = ?2 WHERE fire_code = ?1", nativeQuery = true)
-    void updateVerifyStateByFireCode(String fireCode, String verifyState);
-
-}

src/main/java/com/xkrs/dao/StreetDao.java

@@ -39,4 +39,7 @@ public interface StreetDao extends JpaRepository<StreetEntity, Integer>, JpaSpec
 
     @Query(value = "SELECT DISTINCT t.street_code AS code, t.street_name AS name FROM street AS t WHERE t.county_code = ?1", nativeQuery = true)
     List<Map<String, String>> selectStreetList(String countyCode);
+
+    @Query(value = "SELECT t.pro_code, t.pro_name, t.city_code, t.city_name FROM street AS t group by pro_code, pro_name, city_code, city_name", nativeQuery = true)
+    List<Map<String, String>> selectProCityPair();
 }

src/main/java/com/xkrs/dao/SysAuthorityDao.java

@@ -2,31 +2,16 @@ package com.xkrs.dao;
 
 import com.xkrs.model.entity.SysAuthorityEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
-/**
+@Component
- * SysAuthorityDao
+public interface SysAuthorityDao extends JpaRepository<SysAuthorityEntity, Long>, JpaSpecificationExecutor<SysAuthorityEntity> {
- * @author tajochen
- */
-public interface SysAuthorityDao extends JpaRepository<SysAuthorityEntity,Integer> {
-    /**
-     * 查询权限实体列表根据用户名 Object[]
-     * @param userName 用户名
-     * @return 用户实体
-     */
-    @Query(value = "SELECT a.id, a.authority_name, a.authority_name_zh, a.authority_desc " +
-            "FROM sys_authority a,rel_role_authority ra,sys_role r WHERE r.id = ra.role_id AND ra.authority_id = a.id AND r.id " +
-            "IN (SELECT r.id FROM sys_user u,sys_role r,rel_user_role ur " +
-            "    WHERE u.user_name = :userName AND u.id = ur.user_id AND ur.role_id = r.id)", nativeQuery = true)
-    List<SysAuthorityEntity> selectByUserName(@Param("userName") String userName);
 
     /**
      * 根据id批量查询权限信息
-     * @param id
-     * @return
      */
-    List<SysAuthorityEntity> findAllByIdIn(List<Integer> id);
+    List<SysAuthorityEntity> findAllByIdIn(List<Long> id);
 }

src/main/java/com/xkrs/dao/SysRoleDao.java

@@ -2,59 +2,34 @@ package com.xkrs.dao;
 
 import com.xkrs.model.entity.SysRoleEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
-/**
+@Component
- * SysRoleDao
+public interface SysRoleDao extends JpaRepository<SysRoleEntity, Long>, JpaSpecificationExecutor<SysRoleEntity> {
- * @author tajochen
- */
-public interface SysRoleDao extends JpaRepository<SysRoleEntity,Integer> {
-
-    /**
-     * 查询用户角色列表根据用户id
-     * @param id
-     * @return
-     */
-    @Query(value = "SELECT sys_role.id,sys_role.role_name,sys_role.role_name_zh,sys_role.role_desc " +
-            "FROM sys_role,rel_user_role " +
-            "WHERE sys_role.id = rel_user_role.role_id " +
-            "AND rel_user_role.user_id = :id ", nativeQuery = true)
-    List<SysRoleEntity> selectByUserId(@Param("id") Integer id);
 
     /**
      * 查询用户角色列表根据用户名
+     *
      * @param userName
      * @return
      */
-    @Query(value = "SELECT sys_role.id,sys_role.role_name,sys_role.role_name_zh,sys_role.role_desc " +
+    @Query(value = "SELECT sys_role.id,sys_role.role_name,sys_role.role_name_zh,sys_role.role_desc FROM sys_role.ID = rel_user_role.role_id WHERE rel_user_role.user_id = sys_user.id AND rel_user_role.user_id = sys_user.id AND sys_user.user_name = :userName ", nativeQuery = true)
-            "FROM sys_role.ID = rel_user_role.role_id  " +
-            "WHERE rel_user_role.user_id = sys_user.id " +
-            "AND rel_user_role.user_id = sys_user.id " +
-            "AND sys_user.user_name = :userName ", nativeQuery = true)
     List<SysRoleEntity> selectByUserName(@Param("userName") String userName);
 
-
-//    /**
-//     * 根据用户名修改用户角色
-//     */
-//    @Modifying
-//    @Query(value = "UPDATE sys_user SET last_entry_time = now(), last_entry_ip = :ipAddress " +
-//            "WHERE user_name = :userName ;", nativeQuery = true)
-//    int updateUserRoleByUserName(@Param("userName") String userName);
-
     /**
      * 添加用户角色根据用户名和角色名
+     *
      * @param userName
      * @param roleName
      * @return
      */
     @Modifying
-    @Query(value = "INSERT INTO rel_user_role (id,role_id, user_id) " +
+    @Query(value = "INSERT INTO rel_user_role (id,role_id, user_id) SELECT nextval('rel_user_role_seq'),sys_role.ID,sys_user.ID FROM sys_role,sys_user WHERE sys_role.role_name = :roleName AND sys_user.user_name = :userName ", nativeQuery = true)
-            "SELECT nextval('rel_user_role_seq'),sys_role.ID,sys_user.ID FROM sys_role,sys_user " +
-            "WHERE sys_role.role_name = :roleName AND sys_user.user_name = :userName ", nativeQuery = true)
     int insertRelUserRole(@Param("userName") String userName, @Param("roleName") String roleName);
 }

src/main/java/com/xkrs/dao/SysUserDao.java

@@ -1,33 +1,19 @@
 package com.xkrs.dao;
 
 import com.xkrs.model.entity.SysUserEntity;
-import com.xkrs.model.vo.SysUserVo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Component;
 
-import java.util.List;
+@Component
-
+public interface SysUserDao extends JpaRepository<SysUserEntity, Long>, JpaSpecificationExecutor<SysUserEntity> {
-/**
- * SysUserDao
- *
- * @author tajochen
- */
-public interface SysUserDao extends JpaRepository<SysUserEntity, Integer>, JpaSpecificationExecutor<SysUserEntity> {
-
-    @Modifying(clearAutomatically = true)
-    @Query(value = "UPDATE sys_user SET vip_level = ?2 WHERE id = ?1", nativeQuery = true)
-    void updateVipLevel(Integer id, Integer vipLevel);
 
     @Modifying(clearAutomatically = true)
     @Query(value = "UPDATE sys_user SET receive_sms = ?2 WHERE id = ?1", nativeQuery = true)
-    void updateReceiveSms(Integer id, Integer receiveSms);
+    void updateReceiveSms(Long id, Integer receiveSms);
-
-    @Modifying(clearAutomatically = true)
-    @Query(value = "UPDATE sys_user SET remark = ?2 WHERE id = ?1", nativeQuery = true)
-    void updateRemark(Integer id, String remark);
 
     /**
      * 检查系统用户名是否存在
@@ -41,25 +27,6 @@ public interface SysUserDao extends JpaRepository<SysUserEntity, Integer>, JpaSp
     @Query(value = "SELECT * FROM sys_user WHERE user_name = :userName", nativeQuery = true)
     SysUserEntity selectByUserName(@Param("userName") String userName);
 
-    /**
-     * 根据用户名查询用户信息
-     */
-    SysUserEntity findByUserName(String userName);
-
-    /**
-     * 更新用户登录信息
-     */
-    @Modifying
-    @Query(value = "UPDATE sys_user SET last_entry_time = now(), last_entry_ip = :ipAddress " + "WHERE user_name = :userName ;", nativeQuery = true)
-    int updateSysUserLogin(@Param("userName") String userName, @Param("ipAddress") String ipAddress);
-
-    /**
-     * 软删除系统用户根据id
-     */
-    @Modifying
-    @Query(value = "UPDATE sys_user SET delete_flag = 1  " + "WHERE id = :id ;", nativeQuery = true)
-    int softDeleteGeneralUserById(@Param("id") Integer id);
-
     /**
      * 删除系统用户（危险操作！）
      */
@@ -67,71 +34,39 @@ public interface SysUserDao extends JpaRepository<SysUserEntity, Integer>, JpaSp
     @Query(value = "DELETE FROM sys_user WHERE user_name = :userName ;", nativeQuery = true)
     int deleteSysUser(@Param("userName") String userName);
 
-    /**
-     * 查询用户信息
-     */
-    @Query(value = "select new com.xkrs.model.vo.SysUserVo (id,reallyName,telephone,countyCode,activeFlag,addTime,overTime,dayNum,accountType,countyName,lastEntryIp,loginNum,loginLastTime,vipLevel,receiveSms,remark,agentOrgId) from SysUserEntity")
-    List<SysUserVo> selectAll();
-
-    /**
-     * 根据用户名查询实体信息
-     */
-    @Query(value = "select new com.xkrs.model.vo.SysUserVo (id,reallyName,telephone,countyCode,activeFlag,addTime,overTime,dayNum,accountType,countyName,lastEntryIp,loginNum,loginLastTime,vipLevel,receiveSms,remark,agentOrgId) from SysUserEntity where userName = :userName")
-    SysUserVo selectUserByUserName(String userName);
-
     /**
      * 启用
      */
     @Query(value = "update sys_user set active_flag = 0 where id = ?", nativeQuery = true)
     @Modifying(clearAutomatically = true)
-    void updateEnable(Integer userId);
+    void updateEnable(Long userId);
 
     /**
      * 禁用
      */
     @Query(value = "update sys_user set active_flag = 1 where id = ?", nativeQuery = true)
     @Modifying(clearAutomatically = true)
-    void updateDisable(Integer userId);
+    void updateDisable(Long userId);
 
     /**
      * 用户修改密码
      */
     @Query(value = "update sys_user set password = ?2 where id = ?1", nativeQuery = true)
     @Modifying(clearAutomatically = true)
-    void updatePassword(Integer userId, String newPassword);
+    void updatePassword(Long userId, String newPassword);
 
     /**
-     * 根据id查询用户的信息
+     * 修改用户登录次数
-     */
-    @Query(value = "select * from sys_user where id = ?", nativeQuery = true)
-    SysUserEntity selectByUserId(Integer userId);
-
-    /**
-     * 根据id修改账户的到期时间
-     */
-    @Query(value = "update sys_user set over_time = ?2 where id = ?1", nativeQuery = true)
-    @Modifying(clearAutomatically = true)
-    void updateOverTime(Integer userId, String overTime);
-
-    /**
-     * 将账户的期限修改为永久有效
-     */
-    @Query(value = "update sys_user set over_time = '永久' and day_num = 1 where id = ?", nativeQuery = true)
-    @Modifying(clearAutomatically = true)
-    void updateDayNum(Integer userId);
-
-    /**
-     * 记录用户登录次数
      */
     @Query(value = "update sys_user set login_num = ?2 where id = ?1", nativeQuery = true)
     @Modifying(clearAutomatically = true)
-    void updateLoginNum(Integer userId, Integer loginNum);
+    void updateLoginNum(Long userId, Integer loginNum);
 
     /**
-     * 修改登陆时间
+     * 修改最后登录时间
      */
     @Query(value = "update sys_user set login_last_time = ?2 where id = ?1", nativeQuery = true)
     @Modifying(clearAutomatically = true)
-    void updateLoginLastTime(Integer userId, String loginLastTime);
+    void updateLoginLastTime(Long userId, String loginLastTime);
 
 }

src/main/java/com/xkrs/fireseason/FireSeasonConfigDao.java

@@ -0,0 +1,12 @@
+package com.xkrs.fireseason;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 防火季配置Dao
+ */
+@Component
+public interface FireSeasonConfigDao extends JpaRepository<FireSeasonConfigEntity, Long>, JpaSpecificationExecutor<FireSeasonConfigEntity> {
+}

src/main/java/com/xkrs/fireseason/FireSeasonConfigEntity.java

@@ -0,0 +1,106 @@
+package com.xkrs.fireseason;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 防火季配置表
+ */
+@Entity
+@Table(name = "fire_season_config")
+public class FireSeasonConfigEntity implements Serializable {
+
+    /**
+     * 指定主键，建立自增序列，主键值取自序列
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "fire_season_config_seq_gen")
+    @SequenceGenerator(name = "fire_season_config_seq_gen", sequenceName = "fire_season_config_id_seq", allocationSize = 1)
+    private Long id;
+
+    /**
+     * 级别
+     * 0：默认全局配置
+     * 1：省级
+     * 2：市级
+     * 3：区县级
+     * 4：乡镇街道级
+     */
+    private Long configLevel;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 区划编码
+     */
+    private String countyCode;
+
+    /**
+     * 区划名称
+     */
+    private String countyName;
+
+    public FireSeasonConfigEntity() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getConfigLevel() {
+        return configLevel;
+    }
+
+    public void setConfigLevel(Long configLevel) {
+        this.configLevel = configLevel;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getCountyCode() {
+        return countyCode;
+    }
+
+    public void setCountyCode(String countyCode) {
+        this.countyCode = countyCode;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    @Override
+    public String toString() {
+        return "FireSeasonConfigEntity{" + "id=" + id + ", configLevel=" + configLevel + ", startTime='" + startTime + '\'' + ", endTime='" + endTime + '\'' + ", countyCode='" + countyCode + '\'' + ", countyName='" + countyName + '\'' + '}';
+    }
+}

src/main/java/com/xkrs/fireseason/FireSeasonConfigService.java

@@ -0,0 +1,7 @@
+package com.xkrs.fireseason;
+
+public interface FireSeasonConfigService {
+
+    String updateFireSeasonConfig();
+
+}

src/main/java/com/xkrs/fireseason/FireSeasonConfigServiceImpl.java

@@ -0,0 +1,92 @@
+package com.xkrs.fireseason;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.xkrs.dao.FirePointOrdinaryDao;
+import com.xkrs.dao.StreetDao;
+import com.xkrs.dao.SysUserDao;
+import com.xkrs.helper.FirePointPushManager;
+import com.xkrs.helper.FirePointQueryManager;
+import com.xkrs.utilsnew.CountyCodeUtils;
+import com.xkrs.utilsnew.DateTimeUtils;
+import com.xkrs.utilsnew.ListUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.xkrs.utilsold.HttpClientUtils.sendHttpPostTextPlain;
+
+@Service
+public class FireSeasonConfigServiceImpl implements FireSeasonConfigService {
+
+    public static Logger log = LoggerFactory.getLogger(FireSeasonConfigServiceImpl.class);
+
+    private final Locale locale = LocaleContextHolder.getLocale();
+
+    @Resource
+    private FirePointOrdinaryDao firePointOrdinaryDao;
+
+    @Resource
+    private FirePointQueryManager firePointQueryManager;
+
+    @Resource
+    private FirePointPushManager firePointPushManager;
+
+    @Resource
+    private SysUserDao sysUserDao;
+
+    @Resource
+    private StreetDao streetDao;
+
+    @Resource
+    private FireSeasonConfigDao fireSeasonConfigDao;
+
+    @Override
+    public String updateFireSeasonConfig() {
+        try {
+            long timeTag1 = System.currentTimeMillis();
+            log.info("开始更新订阅：");
+            LocalDateTime now = LocalDateTime.now();//当前时间，用来判断是否处于防火季
+            List<String> fireSeasonCountyCodeList = new ArrayList<>();//处于防火季的区划编码列表
+            List<FireSeasonConfigEntity> fireSeasonConfigList = fireSeasonConfigDao.findAll();//获取全部防火季配置项
+            for (FireSeasonConfigEntity fireSeasonConfig : fireSeasonConfigList) {
+                String startTime = fireSeasonConfig.getStartTime();//开始时间
+                String endTime = fireSeasonConfig.getEndTime();//结束时间
+                String countyCode = fireSeasonConfig.getCountyCode();//区划编码
+                DateTimeUtils.checkDateTimeFormat(startTime);//校验开始时间格式
+                DateTimeUtils.checkDateTimeFormat(endTime);//校验结束时间格式
+                LocalDateTime oldStartLocalDateTime = DateTimeUtils.formatToLocalDateTime(startTime);//解析原始的开始时间
+                LocalDateTime oldEndLocalDateTime = DateTimeUtils.formatToLocalDateTime(endTime);//解析原始的结束时间
+                LocalDateTime newStartLocalDateTime = oldStartLocalDateTime.plusYears(LocalDateTime.now().getYear() - oldStartLocalDateTime.getYear());//同步到今年的开始时间
+                LocalDateTime newEndLocalDateTime = oldEndLocalDateTime.plusYears(LocalDateTime.now().getYear() - oldEndLocalDateTime.getYear());//同步到今年的结束时间
+                if (newStartLocalDateTime.isBefore(now) && newEndLocalDateTime.isAfter(now)) {
+                    fireSeasonCountyCodeList.add(countyCode);//这个区划现在正处于防火季，加入到订阅列表中
+                }
+            }
+            System.out.println("区划信息列表（收集完毕）：" + CountyCodeUtils.obtainLogInfo(fireSeasonConfigList, fireSeasonCountyCodeList));
+            List<String> collectList = CountyCodeUtils.mergeCountyCodeList(fireSeasonCountyCodeList).stream().sorted(String::compareTo).collect(Collectors.toList());
+            System.out.println("区划信息列表（收集、合并、排序完毕）：" + CountyCodeUtils.obtainLogInfo(fireSeasonConfigList, collectList));
+            //发送订阅请求
+            String subscribeUrl = "http://118.24.27.47:5060/push-firepoint/ModifySystemMessages";
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", "秸秆火系统正式版");
+            map.put("url", "http://118.24.27.47:6801/updateFirePoint");
+            map.put("param", ListUtils.fromStringList(collectList, ","));
+            map.put("typeOfLand", "耕地");
+            String updateResult = sendHttpPostTextPlain(subscribeUrl, new ObjectMapper().writeValueAsString(map));
+            long timeTag3 = System.currentTimeMillis();
+            log.info("更新订阅结束，总耗时：" + ((timeTag3 - timeTag1) / 1000D) + "秒。");
+            return updateResult;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return e.getMessage();
+        }
+
+    }
+
+}

src/main/java/com/xkrs/helper/FirePointPushManager.java

@@ -0,0 +1,144 @@
+package com.xkrs.helper;
+
+import com.xkrs.dao.CountyCodeWeiXinDao;
+import com.xkrs.dao.SysUserDao;
+import com.xkrs.model.entity.CountyCodeWeiXinEntity;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
+import com.xkrs.model.entity.SysUserEntity;
+import com.xkrs.model.helper.PushHelper;
+import com.xkrs.utilsnew.DateTimeUtils;
+import com.xkrs.utilsnew.FirePointCodeUtils;
+import com.xkrs.utilsnew.SMSUtils;
+import com.xkrs.utilsnew.WeiXinMessageUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.text.DecimalFormat;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class FirePointPushManager {
+
+    public static Logger log = LoggerFactory.getLogger(FirePointPushManager.class);
+
+    @Resource
+    private SysUserDao sysUserDao;
+
+    @Resource
+    private CountyCodeWeiXinDao countyCodeWeiXinDao;
+
+    @Resource
+    private PushHelper pushHelper;
+
+    public void pushNotification(FirePointOrdinaryEntity firePoint) {
+
+        //发送微信群聊消息
+        sendWeChatGroupMessage(firePoint);
+
+        try {
+            //过滤短信通知收件人
+            List<SysUserEntity> sysUserList = sysUserDao.findAll();
+            List<SysUserEntity> smsReceiverList = FirePointCodeUtils.filterSmsReceiver(firePoint.getTownCode(), sysUserList);
+//            //推送
+//            try {
+//                List<String> userAccountList = pushHelper.obtainUserAccountList(smsReceiverList);
+//                pushHelper.dispatchPushMessage(userAccountList, firePointEntity);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+            if (smsReceiverList.size() > 0) {
+                String[] telephoneArray = new String[smsReceiverList.size()];
+                for (int i = 0; i < smsReceiverList.size(); i++) {
+                    telephoneArray[i] = "86" + smsReceiverList.get(i).getUserName();
+                }
+                int resValue = SMSUtils.sendSmsToUser(telephoneArray, "1425995", new String[]{firePoint.getFirePointAddress()});
+                String sendResult;
+                if (resValue == 0) {
+                    //联系人列表发送短信成功，在数据库中的已发短信数量字段加一
+                    for (SysUserEntity smsReceiver : smsReceiverList) {
+                        Long oldReceiveSmsCount = smsReceiver.getReceiveSmsCount();
+                        if (oldReceiveSmsCount == null || oldReceiveSmsCount <= 0L) {
+                            smsReceiver.setReceiveSmsCount(1L);
+                        } else {
+                            smsReceiver.setReceiveSmsCount(oldReceiveSmsCount + 1L);
+                        }
+                    }
+                    sysUserDao.saveAll(smsReceiverList);
+                    sendResult = "短信通知发送成功！";
+                } else {
+                    sendResult = "短信通知发送失败！";
+                }
+                //记录短信通知日志
+                String nowTime = DateTimeUtils.localDateTimeToString(LocalDateTime.now());
+                StringBuilder builder = new StringBuilder();
+                builder.append("开始统计发送短信").append(nowTime).append("\n");
+                builder.append("发送人：青岛星科瑞升信息科技有限公司").append("\n");
+                builder.append("火点详情：").append(firePoint.toString()).append("\n");
+                for (SysUserEntity smsReceiver : smsReceiverList) {
+                    builder.append("接收人姓名：").append(smsReceiver.getReallyName()).append("，手机号：").append(smsReceiver.getUserName()).append("，区划编码：").append(smsReceiver.getCountyCode()).append("，区划名称：").append(smsReceiver.getCountyName()).append("\n");
+                }
+                builder.append(sendResult).append("\n");
+                builder.append("结束统计发送短信").append(nowTime).append("\n");
+                log.info(builder.toString());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info(e.getMessage());
+        }
+
+    }
+
+    /**
+     * 发送微信消息
+     */
+    private void sendWeChatGroupMessage(FirePointOrdinaryEntity firePoint) {
+        try {
+            List<CountyCodeWeiXinEntity> countyCodeWeiXinList = countyCodeWeiXinDao.findAll();
+            if (countyCodeWeiXinList.isEmpty()) {
+                return;
+            }
+            List<String> weixinIdList = new ArrayList<>();
+            for (CountyCodeWeiXinEntity countyCodeWeiXin : countyCodeWeiXinList) {
+                try {
+                    if ((countyCodeWeiXin.getSendState() != null) && (countyCodeWeiXin.getSendState() != 0)) {
+                        String formatCutCode = FirePointCodeUtils.getFormatCutCode(countyCodeWeiXin.getCountyCode());
+                        if (firePoint.getTownCode().startsWith(formatCutCode)) {
+                            weixinIdList.add(countyCodeWeiXin.getWeixinId());
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            if (weixinIdList.size() > 0) {
+                StringBuilder stringBuilder = new StringBuilder("发送微信消息通知：\n");
+                java.text.DecimalFormat decimalFormat = new DecimalFormat("#.000000");
+                String satelliteTime = firePoint.getSatelliteTime();
+                String formatLongitude = decimalFormat.format(firePoint.getLongitude());
+                String formatLatitude = decimalFormat.format(firePoint.getLatitude());
+                String countyName = firePoint.getCountyName();
+                String streetName = firePoint.getTownName();
+                String landType = firePoint.getLandType();
+                String messageContent = "星巡-秸秆焚烧卫星监测系统\n" + firePoint.getSatelliteType() + "发现1个火点。\n卫星时间：" + satelliteTime + "；\nlongitude：" + formatLongitude + "；\nlatitude：" + formatLatitude + "；\ncountyName：" + countyName + "；\nstreetName：" + streetName + "；\nlandType：" + landType;
+                for (String weixinId : weixinIdList) {
+                    stringBuilder.append(weixinId).append("\n");
+                    try {
+                        WeiXinMessageUtils.sendMsg(weixinId, messageContent, 0);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+                stringBuilder.append("火情信息：").append(messageContent);
+                log.info(stringBuilder.toString());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info(e.getMessage());
+        }
+    }
+
+}

src/main/java/com/xkrs/helper/FirePointQueryManager.java

@@ -0,0 +1,102 @@
+package com.xkrs.helper;
+
+import com.xkrs.dao.FirePointOrdinaryDao;
+import com.xkrs.model.bean.FirePointQueryResultBean;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
+import com.xkrs.model.entity.SysUserEntity;
+import com.xkrs.utilsnew.DateTimeUtils;
+import com.xkrs.utilsnew.FirePointCodeUtils;
+import com.xkrs.utilsnew.TimeRangeUtils;
+import org.apache.hc.core5.util.TextUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class FirePointQueryManager {
+
+    public static Logger log = LoggerFactory.getLogger(FirePointQueryManager.class);
+
+    @Resource
+    private FirePointOrdinaryDao firePointOrdinaryDao;
+
+    /**
+     * 查询火点播报（无token）
+     *
+     * @param limit 最大数量
+     */
+    public FirePointQueryResultBean queryFirePointBroadcast(Integer limit) {
+        int size = (limit != null && limit > 0) ? limit : 10;
+        PageRequest pageRequest = PageRequest.of(1, size, Sort.by(Sort.Direction.DESC, "satelliteTime"));
+        List<FirePointOrdinaryEntity> firePointList = firePointOrdinaryDao.findAll(pageRequest).getContent();
+        return new FirePointQueryResultBean(true, "", firePointList, firePointList.size());
+    }
+
+    public FirePointQueryResultBean queryFirePointBelongToUser(SysUserEntity sysUserEntity, String userSubAreaCountyCode, String startTime, String endTime, String satelliteType, String landType) {
+
+        String noRedundantUserCode = ("管理员".equals(sysUserEntity.getAccountType())) ? null : FirePointCodeUtils.getFormatCutCode(sysUserEntity.getCountyCode());
+        String userSubAreaCutCountyCode = (TextUtils.isEmpty(userSubAreaCountyCode)) ? null : FirePointCodeUtils.getFormatCutCode(userSubAreaCountyCode);
+
+        //查询未审核的普通火点
+        Specification<FirePointOrdinaryEntity> specificationOrdinary = (root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> predicateList = new ArrayList<>();
+            //非空判断
+            predicateList.add(criteriaBuilder.isNotNull(root.get("proCode").as(String.class)));
+            predicateList.add(criteriaBuilder.isNotNull(root.get("proName").as(String.class)));
+            predicateList.add(criteriaBuilder.isNotNull(root.get("cityCode").as(String.class)));
+            predicateList.add(criteriaBuilder.isNotNull(root.get("cityName").as(String.class)));
+            predicateList.add(criteriaBuilder.isNotNull(root.get("countyCode").as(String.class)));
+            predicateList.add(criteriaBuilder.isNotNull(root.get("countyName").as(String.class)));
+            //添加区划编码的过滤
+            if (!TextUtils.isEmpty(noRedundantUserCode)) {
+                predicateList.add(criteriaBuilder.like(root.get("townCode").as(String.class), noRedundantUserCode + "%"));
+            }
+            //添加子区域区划编码的过滤（比如查询火点的系统用户所属的区划是山东省，但是该用户目前只想查询青岛市的火点，那么noRedundantUserCode=山东省区划，userSubAreaCutCountyCode=青岛市区划）
+            if (!TextUtils.isEmpty(userSubAreaCutCountyCode)) {
+                predicateList.add(criteriaBuilder.like(root.get("townCode").as(String.class), userSubAreaCutCountyCode + "%"));
+            }
+            //开始时间查询条件
+            if (!TextUtils.isEmpty(startTime)) {
+                LocalDateTime startTime1 = DateTimeUtils.stringToLocalDateTime(startTime);
+                LocalDateTime startTime2 = LocalDateTime.of(startTime1.getYear(), startTime1.getMonth(), startTime1.getDayOfMonth(), 0, 0, 0, 0);
+                String startTimeString = DateTimeUtils.localDateTimeToString(startTime2);
+                predicateList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("satelliteTime").as(String.class), startTimeString));
+            }
+            //结束时间查询条件
+            if (!TextUtils.isEmpty(endTime)) {
+                LocalDateTime endTime1 = DateTimeUtils.stringToLocalDateTime(endTime).plusDays(1);
+                LocalDateTime endTime2 = LocalDateTime.of(endTime1.getYear(), endTime1.getMonth(), endTime1.getDayOfMonth(), 0, 0, 0, 0);
+                String endTimeString = DateTimeUtils.localDateTimeToString(endTime2);
+                predicateList.add(criteriaBuilder.lessThanOrEqualTo(root.get("satelliteTime").as(String.class), endTimeString));
+            }
+            //卫星类型查询条件
+            if (!TextUtils.isEmpty(satelliteType)) {
+                predicateList.add(criteriaBuilder.equal(root.get("satelliteType").as(String.class), satelliteType));
+            }
+            //地物类型查询条件
+            if (!TextUtils.isEmpty(landType)) {
+                predicateList.add(criteriaBuilder.equal(root.get("landType").as(String.class), landType));
+            }
+            return criteriaBuilder.and(predicateList.toArray(new Predicate[predicateList.size()]));
+        };
+        //未审核的普通火点列表
+        List<FirePointOrdinaryEntity> firePointList = firePointOrdinaryDao.findAll(specificationOrdinary, Sort.by(Sort.Direction.DESC, "satelliteTime"));
+        if ((!"管理员".equals(sysUserEntity.getAccountType())) && TimeRangeUtils.checkIfAllExpired(sysUserEntity)) {
+            //过期的普通用户看不到火点的研判标志
+            for (FirePointOrdinaryEntity firePoint : firePointList) {
+                firePoint.setFireStatus(null);
+            }
+        }
+        return new FirePointQueryResultBean(true, "", firePointList, firePointList.size());
+    }
+
+}

src/main/java/com/xkrs/model/bean/AddressBean.java

@@ -0,0 +1,153 @@
+package com.xkrs.model.bean;
+
+public class AddressBean {
+
+    /**
+     * 解析结果
+     */
+    private boolean success;
+
+    /**
+     * 省的编码
+     */
+    private String proCode;
+
+    /**
+     * 省的名称
+     */
+    private String proName;
+
+    /**
+     * 市的编码
+     */
+    private String cityCode;
+
+    /**
+     * 市的名称
+     */
+    private String cityName;
+
+    /**
+     * 区县的编码
+     */
+    private String countyCode;
+
+    /**
+     * 区县的名称
+     */
+    private String countyName;
+
+    /**
+     * 乡镇街道的编码
+     */
+    private String townCode;
+
+    /**
+     * 乡镇街道的名称
+     */
+    private String townName;
+
+    /**
+     * 详细地址
+     */
+    private String firePointAddress;
+
+    public AddressBean() {
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public String getProCode() {
+        return proCode;
+    }
+
+    public void setProCode(String proCode) {
+        this.proCode = proCode;
+    }
+
+    public String getProName() {
+        return proName;
+    }
+
+    public void setProName(String proName) {
+        this.proName = proName;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCountyCode() {
+        return countyCode;
+    }
+
+    public void setCountyCode(String countyCode) {
+        this.countyCode = countyCode;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    public String getTownCode() {
+        return townCode;
+    }
+
+    public void setTownCode(String townCode) {
+        this.townCode = townCode;
+    }
+
+    public String getTownName() {
+        return townName;
+    }
+
+    public void setTownName(String townName) {
+        this.townName = townName;
+    }
+
+    public String getFirePointAddress() {
+        return firePointAddress;
+    }
+
+    public void setFirePointAddress(String firePointAddress) {
+        this.firePointAddress = firePointAddress;
+    }
+
+    @Override
+    public String toString() {
+        return "AddressBean{" +
+                "success=" + success +
+                ", proCode='" + proCode + '\'' +
+                ", proName='" + proName + '\'' +
+                ", cityCode='" + cityCode + '\'' +
+                ", cityName='" + cityName + '\'' +
+                ", countyCode='" + countyCode + '\'' +
+                ", countyName='" + countyName + '\'' +
+                ", townCode='" + townCode + '\'' +
+                ", townName='" + townName + '\'' +
+                ", firePointAddress='" + firePointAddress + '\'' +
+                '}';
+    }
+}

src/main/java/com/xkrs/model/bean/DataWrapper.java

@@ -0,0 +1,22 @@
+package com.xkrs.model.bean;
+
+public class DataWrapper<DataType> {
+
+    private DataType data;
+
+    public DataWrapper() {
+    }
+
+    public DataWrapper(DataType data) {
+        this.data = data;
+    }
+
+    public DataType getData() {
+        return data;
+    }
+
+    public DataWrapper<DataType> setData(DataType data) {
+        this.data = data;
+        return this;
+    }
+}

src/main/java/com/xkrs/model/bean/DataWrapper2.java

@@ -0,0 +1,33 @@
+package com.xkrs.model.bean;
+
+public class DataWrapper2<DataType1, DataType2> {
+
+    private DataType1 data1;
+    private DataType2 data2;
+
+    public DataWrapper2() {
+    }
+
+    public DataWrapper2(DataType1 data1, DataType2 data2) {
+        this.data1 = data1;
+        this.data2 = data2;
+    }
+
+    public DataType1 getData1() {
+        return data1;
+    }
+
+    public DataWrapper2<DataType1, DataType2> setData1(DataType1 data1) {
+        this.data1 = data1;
+        return this;
+    }
+
+    public DataType2 getData2() {
+        return data2;
+    }
+
+    public DataWrapper2<DataType1, DataType2> setData2(DataType2 data2) {
+        this.data2 = data2;
+        return this;
+    }
+}

src/main/java/com/xkrs/model/bean/DataWrapper3.java

@@ -0,0 +1,44 @@
+package com.xkrs.model.bean;
+
+public class DataWrapper3<DataType1, DataType2, DataType3> {
+
+    private DataType1 data1;
+    private DataType2 data2;
+    private DataType3 data3;
+
+    public DataWrapper3() {
+    }
+
+    public DataWrapper3(DataType1 data1, DataType2 data2, DataType3 data3) {
+        this.data1 = data1;
+        this.data2 = data2;
+        this.data3 = data3;
+    }
+
+    public DataType1 getData1() {
+        return data1;
+    }
+
+    public DataWrapper3<DataType1, DataType2, DataType3> setData1(DataType1 data1) {
+        this.data1 = data1;
+        return this;
+    }
+
+    public DataType2 getData2() {
+        return data2;
+    }
+
+    public DataWrapper3<DataType1, DataType2, DataType3> setData2(DataType2 data2) {
+        this.data2 = data2;
+        return this;
+    }
+
+    public DataType3 getData3() {
+        return data3;
+    }
+
+    public DataWrapper3<DataType1, DataType2, DataType3> setData3(DataType3 data3) {
+        this.data3 = data3;
+        return this;
+    }
+}

src/main/java/com/xkrs/model/bean/DataWrapper4.java

@@ -0,0 +1,55 @@
+package com.xkrs.model.bean;
+
+public class DataWrapper4<DataType1, DataType2, DataType3, DataType4> {
+
+    private DataType1 data1;
+    private DataType2 data2;
+    private DataType3 data3;
+    private DataType4 data4;
+
+    public DataWrapper4() {
+    }
+
+    public DataWrapper4(DataType1 data1, DataType2 data2, DataType3 data3, DataType4 data4) {
+        this.data1 = data1;
+        this.data2 = data2;
+        this.data3 = data3;
+        this.data4 = data4;
+    }
+
+    public DataType1 getData1() {
+        return data1;
+    }
+
+    public DataWrapper4<DataType1, DataType2, DataType3, DataType4> setData1(DataType1 data1) {
+        this.data1 = data1;
+        return this;
+    }
+
+    public DataType2 getData2() {
+        return data2;
+    }
+
+    public DataWrapper4<DataType1, DataType2, DataType3, DataType4> setData2(DataType2 data2) {
+        this.data2 = data2;
+        return this;
+    }
+
+    public DataType3 getData3() {
+        return data3;
+    }
+
+    public DataWrapper4<DataType1, DataType2, DataType3, DataType4> setData3(DataType3 data3) {
+        this.data3 = data3;
+        return this;
+    }
+
+    public DataType4 getData4() {
+        return data4;
+    }
+
+    public DataWrapper4<DataType1, DataType2, DataType3, DataType4> setData4(DataType4 data4) {
+        this.data4 = data4;
+        return this;
+    }
+}

src/main/java/com/xkrs/model/bean/FirePointQueryResultBean.java

@@ -0,0 +1,65 @@
+package com.xkrs.model.bean;
+
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
+
+import java.util.List;
+
+public class FirePointQueryResultBean {
+
+    private boolean success = false;
+
+    private String errorMessage = null;
+
+    private List<FirePointOrdinaryEntity> list = null;
+
+    private long count = 0L;
+
+    public FirePointQueryResultBean() {
+    }
+
+    public FirePointQueryResultBean(String errorMessage) {
+        this.success = false;
+        this.errorMessage = errorMessage;
+        this.list = null;
+        this.count = 0L;
+    }
+
+    public FirePointQueryResultBean(boolean success, String errorMessage, List<FirePointOrdinaryEntity> list, long count) {
+        this.success = success;
+        this.errorMessage = errorMessage;
+        this.list = list;
+        this.count = count;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public List<FirePointOrdinaryEntity> getList() {
+        return list;
+    }
+
+    public void setList(List<FirePointOrdinaryEntity> list) {
+        this.list = list;
+    }
+
+    public long getCount() {
+        return count;
+    }
+
+    public void setCount(long count) {
+        this.count = count;
+    }
+}

src/main/java/com/xkrs/model/bean/LocalDateTimeRange.java

@@ -0,0 +1,34 @@
+package com.xkrs.model.bean;
+
+import java.time.LocalDateTime;
+
+public class LocalDateTimeRange {
+
+    private LocalDateTime startTime;
+
+    private LocalDateTime endTime;
+
+    public LocalDateTimeRange() {
+    }
+
+    public LocalDateTimeRange(LocalDateTime startTime, LocalDateTime endTime) {
+        this.startTime = startTime;
+        this.endTime = endTime;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+}

src/main/java/com/xkrs/model/bean/SendSmsBean.java

@@ -0,0 +1,36 @@
+package com.xkrs.model.bean;
+
+import java.util.List;
+
+public class SendSmsBean {
+
+    private List<String> phoneNumbers;
+
+    private String templateId;
+
+    private List<String> templateParams;
+
+    public List<String> getPhoneNumbers() {
+        return phoneNumbers;
+    }
+
+    public void setPhoneNumbers(List<String> phoneNumbers) {
+        this.phoneNumbers = phoneNumbers;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public List<String> getTemplateParams() {
+        return templateParams;
+    }
+
+    public void setTemplateParams(List<String> templateParams) {
+        this.templateParams = templateParams;
+    }
+}

src/main/java/com/xkrs/model/bean/VipLocalDateTimeRangePair.java

@@ -0,0 +1,26 @@
+package com.xkrs.model.bean;
+
+import java.time.LocalDateTime;
+
+public class VipLocalDateTimeRangePair {
+
+    private LocalDateTime startLocalDateTime;
+
+    private LocalDateTime endLocalDateTime;
+
+    public LocalDateTime getStartLocalDateTime() {
+        return startLocalDateTime;
+    }
+
+    public void setStartLocalDateTime(LocalDateTime startLocalDateTime) {
+        this.startLocalDateTime = startLocalDateTime;
+    }
+
+    public LocalDateTime getEndLocalDateTime() {
+        return endLocalDateTime;
+    }
+
+    public void setEndLocalDateTime(LocalDateTime endLocalDateTime) {
+        this.endLocalDateTime = endLocalDateTime;
+    }
+}

src/main/java/com/xkrs/model/bean/VipTimeRangeBean.java

@@ -0,0 +1,45 @@
+package com.xkrs.model.bean;
+
+import java.util.List;
+
+public class VipTimeRangeBean {
+
+    private List<VipTimeRangeItemBean> list;
+
+    public static class VipTimeRangeItemBean {
+
+        /**
+         * 开始时间
+         */
+        private String startTime;
+
+        /**
+         * 结束时间
+         */
+        private String endTime;
+
+        public String getStartTime() {
+            return startTime;
+        }
+
+        public void setStartTime(String startTime) {
+            this.startTime = startTime;
+        }
+
+        public String getEndTime() {
+            return endTime;
+        }
+
+        public void setEndTime(String endTime) {
+            this.endTime = endTime;
+        }
+    }
+
+    public List<VipTimeRangeItemBean> getList() {
+        return list;
+    }
+
+    public void setList(List<VipTimeRangeItemBean> list) {
+        this.list = list;
+    }
+}

src/main/java/com/xkrs/model/entity/AgentOrgEntity.java

@@ -1,56 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "agent_org")
-public class AgentOrgEntity implements Serializable {
-
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "agent_org_seq_gen")
-    @SequenceGenerator(name = "agent_org_seq_gen", sequenceName = "agent_org_id_seq", allocationSize = 1)
-    private Long id;
-
-    /**
-     * 代理名称
-     */
-    @Column(length = 128, columnDefinition = "varchar(128)")
-    private String orgName;
-
-    /**
-     * 截止日期
-     */
-    @Column(length = 128, columnDefinition = "varchar(128)")
-    private String deadLine;
-
-    public AgentOrgEntity() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public String getDeadLine() {
-        return deadLine;
-    }
-
-    public void setDeadLine(String deadLine) {
-        this.deadLine = deadLine;
-    }
-}

src/main/java/com/xkrs/model/entity/FilePath.java

@@ -1,135 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-
-/**
- * @author XinYi Song
- */
-@Entity
-@Table(name = "file_path")
-public class FilePath {
-
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "file_path_seq_gen")
-    @SequenceGenerator(name = "file_path_seq_gen", sequenceName = "file_path_id_seq",allocationSize = 1)
-    private Integer id;
-
-    /**
-     * 图片路径
-     */
-    @Column(length = 500,columnDefinition = "varchar(500)")
-    private String filePath;
-
-    @Column(length = 88,columnDefinition = "varchar(88)")
-    private String fileName;
-
-    @Column(length = 65,columnDefinition = "varchar(65)")
-    private String size;
-
-    @Column(length = 85,columnDefinition = "varchar(85)")
-    private String mtime;
-
-    @Column(length = 88,columnDefinition = "varchar(88)")
-    private String url;
-
-    @Column(length = 85,columnDefinition = "varchar(85)")
-    private String md5;
-
-    @Column(length = 65,columnDefinition = "varchar(65)")
-    private String scene;
-
-    public FilePath() {
-    }
-
-    public FilePath(Integer id, String filePath, String fileName, String size, String mtime, String url, String md5, String scene) {
-        this.id = id;
-        this.filePath = filePath;
-        this.fileName = fileName;
-        this.size = size;
-        this.mtime = mtime;
-        this.url = url;
-        this.md5 = md5;
-        this.scene = scene;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getFilePath() {
-        return filePath;
-    }
-
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public String getSize() {
-        return size;
-    }
-
-    public void setSize(String size) {
-        this.size = size;
-    }
-
-    public String getMtime() {
-        return mtime;
-    }
-
-    public void setMtime(String mtime) {
-        this.mtime = mtime;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getMd5() {
-        return md5;
-    }
-
-    public void setMd5(String md5) {
-        this.md5 = md5;
-    }
-
-    public String getScene() {
-        return scene;
-    }
-
-    public void setScene(String scene) {
-        this.scene = scene;
-    }
-
-    @Override
-    public String toString() {
-        return "FilePath{" +
-                "id=" + id +
-                ", filePath='" + filePath + '\'' +
-                ", fileName='" + fileName + '\'' +
-                ", size='" + size + '\'' +
-                ", mtime='" + mtime + '\'' +
-                ", url='" + url + '\'' +
-                ", md5='" + md5 + '\'' +
-                ", scene='" + scene + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/entity/FireAndRanger.java

@@ -1,151 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-
-/**
- * 护林员和火点中间表
- * @author xkrs
- */
-@Entity
-@Table(name="fire_and_ranger")
-public class FireAndRanger {
-
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "fire_and_ranger_seq_gen")
-    @SequenceGenerator(name = "fire_and_ranger_seq_gen", sequenceName = "fire_and_ranger_id_seq",allocationSize = 1)
-    private Integer id;
-
-    /**
-     * 护林员的账号（手机号作为和火点的标识）
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String rangerName;
-
-    /**
-     * 火点编码
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String fireCode;
-
-    /**
-     * 处理人
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String handler;
-
-    /**
-     * 核查人
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String verifier;
-
-    /**
-     * 处理时间(核查时间)
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String handlerTime;
-
-    /**
-     * 结束时间
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String endTime;
-
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String progressType;
-
-    public FireAndRanger() {
-    }
-
-    public FireAndRanger(Integer id, String rangerName, String fireCode, String handler, String verifier, String handlerTime, String endTime, String progressType) {
-        this.id = id;
-        this.rangerName = rangerName;
-        this.fireCode = fireCode;
-        this.handler = handler;
-        this.verifier = verifier;
-        this.handlerTime = handlerTime;
-        this.endTime = endTime;
-        this.progressType = progressType;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getRangerName() {
-        return rangerName;
-    }
-
-    public void setRangerName(String rangerName) {
-        this.rangerName = rangerName;
-    }
-
-    public String getFireCode() {
-        return fireCode;
-    }
-
-    public void setFireCode(String fireCode) {
-        this.fireCode = fireCode;
-    }
-
-    public String getHandler() {
-        return handler;
-    }
-
-    public void setHandler(String handler) {
-        this.handler = handler;
-    }
-
-    public String getVerifier() {
-        return verifier;
-    }
-
-    public void setVerifier(String verifier) {
-        this.verifier = verifier;
-    }
-
-    public String getHandlerTime() {
-        return handlerTime;
-    }
-
-    public void setHandlerTime(String handlerTime) {
-        this.handlerTime = handlerTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getProgressType() {
-        return progressType;
-    }
-
-    public void setProgressType(String progressType) {
-        this.progressType = progressType;
-    }
-
-    @Override
-    public String toString() {
-        return "FireAndRanger{" +
-                "id=" + id +
-                ", rangerName='" + rangerName + '\'' +
-                ", fireCode='" + fireCode + '\'' +
-                ", handler='" + handler + '\'' +
-                ", verifier='" + verifier + '\'' +
-                ", handlerTime='" + handlerTime + '\'' +
-                ", endTime='" + endTime + '\'' +
-                ", progressType='" + progressType + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/entity/FirePoint.java

@@ -1,288 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-
-/**
- * @author XinYi Song
- */
-@Entity
-@Table(name="fire")
-public class FirePoint {
-    /**
-     * 指定主键，建立自增序列，主键值取自序列
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "fire_seq_gen")
-    @SequenceGenerator(name = "fire_seq_gen", sequenceName = "fire_id_seq",allocationSize = 1)
-    private Integer id;
-
-    /**
-     * 火点编码
-     */
-    @Column( length = 32,unique = true,columnDefinition = "varchar(32)")
-    private String fireCode;
-
-    /**
-     * 经度
-     */
-    private double longitude;
-
-    /**
-     * 纬度
-     */
-    private double latitude;
-
-    /**
-     * 省市区的编码
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String countyCode;
-
-    /**
-     * 省市区的名称
-     */
-    @Column( columnDefinition = "varchar(64)")
-    private String countyName;
-
-    /**
-     * 卫星监测的时间
-     */
-    private String satelliteTime;
-
-    /**
-     * 卫星的类型
-     */
-    @Column( columnDefinition = "varchar(64)")
-    private String satelliteType;
-
-    /**
-     * 植被类型
-     */
-    @Column( columnDefinition = "varchar(64)")
-    private String landType;
-
-    /**
-     * 添加的时间
-     */
-    private String addTime;
-
-    /**
-     * 置信度
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String confidence;
-
-    /**
-     * 详细地址
-     */
-    private String firePointAddress;
-
-    /**
-     * 火点状态 0 发现 1预警 2核查 -1,3结案
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String fireType;
-
-    /**
-     * 当前火点的图片
-     */
-    private String fireImage;
-
-    /**
-     * 卫星影像图片
-     */
-    private String satelliteImage;
-
-    /**
-     * 火点前的图片
-     */
-    private String beforeFireImage;
-
-    /**
-     * 火点后的图片
-     */
-    private String afterFireImage;
-
-
-    public FirePoint() {
-    }
-
-    public FirePoint(Integer id, String fireCode, double longitude, double latitude, String countyCode, String countyName, String satelliteTime, String satelliteType, String landType, String addTime, String confidence, String firePointAddress, String fireType, String fireImage, String satelliteImage, String beforeFireImage, String afterFireImage) {
-        this.id = id;
-        this.fireCode = fireCode;
-        this.longitude = longitude;
-        this.latitude = latitude;
-        this.countyCode = countyCode;
-        this.countyName = countyName;
-        this.satelliteTime = satelliteTime;
-        this.satelliteType = satelliteType;
-        this.landType = landType;
-        this.addTime = addTime;
-        this.confidence = confidence;
-        this.firePointAddress = firePointAddress;
-        this.fireType = fireType;
-        this.fireImage = fireImage;
-        this.satelliteImage = satelliteImage;
-        this.beforeFireImage = beforeFireImage;
-        this.afterFireImage = afterFireImage;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getFireCode() {
-        return fireCode;
-    }
-
-    public void setFireCode(String fireCode) {
-        this.fireCode = fireCode;
-    }
-
-    public double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(double longitude) {
-        this.longitude = longitude;
-    }
-
-    public double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getCountyCode() {
-        return countyCode;
-    }
-
-    public void setCountyCode(String countyCode) {
-        this.countyCode = countyCode;
-    }
-
-    public String getCountyName() {
-        return countyName;
-    }
-
-    public void setCountyName(String countyName) {
-        this.countyName = countyName;
-    }
-
-    public String getSatelliteTime() {
-        return satelliteTime;
-    }
-
-    public void setSatelliteTime(String satelliteTime) {
-        this.satelliteTime = satelliteTime;
-    }
-
-    public String getSatelliteType() {
-        return satelliteType;
-    }
-
-    public void setSatelliteType(String satelliteType) {
-        this.satelliteType = satelliteType;
-    }
-
-    public String getLandType() {
-        return landType;
-    }
-
-    public void setLandType(String landType) {
-        this.landType = landType;
-    }
-
-    public String getAddTime() {
-        return addTime;
-    }
-
-    public void setAddTime(String addTime) {
-        this.addTime = addTime;
-    }
-
-    public String getConfidence() {
-        return confidence;
-    }
-
-    public void setConfidence(String confidence) {
-        this.confidence = confidence;
-    }
-
-    public String getFirePointAddress() {
-        return firePointAddress;
-    }
-
-    public void setFirePointAddress(String firePointAddress) {
-        this.firePointAddress = firePointAddress;
-    }
-
-    public String getFireType() {
-        return fireType;
-    }
-
-    public void setFireType(String fireType) {
-        this.fireType = fireType;
-    }
-
-    public String getFireImage() {
-        return fireImage;
-    }
-
-    public void setFireImage(String fireImage) {
-        this.fireImage = fireImage;
-    }
-
-    public String getSatelliteImage() {
-        return satelliteImage;
-    }
-
-    public void setSatelliteImage(String satelliteImage) {
-        this.satelliteImage = satelliteImage;
-    }
-
-    public String getBeforeFireImage() {
-        return beforeFireImage;
-    }
-
-    public void setBeforeFireImage(String beforeFireImage) {
-        this.beforeFireImage = beforeFireImage;
-    }
-
-    public String getAfterFireImage() {
-        return afterFireImage;
-    }
-
-    public void setAfterFireImage(String afterFireImage) {
-        this.afterFireImage = afterFireImage;
-    }
-
-    @Override
-    public String toString() {
-        return "FirePoint{" +
-                "id=" + id +
-                ", fireCode='" + fireCode + '\'' +
-                ", longitude=" + longitude +
-                ", latitude=" + latitude +
-                ", countyCode='" + countyCode + '\'' +
-                ", countyName='" + countyName + '\'' +
-                ", satelliteTime='" + satelliteTime + '\'' +
-                ", satelliteType='" + satelliteType + '\'' +
-                ", landType='" + landType + '\'' +
-                ", addTime='" + addTime + '\'' +
-                ", confidence='" + confidence + '\'' +
-                ", firePointAddress='" + firePointAddress + '\'' +
-                ", fireType='" + fireType + '\'' +
-                ", fireImage='" + fireImage + '\'' +
-                ", satelliteImage='" + satelliteImage + '\'' +
-                ", beforeFireImage='" + beforeFireImage + '\'' +
-                ", afterFireImage='" + afterFireImage + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/entity/FirePointOrdinaryEntity.java

@@ -3,63 +3,34 @@ package com.xkrs.model.entity;
 import javax.persistence.*;
 import java.io.Serializable;
 
+/**
+ * 未审核的普通火点
+ */
 @Entity
-@Table(name = "fire_point")
+@Table(name = "fire_point_ordinary")
-public class FirePointEntity implements Serializable {
+public class FirePointOrdinaryEntity implements Serializable {
 
     /**
      * 指定主键，建立自增序列，主键值取自序列
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "fire_point_seq_gen")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "fire_point_ordinary_seq_gen")
-    @SequenceGenerator(name = "fire_point_seq_gen", sequenceName = "fire_point_id_seq", allocationSize = 1)
+    @SequenceGenerator(name = "fire_point_ordinary_seq_gen", sequenceName = "fire_point_ordinary_id_seq", allocationSize = 1)
-    private Integer id;
+    private Long id;
 
     /**
      * 火点编码
      */
-    @Column(length = 32, unique = true, columnDefinition = "varchar(32)")
+    @Column(length = 64, unique = true, columnDefinition = "varchar(64)")
     private String fireCode;
 
     /**
-     * 经度
+     * 火点状态
-     */
+     * 0：真火点
-    private double longitude;
+     * 1或null：伪火点
-
-    /**
-     * 纬度
-     */
-    private double latitude;
-
-    /**
-     * 详细地址
-     */
-    @Column(length = 255, columnDefinition = "varchar(255)")
-    private String firePointAddress;
-
-    /**
-     * 街道编码
-     */
-    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String streetCode;
-
-    /**
-     * 街道名称
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String streetName;
-
-    /**
-     * 省市区编码
      */
     @Column(length = 32, columnDefinition = "varchar(32)")
-    private String countyCode;
+    private String fireStatus;
-
-    /**
-     * 省市区名称
-     */
-    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String countyName;
 
     /**
      * 卫星监测的时间
@@ -68,7 +39,17 @@ public class FirePointEntity implements Serializable {
     private String satelliteTime;
 
     /**
-     * 卫星的类型
+     * 经度
+     */
+    private Double longitude;
+
+    /**
+     * 纬度
+     */
+    private Double latitude;
+
+    /**
+     * 卫星类型
      */
     @Column(length = 64, columnDefinition = "varchar(64)")
     private String satelliteType;
@@ -79,69 +60,104 @@ public class FirePointEntity implements Serializable {
     @Column(length = 64, columnDefinition = "varchar(64)")
     private String landType;
 
-    /**
-     * 添加的时间
-     */
-    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String addTime;
-
     /**
      * 置信度
      */
     @Column(length = 32, columnDefinition = "varchar(32)")
     private String confidence;
 
-    /**
-     * 火点状态
-     * 0：发现
-     * 1：预警
-     * 2：核查
-     * -1，3：结案
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String fireType;
-
-    /**
-     * 审核火点状态
-     * 0：未审核
-     * 1：审核通过
-     * 2：审核未通过
-     */
-    @Column(length = 65, columnDefinition = "varchar(32)")
-    private String auditFireType;
-
     /**
      * 当前火点的图片
      */
-    @Column(length = 255, columnDefinition = "varchar(255)")
+    @Column(length = 512, columnDefinition = "varchar(512)")
     private String fireImage;
 
     /**
      * 卫星影像图片
      */
-    @Column(length = 255, columnDefinition = "varchar(255)")
+    @Column(length = 512, columnDefinition = "varchar(512)")
     private String satelliteImage;
 
     /**
-     * 火点前的图片
+     * 添加的时间
      */
-    @Column(length = 255, columnDefinition = "varchar(255)")
+    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String beforeFireImage;
+    private String addTime;
 
     /**
-     * 火点后的图片
+     * 详细地址
      */
     @Column(length = 255, columnDefinition = "varchar(255)")
-    private String afterFireImage;
+    private String firePointAddress;
 
-    public FirePointEntity() {
+    /**
+     * 备注
+     */
+    @Column(length = 1024, columnDefinition = "varchar(1024)")
+    private String remark;
+
+    /**
+     * 占位符
+     */
+    @Column(length = 1024, columnDefinition = "varchar(1024)")
+    private String placeHolder;
+
+    /**
+     * 省的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String proCode;
+
+    /**
+     * 省的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String proName;
+
+    /**
+     * 市的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String cityCode;
+
+    /**
+     * 市的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String cityName;
+
+    /**
+     * 区县的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String countyCode;
+
+    /**
+     * 区县的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String countyName;
+
+    /**
+     * 乡镇街道的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String townCode;
+
+    /**
+     * 乡镇街道的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String townName;
+
+    public FirePointOrdinaryEntity() {
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -153,60 +169,12 @@ public class FirePointEntity implements Serializable {
         this.fireCode = fireCode;
     }
 
-    public double getLongitude() {
+    public String getFireStatus() {
-        return longitude;
+        return fireStatus;
     }
 
-    public void setLongitude(double longitude) {
+    public void setFireStatus(String fireStatus) {
-        this.longitude = longitude;
+        this.fireStatus = fireStatus;
-    }
-
-    public double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFirePointAddress() {
-        return firePointAddress;
-    }
-
-    public void setFirePointAddress(String firePointAddress) {
-        this.firePointAddress = firePointAddress;
-    }
-
-    public String getStreetCode() {
-        return streetCode;
-    }
-
-    public void setStreetCode(String streetCode) {
-        this.streetCode = streetCode;
-    }
-
-    public String getStreetName() {
-        return streetName;
-    }
-
-    public void setStreetName(String streetName) {
-        this.streetName = streetName;
-    }
-
-    public String getCountyCode() {
-        return countyCode;
-    }
-
-    public void setCountyCode(String countyCode) {
-        this.countyCode = countyCode;
-    }
-
-    public String getCountyName() {
-        return countyName;
-    }
-
-    public void setCountyName(String countyName) {
-        this.countyName = countyName;
     }
 
     public String getSatelliteTime() {
@@ -217,6 +185,22 @@ public class FirePointEntity implements Serializable {
         this.satelliteTime = satelliteTime;
     }
 
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
     public String getSatelliteType() {
         return satelliteType;
     }
@@ -233,14 +217,6 @@ public class FirePointEntity implements Serializable {
         this.landType = landType;
     }
 
-    public String getAddTime() {
-        return addTime;
-    }
-
-    public void setAddTime(String addTime) {
-        this.addTime = addTime;
-    }
-
     public String getConfidence() {
         return confidence;
     }
@@ -249,22 +225,6 @@ public class FirePointEntity implements Serializable {
         this.confidence = confidence;
     }
 
-    public String getFireType() {
-        return fireType;
-    }
-
-    public void setFireType(String fireType) {
-        this.fireType = fireType;
-    }
-
-    public String getAuditFireType() {
-        return auditFireType;
-    }
-
-    public void setAuditFireType(String auditFireType) {
-        this.auditFireType = auditFireType;
-    }
-
     public String getFireImage() {
         return fireImage;
     }
@@ -281,45 +241,128 @@ public class FirePointEntity implements Serializable {
         this.satelliteImage = satelliteImage;
     }
 
-    public String getBeforeFireImage() {
+    public String getAddTime() {
-        return beforeFireImage;
+        return addTime;
     }
 
-    public void setBeforeFireImage(String beforeFireImage) {
+    public void setAddTime(String addTime) {
-        this.beforeFireImage = beforeFireImage;
+        this.addTime = addTime;
     }
 
-    public String getAfterFireImage() {
+    public String getFirePointAddress() {
-        return afterFireImage;
+        return firePointAddress;
     }
 
-    public void setAfterFireImage(String afterFireImage) {
+    public void setFirePointAddress(String firePointAddress) {
-        this.afterFireImage = afterFireImage;
+        this.firePointAddress = firePointAddress;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getPlaceHolder() {
+        return placeHolder;
+    }
+
+    public void setPlaceHolder(String placeHolder) {
+        this.placeHolder = placeHolder;
+    }
+
+    public String getProCode() {
+        return proCode;
+    }
+
+    public void setProCode(String proCode) {
+        this.proCode = proCode;
+    }
+
+    public String getProName() {
+        return proName;
+    }
+
+    public void setProName(String proName) {
+        this.proName = proName;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCountyCode() {
+        return countyCode;
+    }
+
+    public void setCountyCode(String countyCode) {
+        this.countyCode = countyCode;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    public String getTownCode() {
+        return townCode;
+    }
+
+    public void setTownCode(String townCode) {
+        this.townCode = townCode;
+    }
+
+    public String getTownName() {
+        return townName;
+    }
+
+    public void setTownName(String townName) {
+        this.townName = townName;
     }
 
     @Override
     public String toString() {
-        return "FirePointEntity{" +
+        return "FirePointOrdinaryEntity{" +
                 "id=" + id +
                 ", fireCode='" + fireCode + '\'' +
+                ", fireStatus='" + fireStatus + '\'' +
+                ", satelliteTime='" + satelliteTime + '\'' +
                 ", longitude=" + longitude +
                 ", latitude=" + latitude +
-                ", firePointAddress='" + firePointAddress + '\'' +
-                ", streetCode='" + streetCode + '\'' +
-                ", streetName='" + streetName + '\'' +
-                ", countyCode='" + countyCode + '\'' +
-                ", countyName='" + countyName + '\'' +
-                ", satelliteTime='" + satelliteTime + '\'' +
                 ", satelliteType='" + satelliteType + '\'' +
                 ", landType='" + landType + '\'' +
-                ", addTime='" + addTime + '\'' +
                 ", confidence='" + confidence + '\'' +
-                ", fireType='" + fireType + '\'' +
-                ", auditFireType='" + auditFireType + '\'' +
                 ", fireImage='" + fireImage + '\'' +
                 ", satelliteImage='" + satelliteImage + '\'' +
-                ", beforeFireImage='" + beforeFireImage + '\'' +
+                ", addTime='" + addTime + '\'' +
-                ", afterFireImage='" + afterFireImage + '\'' +
+                ", firePointAddress='" + firePointAddress + '\'' +
+                ", remark='" + remark + '\'' +
+                ", placeHolder='" + placeHolder + '\'' +
+                ", proCode='" + proCode + '\'' +
+                ", proName='" + proName + '\'' +
+                ", cityCode='" + cityCode + '\'' +
+                ", cityName='" + cityName + '\'' +
+                ", countyCode='" + countyCode + '\'' +
+                ", countyName='" + countyName + '\'' +
+                ", townCode='" + townCode + '\'' +
+                ", townName='" + townName + '\'' +
                 '}';
     }
 }

src/main/java/com/xkrs/model/entity/FireTask.java

@@ -1,91 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * @author xkrs
- * 任务表
- */
-@Entity
-@Table(name = "fire_task")
-public class FireTask implements Serializable {
-
-    /**
-     * id 主键
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "fire_task_seq_gen")
-    @SequenceGenerator(name = "fire_task_seq_gen", sequenceName = "fire_task_id_seq",allocationSize = 1)
-    private Integer id;
-
-    /**
-     * 火点编码
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String taskFireCode;
-
-    /**
-     * 任务描述
-     */
-    @Column(length = 2000, columnDefinition = "varchar(2000)")
-    private String taskInformation;
-
-    /**
-     * 提交任务的时间
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String taskTime;
-
-    public FireTask() {
-    }
-
-    public FireTask(Integer id, String taskFireCode, String taskInformation, String taskTime) {
-        this.id = id;
-        this.taskFireCode = taskFireCode;
-        this.taskInformation = taskInformation;
-        this.taskTime = taskTime;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getTaskFireCode() {
-        return taskFireCode;
-    }
-
-    public void setTaskFireCode(String taskFireCode) {
-        this.taskFireCode = taskFireCode;
-    }
-
-    public String getTaskInformation() {
-        return taskInformation;
-    }
-
-    public void setTaskInformation(String taskInformation) {
-        this.taskInformation = taskInformation;
-    }
-
-    public String getTaskTime() {
-        return taskTime;
-    }
-
-    public void setTaskTime(String taskTime) {
-        this.taskTime = taskTime;
-    }
-
-    @Override
-    public String toString() {
-        return "FireTask{" +
-                "id=" + id +
-                ", taskFireCode='" + taskFireCode + '\'' +
-                ", taskInformation='" + taskInformation + '\'' +
-                ", taskTime='" + taskTime + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/entity/FireTaskPhoto.java

@@ -1,74 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * @author xkrs
- * 任务和图片中间表
- */
-@Entity
-@Table(name = "fire_task_photo")
-public class FireTaskPhoto implements Serializable {
-    /**
-     * id 主键
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "fire_task_photo_seq_gen")
-    @SequenceGenerator(name = "fire_task_photo_seq_gen", sequenceName = "fire_task_photo_id_seq",allocationSize = 1)
-    private Integer id;
-
-    /**
-     * 火点编码
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String photoFireCode;
-
-    /**
-     * 任务图片链接
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String taskPhoto;
-
-    public FireTaskPhoto() {
-    }
-
-    public FireTaskPhoto(Integer id, String photoFireCode, String taskPhoto) {
-        this.id = id;
-        this.photoFireCode = photoFireCode;
-        this.taskPhoto = taskPhoto;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getPhotoFireCode() {
-        return photoFireCode;
-    }
-
-    public void setPhotoFireCode(String photoFireCode) {
-        this.photoFireCode = photoFireCode;
-    }
-
-    public String getTaskPhoto() {
-        return taskPhoto;
-    }
-
-    public void setTaskPhoto(String taskPhoto) {
-        this.taskPhoto = taskPhoto;
-    }
-
-    @Override
-    public String toString() {
-        return "FireTaskPhoto{" +
-                "id=" + id +
-                ", photoFireCode='" + photoFireCode + '\'' +
-                ", taskPhoto='" + taskPhoto + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/entity/ForestRanger.java

@@ -1,155 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * @author xkrs
- * 护林员信息
- */
-@Entity
-@Table(name = "forest_ranger")
-public class ForestRanger implements Serializable {
-
-    /**
-     * 主键
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "forest_ranger_seq_gen")
-    @SequenceGenerator(name = "forest_ranger_seq_gen", sequenceName = "forest_ranger_id_seq",allocationSize = 1)
-    private Integer id;
-
-    /**
-     * 护林员的姓名
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String rangerName;
-
-    /**
-     * 护林员的电话
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String rangerPhone;
-
-    /**
-     * 纬度
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String rangerLatitude;
-
-    /**
-     * 经度
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String rangerLongitude;
-
-    /**
-     * 护林员所在市区县
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String rangerCountyName;
-
-    /**
-     * 市区县的编码
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String rangerCountyCode;
-
-    /**
-     * 护林员的状态（0空闲  1正在执行任务）
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String rangerType;
-
-    public ForestRanger() {
-    }
-
-    public ForestRanger(Integer id, String rangerName, String rangerPhone, String rangerLatitude, String rangerLongitude, String rangerCountyName, String rangerCountyCode, String rangerType) {
-        this.id = id;
-        this.rangerName = rangerName;
-        this.rangerPhone = rangerPhone;
-        this.rangerLatitude = rangerLatitude;
-        this.rangerLongitude = rangerLongitude;
-        this.rangerCountyName = rangerCountyName;
-        this.rangerCountyCode = rangerCountyCode;
-        this.rangerType = rangerType;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getRangerName() {
-        return rangerName;
-    }
-
-    public void setRangerName(String rangerName) {
-        this.rangerName = rangerName;
-    }
-
-    public String getRangerPhone() {
-        return rangerPhone;
-    }
-
-    public void setRangerPhone(String rangerPhone) {
-        this.rangerPhone = rangerPhone;
-    }
-
-    public String getRangerLatitude() {
-        return rangerLatitude;
-    }
-
-    public void setRangerLatitude(String rangerLatitude) {
-        this.rangerLatitude = rangerLatitude;
-    }
-
-    public String getRangerLongitude() {
-        return rangerLongitude;
-    }
-
-    public void setRangerLongitude(String rangerLongitude) {
-        this.rangerLongitude = rangerLongitude;
-    }
-
-    public String getRangerCountyName() {
-        return rangerCountyName;
-    }
-
-    public void setRangerCountyName(String rangerCountyName) {
-        this.rangerCountyName = rangerCountyName;
-    }
-
-    public String getRangerCountyCode() {
-        return rangerCountyCode;
-    }
-
-    public void setRangerCountyCode(String rangerCountyCode) {
-        this.rangerCountyCode = rangerCountyCode;
-    }
-
-    public String getRangerType() {
-        return rangerType;
-    }
-
-    public void setRangerType(String rangerType) {
-        this.rangerType = rangerType;
-    }
-
-    @Override
-    public String toString() {
-        return "XkRsForestRanger{" +
-                "id=" + id +
-                ", rangerName='" + rangerName + '\'' +
-                ", rangerPhone='" + rangerPhone + '\'' +
-                ", rangerLatitude='" + rangerLatitude + '\'' +
-                ", rangerLongitude='" + rangerLongitude + '\'' +
-                ", rangerCountyName='" + rangerCountyName + '\'' +
-                ", rangerCountyCode='" + rangerCountyCode + '\'' +
-                ", rangerType='" + rangerType + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/entity/GlobalConfigDictEntity.java

@@ -1,70 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * 全局配置字典表
- */
-@Entity
-@Table(name = "global_config_dict")
-public class GlobalConfigDictEntity implements Serializable {
-
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "global_config_dict_seq_gen")
-    @SequenceGenerator(name = "global_config_dict_seq_gen", sequenceName = "global_config_dict_id_seq", allocationSize = 1)
-    private Long id;
-
-    /**
-     * 全局配置字典的编码
-     */
-    private Long code;
-
-    /**
-     * 全局配置字典的名称
-     */
-    private String name;
-
-    /**
-     * 全局配置字典的备注
-     */
-    private String remark;
-
-    public GlobalConfigDictEntity() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCode() {
-        return code;
-    }
-
-    public void setCode(Long code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-}

src/main/java/com/xkrs/model/entity/GlobalConfigEntity.java

@@ -1,57 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * 全局配置表
- */
-@Entity
-@Table(name = "global_config")
-public class GlobalConfigEntity implements Serializable {
-
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "global_config_seq_gen")
-    @SequenceGenerator(name = "global_config_seq_gen", sequenceName = "global_config_id_seq", allocationSize = 1)
-    private Long id;
-
-    /**
-     * 全局配置项的编号
-     */
-    private Long code;
-
-    /**
-     * 全局配置项的值
-     */
-    private Long value;
-
-    public GlobalConfigEntity() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCode() {
-        return code;
-    }
-
-    public void setCode(Long code) {
-        this.code = code;
-    }
-
-    public Long getValue() {
-        return value;
-    }
-
-    public void setValue(Long value) {
-        this.value = value;
-    }
-}

src/main/java/com/xkrs/model/entity/GlobalConfigurationEntity.java

@@ -1,94 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * 全局配置表
- */
-@Entity
-@Table(name = "global_configuration")
-public class GlobalConfigurationEntity implements Serializable {
-
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "global_configuration_seq_gen")
-    @SequenceGenerator(name = "global_configuration_seq_gen", sequenceName = "global_configuration_id_seq", allocationSize = 1)
-    private Long id;
-
-    /**
-     * 全局配置项所属的组
-     */
-    private String belongGroup;
-
-    /**
-     * 全局配置项的键
-     */
-    private String key;
-
-    /**
-     * 全局配置项的值
-     */
-    private String value;
-
-    /**
-     * 备注信息
-     */
-    private String remark;
-
-    public GlobalConfigurationEntity() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getBelongGroup() {
-        return belongGroup;
-    }
-
-    public void setBelongGroup(String belongGroup) {
-        this.belongGroup = belongGroup;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "GlobalConfigurationEntity{" +
-                "id=" + id +
-                ", belongGroup='" + belongGroup + '\'' +
-                ", key='" + key + '\'' +
-                ", value='" + value + '\'' +
-                ", remark='" + remark + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/entity/GlobalSettingEntity.java

@@ -1,57 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * 全局配置表
- */
-@Entity
-@Table(name = "global_setting")
-public class GlobalSettingEntity implements Serializable {
-
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "global_setting_seq_gen")
-    @SequenceGenerator(name = "global_setting_seq_gen", sequenceName = "global_setting_id_seq", allocationSize = 1)
-    private Long id;
-
-    /**
-     * 全局配置项的键
-     */
-    private String key;
-
-    /**
-     * 全局配置项的值
-     */
-    private Long value;
-
-    public GlobalSettingEntity() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public Long getValue() {
-        return value;
-    }
-
-    public void setValue(Long value) {
-        this.value = value;
-    }
-}

src/main/java/com/xkrs/model/entity/LandEntity.java

@@ -13,7 +13,7 @@ public class LandEntity {
      */
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "city_seq_gen")
-    @SequenceGenerator(name = "city_seq_gen", sequenceName = "city_id_seq",allocationSize = 1)
+    @SequenceGenerator(name = "city_seq_gen", sequenceName = "city_id_seq", allocationSize = 1)
     private Integer id;
 
     /**
@@ -48,9 +48,6 @@ public class LandEntity {
 
     @Override
     public String toString() {
-        return "LandEntity{" +
+        return "LandEntity{" + "id=" + id + ", landName='" + landName + '\'' + '}';
-                "id=" + id +
-                ", landName='" + landName + '\'' +
-                '}';
     }
 }

src/main/java/com/xkrs/model/entity/NoticeEntity.java

@@ -0,0 +1,97 @@
+package com.xkrs.model.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 公告栏通知
+ */
+@Entity
+@Table(name = "notice")
+public class NoticeEntity implements Serializable {
+
+    /**
+     * 指定主键，建立自增序列，主键值取自序列
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "notice_seq_gen")
+    @SequenceGenerator(name = "notice_seq_gen", sequenceName = "notice_id_seq", allocationSize = 1)
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    @Column(length = 40960, columnDefinition = "varchar(40960)")
+    private String content;
+
+    /**
+     * 作者
+     */
+    private String author;
+
+    /**
+     * 公告栏通知的状态
+     * 0：正常
+     * 1：禁用
+     */
+    private Integer state;
+
+    public NoticeEntity() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    @Override
+    public String toString() {
+        return "NoticeEntity{" +
+                "id=" + id +
+                ", title='" + title + '\'' +
+                ", content='" + content + '\'' +
+                ", author='" + author + '\'' +
+                ", state=" + state +
+                '}';
+    }
+}

src/main/java/com/xkrs/model/entity/NoticeRelaEntity.java

@@ -0,0 +1,82 @@
+package com.xkrs.model.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 公告栏通知关联表
+ */
+@Entity
+@Table(name = "notice_rela")
+public class NoticeRelaEntity implements Serializable {
+
+    /**
+     * 指定主键，建立自增序列，主键值取自序列
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "notice_rela_seq_gen")
+    @SequenceGenerator(name = "notice_rela_seq_gen", sequenceName = "notice_rela_id_seq", allocationSize = 1)
+    private Long id;
+
+    /**
+     * 公告栏通知Id
+     */
+    private Long noticeId;
+
+    /**
+     * 用户Id
+     */
+    private Long userId;
+
+    /**
+     * 当前用户是否已读公告栏通知
+     * 0：未读
+     * 1：已读
+     */
+    private Integer state;
+
+    public NoticeRelaEntity() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getNoticeId() {
+        return noticeId;
+    }
+
+    public void setNoticeId(Long noticeId) {
+        this.noticeId = noticeId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    @Override
+    public String toString() {
+        return "NoticeRelaEntity{" +
+                "id=" + id +
+                ", noticeId=" + noticeId +
+                ", userId=" + userId +
+                ", state=" + state +
+                '}';
+    }
+}

src/main/java/com/xkrs/model/entity/RelRoleAuthorityEntity.java

@@ -5,10 +5,11 @@ import java.io.Serializable;
 
 /**
  * RelRoleAuthority 表实体类
+ *
  * @author tajochen
  */
 @Entity
-@Table(name="rel_role_authority")
+@Table(name = "rel_role_authority")
 public class RelRoleAuthorityEntity implements Serializable {
 
     /**
@@ -16,46 +17,49 @@ public class RelRoleAuthorityEntity implements Serializable {
      */
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "rel_role_authority_seq_gen")
-    @SequenceGenerator(name = "rel_role_authority_seq_gen", sequenceName = "rel_role_authority_id_seq",allocationSize = 1)
+    @SequenceGenerator(name = "rel_role_authority_seq_gen", sequenceName = "rel_role_authority_id_seq", allocationSize = 1)
-    private Integer id;
+    private Long id;
 
     @Column(nullable = false)
-    private Integer roleId;
+    private Long roleId;
 
     @Column(nullable = false)
-    private Integer authorityId;
+    private Long authorityId;
 
-    private Integer userId;
+    private Long userId;
 
-    public Integer getId() {
+    public RelRoleAuthorityEntity() {
+    }
+
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Integer getRoleId() {
+    public Long getRoleId() {
         return roleId;
     }
 
-    public void setRoleId(Integer roleId) {
+    public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
 
-    public Integer getAuthorityId() {
+    public Long getAuthorityId() {
         return authorityId;
     }
 
-    public void setAuthorityId(Integer authorityId) {
+    public void setAuthorityId(Long authorityId) {
         this.authorityId = authorityId;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 

src/main/java/com/xkrs/model/entity/RelUserRoleEntity.java

@@ -3,12 +3,8 @@ package com.xkrs.model.entity;
 import javax.persistence.*;
 import java.io.Serializable;
 
-/**
- * RelUserRole 表实体类
- * @author tajochen
- */
 @Entity
-@Table(name="rel_user_role")
+@Table(name = "rel_user_role")
 public class RelUserRoleEntity implements Serializable {
 
     /**
@@ -16,20 +12,23 @@ public class RelUserRoleEntity implements Serializable {
      */
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "rel_user_role_seq_gen")
-    @SequenceGenerator(name = "rel_user_role_seq_gen", sequenceName = "rel_user_role_id_seq",allocationSize = 1)
+    @SequenceGenerator(name = "rel_user_role_seq_gen", sequenceName = "rel_user_role_id_seq", allocationSize = 1)
-    private Integer id;
+    private Long id;
 
     @Column(nullable = false)
     private Long userId;
 
     @Column(nullable = false)
-    private Integer roleId;
+    private Long roleId;
 
-    public Integer getId() {
+    public RelUserRoleEntity() {
+    }
+
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -41,11 +40,11 @@ public class RelUserRoleEntity implements Serializable {
         this.userId = userId;
     }
 
-    public Integer getRoleId() {
+    public Long getRoleId() {
         return roleId;
     }
 
-    public void setRoleId(Integer roleId) {
+    public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
 

src/main/java/com/xkrs/model/entity/SettingEntity.java

@@ -1,50 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * @author xkrs
- */
-@Entity
-@Table(name = "setting")
-public class SettingEntity implements Serializable {
-
-    /**
-     * 主键id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "setting_seq_gen")
-    @SequenceGenerator(name = "setting_seq_gen", sequenceName = "setting_id_seq", allocationSize = 1)
-    private Long id;
-
-    /**
-     * 0：关，1：开
-     */
-    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String switchState;
-
-    public SettingEntity() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getSwitchState() {
-        return switchState;
-    }
-
-    public void setSwitchState(String switchState) {
-        this.switchState = switchState;
-    }
-
-    @Override
-    public String toString() {
-        return "SettingEntity{" + "id=" + id + ", switchState='" + switchState + '\'' + '}';
-    }
-}

src/main/java/com/xkrs/model/entity/ShanDongFirePointEntity.java

@@ -1,292 +0,0 @@
-package com.xkrs.model.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * @author XinYi Song
- */
-@Entity
-@Table(name = "fire_point_shandong")
-public class ShanDongFirePointEntity implements Serializable {
-
-    /**
-     * 指定主键，建立自增序列，主键值取自序列
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "fire_point_shandong_seq_gen")
-    @SequenceGenerator(name = "fire_point_shandong_seq_gen", sequenceName = "fire_point_shandong_id_seq", allocationSize = 1)
-    private Integer id;
-
-    /**
-     * 火点编码
-     */
-    @Column(length = 32, unique = true, columnDefinition = "varchar(32)")
-    private String fireCode;
-
-    /**
-     * 经度
-     */
-    private double longitude;
-
-    /**
-     * 纬度
-     */
-    private double latitude;
-
-    /**
-     * 省市区的编码
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String countyCode;
-
-    /**
-     * 省市区的名称
-     */
-    @Column(columnDefinition = "varchar(64)")
-    private String countyName;
-
-    /**
-     * 卫星监测的时间
-     */
-    private String satelliteTime;
-
-    /**
-     * 卫星的类型
-     */
-    @Column(columnDefinition = "varchar(64)")
-    private String satelliteType;
-
-    /**
-     * 植被类型
-     */
-    @Column(columnDefinition = "varchar(64)")
-    private String landType;
-
-    /**
-     * 添加的时间
-     */
-    private String addTime;
-
-    /**
-     * 置信度
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String confidence;
-
-    /**
-     * 详细地址
-     */
-    private String firePointAddress;
-
-    /**
-     * 火点状态 0 发现 1预警 2核查 -1,3结案
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String fireType;
-
-    /**
-     * 当前火点的图片
-     */
-    private String fireImage;
-
-    /**
-     * 卫星影像图片
-     */
-    private String satelliteImage;
-
-    /**
-     * 火点前的图片
-     */
-    private String beforeFireImage;
-
-    /**
-     * 火点后的图片
-     */
-    private String afterFireImage;
-
-    /**
-     * 街道编码
-     */
-    @Column(length = 65, columnDefinition = "varchar(65)")
-    private String streetCode;
-
-    @Column(length = 65, columnDefinition = "varchar(85)")
-    private String streetName;
-
-    /**
-     * 0：未审核
-     * 1：审核通过
-     * 2：审核不通过
-     */
-    @Column(length = 65, columnDefinition = "varchar(85)")
-    private String verifyState;
-
-    public ShanDongFirePointEntity() {
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getFireCode() {
-        return fireCode;
-    }
-
-    public void setFireCode(String fireCode) {
-        this.fireCode = fireCode;
-    }
-
-    public double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(double longitude) {
-        this.longitude = longitude;
-    }
-
-    public double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getCountyCode() {
-        return countyCode;
-    }
-
-    public void setCountyCode(String countyCode) {
-        this.countyCode = countyCode;
-    }
-
-    public String getCountyName() {
-        return countyName;
-    }
-
-    public void setCountyName(String countyName) {
-        this.countyName = countyName;
-    }
-
-    public String getSatelliteTime() {
-        return satelliteTime;
-    }
-
-    public void setSatelliteTime(String satelliteTime) {
-        this.satelliteTime = satelliteTime;
-    }
-
-    public String getSatelliteType() {
-        return satelliteType;
-    }
-
-    public void setSatelliteType(String satelliteType) {
-        this.satelliteType = satelliteType;
-    }
-
-    public String getLandType() {
-        return landType;
-    }
-
-    public void setLandType(String landType) {
-        this.landType = landType;
-    }
-
-    public String getAddTime() {
-        return addTime;
-    }
-
-    public void setAddTime(String addTime) {
-        this.addTime = addTime;
-    }
-
-    public String getConfidence() {
-        return confidence;
-    }
-
-    public void setConfidence(String confidence) {
-        this.confidence = confidence;
-    }
-
-    public String getFirePointAddress() {
-        return firePointAddress;
-    }
-
-    public void setFirePointAddress(String firePointAddress) {
-        this.firePointAddress = firePointAddress;
-    }
-
-    public String getFireType() {
-        return fireType;
-    }
-
-    public void setFireType(String fireType) {
-        this.fireType = fireType;
-    }
-
-    public String getFireImage() {
-        return fireImage;
-    }
-
-    public void setFireImage(String fireImage) {
-        this.fireImage = fireImage;
-    }
-
-    public String getSatelliteImage() {
-        return satelliteImage;
-    }
-
-    public void setSatelliteImage(String satelliteImage) {
-        this.satelliteImage = satelliteImage;
-    }
-
-    public String getBeforeFireImage() {
-        return beforeFireImage;
-    }
-
-    public void setBeforeFireImage(String beforeFireImage) {
-        this.beforeFireImage = beforeFireImage;
-    }
-
-    public String getAfterFireImage() {
-        return afterFireImage;
-    }
-
-    public void setAfterFireImage(String afterFireImage) {
-        this.afterFireImage = afterFireImage;
-    }
-
-    public String getStreetCode() {
-        return streetCode;
-    }
-
-    public void setStreetCode(String streetCode) {
-        this.streetCode = streetCode;
-    }
-
-    public String getStreetName() {
-        return streetName;
-    }
-
-    public void setStreetName(String streetName) {
-        this.streetName = streetName;
-    }
-
-    public String getVerifyState() {
-        return verifyState;
-    }
-
-    public void setVerifyState(String verifyState) {
-        this.verifyState = verifyState;
-    }
-
-    @Override
-    public String toString() {
-        return "ShanDongFirePointEntity{" + "id=" + id + ", fireCode='" + fireCode + '\'' + ", longitude=" + longitude + ", latitude=" + latitude + ", countyCode='" + countyCode + '\'' + ", countyName='" + countyName + '\'' + ", satelliteTime='" + satelliteTime + '\'' + ", satelliteType='" + satelliteType + '\'' + ", landType='" + landType + '\'' + ", addTime='" + addTime + '\'' + ", confidence='" + confidence + '\'' + ", firePointAddress='" + firePointAddress + '\'' + ", fireType='" + fireType + '\'' + ", fireImage='" + fireImage + '\'' + ", satelliteImage='" + satelliteImage + '\'' + ", beforeFireImage='" + beforeFireImage + '\'' + ", afterFireImage='" + afterFireImage + '\'' + ", streetCode='" + streetCode + '\'' + ", streetName='" + streetName + '\'' + ", verifyState='" + verifyState + '\'' + '}';
-    }
-}

src/main/java/com/xkrs/model/entity/SysAuthorityEntity.java

@@ -3,12 +3,8 @@ package com.xkrs.model.entity;
 import javax.persistence.*;
 import java.io.Serializable;
 
-/**
- * SysAuthority 表实体类
- * @author tajochen
- */
 @Entity
-@Table(name="sys_authority")
+@Table(name = "sys_authority")
 public class SysAuthorityEntity implements Serializable {
 
     /**
@@ -16,10 +12,10 @@ public class SysAuthorityEntity implements Serializable {
      */
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sys_authority_seq_gen")
-    @SequenceGenerator(name = "sys_authority_seq_gen", sequenceName = "sys_authority_id_seq",allocationSize = 1)
+    @SequenceGenerator(name = "sys_authority_seq_gen", sequenceName = "sys_authority_id_seq", allocationSize = 1)
-    private Integer id;
+    private Long id;
 
-    @Column(length = 64, nullable = false, unique = true,columnDefinition = "varchar(64)")
+    @Column(length = 64, nullable = false, unique = true, columnDefinition = "varchar(64)")
     private String authorityName;
 
     @Column(length = 64, columnDefinition = "varchar(64)")
@@ -28,11 +24,14 @@ public class SysAuthorityEntity implements Serializable {
     @Column(length = 128, columnDefinition = "varchar(128)")
     private String authorityDesc;
 
-    public Integer getId() {
+    public SysAuthorityEntity() {
+    }
+
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -41,7 +40,7 @@ public class SysAuthorityEntity implements Serializable {
     }
 
     public void setAuthorityName(String authorityName) {
-        this.authorityName = authorityName == null ? null : authorityName.trim();
+        this.authorityName = authorityName;
     }
 
     public String getAuthorityNameZh() {
@@ -49,7 +48,7 @@ public class SysAuthorityEntity implements Serializable {
     }
 
     public void setAuthorityNameZh(String authorityNameZh) {
-        this.authorityNameZh = authorityNameZh == null ? null : authorityNameZh.trim();
+        this.authorityNameZh = authorityNameZh;
     }
 
     public String getAuthorityDesc() {
@@ -57,7 +56,7 @@ public class SysAuthorityEntity implements Serializable {
     }
 
     public void setAuthorityDesc(String authorityDesc) {
-        this.authorityDesc = authorityDesc == null ? null : authorityDesc.trim();
+        this.authorityDesc = authorityDesc;
     }
 
     @Override
@@ -65,8 +64,8 @@ public class SysAuthorityEntity implements Serializable {
         return "SysAuthorityEntity{" +
                 "id=" + id +
                 ", authorityName='" + authorityName + '\'' +
-                ", authorityDesc='" + authorityDesc + '\'' +
                 ", authorityNameZh='" + authorityNameZh + '\'' +
+                ", authorityDesc='" + authorityDesc + '\'' +
                 '}';
     }
 }

src/main/java/com/xkrs/model/entity/SysRoleEntity.java

@@ -5,10 +5,9 @@ import java.io.Serializable;
 
 /**
  * SysRole 表实体类
- * @author tajochen
  */
 @Entity
-@Table(name="sys_role")
+@Table(name = "sys_role")
 public class SysRoleEntity implements Serializable {
 
     /**
@@ -16,10 +15,10 @@ public class SysRoleEntity implements Serializable {
      */
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sys_role_seq_gen")
-    @SequenceGenerator(name = "sys_role_seq_gen", sequenceName = "sys_role_id_seq",allocationSize = 1)
+    @SequenceGenerator(name = "sys_role_seq_gen", sequenceName = "sys_role_id_seq", allocationSize = 1)
-    private Integer id;
+    private Long id;
 
-    @Column(length = 32, nullable = false, unique = true,columnDefinition = "varchar(32)")
+    @Column(length = 32, nullable = false, unique = true, columnDefinition = "varchar(32)")
     private String roleName;
 
     @Column(length = 32, columnDefinition = "varchar(32)")
@@ -28,11 +27,14 @@ public class SysRoleEntity implements Serializable {
     @Column(length = 64, columnDefinition = "varchar(64)")
     private String roleDesc;
 
-    public Integer getId() {
+    public SysRoleEntity() {
+    }
+
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -41,15 +43,7 @@ public class SysRoleEntity implements Serializable {
     }
 
     public void setRoleName(String roleName) {
-        this.roleName = roleName == null ? null : roleName.trim();
+        this.roleName = roleName;
-    }
-
-    public String getRoleDesc() {
-        return roleDesc;
-    }
-
-    public void setRoleDesc(String roleDesc) {
-        this.roleDesc = roleDesc == null ? null : roleDesc.trim();
     }
 
     public String getRoleNameZh() {
@@ -57,16 +51,19 @@ public class SysRoleEntity implements Serializable {
     }
 
     public void setRoleNameZh(String roleNameZh) {
-        this.roleNameZh = roleNameZh == null ? null : roleNameZh.trim();
+        this.roleNameZh = roleNameZh;
+    }
+
+    public String getRoleDesc() {
+        return roleDesc;
+    }
+
+    public void setRoleDesc(String roleDesc) {
+        this.roleDesc = roleDesc;
     }
 
     @Override
     public String toString() {
-        return "SysRoleEntity{" +
+        return "SysRoleEntity{" + "id=" + id + ", roleName='" + roleName + '\'' + ", roleNameZh='" + roleNameZh + '\'' + ", roleDesc='" + roleDesc + '\'' + '}';
-                "id=" + id +
-                ", roleName='" + roleName + '\'' +
-                ", roleNameZh='" + roleNameZh + '\'' +
-                ", roleDesc='" + roleDesc + '\'' +
-                '}';
     }
 }

src/main/java/com/xkrs/model/entity/SysUserEntity.java

@@ -2,14 +2,7 @@ package com.xkrs.model.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
-
-/**
- * SysUser 表实体类
- *
- * @author tajochen
- */
 @Entity
 @Table(name = "sys_user")
 public class SysUserEntity implements Serializable {
@@ -20,74 +13,50 @@ public class SysUserEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sys_user_seq_gen")
     @SequenceGenerator(name = "sys_user_seq_gen", sequenceName = "sys_user_id_seq", allocationSize = 1)
-    private Integer id;
+    private Long id;
 
     /**
      * 用户名
      */
-    @Column(length = 16, nullable = false, unique = true, columnDefinition = "varchar(16)")
+    @Column(nullable = false, unique = true)
     private String userName;
 
     /**
      * 用户真实姓名
      */
-    @Column(length = 32, columnDefinition = "varchar(32)")
     private String reallyName;
 
     /**
      * 密码
      */
-    @Column(length = 64, nullable = false, columnDefinition = "varchar(64)")
+    @Column(nullable = false)
     private String password;
 
-    @Column(length = 32, nullable = false, columnDefinition = "varchar(32)")
+    @Column(nullable = false)
     private String salt;
 
-    @Column(length = 16, unique = true, columnDefinition = "varchar(16)")
+    @Column(unique = true)
     private String telephone;
 
-    @Column(length = 32, columnDefinition = "varchar(32)")
     private String countyCode;
 
-    @Column(columnDefinition = "varchar(192)")
+    private String countyName;
-    private String signature;
 
+    /**
+     * 0：正常用户
+     * 1：被禁用的用户
+     */
     @Column(nullable = false)
     private Integer activeFlag;
 
-    @Column(nullable = false, columnDefinition = "smallint")
-    private Integer statusCode;
-
     @Column(nullable = false)
     private String addTime;
 
-    private LocalDateTime lastEntryTime;
-
-    @Column(nullable = false)
-    private Integer deleteFlag;
-
-    @Column(columnDefinition = "varchar(64)")
-    private String lastEntryIp;
-
-    /**
-     * 账号的使用天数
-     */
-    private Integer dayNum;
-
-    /**
-     * 账号到期的时间
-     */
-    private String overTime;
-
     /**
      * 账号类别
      */
-    @Column(length = 64, columnDefinition = "varchar(64)")
     private String accountType;
 
-    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String countyName;
-
     /**
      * 登录次数
      */
@@ -114,34 +83,45 @@ public class SysUserEntity implements Serializable {
      */
     private Integer receiveSms;
 
+    /**
+     * 一共接收了多少条短信
+     */
+    private Long receiveSmsCount;
+
     /**
      * 备注
      */
     private String remark;
 
     /**
-     * 代理组织的ID
+     * 推送ID
      */
-    private Long agentOrgId;
+    private String pushId;
 
     /**
-     * 推送的 userAccount
+     * 占位符
      */
-    private String pushUserAccount;
+    private String placeHolder;
 
     /**
-     * 推送的 regID
+     * 账号的使用天数
      */
-    private String pushRegID;
+    private Long dayNum;
+
+    /**
+     * VIP时间范围列表Json
+     */
+    @Column(columnDefinition = "varchar(40960)")
+    private String vipTimeRangeJson;
 
     public SysUserEntity() {
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -193,12 +173,12 @@ public class SysUserEntity implements Serializable {
         this.countyCode = countyCode;
     }
 
-    public String getSignature() {
+    public String getCountyName() {
-        return signature;
+        return countyName;
     }
 
-    public void setSignature(String signature) {
+    public void setCountyName(String countyName) {
-        this.signature = signature;
+        this.countyName = countyName;
     }
 
     public Integer getActiveFlag() {
@@ -209,14 +189,6 @@ public class SysUserEntity implements Serializable {
         this.activeFlag = activeFlag;
     }
 
-    public Integer getStatusCode() {
-        return statusCode;
-    }
-
-    public void setStatusCode(Integer statusCode) {
-        this.statusCode = statusCode;
-    }
-
     public String getAddTime() {
         return addTime;
     }
@@ -225,46 +197,6 @@ public class SysUserEntity implements Serializable {
         this.addTime = addTime;
     }
 
-    public LocalDateTime getLastEntryTime() {
-        return lastEntryTime;
-    }
-
-    public void setLastEntryTime(LocalDateTime lastEntryTime) {
-        this.lastEntryTime = lastEntryTime;
-    }
-
-    public Integer getDeleteFlag() {
-        return deleteFlag;
-    }
-
-    public void setDeleteFlag(Integer deleteFlag) {
-        this.deleteFlag = deleteFlag;
-    }
-
-    public String getLastEntryIp() {
-        return lastEntryIp;
-    }
-
-    public void setLastEntryIp(String lastEntryIp) {
-        this.lastEntryIp = lastEntryIp;
-    }
-
-    public Integer getDayNum() {
-        return dayNum;
-    }
-
-    public void setDayNum(Integer dayNum) {
-        this.dayNum = dayNum;
-    }
-
-    public String getOverTime() {
-        return overTime;
-    }
-
-    public void setOverTime(String overTime) {
-        this.overTime = overTime;
-    }
-
     public String getAccountType() {
         return accountType;
     }
@@ -273,14 +205,6 @@ public class SysUserEntity implements Serializable {
         this.accountType = accountType;
     }
 
-    public String getCountyName() {
-        return countyName;
-    }
-
-    public void setCountyName(String countyName) {
-        this.countyName = countyName;
-    }
-
     public Integer getLoginNum() {
         return loginNum;
     }
@@ -321,6 +245,14 @@ public class SysUserEntity implements Serializable {
         this.receiveSms = receiveSms;
     }
 
+    public Long getReceiveSmsCount() {
+        return receiveSmsCount;
+    }
+
+    public void setReceiveSmsCount(Long receiveSmsCount) {
+        this.receiveSmsCount = receiveSmsCount;
+    }
+
     public String getRemark() {
         return remark;
     }
@@ -329,32 +261,63 @@ public class SysUserEntity implements Serializable {
         this.remark = remark;
     }
 
-    public Long getAgentOrgId() {
+    public String getPushId() {
-        return agentOrgId;
+        return pushId;
     }
 
-    public void setAgentOrgId(Long agentOrgId) {
+    public void setPushId(String pushId) {
-        this.agentOrgId = agentOrgId;
+        this.pushId = pushId;
     }
 
-    public String getPushUserAccount() {
+    public String getPlaceHolder() {
-        return pushUserAccount;
+        return placeHolder;
     }
 
-    public void setPushUserAccount(String pushUserAccount) {
+    public void setPlaceHolder(String placeHolder) {
-        this.pushUserAccount = pushUserAccount;
+        this.placeHolder = placeHolder;
     }
 
-    public String getPushRegID() {
+    public Long getDayNum() {
-        return pushRegID;
+        return dayNum;
     }
 
-    public void setPushRegID(String pushRegID) {
+    public void setDayNum(Long dayNum) {
-        this.pushRegID = pushRegID;
+        this.dayNum = dayNum;
+    }
+
+    public String getVipTimeRangeJson() {
+        return vipTimeRangeJson;
+    }
+
+    public void setVipTimeRangeJson(String vipTimeRangeJson) {
+        this.vipTimeRangeJson = vipTimeRangeJson;
     }
 
     @Override
     public String toString() {
-        return "SysUserEntity{" + "id=" + id + ", userName='" + userName + '\'' + ", reallyName='" + reallyName + '\'' + ", password='" + password + '\'' + ", salt='" + salt + '\'' + ", telephone='" + telephone + '\'' + ", countyCode='" + countyCode + '\'' + ", signature='" + signature + '\'' + ", activeFlag=" + activeFlag + ", statusCode=" + statusCode + ", addTime='" + addTime + '\'' + ", lastEntryTime=" + lastEntryTime + ", deleteFlag=" + deleteFlag + ", lastEntryIp='" + lastEntryIp + '\'' + ", dayNum=" + dayNum + ", overTime='" + overTime + '\'' + ", accountType='" + accountType + '\'' + ", countyName='" + countyName + '\'' + ", loginNum=" + loginNum + ", loginLastTime='" + loginLastTime + '\'' + ", userAgent='" + userAgent + '\'' + ", vipLevel=" + vipLevel + ", receiveSms=" + receiveSms + ", remark='" + remark + '\'' + ", agentOrgId=" + agentOrgId + ", pushUserAccount='" + pushUserAccount + '\'' + ", pushRegID='" + pushRegID + '\'' + '}';
+        return "SysUserEntity{" +
+                "id=" + id +
+                ", userName='" + userName + '\'' +
+                ", reallyName='" + reallyName + '\'' +
+                ", password='" + password + '\'' +
+                ", salt='" + salt + '\'' +
+                ", telephone='" + telephone + '\'' +
+                ", countyCode='" + countyCode + '\'' +
+                ", countyName='" + countyName + '\'' +
+                ", activeFlag=" + activeFlag +
+                ", addTime='" + addTime + '\'' +
+                ", accountType='" + accountType + '\'' +
+                ", loginNum=" + loginNum +
+                ", loginLastTime='" + loginLastTime + '\'' +
+                ", userAgent='" + userAgent + '\'' +
+                ", vipLevel=" + vipLevel +
+                ", receiveSms=" + receiveSms +
+                ", receiveSmsCount=" + receiveSmsCount +
+                ", remark='" + remark + '\'' +
+                ", pushId='" + pushId + '\'' +
+                ", placeHolder='" + placeHolder + '\'' +
+                ", dayNum=" + dayNum +
+                ", vipTimeRangeJson='" + vipTimeRangeJson + '\'' +
+                '}';
     }
 }

src/main/java/com/xkrs/model/helper/PushHelper.java

@@ -1,11 +1,11 @@
-package com.xkrs.sms;
+package com.xkrs.model.helper;
 
 import com.xiaomi.push.sdk.ErrorCode;
 import com.xiaomi.xmpush.server.Constants;
 import com.xiaomi.xmpush.server.Message;
 import com.xiaomi.xmpush.server.Result;
 import com.xiaomi.xmpush.server.Sender;
-import com.xkrs.model.entity.FirePointEntity;
+import com.xkrs.model.entity.FirePointOrdinaryEntity;
 import com.xkrs.model.entity.SysUserEntity;
 import org.springframework.stereotype.Component;
 
@@ -18,24 +18,24 @@ public class PushHelper {
     public PushHelper() {
     }
 
-    public List<String> obtainUserAccountList(List<SysUserEntity> sysUserList) {
+    public List<String> obtainUserPushIdList(List<SysUserEntity> sysUserList) {
-        List<String> userAccountList = new ArrayList<>();
+        List<String> userPushIdList = new ArrayList<>();
         if (sysUserList != null && sysUserList.size() > 0) {
             for (SysUserEntity sysUserEntity : sysUserList) {
-                userAccountList.add(sysUserEntity.getPushUserAccount());
+                userPushIdList.add(sysUserEntity.getPushId());
             }
         }
-        return userAccountList;
+        return userPushIdList;
     }
 
     /**
      * 发起推送
      *
      * @param userAccountList userAccount 非空白，不能包含逗号, 长度小于128
-     * @param firePointEntity
+     * @param firePoint
      * @throws Exception
      */
-    public void dispatchPushMessage(List<String> userAccountList, FirePointEntity firePointEntity) throws Exception {
+    public void dispatchPushMessage(List<String> userAccountList, FirePointOrdinaryEntity firePoint) throws Exception {
         Constants.useOfficial();
         Sender sender = new Sender("f6N7nchoqOWj3YyZiQPH2w==");
         String messagePayload = "This is a message";

src/main/java/com/xkrs/model/qo/AllFirePointQo.java

@@ -1,30 +1,16 @@
 package com.xkrs.model.qo;
 
-/**
+public class AllFirePointQo {
- * @author XinYi Song
- * 火点参数类
- */
-public class FirePointQo {
 
     /**
      * 火点编码
      */
     private String fireCode;
 
-    /**
-     * 省市区的编码
-     */
-    private Integer countyCode;
-
-    /**
-     * 省市区的名称
-     */
-    private String countyName;
-
     /**
      * 卫星监测的时间戳
      */
-    private Integer satelliteTimeTs;
+    private Long satelliteTimeTs;
 
     /**
      * 经度
@@ -62,11 +48,21 @@ public class FirePointQo {
     private String satelliteImage;
 
     /**
-     * 乡镇街道区划编码
+     * 省市区的编码
+     */
+    private Long countyCode;
+
+    /**
+     * 省市区的名称
+     */
+    private String countyName;
+
+    /**
+     * 乡镇街道的编码
      */
     private String towncode;
 
-    public FirePointQo() {
+    public AllFirePointQo() {
     }
 
     public String getFireCode() {
@@ -77,27 +73,11 @@ public class FirePointQo {
         this.fireCode = fireCode;
     }
 
-    public Integer getCountyCode() {
+    public Long getSatelliteTimeTs() {
-        return countyCode;
-    }
-
-    public void setCountyCode(Integer countyCode) {
-        this.countyCode = countyCode;
-    }
-
-    public String getCountyName() {
-        return countyName;
-    }
-
-    public void setCountyName(String countyName) {
-        this.countyName = countyName;
-    }
-
-    public Integer getSatelliteTimeTs() {
         return satelliteTimeTs;
     }
 
-    public void setSatelliteTimeTs(Integer satelliteTimeTs) {
+    public void setSatelliteTimeTs(Long satelliteTimeTs) {
         this.satelliteTimeTs = satelliteTimeTs;
     }
 
@@ -157,6 +137,22 @@ public class FirePointQo {
         this.satelliteImage = satelliteImage;
     }
 
+    public Long getCountyCode() {
+        return countyCode;
+    }
+
+    public void setCountyCode(Long countyCode) {
+        this.countyCode = countyCode;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
     public String getTowncode() {
         return towncode;
     }
@@ -167,6 +163,19 @@ public class FirePointQo {
 
     @Override
     public String toString() {
-        return "FirePointQo{" + "fireCode='" + fireCode + '\'' + ", countyCode=" + countyCode + ", countyName='" + countyName + '\'' + ", satelliteTimeTs=" + satelliteTimeTs + ", longitude=" + longitude + ", latitude=" + latitude + ", satelliteType='" + satelliteType + '\'' + ", landtype='" + landtype + '\'' + ", confidence='" + confidence + '\'' + ", fireImage='" + fireImage + '\'' + ", satelliteImage='" + satelliteImage + '\'' + ", towncode='" + towncode + '\'' + '}';
+        return "AllFirePointQo{" +
+                "fireCode='" + fireCode + '\'' +
+                ", satelliteTimeTs=" + satelliteTimeTs +
+                ", longitude=" + longitude +
+                ", latitude=" + latitude +
+                ", satelliteType='" + satelliteType + '\'' +
+                ", landtype='" + landtype + '\'' +
+                ", confidence='" + confidence + '\'' +
+                ", fireImage='" + fireImage + '\'' +
+                ", satelliteImage='" + satelliteImage + '\'' +
+                ", countyCode=" + countyCode +
+                ", countyName='" + countyName + '\'' +
+                ", towncode='" + towncode + '\'' +
+                '}';
     }
 }

src/main/java/com/xkrs/model/qo/AuditFireTypeQo.java

@@ -1,38 +0,0 @@
-package com.xkrs.model.qo;
-
-import com.xkrs.model.validation.AuditFireTypeQoUpdate;
-
-import javax.validation.constraints.NotNull;
-
-public class AuditFireTypeQo {
-
-    @NotNull(message = "{FirePoint.fireCode.blank}", groups = {AuditFireTypeQoUpdate.class})
-    private String fireCode;
-
-    @NotNull(message = "{FirePoint.auditFireType.blank}", groups = {AuditFireTypeQoUpdate.class})
-    private String auditFireType;
-
-    public AuditFireTypeQo() {
-    }
-
-    public String getFireCode() {
-        return fireCode;
-    }
-
-    public void setFireCode(String fireCode) {
-        this.fireCode = fireCode;
-    }
-
-    public String getAuditFireType() {
-        return auditFireType;
-    }
-
-    public void setAuditFireType(String auditFireType) {
-        this.auditFireType = auditFireType;
-    }
-
-    @Override
-    public String toString() {
-        return "AuditFireTypeQo{" + "fireCode='" + fireCode + '\'' + ", auditFireType='" + auditFireType + '\'' + '}';
-    }
-}

src/main/java/com/xkrs/model/qo/GlobalConfigDictQo.java

@@ -1,46 +0,0 @@
-package com.xkrs.model.qo;
-
-public class GlobalConfigDictQo {
-
-    /**
-     * 全局配置字典的编码
-     */
-    private Long code;
-
-    /**
-     * 全局配置字典的名称
-     */
-    private String name;
-
-    /**
-     * 全局配置字典的备注
-     */
-    private String remark;
-
-    public GlobalConfigDictQo() {
-    }
-
-    public Long getCode() {
-        return code;
-    }
-
-    public void setCode(Long code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-}

src/main/java/com/xkrs/model/qo/SettingQo.java

@@ -1,27 +0,0 @@
-package com.xkrs.model.qo;
-
-import com.xkrs.model.validation.SettingQoUpdate;
-
-import javax.validation.constraints.NotNull;
-
-public class SettingQo {
-
-    @NotNull(message = "{Setting.switchState.blank}", groups = {SettingQoUpdate.class})
-    private String switchState;
-
-    public SettingQo() {
-    }
-
-    public String getSwitchState() {
-        return switchState;
-    }
-
-    public void setSwitchState(String switchState) {
-        this.switchState = switchState;
-    }
-
-    @Override
-    public String toString() {
-        return "SettingQo{" + "switchState='" + switchState + '\'' + '}';
-    }
-}

src/main/java/com/xkrs/model/qo/ShanDongFirePointVerifyStateQo.java

@@ -1,38 +0,0 @@
-package com.xkrs.model.qo;
-
-import com.xkrs.model.validation.ShanDongFirePointVerifyStateQoUpdate;
-
-import javax.validation.constraints.NotNull;
-
-public class ShanDongFirePointVerifyStateQo {
-
-    @NotNull(message = "{FirePoint.fireCode.blank}", groups = {ShanDongFirePointVerifyStateQoUpdate.class})
-    private String fireCode;
-
-    @NotNull(message = "{FirePoint.verifyState.blank}", groups = {ShanDongFirePointVerifyStateQoUpdate.class})
-    private String verifyState;
-
-    public ShanDongFirePointVerifyStateQo() {
-    }
-
-    public String getFireCode() {
-        return fireCode;
-    }
-
-    public void setFireCode(String fireCode) {
-        this.fireCode = fireCode;
-    }
-
-    public String getVerifyState() {
-        return verifyState;
-    }
-
-    public void setVerifyState(String verifyState) {
-        this.verifyState = verifyState;
-    }
-
-    @Override
-    public String toString() {
-        return "ShanDongFirePointVerifyStateQo{" + "fireCode='" + fireCode + '\'' + ", verifyState='" + verifyState + '\'' + '}';
-    }
-}

src/main/java/com/xkrs/model/qo/SysUserPushAccountQo.java

@@ -1,37 +0,0 @@
-package com.xkrs.model.qo;
-
-public class SysUserPushAccountQo {
-
-    private Integer id;
-
-    private String regID;
-
-    private String userAccount;
-
-    public SysUserPushAccountQo() {
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getRegID() {
-        return regID;
-    }
-
-    public void setRegID(String regID) {
-        this.regID = regID;
-    }
-
-    public String getUserAccount() {
-        return userAccount;
-    }
-
-    public void setUserAccount(String userAccount) {
-        this.userAccount = userAccount;
-    }
-}

src/main/java/com/xkrs/model/qo/SysUserPushIdQo.java

@@ -0,0 +1,27 @@
+package com.xkrs.model.qo;
+
+public class SysUserPushIdQo {
+
+    private Long id;
+
+    private String pushId;
+
+    public SysUserPushIdQo() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPushId() {
+        return pushId;
+    }
+
+    public void setPushId(String pushId) {
+        this.pushId = pushId;
+    }
+}

src/main/java/com/xkrs/model/qo/SysUserQo.java

@@ -1,7 +1,7 @@
 package com.xkrs.model.qo;
 
-import com.xkrs.model.validation.SysUserQoInsert;
+import com.xkrs.model.va.SysUserQoInsert;
-import com.xkrs.model.validation.SysUserQoUpdate;
+import com.xkrs.model.va.SysUserQoUpdate;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;
@@ -9,11 +9,6 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
-/**
- * SysUserQo
- *
- * @author tajochen
- */
 public class SysUserQo {
 
     @NotNull(message = "{SysUser.id.blank}", groups = {SysUserQoUpdate.class})
@@ -58,11 +53,6 @@ public class SysUserQo {
 
     private String accountType;
 
-    /**
-     * 代理组织ID
-     */
-    private Long agentOrgId;
-
     public SysUserQo() {
     }
 
@@ -170,11 +160,4 @@ public class SysUserQo {
         this.accountType = accountType;
     }
 
-    public Long getAgentOrgId() {
-        return agentOrgId;
-    }
-
-    public void setAgentOrgId(Long agentOrgId) {
-        this.agentOrgId = agentOrgId;
-    }
 }

src/main/java/com/xkrs/model/qo/SysUserReceiveSmsQo.java

@@ -1,6 +1,6 @@
 package com.xkrs.model.qo;
 
-import com.xkrs.model.validation.SysUserQoUpdate;
+import com.xkrs.model.va.SysUserQoUpdate;
 
 import javax.validation.constraints.NotNull;
 

src/main/java/com/xkrs/model/qo/SysUserRemarkQo.java

@@ -1,13 +1,13 @@
 package com.xkrs.model.qo;
 
-import com.xkrs.model.validation.SysUserQoUpdate;
+import com.xkrs.model.va.SysUserQoUpdate;
 
 import javax.validation.constraints.NotNull;
 
 public class SysUserRemarkQo {
 
     @NotNull(message = "{SysUser.id.blank}", groups = {SysUserQoUpdate.class})
-    private Integer id;
+    private Long id;
 
     @NotNull(message = "{SysUser.remark.blank}", groups = {SysUserQoUpdate.class})
     private String remark;
@@ -15,11 +15,11 @@ public class SysUserRemarkQo {
     public SysUserRemarkQo() {
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

src/main/java/com/xkrs/model/qo/SysUserVipLevelQo.java

@@ -1,6 +1,6 @@
 package com.xkrs.model.qo;
 
-import com.xkrs.model.validation.SysUserQoUpdate;
+import com.xkrs.model.va.SysUserQoUpdate;
 
 import javax.validation.constraints.NotNull;
 

src/main/java/com/xkrs/model/qo/UpdateFirePointQo.java

@@ -0,0 +1,48 @@
+package com.xkrs.model.qo;
+
+import com.xkrs.model.va.FirePointQoUpdate;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+public class UpdateFirePointQo {
+
+    @NotNull(message = "{UpdateFirePointQo.data.blank}", groups = {FirePointQoUpdate.class})
+    private List<DataDTO> data;
+
+    public static class DataDTO {
+
+        @NotNull(message = "{UpdateFirePointQo.DataDTO.fireCode.blank}", groups = {FirePointQoUpdate.class})
+        private String fireCode;
+
+        @NotNull(message = "{UpdateFirePointQo.DataDTO.status.blank}", groups = {FirePointQoUpdate.class})
+        private String status;
+
+        public String getFireCode() {
+            return fireCode;
+        }
+
+        public void setFireCode(String fireCode) {
+            this.fireCode = fireCode;
+        }
+
+        public String getStatus() {
+            return status;
+        }
+
+        public void setStatus(String status) {
+            this.status = status;
+        }
+    }
+
+    public UpdateFirePointQo() {
+    }
+
+    public List<DataDTO> getData() {
+        return data;
+    }
+
+    public void setData(List<DataDTO> data) {
+        this.data = data;
+    }
+}

src/main/java/com/xkrs/model/va/FirePointQoUpdate.java

@@ -0,0 +1,4 @@
+package com.xkrs.model.va;
+
+public interface FirePointQoUpdate {
+}

src/main/java/com/xkrs/model/va/SysUserQoInsert.java

@@ -1,4 +1,4 @@
-package com.xkrs.model.validation;
+package com.xkrs.model.va;
 
 /**
  * SysUserQoInsert

src/main/java/com/xkrs/model/va/SysUserQoUpdate.java

@@ -1,4 +1,4 @@
-package com.xkrs.model.validation;
+package com.xkrs.model.va;
 
 /**
  * SysUserQoUpdate

src/main/java/com/xkrs/model/validation/AuditFireTypeQoUpdate.java

@@ -1,4 +0,0 @@
-package com.xkrs.model.validation;
-
-public interface AuditFireTypeQoUpdate {
-}

src/main/java/com/xkrs/model/validation/SettingQoUpdate.java

@@ -1,4 +0,0 @@
-package com.xkrs.model.validation;
-
-public interface SettingQoUpdate {
-}

src/main/java/com/xkrs/model/validation/ShanDongFirePointVerifyStateQoUpdate.java

@@ -1,4 +0,0 @@
-package com.xkrs.model.validation;
-
-public interface ShanDongFirePointVerifyStateQoUpdate {
-}

src/main/java/com/xkrs/model/vo/AppPhotoVo.java

@@ -1,33 +0,0 @@
-package com.xkrs.model.vo;
-
-import java.io.Serializable;
-
-/**
- * @author xkrs
- */
-public class AppPhotoVo implements Serializable {
-
-    private String taskPhoto;
-
-    public AppPhotoVo() {
-    }
-
-    public AppPhotoVo(String taskPhoto) {
-        this.taskPhoto = taskPhoto;
-    }
-
-    public String getTaskPhoto() {
-        return taskPhoto;
-    }
-
-    public void setTaskPhoto(String taskPhoto) {
-        this.taskPhoto = taskPhoto;
-    }
-
-    @Override
-    public String toString() {
-        return "AppPhotoVo{" +
-                "taskPhoto='" + taskPhoto + '\'' +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/vo/AppTaskBodyVo.java

@@ -1,70 +0,0 @@
-package com.xkrs.model.vo;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author xkrs
- */
-public class AppTaskBodyVo implements Serializable {
-
-    private String fireCode;
-
-    private String taskInformation;
-
-    private String taskTime;
-
-    private List taskFirePhoto;
-
-    public AppTaskBodyVo() {
-    }
-
-    public AppTaskBodyVo(String fireCode, String taskInformation, String taskTime, List taskFirePhoto) {
-        this.fireCode = fireCode;
-        this.taskInformation = taskInformation;
-        this.taskTime = taskTime;
-        this.taskFirePhoto = taskFirePhoto;
-    }
-
-    public String getFireCode() {
-        return fireCode;
-    }
-
-    public void setFireCode(String fireCode) {
-        this.fireCode = fireCode;
-    }
-
-    public String getTaskInformation() {
-        return taskInformation;
-    }
-
-    public void setTaskInformation(String taskInformation) {
-        this.taskInformation = taskInformation;
-    }
-
-    public String getTaskTime() {
-        return taskTime;
-    }
-
-    public void setTaskTime(String taskTime) {
-        this.taskTime = taskTime;
-    }
-
-    public List getTaskFirePhoto() {
-        return taskFirePhoto;
-    }
-
-    public void setTaskFirePhoto(List taskFirePhoto) {
-        this.taskFirePhoto = taskFirePhoto;
-    }
-
-    @Override
-    public String toString() {
-        return "AppTaskBodyVo{" +
-                "fireCode='" + fireCode + '\'' +
-                ", taskInformation='" + taskInformation + '\'' +
-                ", taskTime='" + taskTime + '\'' +
-                ", taskFirePhoto=" + taskFirePhoto +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/vo/FileServerResultVo.java

@@ -1,67 +0,0 @@
-package com.xkrs.model.vo;
-
-import java.io.Serializable;
-
-/**
- * FileServerResultVo 文件服务器查询结果
- * @author tajochen
- */
-public class FileServerResultVo<T> implements Serializable {
-
-    /**
-     * 状态信息
-     */
-    String status;
-
-    /**
-     * 提示信息
-     */
-    String message;
-
-    /**
-     * 数据
-     */
-    T data;
-
-    public FileServerResultVo() {
-    }
-
-    public FileServerResultVo(String status, String msg, T data) {
-        this.status = status;
-        this.message = msg;
-        this.data = data;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    @Override
-    public String toString() {
-        return "FileServerResultVo{" +
-                "status='" + status + '\'' +
-                ", message='" + message + '\'' +
-                ", data=" + data +
-                '}';
-    }
-}

src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java

@@ -3,9 +3,7 @@ package com.xkrs.model.vo;
 import java.util.List;
 
 /**
- * @author wudong
+ * 高德逆地理类
- * @date 2022/5/6 17:38
- * @description
  */
 public class GaoDeIgGeocodeVo {