【情报二期】数据域服务 - 更新配置文件、pom文件以及依赖jar

pom.xml

@@ -31,7 +31,7 @@
     <poi.version>4.1.2</poi.version>
     <velocity.version>2.3</velocity.version>
     <jwt.version>0.9.1</jwt.version>
-    <jackson.version>2.14.2</jackson.version>
+    <jackson.version>2.12.7</jackson.version>
   </properties>
 
   <dependencies>
@@ -60,18 +60,161 @@
       <groupId>org.locationtech.jts</groupId>
       <artifactId>jts-core</artifactId>
       <version>1.19.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/jts-core-1.19.0.jar</systemPath>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot</artifactId>
+      <version>2.5.15</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-boot-2.5.15.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframewor.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+      <version>2.5.15</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-boot-autoconfigure-2.5.15.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-json</artifactId>
+      <version>2.5.15</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-boot-starter-json-2.5.15.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-logging</artifactId>
+      <version>2.5.15</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-boot-starter-logging-2.5.15.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-tomcat</artifactId>
+      <version>2.5.15</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-boot-starter-tomcat-2.5.15.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-aop-5.3.27.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-beans-5.3.27.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-core-5.3.27.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-context-5.3.27.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>5.3.33</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-context-support-5.3.33.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-jdbc-5.3.27.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-expression-5.3.27.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jcl</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-jcl-5.3.27.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-oxm</artifactId>
+      <version>5.3.33</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-oxm-5.3.33.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-tx-5.3.27.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-web-5.3.27.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>5.3.27</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-webmvc-5.3.27.jar</systemPath>
+    </dependency>
+
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-validation</artifactId>
       <version>2.5.15</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-boot-starter-validation-2.5.15.jar</systemPath>
     </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
       <version>2.5.15</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-boot-starter-2.5.15.jar</systemPath>
     </dependency>
 
     <!-- Spring Web -->
@@ -79,12 +222,17 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
       <version>2.5.15</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-boot-starter-web-2.5.15.jar</systemPath>
     </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-jdbc</artifactId>
       <version>2.5.15</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/spring-boot-starter-jdbc-2.5.15.jar</systemPath>
+
     </dependency>
 
     <!-- 阿里数据库连接池 -->
@@ -92,6 +240,8 @@
       <groupId>com.alibaba</groupId>
       <artifactId>druid-spring-boot-starter</artifactId>
       <version>${druid.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/druid-spring-boot-starter-1.2.23.jar</systemPath>
     </dependency>
 
     <!-- 解析客户端操作系统、浏览器等 -->
@@ -99,6 +249,8 @@
       <groupId>eu.bitwalker</groupId>
       <artifactId>UserAgentUtils</artifactId>
       <version>${bitwalker.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/UserAgentUtils-1.21.jar</systemPath>
     </dependency>
 
     <!-- pagehelper 分页插件 -->
@@ -113,6 +265,48 @@
       <groupId>com.github.oshi</groupId>
       <artifactId>oshi-core</artifactId>
       <version>${oshi.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/oshi-core-6.6.3.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.32</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/slf4j-api-1.7.32.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-clients</artifactId>
+      <version>1.1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/kafka-clients-1.1.0.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-streams</artifactId>
+      <version>1.1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/kafka-streams-1.1.0.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-streams-examples</artifactId>
+      <version>1.1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/kafka-streams-examples-1.1.0.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4.10</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/httpcore-4.4.10.jar</systemPath>
     </dependency>
 
     <!-- io常用工具类 -->
@@ -120,6 +314,16 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>${commons.io.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/commons-io-2.13.0.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang3</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.11</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/commons-lang3-3.11.jar</systemPath>
     </dependency>
 
     <!-- excel工具 -->
@@ -127,6 +331,8 @@
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
       <version>${poi.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/poi-ooxml-4.1.2.jar</systemPath>
     </dependency>
 
     <!-- velocity代码生成使用模板 -->
@@ -134,6 +340,8 @@
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-engine-core</artifactId>
       <version>${velocity.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/velocity-engine-core-2.3.jar</systemPath>
     </dependency>
 
     <!-- 阿里JSON解析器 -->
@@ -141,6 +349,8 @@
       <groupId>com.alibaba.fastjson2</groupId>
       <artifactId>fastjson2</artifactId>
       <version>${fastjson.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/fastjson2-2.0.53.jar</systemPath>
     </dependency>
 
     <!-- Token生成与解析-->
@@ -148,6 +358,8 @@
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt</artifactId>
       <version>${jwt.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/jjwt-0.9.1.jar</systemPath>
     </dependency>
 
     <!-- 验证码 -->
@@ -155,12 +367,16 @@
       <groupId>pro.fessional</groupId>
       <artifactId>kaptcha</artifactId>
       <version>${kaptcha.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/kaptcha-2.3.3.jar</systemPath>
     </dependency>
 
     <dependency>
       <groupId>cn.hutool</groupId>
       <artifactId>hutool-all</artifactId>
       <version>5.8.16</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/hutool-all-5.8.16.jar</systemPath>
     </dependency>
 
 
@@ -168,6 +384,8 @@
       <groupId>com.alibaba</groupId>
       <artifactId>easyexcel</artifactId>
       <version>3.3.2</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/easyexcel-3.3.2.jar</systemPath>
     </dependency>
 
     <!-- Mysql驱动包 -->
@@ -175,6 +393,8 @@
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <version>8.0.30</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/mysql-connector-java-8.0.30.jar</systemPath>
     </dependency>
 
     <dependency>
@@ -188,24 +408,32 @@
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
       <version>1.15.1</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/jsoup-1.15.1.jar</systemPath>
     </dependency>
 
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>4.5.6</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/httpclient-4.5.6.jar</systemPath>
     </dependency>
 
     <dependency>
       <groupId>com.alibaba</groupId>
       <artifactId>fastjson</artifactId>
       <version>1.2.31</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/fastjson-1.2.31.jar</systemPath>
     </dependency>
 
     <dependency>
       <groupId>com.sun.mail</groupId>
       <artifactId>javax.mail</artifactId>
       <version>1.6.2</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/javax.mail-1.6.2.jar</systemPath>
     </dependency>
 
     <!-- Jackson Databind -->
@@ -213,24 +441,120 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
       <version>${jackson.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/jackson-databind-2.12.7.jar</systemPath>
     </dependency>
     <!-- Jackson Annotations -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
       <version>${jackson.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/jackson-annotations-2.12.7.jar</systemPath>
     </dependency>
     <!-- Jackson Core -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
       <version>${jackson.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/jackson-core-2.12.7.jar</systemPath>
     </dependency>
     <!-- Jackson JSR310 Data Types -->
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
       <version>${jackson.version}</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/jackson-datatype-jsr310-2.12.7.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <version>9.0.75</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/tomcat-embed-core-9.0.75.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-embed-el</artifactId>
+      <version>9.0.75</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/tomcat-embed-el-9.0.75.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-embed-websocket</artifactId>
+      <version>9.0.75</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/tomcat-embed-websocket-9.0.75.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.xmlbeans</groupId>
+      <artifactId>xmlbeans</artifactId>
+      <version>3.1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/xmlbeans-3.1.0.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.yaml.snakeyaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.28</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/snakeyaml-1.28.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/servlet-api-2.5.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>2.17.2</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/log4j-api-2.17.2.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-to-slf4j</artifactId>
+      <version>2.17.2</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/log4j-to-slf4j-2.17.2.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>txw2</artifactId>
+      <version>2.3.2</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/txw2-2.3.2.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jvnet.staxex</groupId>
+      <artifactId>stax-ex</artifactId>
+      <version>1.8.1</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/stax-ex-1.8.1.jar</systemPath>
+    </dependency>
+
+    <dependency>
+      <groupId>com.alibaba</groupId>
+      <artifactId>druid</artifactId>
+      <version>1.2.23</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/druid-1.2.23.jar</systemPath>
     </dependency>
 
   </dependencies>

src/main/java/com/hhwy/qbeqsjy/common/Constants.java

@@ -12,19 +12,19 @@ import java.util.Locale;
 public class Constants {
 
     // 数据资源编码：同火车
-    public static final String RES_CODE_THC = "";
+    public static final String RES_CODE_THC = "01A1201001039";
     // 数据资源编码：同航班
-    public static final String RES_CODE_THB = "";
+    public static final String RES_CODE_THB = "01A1200002658";
     // 数据资源编码：同宾馆
-    public static final String RES_CODE_TBG = "";
+    public static final String RES_CODE_TBG = "01A1200002660";
     // 数据资源编码：同网吧
-    public static final String RES_CODE_TWB = "";
+    public static final String RES_CODE_TWB = "01A1200002661";
     // 数据资源编码：同长途客运
-    public static final String RES_CODE_TCTKY = "";
+    public static final String RES_CODE_TCTKY = "01A1201001040";
     // 数据资源编码：同民航进港
-    public static final String RES_CODE_TMHJG = "";
+    public static final String RES_CODE_TMHJG = "01A1200002659";
     // 数据资源编码：同民航离港
-    public static final String RES_CODE_TMHLG = "";
+    public static final String RES_CODE_TMHLG = "01A1201001038";
     // 接口响应内容类型默认值
     public static final String DEFAULT_RSP_TYPE = "application/json";
     // 接口响应内容类型值

src/main/java/com/hhwy/qbeqsjy/common/ServletUtils.java

@@ -1,217 +0,0 @@
-package com.hhwy.qbeqsjy.common;
-
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 客户端工具类
- * 
- * @author ruoyi
- */
-public class ServletUtils
-{
-    /**
-     * 获取String参数
-     */
-    public static String getParameter(String name)
-    {
-        return getRequest().getParameter(name);
-    }
-
-    /**
-     * 获取String参数
-     */
-    public static String getParameter(String name, String defaultValue)
-    {
-        return Convert.toStr(getRequest().getParameter(name), defaultValue);
-    }
-
-    /**
-     * 获取Integer参数
-     */
-    public static Integer getParameterToInt(String name)
-    {
-        return Convert.toInt(getRequest().getParameter(name));
-    }
-
-    /**
-     * 获取Integer参数
-     */
-    public static Integer getParameterToInt(String name, Integer defaultValue)
-    {
-        return Convert.toInt(getRequest().getParameter(name), defaultValue);
-    }
-
-    /**
-     * 获取Boolean参数
-     */
-    public static Boolean getParameterToBool(String name)
-    {
-        return Convert.toBool(getRequest().getParameter(name));
-    }
-
-    /**
-     * 获取Boolean参数
-     */
-    public static Boolean getParameterToBool(String name, Boolean defaultValue)
-    {
-        return Convert.toBool(getRequest().getParameter(name), defaultValue);
-    }
-
-    /**
-     * 获得所有请求参数
-     *
-     * @param request 请求对象{@link ServletRequest}
-     * @return Map
-     */
-    public static Map<String, String[]> getParams(ServletRequest request)
-    {
-        final Map<String, String[]> map = request.getParameterMap();
-        return Collections.unmodifiableMap(map);
-    }
-
-    /**
-     * 获得所有请求参数
-     *
-     * @param request 请求对象{@link ServletRequest}
-     * @return Map
-     */
-    public static Map<String, String> getParamMap(ServletRequest request)
-    {
-        Map<String, String> params = new HashMap<>();
-        for (Map.Entry<String, String[]> entry : getParams(request).entrySet())
-        {
-            params.put(entry.getKey(), StringUtils.join(entry.getValue(), ","));
-        }
-        return params;
-    }
-
-    /**
-     * 获取request
-     */
-    public static HttpServletRequest getRequest()
-    {
-        return getRequestAttributes().getRequest();
-    }
-
-    /**
-     * 获取response
-     */
-    public static HttpServletResponse getResponse()
-    {
-        return getRequestAttributes().getResponse();
-    }
-
-    /**
-     * 获取session
-     */
-    public static HttpSession getSession()
-    {
-        return getRequest().getSession();
-    }
-
-    public static ServletRequestAttributes getRequestAttributes()
-    {
-        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
-        return (ServletRequestAttributes) attributes;
-    }
-
-    /**
-     * 将字符串渲染到客户端
-     * 
-     * @param response 渲染对象
-     * @param string 待渲染的字符串
-     */
-    public static void renderString(HttpServletResponse response, String string)
-    {
-        try
-        {
-            response.setStatus(200);
-            response.setContentType("application/json");
-            response.setCharacterEncoding("utf-8");
-            response.getWriter().print(string);
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 是否是Ajax异步请求
-     * 
-     * @param request
-     */
-    public static boolean isAjaxRequest(HttpServletRequest request)
-    {
-        String accept = request.getHeader("accept");
-        if (accept != null && accept.contains("application/json"))
-        {
-            return true;
-        }
-
-        String xRequestedWith = request.getHeader("X-Requested-With");
-        if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest"))
-        {
-            return true;
-        }
-
-        String uri = request.getRequestURI();
-        if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
-        {
-            return true;
-        }
-
-        String ajax = request.getParameter("__ajax");
-        return StringUtils.inStringIgnoreCase(ajax, "json", "xml");
-    }
-
-    /**
-     * 内容编码
-     * 
-     * @param str 内容
-     * @return 编码后的内容
-     */
-    public static String urlEncode(String str)
-    {
-        try
-        {
-            return URLEncoder.encode(str, Constants.UTF8);
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            return StringUtils.EMPTY;
-        }
-    }
-
-    /**
-     * 内容解码
-     * 
-     * @param str 内容
-     * @return 解码后的内容
-     */
-    public static String urlDecode(String str)
-    {
-        try
-        {
-            return URLDecoder.decode(str, Constants.UTF8);
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            return StringUtils.EMPTY;
-        }
-    }
-}

src/main/java/com/hhwy/qbeqsjy/controller/CtrlController.java

@@ -161,6 +161,18 @@ public class CtrlController {
     }
 
 
+    @GetMapping("/test")
+    public AjaxResult test(){
+        try{
+            log.info("增量查询布控任务预警结果数据...");
+            return AjaxResult.success("6464646464");
+        } catch (Exception e){
+            log.error("增量查询布控任务预警结果数据发生异常", e);
+        }
+        return AjaxResult.error(Constants.SERVER_ERROR_MSG);
+    }
+
+
 
 
 

src/main/java/com/hhwy/qbeqsjy/dto/CtrlDTO.java

@@ -3,8 +3,6 @@ package com.hhwy.qbeqsjy.dto;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/hhwy/qbeqsjy/service/CtrlService.java

@@ -175,17 +175,17 @@ public class CtrlService {
         ExecutorService executorService = Executors.newFixedThreadPool(Constants.NUM_1);
         executorService.execute(() -> {
             for (String resourceId : resourceIdList) {
-                // 根据数据资源业务ID查询对应的模型信息
-                Map<String, Object> modelDictInfoMap = ctrlDao.queryModelDictInfo(Integer.valueOf(resourceId));
+                // 根据数据资源业务ID读取配置文件中对应的数据资源标识符和数据资源编码
+                String[] resourceInfoArr = CommonUtil.getConfValueByKey("SJZYYWID_" + resourceId).split(",");
                 for (Map<String, Object> clueMap : clueList) {
                     String clue = String.valueOf(clueMap.get("clue"));
                     String clueType = String.valueOf(clueMap.get("clueType"));
                     if(clueCodeIdCard.equals(clueType)){
-                        sameTravelService.callFHUniQueryService(taskId, clue, "", "");
+                        sameTravelService.callFHUniQueryService(taskId, clue, resourceInfoArr[0], resourceInfoArr[1]);
                     }
                 }
             }
-            log.info("--- > 任务ID：{}，线索集合同行类业务查询完成", taskId);
+            log.info("--- > 任务ID：{}，线索集合同行类业务数据查询完成", taskId);
 
         });
         executorService.shutdown();