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
d98ef3dc
Commit
d98ef3dc
authored
Aug 09, 2022
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
内蒙时空相关接口对接(内蒙)
parent
b3c5c7e5
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
72 additions
and
49 deletions
+72
-49
service/asj/src/main/java/com/founder/asj/controller/TbStAsjController.java
+2
-14
service/asj/src/main/java/com/founder/asj/mapper/TbStAsjMapper.java
+3
-0
service/asj/src/main/java/com/founder/asj/mapper/xml/TbStAsjMapper.xml
+30
-19
service/asj/src/main/java/com/founder/asj/service/TbStAsjService.java
+3
-0
service/asj/src/main/java/com/founder/asj/service/impl/TbStAsjServiceImpl.java
+7
-0
service/asj/src/main/resources/bootstrap.properties
+27
-16
No files found.
service/asj/src/main/java/com/founder/asj/controller/TbStAsjController.java
View file @
d98ef3dc
...
@@ -167,20 +167,8 @@ public class TbStAsjController {
...
@@ -167,20 +167,8 @@ public class TbStAsjController {
@PostMapping
(
"getAsjbzxx"
)
@PostMapping
(
"getAsjbzxx"
)
public
MapRestResult
get
(
@ApiParam
(
name
=
"asjbh"
,
value
=
"案事件编号"
,
required
=
true
)
public
MapRestResult
get
(
@ApiParam
(
name
=
"asjbh"
,
value
=
"案事件编号"
,
required
=
true
)
@RequestParam
String
asjbh
)
{
@RequestParam
String
asjbh
)
{
QueryWrapper
<
TbXwAsjbz
>
wrapper
=
new
QueryWrapper
<>();
TbXwAsjbz
asjbz
=
tbStAsjService
.
selectAsjxxListBz
(
asjbh
);
return
MapRestResult
.
build
(
200
,
"成功获取案件标注信息"
,
"1"
,
asjbz
);
//判断条件值是否为空,如果不为空拼接条件
if
(!
StringUtils
.
isEmpty
(
asjbh
))
{
wrapper
.
eq
(
"asjbh"
,
asjbh
);
}
//设置需要查询的字段
wrapper
.
select
(
"ASJBH"
,
"AJZLB"
,
"AJXZLB"
,
"XALBDMBCMS"
,
"(select name from sys_dictitem where groupid='CODE_AJZLB'"
+
"and code=AJZLB) as XSZALXDMSTR"
,
"(select name from sys_dictitem where groupid='CODE_AJXZLB'"
+
"and code=AJXZLB) as XSLALXDMSTR"
,
"(select name from sys_dictitem where groupid='CODE_XALBDMBCMS'"
+
"and code=XALBDMBCMS) as XALBDMBCMSSTR"
);
TbXwAsjbz
asjbz
=
tbStAsjBzService
.
getOne
(
wrapper
);
return
MapRestResult
.
build
(
202
,
"成功获取案件标注信息"
,
"1"
,
asjbz
);
}
}
// 查询案事件标注信息
// 查询案事件标注信息
...
...
service/asj/src/main/java/com/founder/asj/mapper/TbStAsjMapper.java
View file @
d98ef3dc
...
@@ -4,6 +4,7 @@ package com.founder.asj.mapper;
...
@@ -4,6 +4,7 @@ package com.founder.asj.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.founder.commonutils.asjEntity.CbxszAndXlaj
;
import
com.founder.commonutils.asjEntity.CbxszAndXlaj
;
import
com.founder.commonutils.asjEntity.TbStAsj
;
import
com.founder.commonutils.asjEntity.TbStAsj
;
import
com.founder.commonutils.asjEntity.TbXwAsjbz
;
import
com.founder.commonutils.publicEntity.Receiving
;
import
com.founder.commonutils.publicEntity.Receiving
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
@@ -34,6 +35,8 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
...
@@ -34,6 +35,8 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
List
<
TbStAsj
>
selectAsjxxByReceivingList
(
Receiving
receiving
);
List
<
TbStAsj
>
selectAsjxxByReceivingList
(
Receiving
receiving
);
TbXwAsjbz
selectAsjxxListBz
(
String
asjbh
);
List
<
TbStAsj
>
selectTlAsjxx
(
Receiving
receiving
);
List
<
TbStAsj
>
selectTlAsjxx
(
Receiving
receiving
);
List
<
Map
<
String
,
Object
>>
getAsjxxByZjhm
(
@Param
(
value
=
"zjhm"
)
String
zjhm
);
List
<
Map
<
String
,
Object
>>
getAsjxxByZjhm
(
@Param
(
value
=
"zjhm"
)
String
zjhm
);
...
...
service/asj/src/main/java/com/founder/asj/mapper/xml/TbStAsjMapper.xml
View file @
d98ef3dc
...
@@ -29,10 +29,10 @@
...
@@ -29,10 +29,10 @@
to_char(b.JYAQ) as jyaq,
to_char(b.JYAQ) as jyaq,
to_char(b.ASJFSSJ_ASJFSKSSJ,'yyyy-MM-dd hh24:mi:ss') as asjfssj_asjfskssj,
to_char(b.ASJFSSJ_ASJFSKSSJ,'yyyy-MM-dd hh24:mi:ss') as asjfssj_asjfskssj,
(select name from SYS_DICTITEM where groupid='CODE_ZCJDDM' AND code = b.ZCJDDM) as zcjdmc,
(select name from SYS_DICTITEM where groupid='CODE_ZCJDDM' AND code = b.ZCJDDM) as zcjdmc,
(select name from SYS_DICTITEM where groupid='CODE_AJ
ZLB' AND code = bz.AJZLB
) as ajzlbmc,
(select name from SYS_DICTITEM where groupid='CODE_AJ
LB' AND code = b.AJLBDM
) as ajzlbmc,
(select name from SYS_DICTITEM where groupid='CODE_
AJXZLB' AND code = bz.AJXZLB
) as ajxzlbmc,
(select name from SYS_DICTITEM where groupid='CODE_
ZATZ' AND code = b.ZATZ_JYQK
) as ajxzlbmc,
(select name from SYS_DICTITEM where groupid='CODE_
XALBDMBCMS' AND code = bz.XALBDMBCMS
) as xalbdmbcmsmc
(select name from SYS_DICTITEM where groupid='CODE_
AJXLB' AND code = bz.AJXLB
) as xalbdmbcmsmc
from TB_YW_XSZ_CBAJ a,TB_ST_ASJ b,TB_ST_ASJBZ bz where 1=1 AND a.asjbh = b.asjbh
from TB_YW_XSZ_CBAJ a,TB_ST_ASJ b,TB_ST_ASJ
_ASJ
BZ bz where 1=1 AND a.asjbh = b.asjbh
AND a.asjbh = bz.asjbh
AND a.asjbh = bz.asjbh
AND a.XXSC_PDBZ = 0
AND a.XXSC_PDBZ = 0
AND a.ASJBH != #{asjbhs}
AND a.ASJBH != #{asjbhs}
...
@@ -51,10 +51,10 @@
...
@@ -51,10 +51,10 @@
to_char(b.JYAQ) as jyaq,
to_char(b.JYAQ) as jyaq,
to_char(b.ASJFSSJ_ASJFSKSSJ,'yyyy-MM-dd hh24:mi:ss') as asjfssj_asjfskssj,
to_char(b.ASJFSSJ_ASJFSKSSJ,'yyyy-MM-dd hh24:mi:ss') as asjfssj_asjfskssj,
(select name from SYS_DICTITEM where groupid='CODE_ZCJDDM' AND code = b.ZCJDDM) as zcjdmc,
(select name from SYS_DICTITEM where groupid='CODE_ZCJDDM' AND code = b.ZCJDDM) as zcjdmc,
(select name from SYS_DICTITEM where groupid='CODE_AJ
ZLB' AND code = bz.AJZLB
) as ajzlbmc,
(select name from SYS_DICTITEM where groupid='CODE_AJ
LB' AND code = b.AJLBDM
) as ajzlbmc,
(select name from SYS_DICTITEM where groupid='CODE_
AJXZLB' AND code = bz.AJXZLB
) as ajxzlbmc,
(select name from SYS_DICTITEM where groupid='CODE_
ZATZ' AND code = b.ZATZ_JYQK
) as ajxzlbmc,
(select name from SYS_DICTITEM where groupid='CODE_
XALBDMBCMS' AND code = bz.XALBDMBCMS
) as xalbdmbcmsmc
(select name from SYS_DICTITEM where groupid='CODE_
AJXLB' AND code = bz.AJXLB
) as xalbdmbcmsmc
from TB_YW_CBZ_CBAJ a,TB_ST_ASJ b,TB_ST_ASJBZ bz where 1=1 AND a.asjbh = b.asjbh
from TB_YW_CBZ_CBAJ a,TB_ST_ASJ b,TB_ST_ASJ
_ASJ
BZ bz where 1=1 AND a.asjbh = b.asjbh
AND a.asjbh = bz.asjbh
AND a.asjbh = bz.asjbh
AND a.XXSC_PDBZ = 0
AND a.XXSC_PDBZ = 0
AND a.ASJBH != #{asjbhs}
AND a.ASJBH != #{asjbhs}
...
@@ -389,7 +389,7 @@
...
@@ -389,7 +389,7 @@
</if>
</if>
, (select name from sys_dictitem where groupid='CODE_ZCJDDM' and code=T.ZCJDDM) as zcjddmStr
, (select name from sys_dictitem where groupid='CODE_ZCJDDM' and code=T.ZCJDDM) as zcjddmStr
FROM tb_st_asj T
FROM tb_st_asj T
left join tb_st_asjbz T1 on T1.asjbh=T.asjbh
left join tb_st_asj
_asj
bz T1 on T1.asjbh=T.asjbh
WHERE 1=1 and ASJFSDD_DQJD is not null and ASJFSDD_DQWD is not null
WHERE 1=1 and ASJFSDD_DQJD is not null and ASJFSDD_DQWD is not null
<include
refid=
"queryWhereByTlasj"
/>
<include
refid=
"queryWhereByTlasj"
/>
</select>
</select>
...
@@ -407,13 +407,13 @@
...
@@ -407,13 +407,13 @@
AND T.ASJFSDD_DQWD
<![CDATA[>=]]>
#{qswd,jdbcType=VARCHAR} AND T.ASJFSDD_DQWD
<![CDATA[<=]]>
#{jswd,jdbcType=VARCHAR}
AND T.ASJFSDD_DQWD
<![CDATA[>=]]>
#{qswd,jdbcType=VARCHAR} AND T.ASJFSDD_DQWD
<![CDATA[<=]]>
#{jswd,jdbcType=VARCHAR}
</if>
</if>
<if
test=
"ajzlb!= null and ajzlb!=''"
>
<if
test=
"ajzlb!= null and ajzlb!=''"
>
AND T
1.ajzlb
= #{ ajzlb , jdbcType=VARCHAR }
AND T
.ajlbdm
= #{ ajzlb , jdbcType=VARCHAR }
</if>
</if>
<if
test=
"ajxzlb!= null and ajxzlb!=''"
>
<if
test=
"ajxzlb!= null and ajxzlb!=''"
>
AND T
1.ajxzlb
= #{ ajxzlb , jdbcType=VARCHAR }
AND T
.zatz_jyqk
= #{ ajxzlb , jdbcType=VARCHAR }
</if>
</if>
<if
test=
"xalbdmbcms!= null and xalbdmbcms!=''"
>
<if
test=
"xalbdmbcms!= null and xalbdmbcms!=''"
>
AND T1.
xalbdmbcms
= #{ xalbdmbcms , jdbcType=VARCHAR }
AND T1.
ajxlb
= #{ xalbdmbcms , jdbcType=VARCHAR }
</if>
</if>
<if
test=
"gjc!= null and gjc.length>0"
>
<if
test=
"gjc!= null and gjc.length>0"
>
...
@@ -441,13 +441,13 @@
...
@@ -441,13 +441,13 @@
(select name from SYS_DICTITEM where groupid='CODE_UNIT' AND code = T.zuzdw_Gajgjgdm) AS zuzdwGajgjgdmMc,
(select name from SYS_DICTITEM where groupid='CODE_UNIT' AND code = T.zuzdw_Gajgjgdm) AS zuzdwGajgjgdmMc,
(select name from SYS_DICTITEM where groupid='CODE_ZCJDDM' AND code = T.zcjddm) AS zcjddmMc,
(select name from SYS_DICTITEM where groupid='CODE_ZCJDDM' AND code = T.zcjddm) AS zcjddmMc,
(select name from SYS_DICTITEM where groupid='CODE_UNIT' AND code = T.ladw_Gajgjgdm) AS ladwGajgjgdmMc,
(select name from SYS_DICTITEM where groupid='CODE_UNIT' AND code = T.ladw_Gajgjgdm) AS ladwGajgjgdmMc,
ASJBZ.ajzlb
AS ajzlb,
T.AJLBDM
AS ajzlb,
(select name from SYS_DICTITEM where groupid='CODE_AJ
ZLB' AND code = ASJBZ.ajzlb
) AS ajzlbMc,
(select name from SYS_DICTITEM where groupid='CODE_AJ
LB' AND code = T.AJLBDM
) AS ajzlbMc,
ASJBZ.ajxzlb
AS ajxzlb,
T.ZATZ_JYQK
AS ajxzlb,
(select name from SYS_DICTITEM where groupid='CODE_
AJXZLB' AND code = ASJBZ.ajxzlb
) AS ajxzlbMc,
(select name from SYS_DICTITEM where groupid='CODE_
ZATZ' AND code = T.ZATZ_JYQK
) AS ajxzlbMc,
ASJBZ.
xalbdmbcms
AS xalbdmbcms,
ASJBZ.
AJXLB
AS xalbdmbcms,
(select name from SYS_DICTITEM where groupid='CODE_
XALBDMBCMS' AND code = ASJBZ.xalbdmbcms
) AS xalbdmbcmsMc
(select name from SYS_DICTITEM where groupid='CODE_
AJXLB' AND code = ASJBZ.AJXLB
) AS xalbdmbcmsMc
FROM TB_ST_ASJ T,TB_ST_ASJBZ ASJBZ,TB_XW_ZBFZXYR XYR
FROM TB_ST_ASJ T,TB_ST_ASJ
_ASJ
BZ ASJBZ,TB_XW_ZBFZXYR XYR
where
where
T.ASJBH = ASJBZ.ASJBH(+)
T.ASJBH = ASJBZ.ASJBH(+)
AND
AND
...
@@ -460,4 +460,15 @@
...
@@ -460,4 +460,15 @@
and XYR.zhfzxyr_Cyzj_Zjhm = #{zjhm}
and XYR.zhfzxyr_Cyzj_Zjhm = #{zjhm}
</if>
</if>
</select>
</select>
<select
id=
"selectAsjxxListBz"
parameterType=
"java.lang.String"
resultType=
"com.founder.commonutils.asjEntity.TbXwAsjbz"
>
SELECT
T.ASJBH
,T.AJLBDM as AJZLB
,T.ZATZ_JYQK as AJXZLB
,BZ.AJXLB as XALBDMBCMS
,(select name from SYS_DICTITEM where groupid='CODE_AJLB' AND code = T.AJLBDM) AS XSZALXDMSTR
,(select name from SYS_DICTITEM where groupid='CODE_ZATZ' AND code = T.ZATZ_JYQK) AS XSLALXDMSTR
,(select name from SYS_DICTITEM where groupid='CODE_AJXLB' AND code = BZ.AJXLB) AS XALBDMBCMSSTR
FROM tb_st_asj T LEFT JOIN TB_ST_ASJ_ASJBZ BZ on T.ASJBH = BZ.ASJBH WHERE T.ASJBH=#{asjbh}
</select>
</mapper>
</mapper>
service/asj/src/main/java/com/founder/asj/service/TbStAsjService.java
View file @
d98ef3dc
...
@@ -4,6 +4,7 @@ package com.founder.asj.service;
...
@@ -4,6 +4,7 @@ package com.founder.asj.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.founder.commonutils.asjEntity.CbxszAndXlaj
;
import
com.founder.commonutils.asjEntity.CbxszAndXlaj
;
import
com.founder.commonutils.asjEntity.TbStAsj
;
import
com.founder.commonutils.asjEntity.TbStAsj
;
import
com.founder.commonutils.asjEntity.TbXwAsjbz
;
import
com.founder.commonutils.publicEntity.MapRestResult
;
import
com.founder.commonutils.publicEntity.MapRestResult
;
import
com.founder.commonutils.publicEntity.Receiving
;
import
com.founder.commonutils.publicEntity.Receiving
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
@@ -33,6 +34,8 @@ public interface TbStAsjService extends IService<TbStAsj> {
...
@@ -33,6 +34,8 @@ public interface TbStAsjService extends IService<TbStAsj> {
List
<
TbStAsj
>
selectAsjxxList
(
Receiving
receiving
);
List
<
TbStAsj
>
selectAsjxxList
(
Receiving
receiving
);
TbXwAsjbz
selectAsjxxListBz
(
String
asjbh
);
MapRestResult
selectTlAsjxxList
(
Receiving
receiving
);
MapRestResult
selectTlAsjxxList
(
Receiving
receiving
);
List
<
Map
<
String
,
Object
>>
getAsjxxByZjhm
(
String
zjhm
);
List
<
Map
<
String
,
Object
>>
getAsjxxByZjhm
(
String
zjhm
);
...
...
service/asj/src/main/java/com/founder/asj/service/impl/TbStAsjServiceImpl.java
View file @
d98ef3dc
...
@@ -7,6 +7,7 @@ import com.founder.asj.qgxzMapper.TbStAsjqgMapper;
...
@@ -7,6 +7,7 @@ import com.founder.asj.qgxzMapper.TbStAsjqgMapper;
import
com.founder.asj.service.TbStAsjService
;
import
com.founder.asj.service.TbStAsjService
;
import
com.founder.commonutils.asjEntity.CbxszAndXlaj
;
import
com.founder.commonutils.asjEntity.CbxszAndXlaj
;
import
com.founder.commonutils.asjEntity.TbStAsj
;
import
com.founder.commonutils.asjEntity.TbStAsj
;
import
com.founder.commonutils.asjEntity.TbXwAsjbz
;
import
com.founder.commonutils.publicEntity.MapRestResult
;
import
com.founder.commonutils.publicEntity.MapRestResult
;
import
com.founder.commonutils.publicEntity.Receiving
;
import
com.founder.commonutils.publicEntity.Receiving
;
import
com.founder.commonutils.util.StringUtil
;
import
com.founder.commonutils.util.StringUtil
;
...
@@ -61,6 +62,12 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
...
@@ -61,6 +62,12 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
public
List
<
TbStAsj
>
selectAsjxxList
(
Receiving
receiving
)
{
public
List
<
TbStAsj
>
selectAsjxxList
(
Receiving
receiving
)
{
return
tbStAsjMapper
.
selectAsjxxByReceivingList
(
receiving
);
return
tbStAsjMapper
.
selectAsjxxByReceivingList
(
receiving
);
}
}
@Override
public
TbXwAsjbz
selectAsjxxListBz
(
String
asjbh
)
{
return
tbStAsjMapper
.
selectAsjxxListBz
(
asjbh
);
}
//utils.StringUtil
//utils.StringUtil
@Override
@Override
public
MapRestResult
selectTlAsjxxList
(
Receiving
receiving
)
{
public
MapRestResult
selectTlAsjxxList
(
Receiving
receiving
)
{
...
...
service/asj/src/main/resources/bootstrap.properties
View file @
d98ef3dc
#配置中心地址
#服务端口
spring.cloud.nacos.config.server-addr
=
47.92.48.137:8848
server.port
=
1001
spring.cloud.nacos.discovery.server-addr
=
47.92.48.137:8848
#spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#返回json的全局时间格式
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
spring.jackson.date-format
=
yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone
=
GMT+8
spring.profiles.active
=
dev
#设置日志级别
logging.level.root
=
INFO
# 该配置影响统一配置中心中的dataId
#刑专库
spring.application.name
=
asj
spring.datasource.xzxtdb.driver-class-name
=
oracle.jdbc.driver.OracleDriver
spring.cloud.nacos.config.namespace
=
dev
spring.datasource.xzxtdb.url
=
jdbc:oracle:thin:@10.100.17.120:1521:XZXT
spring.datasource.xzxtdb.username
=
XZXT
spring.datasource.xzxtdb.password
=
XzxtPwd#15
spring.datasource.xzxtdb.type
=
com.alibaba.druid.pool.DruidDataSource
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
#全国库
# 开启动态刷新配置,否则配置文件修改,工程无法感知
spring.datasource.qgdb.driver-class-name
=
oracle.jdbc.driver.OracleDriver
#spring.cloud.nacos.config.ext-config[0].refresh=true
spring.datasource.qgdb.url
=
jdbc:oracle:thin:@10.2.164.176:1521:xzdb176
spring.datasource.qgdb.username
=
fz_ts
spring.datasource.qgdb.password
=
fz_ts
spring.datasource.qgdb.type
=
com.alibaba.druid.pool.DruidDataSource
spring.cloud.nacos.config.shared-dataids
=
asjpz.properties
spring.cloud.nacos.config.refreshable-dataids
=
asjpz.properties
#sql日志
management.health.elasticsearch.enabled
:
false
mybatis-plus.configuration.log-impl
:
org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
#单位
ssdw
=
150000000000
#xml扫包
#
mybatis-plus.mapper-locations
=
classpath:com/founder/asj/mapper/xml/*.xml
\ No newline at end of file
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