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
dcb8328c
Commit
dcb8328c
authored
Jul 11, 2021
by
YANGYANG
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
标注详情刷新json文件提价
parent
d7a78592
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
27 deletions
+34
-27
service/bzpt/src/main/java/com/founder/bzpt/controller/RedisController.java
+3
-3
service/bzpt/src/main/java/com/founder/bzpt/mapper/xml/DetailMapper.xml
+21
-24
service/bzpt/src/main/java/com/founder/bzpt/service/impl/SysDictitemServiceImpl.java
+10
-0
No files found.
service/bzpt/src/main/java/com/founder/bzpt/controller/RedisController.java
View file @
dcb8328c
...
...
@@ -49,8 +49,8 @@ public class RedisController {
setAjlb
(
"CODE_GABAJZLB"
,
"CODE_GABAJZLB.json"
,
request
);
setAjlb
(
"CODE_GABAJXZLB"
,
"CODE_GABAJXZLB.json"
,
request
);
}
else
{
if
(
"CODE_GABAJZLB"
.
equals
(
type
)){
setAjlb
(
"CODE_GABAJZLB"
,
"CODE_GABAJZLB.json"
,
request
);
if
(
"CODE_GABAJZLB
S
"
.
equals
(
type
)){
setAjlb
(
"CODE_GABAJZLB"
,
"CODE_GABAJZLB
S
.json"
,
request
);
}
else
if
(
"CODE_GABAJXZLB"
.
equals
(
type
)){
setAjlb
(
"CODE_GABAJXZLB"
,
"CODE_GABAJXZLB.json"
,
request
);
}
...
...
@@ -63,7 +63,7 @@ public class RedisController {
List
<
DictItem
>
list
=
dicItemService
.
queryTreeDataByType
(
type
,
""
);
jsonStr
=
JSONObject
.
toJSONString
(
list
);
try
{
String
filePath
=
/*request.getSession().getServletContext().getRealPath("/") + */
"
I:\\dist\\JsonData\\
"
+
typeJson
;
String
filePath
=
/*request.getSession().getServletContext().getRealPath("/") + */
"
/data/gabbzbtqd/dist/jsonData
"
+
typeJson
;
File
file
=
new
File
(
filePath
);
String
encoding
=
"utf-8"
;
BufferedWriter
out
=
new
BufferedWriter
(
new
OutputStreamWriter
(
...
...
service/bzpt/src/main/java/com/founder/bzpt/mapper/xml/DetailMapper.xml
View file @
dcb8328c
...
...
@@ -333,12 +333,12 @@
(select name from sys_dictitem where groupid='CODE_GABAJXZLB' AND code = ASJBZ.AJXZLB) as ajxzlbmc,
ASJBZ.XALBDMBCMS AS xalbdmbcms,
(select name from sys_dictitem where groupid='CODE_XALBDMBCMS' AND code = ASJBZ.XALBDMBCMS) as xalbdmbcmsmc,
TO_CHAR(T.ASJFSSJ_ASJFSKSSJ,'YYYY-MM-DD HH24:mi:ss') AS asjfssj_asjfsks
sj,
TO_CHAR(T.ASJFSSJ_ASJFSJSSJ,'YYYY-MM-DD HH24:mi:ss') AS asjfssj_asjfsj
ssj,
TO_CHAR(T.GXSJ,'YYYY-MM-DD HH24:mi:ss') AS gx
sj,
TO_CHAR(T.SLSJ,'YYYY-MM-DD HH24:mi:ss') AS
slsj,
TO_CHAR(T.DJSJ,'YYYY-MM-DD HH24:mi:ss') AS
djsj,
TO_CHAR(T.LARQ,'YYYY-MM-DD HH24:mi:ss') AS
larqsj,
DATE_FORMAT(T.gxsj,'%Y-%m-%d %H:%i:%s') as gx
sj,
DATE_FORMAT(T.ASJFSSJ_ASJFSKSSJ,'%Y-%m-%d %H:%i:%s') as asjfssj_asjfsk
ssj,
DATE_FORMAT(T.ASJFSSJ_ASJFSJSSJ,'%Y-%m-%d %H:%i:%s') as asjfssj_asjfsjs
sj,
DATE_FORMAT(T.SLSJ,'%Y-%m-%d %H:%i:%s') as
slsj,
DATE_FORMAT(T.djsj,'%Y-%m-%d %H:%i:%s') as
djsj,
DATE_FORMAT(T.LARQ,'%Y-%m-%d %H:%i:%s') as
larqsj,
T.ASJFSDD_DZMC AS asjfsdd_dzmc,
T.XXDJDW_GAJGJGDM AS xxdjdw_gajgjgdm,
T.XXDJDW_GAJGMC AS xxdjdw_gajgmc,
...
...
@@ -359,17 +359,16 @@
T.asjbh AS asjbh,
ASJBZ.asjbz_ajfl AS asjbzAjfl,
ASJBZ.ajzlb AS ajzlb,
(select name from
SYS_DICTITEM
where groupid='CODE_GABAJZLB' AND code = ASJBZ.ajzlb) AS ajzlbMc,
(select name from
sys_dictitem
where groupid='CODE_GABAJZLB' AND code = ASJBZ.ajzlb) AS ajzlbMc,
ASJBZ.ajxzlb AS ajxzlb,
(select name from
SYS_DICTITEM
where groupid='CODE_GABAJXZLB' AND code = ASJBZ.ajxzlb) AS ajxzlbMc,
(select name from
sys_dictitem
where groupid='CODE_GABAJXZLB' AND code = ASJBZ.ajxzlb) AS ajxzlbMc,
ASJBZ.xalbdmbcms AS xalbdmbcms,
(select name from
SYS_DICTITEM
where groupid='CODE_GABXALBDMBCMS' AND code = ASJBZ.xalbdmbcms) AS xalbdmbcmsMc,
(select name from
sys_dictitem
where groupid='CODE_GABXALBDMBCMS' AND code = ASJBZ.xalbdmbcms) AS xalbdmbcmsMc,
ASJBZ.bzzt AS bzzt,
T.SSJZRMBY AS ssjzrmby,
case when ASJBZ.bzzt='1' then '已标注' else case when ASJBZ.bzzt='2' then '待标注' else '未标注' end end AS bzztMs
FROM TB_ST_ASJ T, TB_ST_ASJBZ ASJBZ,TB_XW_ZBFZXYR XYR where
T.ASJBH = ASJBZ.ASJBH(+)
AND T.ASJBH = XYR.ASJBH
FROM tb_st_asj T LEFT JOIN tb_st_asjbz ASJBZ ON T.ASJBH = ASJBZ.ASJBH ,tb_xw_zbfzxyr XYR where
T.ASJBH = XYR.ASJBH
AND T.XXSC_PDBZ = 0
AND XYR.XXSC_PDBZ = 0
AND T.ASJBH = #{asjbh}
...
...
@@ -380,17 +379,16 @@
RYBH.xxzjbh AS xxzjbh,
T.asjbh AS asjbh,
ASJBZ.ajzlb AS ajzlb,
(select name from
SYS_DICTITEM
where groupid='CODE_GABAJZLB' AND code = ASJBZ.ajzlb) AS ajzlbMc,
(select name from
sys_dictitem
where groupid='CODE_GABAJZLB' AND code = ASJBZ.ajzlb) AS ajzlbMc,
ASJBZ.ajxzlb AS ajxzlb,
(select name from
SYS_DICTITEM
where groupid='CODE_GABAJXZLB' AND code = ASJBZ.ajxzlb) AS ajxzlbMc,
(select name from
sys_dictitem
where groupid='CODE_GABAJXZLB' AND code = ASJBZ.ajxzlb) AS ajxzlbMc,
ASJBZ.xalbdmbcms AS xalbdmbcms,
(select name from
SYS_DICTITEM
where groupid='CODE_GABXALBDMBCMS' AND code = ASJBZ.xalbdmbcms) AS xalbdmbcmsMc,
(select name from
sys_dictitem
where groupid='CODE_GABXALBDMBCMS' AND code = ASJBZ.xalbdmbcms) AS xalbdmbcmsMc,
ASJBZ.bzzt as bzzt,
T.SSJZRMBY AS ssjzrmby,
case when ASJBZ.bzzt='1' then '已标注' else case when ASJBZ.bzzt='2' then '待标注' else '未标注' end end AS bzztMs
FROM TB_ST_ASJ T, TB_ST_ASJBZ ASJBZ,TB_XW_RYBH RYBH where
T.ASJBH = ASJBZ.ASJBH(+)
AND T.ASJBH = RYBH.ASJBH
FROM tb_st_asj T LEFT JOIN tb_st_asjbz ASJBZ ON T.ASJBH = ASJBZ.ASJBH ,tb_xw_rybh RYBH where
T.ASJBH = RYBH.ASJBH
AND T.XXSC_PDBZ = 0
AND RYBH.XXSC_PDBZ = 0
AND T.ASJBH = #{asjbh}
...
...
@@ -402,17 +400,16 @@
T.asjbh AS asjbh,
ASJBZ.asjbz_ajfl AS asjbzAjfl,
ASJBZ.ajzlb AS ajzlb,
(select name from
SYS_DICTITEM
where groupid='CODE_GABAJZLB' AND code = ASJBZ.ajzlb) AS ajzlbMc,
(select name from
sys_dictitem
where groupid='CODE_GABAJZLB' AND code = ASJBZ.ajzlb) AS ajzlbMc,
ASJBZ.ajxzlb AS ajxzlb,
(select name from
SYS_DICTITEM
where groupid='CODE_GABAJXZLB' AND code = ASJBZ.ajxzlb) AS ajxzlbMc,
(select name from
sys_dictitem
where groupid='CODE_GABAJXZLB' AND code = ASJBZ.ajxzlb) AS ajxzlbMc,
ASJBZ.xalbdmbcms AS xalbdmbcms,
(select name from
SYS_DICTITEM
where groupid='CODE_GABXALBDMBCMS' AND code = ASJBZ.xalbdmbcms) AS xalbdmbcmsMc,
(select name from
sys_dictitem
where groupid='CODE_GABXALBDMBCMS' AND code = ASJBZ.xalbdmbcms) AS xalbdmbcmsMc,
ASJBZ.bzzt AS bzzt,
T.SSJZRMBY AS ssjzrmby,
case when ASJBZ.bzzt='1' then '已标注' else case when ASJBZ.bzzt='2' then '待标注' else '未标注' end end AS bzztMs
FROM TB_ST_ASJ T, TB_ST_ASJBZ ASJBZ,TB_XW_ZBFZXYR XYR, TB_XW_RYBH RYBH where
T.ASJBH = ASJBZ.ASJBH(+)
AND T.ASJBH = XYR.ASJBH
FROM tb_st_asj T LEFT JOIN tb_st_asjbz ASJBZ ON T.ASJBH = ASJBZ.ASJBH ,tb_xw_zbfzxyr XYR, tb_xw_rybh RYBH where
T.ASJBH = XYR.ASJBH
AND T.ASJBH = RYBH.ASJBH
AND T.XXSC_PDBZ = 0
AND XYR.XXSC_PDBZ = 0
...
...
service/bzpt/src/main/java/com/founder/bzpt/service/impl/SysDictitemServiceImpl.java
View file @
dcb8328c
...
...
@@ -59,6 +59,16 @@ public class SysDictitemServiceImpl extends
}
}
}
// 为刷新前端json字典处理
if
(
"CODE_GABAJZLB"
.
equals
(
type
))
{
Iterator
<
DictItem
>
iterators
=
list
.
iterator
();
while
(
iterators
.
hasNext
())
{
if
(
StringUtils
.
isEmpty
(
iterators
.
next
().
getParentId
()))
{
iterators
.
remove
();
}
}
}
return
list
;
}
...
...
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