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
18ba34f5
Commit
18ba34f5
authored
Mar 09, 2021
by
Guojunfeng
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
f5e74417
05cd1226
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
229 additions
and
8 deletions
+229
-8
pom.xml
+6
-6
service/asj/src/main/java/com/founder/asj/controller/TbStAsjController.java
+15
-2
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
+194
-0
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
+6
-0
service/asj/src/main/resources/application.properties
+2
-0
No files found.
pom.xml
View file @
18ba34f5
...
@@ -106,11 +106,11 @@
...
@@ -106,11 +106,11 @@
</dependency>
</dependency>
<!--aliyunOSS-->
<!--aliyunOSS-->
<dependency>
<
!--<
dependency>
<groupId>com.aliyun.oss</groupId>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>${aliyun.oss.version}</version>
<version>${aliyun.oss.version}</version>
</dependency>
</dependency>
-->
<!--日期时间工具-->
<!--日期时间工具-->
<dependency>
<dependency>
...
@@ -182,16 +182,16 @@
...
@@ -182,16 +182,16 @@
<artifactId>
aliyun-java-sdk-vod
</artifactId>
<artifactId>
aliyun-java-sdk-vod
</artifactId>
<version>
${aliyun-java-sdk-vod.version}
</version>
<version>
${aliyun-java-sdk-vod.version}
</version>
</dependency>
</dependency>
<dependency>
<
!--<
dependency>
<groupId>com.aliyun</groupId>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-vod-upload</artifactId>
<artifactId>aliyun-java-vod-upload</artifactId>
<version>${aliyun-java-vod-upload.version}</version>
<version>${aliyun-java-vod-upload.version}</version>
</dependency>
</dependency>
-->
<dependency>
<
!--<
dependency>
<groupId>com.aliyun</groupId>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-sdk-vod-upload</artifactId>
<artifactId>aliyun-sdk-vod-upload</artifactId>
<version>${aliyun-sdk-vod-upload.version}</version>
<version>${aliyun-sdk-vod-upload.version}</version>
</dependency>
</dependency>
-->
<dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
<artifactId>
fastjson
</artifactId>
...
...
service/asj/src/main/java/com/founder/asj/controller/TbStAsjController.java
View file @
18ba34f5
...
@@ -10,10 +10,12 @@ import com.founder.commonutils.asjEntity.AsjQuery;
...
@@ -10,10 +10,12 @@ import com.founder.commonutils.asjEntity.AsjQuery;
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.publicEntity.R
;
import
com.founder.commonutils.publicEntity.R
;
import
com.founder.commonutils.publicEntity.Receiving
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
io.swagger.annotations.ApiParam
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -38,6 +40,17 @@ public class TbStAsjController {
...
@@ -38,6 +40,17 @@ public class TbStAsjController {
@Autowired
@Autowired
private
TbStAsjService
tbStAsjService
;
private
TbStAsjService
tbStAsjService
;
@Value
(
"${ssdw}"
)
private
String
ssdw
;
//案件查询(存储reids)
@PostMapping
(
"/ajxx"
)
public
R
selectAsjxx
(
@RequestBody
Receiving
receiving
)
{
receiving
.
setSsdw
(
ssdw
);
//设置所属单位,用于案件类别代码转译
//return tbStAsjService.selectAsjxxList(receiving);
List
<
TbStAsj
>
asjList
=
tbStAsjService
.
selectAsjxxList
(
receiving
);
return
R
.
ok
().
data
(
"data"
,
asjList
);
}
@ApiOperation
(
value
=
"按条件查询案件"
)
@ApiOperation
(
value
=
"按条件查询案件"
)
@PostMapping
(
"getAsj"
)
@PostMapping
(
"getAsj"
)
public
R
getAsj
(
@RequestBody
AsjQuery
asjQuery
)
{
public
R
getAsj
(
@RequestBody
AsjQuery
asjQuery
)
{
...
@@ -126,7 +139,7 @@ public class TbStAsjController {
...
@@ -126,7 +139,7 @@ public class TbStAsjController {
}
}
}
}
@ApiOperation
(
value
=
"获取同类案件信息"
)
/*
@ApiOperation(value = "获取同类案件信息")
@PostMapping("getTlajxx")
@PostMapping("getTlajxx")
public R get(@RequestBody AsjQuery asjQuery) {
public R get(@RequestBody AsjQuery asjQuery) {
QueryWrapper<TbStAsj> wrapperByasjbh = new QueryWrapper<>();
QueryWrapper<TbStAsj> wrapperByasjbh = new QueryWrapper<>();
...
@@ -164,7 +177,7 @@ public class TbStAsjController {
...
@@ -164,7 +177,7 @@ public class TbStAsjController {
}
}
List<TbStAsj> list = tbStAsjService.list(wrapper);
List<TbStAsj> list = tbStAsjService.list(wrapper);
return R.ok().data("asj", list);
return R.ok().data("asj", list);
}
}
*/
// 查询案事件标注信息
// 查询案事件标注信息
@ApiOperation
(
value
=
"获取串并线索组信息"
)
@ApiOperation
(
value
=
"获取串并线索组信息"
)
...
...
service/asj/src/main/java/com/founder/asj/mapper/TbStAsjMapper.java
View file @
18ba34f5
...
@@ -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.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
;
...
@@ -30,4 +31,6 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
...
@@ -30,4 +31,6 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
List
<
CbxszAndXlaj
>
GetlistCbzXgaj
(
Map
map
);
List
<
CbxszAndXlaj
>
GetlistCbzXgaj
(
Map
map
);
String
getNameByCode
(
Map
<
String
,
String
>
map
);
String
getNameByCode
(
Map
<
String
,
String
>
map
);
List
<
TbStAsj
>
selectAsjxxByReceivingList
(
Receiving
receiving
);
}
}
service/asj/src/main/java/com/founder/asj/mapper/xml/TbStAsjMapper.xml
View file @
18ba34f5
...
@@ -69,4 +69,198 @@
...
@@ -69,4 +69,198 @@
<if
test=
"groupid!=null and groupid!=''"
>
and groupid = #{groupid}
</if>
<if
test=
"groupid!=null and groupid!=''"
>
and groupid = #{groupid}
</if>
<if
test=
"code!=null and code!=''"
>
and code = #{code}
</if>
<if
test=
"code!=null and code!=''"
>
and code = #{code}
</if>
</select>
</select>
<select
id=
"selectAsjxxByReceivingList"
parameterType=
"com.founder.commonutils.publicEntity.Receiving"
resultType=
"com.founder.commonutils.asjEntity.TbStAsj"
>
SELECT
KYMYQZ_WPSL
,T.ASJBH
,KYZZQZ_WPSL
,KYFZQZ_WPSL
,KYQTQZ_WPSL
,SLSJ
,SLDW_GAJGJGDM
,SLDW_GAJGMC
,LARQ
,LADW_GAJGJGDM
,LADW_GAJGMC
,ZARY_RS
,SJCWJZRMBY
,ZCZJ_ZCXWYJMS
,ZCZJ_ZXSJ01
,ZCZJDW_GAJGJGDM
,ZCZJDW_GAJGMC
,YSSCQSRQ
,YSSCQSAJSCFHJDDM
,SFCXAJ_PDBZ
,CXAJYYDM
,CXAJDW_GAJGJGDM
,CXAJDW_GAJGMC
,CXAJRQ
,XSAJXSGZJGDM
,ZBR_XM
,ZBR_GMSFHM
,ZBR_LXDH
,XBR_XM
,XBR_GMSFHM
,XBR_LXDH
,XSJSFZR_XM
,XSJSFZR_GMSFHM
,XSJSFZR_LXDH
,GAJGFZR_XM
,GAJGFZR_GMSFHM
,GAJGFZR_LXDH
,T.JJBH
,XCKYBH
,ASJLYDM
,XSJQLBDM
,ZCJDDM
,XSAJLASCJGDM
,AJLBDM
,ZATZ_JYQK
,TSSDDM
,ZATZZDFL_JYQK
,ZATZBCMS_JYQK
,ZATZ_AJZATZJHBD
,AJMC
,FXASJSJ
,FXASJDD_XZQHDM
,FXASJDD_DZMC
,ASJFSSJ_ASJFSKSSJ
,ASJFSSJ_ASJFSJSSJ
,ASJFSSJ_RSDDM
,ASJFSSJ_ZASJ_ZASJLBDM
,ASJFSSJ_ZASJ_DMBCMS
,ASJFSDD_XZQHDM
,ASJFSDD_DZMC
,ASJFSDD_DQJD
,ASJFSDD_DQWD
,ASJFSDD_DQJD as x
,ASJFSDD_DQWD as y
,ASJFSDD_DYLBDM
,ASJFSDD_SACS_SACSLBDM
,ASJFSDD_SACS_DMBCMS
,ASJFSDD_KJBW_KJBWLBDM
,ASJFSDD_KJBW_DMBCMS
,ASJFSDD_SFJZWN_PDBZ
,ASJFSDD_JZWCS
,ASJFSDD_ASJFSLC
,ASJFSDD_SFZLZZ_PDBZ
,JYAQ
,SFSQ_PDBZ
,SFSB_PDBZ
,SFMA_PDBZ
,SFSH_PDBZ
,SFSJDQPCL_PDBZ
,SFSW_PDBZ
,SFGM_PDBZ
,SWASJSWQK
,ASJDBJBDM
,LLFS_LLFSDM
,LLFS_DMBCMS
,LLSJ
,SY_JYQK
,FZXYRTSXW_FZXYRTSXWDM
,FZXYRTSXW_DMBCMS
,FZXYRSXZAHJQK
,QTSDTD_JYQK
,ASJFSSJFX_ASJFSKSSJ
,ASJFSSJFX_ASJFSJSSJ
,ZARFX_RSXX
,ZARFX_RSSX
,FZXYRTZ_JYQK
,FZXYRTSZC_FZXYRTSZCDM
,FZXYRTSZC_DMBCMS
,ZAGJ_SAWPDM
,ZAGJ_JYQK
,ZADJMS
,ZAMDMS
,KJFWDM
,LCZA_JYQK
,JHZA_JYQK
,GTFZFZXYRZHXSDM
,GTFZFZXYRGC_GTFZFZXYRGCDM
,GTFZFZXYRGC_DMBCMS
,XZWPFX_SAWP_SAWPDM
,XZWPFX_SAWP_DMBCMS
,SSWPQX_JYQK
,FZXYRYLWP_JYQK
,XCKYWP_JYQK
,FXXS_JYQK
,ASJSWRY_RS
,ASJSSRY_RS
,ASJSSCW_JYQK
,SSJZRMBY
,KYZSQZ_WPSL
,JJSD_JJSDDM
,JSSD_JSSDDM
,ZPSD_ZPSDDM
,LKJZKJFS_LKJZKJFSDM
,ZAZBSD_ZAZBSDDM
,JRJZKJFSJSD_JRJZKJFSJSDDM
<if
test=
"ssdw != '441900000000'"
>
,(select name from sys_dictitem where groupid='CODE_AJLB' and code=T.ajlbdm) as ajlbdmStr
</if>
<if
test=
"ssdw == '441900000000'"
>
,(case
when T.ajlx_dg='01' then (select name from sys_dictitem where groupid='CODE_AJLB' and code=T.ajlbdm)
when T.ajlx_dg!='01' then (select name from sys_dictitem where groupid='CODE_DG_AJ_AB' and code=T.AB_DG)
else '' end ) as ajlbdmStr
</if>
FROM tb_st_asj T WHERE 1=1
<include
refid=
"queryWhereByReceiving"
/>
</select>
<sql
id=
"queryWhereByReceiving"
>
<if
test=
"asjbh!= null"
>
AND T.ASJBH= #{ asjbh , jdbcType=VARCHAR }
</if>
<if
test=
"ajlbdm!= null"
>
AND T.AJLBDM= #{ ajlbdm , jdbcType=VARCHAR }
</if>
<if
test=
"jyaq!= null"
>
AND T.JYAQ LIKE '%' || #{jyaq , jdbcType=VARCHAR } || '%'
</if>
<if
test=
"asjfssj_asjfskssj_start!= null"
>
AND T.ASJFSSJ_ASJFSKSSJ
<![CDATA[>=]]>
to_date(#{asjfssj_asjfskssj_start},'yyyy-MM-dd hh24:mi:ss')
</if>
<if
test=
"asjfssj_asjfskssj_end!= null"
>
AND T.ASJFSSJ_ASJFSKSSJ
<![CDATA[<]]>
to_date(#{asjfssj_asjfskssj_end},'yyyy-MM-dd hh24:mi:ss')
</if>
<if
test=
"ajslsj_start!= null"
>
AND T.SLSJ
<![CDATA[>=]]>
to_date(#{ajslsj_start},'yyyy-MM-dd hh24:mi:ss')
</if>
<if
test=
"ajslsj_end!= null"
>
AND T.SLSJ
<![CDATA[<]]>
to_date(#{ajslsj_end},'yyyy-MM-dd hh24:mi:ss')
</if>
<if
test=
"larq_start!= null"
>
AND T.LARQ
<![CDATA[>=]]>
to_date(#{larq_start},'yyyy-MM-dd hh24:mi:ss')
</if>
<if
test=
"larq_end!= null"
>
AND T.LARQ
<![CDATA[<]]>
to_date(#{larq_end},'yyyy-MM-dd hh24:mi:ss')
</if>
<if
test=
"ladw_gajgjgdm!= null"
>
AND T.LADW_GAJGJGDM= #{ ladw_gajgjgdm , jdbcType=VARCHAR }
</if>
<if
test=
"afdxzqhdm!= null"
>
AND T.ASJFSDD_XZQHDM= #{ afdxzqhdm , jdbcType=VARCHAR }
</if>
<if
test=
"asjfsd_dzmc!= null"
>
AND T.ASJFSDD_DZMC LIKE '%' || #{asjfsd_dzmc , jdbcType=VARCHAR } || '%'
</if>
<if
test=
"x!= null and x!=0.0"
>
AND T.ASJFSDD_DQJD= #{ x , jdbcType=DOUBLE }
</if>
<if
test=
"y!= null and y!=0.0"
>
AND T.ASJFSDD_DQWD= #{ y , jdbcType=DOUBLE }
</if>
<if
test=
"zcjddm!= null"
>
AND T.ZCJDDM= #{ zcjddm , jdbcType=VARCHAR }
</if>
<if
test=
"xckybh!= null"
>
AND T.XCKYBH= #{ xckybh , jdbcType=VARCHAR }
</if>
</sql>
</mapper>
</mapper>
service/asj/src/main/java/com/founder/asj/service/TbStAsjService.java
View file @
18ba34f5
...
@@ -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.publicEntity.Receiving
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -27,4 +28,6 @@ public interface TbStAsjService extends IService<TbStAsj> {
...
@@ -27,4 +28,6 @@ public interface TbStAsjService extends IService<TbStAsj> {
List
<
CbxszAndXlaj
>
GetlistCbzXgaj
(
Map
map
);
List
<
CbxszAndXlaj
>
GetlistCbzXgaj
(
Map
map
);
String
getNameByCode
(
Map
<
String
,
String
>
map
);
String
getNameByCode
(
Map
<
String
,
String
>
map
);
List
<
TbStAsj
>
selectAsjxxList
(
Receiving
receiving
);
}
}
service/asj/src/main/java/com/founder/asj/service/impl/TbStAsjServiceImpl.java
View file @
18ba34f5
...
@@ -6,6 +6,7 @@ import com.founder.asj.mapper.TbStAsjMapper;
...
@@ -6,6 +6,7 @@ import com.founder.asj.mapper.TbStAsjMapper;
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.publicEntity.Receiving
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -50,4 +51,9 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
...
@@ -50,4 +51,9 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
public
String
getNameByCode
(
Map
<
String
,
String
>
map
){
public
String
getNameByCode
(
Map
<
String
,
String
>
map
){
return
tbStAsjMapper
.
getNameByCode
(
map
);
return
tbStAsjMapper
.
getNameByCode
(
map
);
}
}
@Override
public
List
<
TbStAsj
>
selectAsjxxList
(
Receiving
receiving
)
{
return
tbStAsjMapper
.
selectAsjxxByReceivingList
(
receiving
);
}
}
}
service/asj/src/main/resources/application.properties
View file @
18ba34f5
...
@@ -12,6 +12,8 @@ spring.jackson.time-zone=GMT+8
...
@@ -12,6 +12,8 @@ spring.jackson.time-zone=GMT+8
#配置mapper xml文件的路径
#配置mapper xml文件的路径
mybatis-plus.mapper-locations
=
classpath:com/founder/asj/mapper/xml/*.xml
mybatis-plus.mapper-locations
=
classpath:com/founder/asj/mapper/xml/*.xml
#所属单位,东莞与其他单位所有案件类别字典可能有所差异,故需要加单位进行判断(东莞441900000000)
ssdw
=
441900000000
# 设置日志级别
# 设置日志级别
#logging.level.root=INFO
#logging.level.root=INFO
...
...
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