Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
map-parent
Commits
ff06e4ea
Commit
ff06e4ea
authored
Oct 25, 2022
by
宋珺琪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查看结果时空回溯结构化的添加
parent
beb4ffe0
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
6 deletions
+33
-6
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java
+4
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java
+7
-6
service/publicapi/src/main/resources/bootstrap-dev.properties
+9
-0
service/publicapi/src/main/resources/bootstrap-prod.properties
+13
-0
No files found.
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java
View file @
ff06e4ea
...
...
@@ -203,6 +203,10 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
// 时空伴随
listResult
=
skRegionalsResultService
.
skbsResult
(
params
,
taskType
);
break
;
case
"skhs_jgh"
:
// 时空回溯结构化
jsonArray
=
JsonUtils
.
readJsonFromClassPath
(
"data/getRxhs.json"
,
JSONArray
.
class
);
break
;
}
if
(
jsonArray
.
size
()>
0
)
{
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java
View file @
ff06e4ea
...
...
@@ -24,6 +24,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import
org.apache.poi.ss.usermodel.Workbook
;
import
org.apache.poi.xssf.usermodel.XSSFWorkbook
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -61,12 +62,12 @@ public class HnTbStRygxController {
public
static
final
String
TEAM_KEY
=
"teamNum:"
;
//创建人+任务id+团伙数量
public
static
final
String
IMG_TASK_KEY
=
"imgKey"
;
//上传的路径
p
ublic
static
final
String
HNKSH_FILE_PATH
=
"/data/excel/kshExcel/"
;
//下载的路径
p
ublic
static
final
String
HNKSH_DOWNLOAD_FILE_PATH
=
"http://47.92.48.137:1009/excel/kshExcel/"
;
//下载模板的路径
p
ublic
static
final
String
HNKSH_DOWNLOAD_EXCEL_TEMPLATE_PATH
=
"http://47.92.48.137:1009/excel/kshExcel/ExcelTemplate.xls"
;
@Value
(
"${hnkshFilePath}"
)
p
rivate
String
HNKSH_FILE_PATH
;
@Value
(
"${hnkshDownloadFilePath}"
)
p
rivate
String
HNKSH_DOWNLOAD_FILE_PATH
;
@Value
(
"${hnkshDownloadExcelTemplatePath}"
)
p
rivate
String
HNKSH_DOWNLOAD_EXCEL_TEMPLATE_PATH
;
/**
...
...
service/publicapi/src/main/resources/bootstrap-dev.properties
View file @
ff06e4ea
...
...
@@ -22,9 +22,18 @@ spring.datasource.qgdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
spring.datasource.qgdb.password
=
ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
spring.datasource.qgdb.type
=
com.alibaba.druid.pool.DruidDataSource
#redis
spring.redis.host
=
47.92.225.109
spring.redis.port
=
3001
spring.redis.password
=
CcXzxt
#\u6570\u636E\u5206\u6790\u4E0A\u4F20\u7684\u8DEF\u5F84
hnkshFilePath
=
/data/excel/kshExcel/
#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u7684\u8DEF\u5F84
hnkshDownloadFilePath
=
http://47.92.48.137:1009/excel/kshExcel/
#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u6A21\u677F\u7684\u8DEF\u5F84
hnkshDownloadExcelTemplatePath
=
http://47.92.48.137:1009/excel/kshExcel/ExcelTemplate.xls
#xml???
mybatis-plus.mapper-locations
=
classpath*:com/founder/publicapi/mapper/*/xml/*.xml
#es?????????
...
...
service/publicapi/src/main/resources/bootstrap-prod.properties
View file @
ff06e4ea
...
...
@@ -21,6 +21,19 @@ spring.datasource.qgdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNR
spring.datasource.qgdb.username
=
ENC(e7qsvm7EnrdHG04YnaTMsw==)
spring.datasource.qgdb.password
=
ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
spring.datasource.qgdb.type
=
com.alibaba.druid.pool.DruidDataSource
#redis
spring.redis.host
=
47.92.225.109
spring.redis.port
=
3001
spring.redis.password
=
CcXzxt
#\u6570\u636E\u5206\u6790\u4E0A\u4F20\u7684\u8DEF\u5F84
hnkshFilePath
=
/data/excel/kshExcel/
#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u7684\u8DEF\u5F84
hnkshDownloadFilePath
=
http://47.92.48.137:1009/excel/kshExcel/
#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u6A21\u677F\u7684\u8DEF\u5F84
hnkshDownloadExcelTemplatePath
=
http://47.92.48.137:1009/excel/kshExcel/ExcelTemplate.xls
#xml\u0268\uFFFD\uFFFD
mybatis-plus.mapper-locations
=
classpath*:com/founder/publicapi/mapper/*/xml/*.xml
#es\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0631\uFFFD
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment