Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-solr
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
常超
xzxt-solr
Commits
3f63f24f
Commit
3f63f24f
authored
May 19, 2020
by
liu_xiaoxu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/dev_neimeng' into dev_neimeng
parents
56882f50
0fa6b294
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
src/main/java/com/cc/controller/SolrController.java
+0
-0
src/main/java/com/cc/service/impl/SolrServiceImpl.java
+6
-0
src/main/resources/jdbcconfig.properties
+3
-2
src/main/webapp/wzmstcx.jsp
+2
-0
No files found.
src/main/java/com/cc/controller/SolrController.java
View file @
3f63f24f
This diff is collapsed.
Click to expand it.
src/main/java/com/cc/service/impl/SolrServiceImpl.java
View file @
3f63f24f
...
@@ -4711,6 +4711,9 @@ public class SolrServiceImpl implements SolrService {
...
@@ -4711,6 +4711,9 @@ public class SolrServiceImpl implements SolrService {
mapResult
.
put
(
"spsj"
,
solrDocument
.
get
(
"SPSJ"
));
mapResult
.
put
(
"spsj"
,
solrDocument
.
get
(
"SPSJ"
));
mapResult
.
put
(
"spyj"
,
solrDocument
.
get
(
"SPYJ"
));
mapResult
.
put
(
"spyj"
,
solrDocument
.
get
(
"SPYJ"
));
mapResult
.
put
(
"spr_xm"
,
solrDocument
.
get
(
"SPR_XM"
));
mapResult
.
put
(
"spr_xm"
,
solrDocument
.
get
(
"SPR_XM"
));
mapResult
.
put
(
"xckybh"
,
solrDocument
.
get
(
"XCKYBH"
));
mapResult
.
put
(
"stjy_rydnabh"
,
solrDocument
.
get
(
"STJY_RYDNABH"
));
xyrxxList
.
add
(
mapResult
);
xyrxxList
.
add
(
mapResult
);
}
}
}
}
...
@@ -4801,6 +4804,9 @@ public class SolrServiceImpl implements SolrService {
...
@@ -4801,6 +4804,9 @@ public class SolrServiceImpl implements SolrService {
mapResult
.
put
(
"spsj"
,
solrDocument
.
get
(
"SPSJ"
));
mapResult
.
put
(
"spsj"
,
solrDocument
.
get
(
"SPSJ"
));
mapResult
.
put
(
"spyj"
,
solrDocument
.
get
(
"SPYJ"
));
mapResult
.
put
(
"spyj"
,
solrDocument
.
get
(
"SPYJ"
));
mapResult
.
put
(
"spr_xm"
,
solrDocument
.
get
(
"SPR_XM"
));
mapResult
.
put
(
"spr_xm"
,
solrDocument
.
get
(
"SPR_XM"
));
mapResult
.
put
(
"xckybh"
,
solrDocument
.
get
(
"XCKYBH"
));
mapResult
.
put
(
"stjy_rydnabh"
,
solrDocument
.
get
(
"STJY_RYDNABH"
));
ryxxList
.
add
(
mapResult
);
ryxxList
.
add
(
mapResult
);
}
}
if
(
null
!=
groupids
&&
!
""
.
equals
(
groupids
)){
if
(
null
!=
groupids
&&
!
""
.
equals
(
groupids
)){
...
...
src/main/resources/jdbcconfig.properties
View file @
3f63f24f
#\u5185\u8499
#\u5185\u8499
jdbc.driverClass
=
oracle.jdbc.driver.OracleDriver
jdbc.driverClass
=
oracle.jdbc.driver.OracleDriver
jdbc.url
=
jdbc:oracle:thin:@
192.168.1.102:1521:XZXT
jdbc.url
=
jdbc:oracle:thin:@
47.92.129.99:1600:orcl
jdbc.user
=
XZXT
jdbc.user
=
XZXT
jdbc.password
=
XZXT
jdbc.password
=
XZXT
#mis
#mis
jdbc.mis.driverClass
=
oracle.jdbc.driver.OracleDriver
jdbc.mis.driverClass
=
oracle.jdbc.driver.OracleDriver
jdbc.mis.url
=
jdbc:oracle:thin:@
192.168.1.102:1521:XZXT
jdbc.mis.url
=
jdbc:oracle:thin:@
47.92.129.99:orcl
jdbc.mis.user
=
DBAUSERGAXZ
jdbc.mis.user
=
DBAUSERGAXZ
jdbc.mis.password
=
DBAUSERGAXZ
jdbc.mis.password
=
DBAUSERGAXZ
\ No newline at end of file
src/main/webapp/wzmstcx.jsp
View file @
3f63f24f
...
@@ -863,6 +863,8 @@
...
@@ -863,6 +863,8 @@
'3'
:[
'xxdjdw_gajgmc'
,
'登记单位'
],
'3'
:[
'xxdjdw_gajgmc'
,
'登记单位'
],
'4'
:[
'wzmst_djsj_desc'
,
'登记时间'
],
'4'
:[
'wzmst_djsj_desc'
,
'登记时间'
],
'5'
:[
'xxdjry_xm'
,
'登记人姓名'
],
'5'
:[
'xxdjry_xm'
,
'登记人姓名'
],
'6'
:[
'xckybh'
,
'现场勘验编号'
],
'7'
:[
'stjy_rydnabh'
,
'人员DNA'
],
}
}
...
...
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