Skip to content

M
map-parent
Commit 601055e4 by yangyang
Options

点位校验提交(西藏)

parent 801d4f17
Showing with 107 additions and 67 deletions
service/publicapi/src/main/java/com/founder/publicapi/controller/AsjService/AsjController.java
......@@ -10,6 +10,7 @@ import com.founder.commonutils.model.asjEntity.TbStAsjResult;
import com.founder.commonutils.model.newPublicEntity.*;
import com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo;
import com.founder.commonutils.model.vo.param.*;
import com.founder.commonutils.util.JsonUtils;
import com.founder.publicapi.service.TbStAsjService;
......@@ -55,47 +56,6 @@ public class AsjController {
return MapRestResult.build(200,"成功获取案件信息",total,asjList);
}
@OperLog(message = "点位校验_保存经纬度/不予校验",operation = OperationType.UPDATE)
@ApiOperation(value = "点位校验_保存经纬度/不予校验")
@PostMapping("update")
public MapRestResult UpdateAsjxxByAsjbh(@RequestBody TbStAsj tbStAsj,HttpServletRequest request) {
if (tbStAsj.getFlag().equals("true")){
return MapRestResult.build(200,"flag为true","1","1");
}else if (tbStAsj.getFlag().equals("false")){
try {
//获取request中的用户信息
SysUser user = (SysUser)request.getAttribute("user");
TbAsjJwdInfo tbAsjJwdInfo = new TbAsjJwdInfo();
tbAsjJwdInfo.setAsjbh(tbStAsj.getAsjbh());
tbAsjJwdInfo.setGxrXm(user.getTrueName());
tbAsjJwdInfo.setGxrDwdm(user.getUnitcode());
tbAsjJwdInfo.setGxrZjhm(user.getIdentitycard());
tbAsjJwdInfo.setGxrDwmc(user.getUnitname());
tbAsjJwdInfo.setSfjyPdbz(tbStAsj.getSfjyPdbz());
tbAsjJwdInfo.setJyJd(String.valueOf(tbStAsj.getX()));
tbAsjJwdInfo.setJyWd(String.valueOf(tbStAsj.getY()));
if(tbStAsjService.updateJwdinfo(tbAsjJwdInfo)>0&&"1".equals(tbStAsj.getSfjyPdbz())){
tbStAsjService.updateById(tbStAsj);
}
} catch (Exception e) {
e.printStackTrace();
return MapRestResult.build(201,"修改失败","1",e);
}
return MapRestResult.build(200,"修改成功","1","1");
}else {
return new MapRestResult(201,"不ok,flag为空","");
}
}
@OperLog(message = "点位校验_获取案件经纬度",operation = OperationType.QUERY)
@ApiOperation(value = "点位校验_获取案件经纬度")
@PostMapping("getJwdinfoByAsjbh")
public MapRestResult getJwdinfoByAsjbh(@RequestBody TbStAsj tbStAsj) {
TbAsjJwdInfo tbAsjJwdinfo = tbStAsjService.getJwdinfoByAsjbh(tbStAsj.getAsjbh());
return MapRestResult.build(200,"成功获取经纬度校验信息","1",tbAsjJwdinfo);
}
@OperLog(message = "获取串并线索组信息",operation = OperationType.QUERY)
@ApiOperation(value = "获取串并线索组信息")
@PostMapping("/querAsjxxCbzAndXlaj")
......@@ -211,4 +171,73 @@ public class AsjController {
}
return MapRestResult.build(200,"成功",jsonArray.size(),jsonArray);
}
@OperLog(message = "点位校验案件信息查询",operation = OperationType.QUERY)
@ApiOperation(value = "点位校验案件信息查询")
@RequestMapping("/toQueryJwdinfo")
@ResponseBody
public MapRestResult toQueryJwdinfo(@RequestBody TbAsjJwdinfo tbAsjJwdinfo, HttpServletRequest request) {
//获取request中的用户信息
SysUser user = (SysUser)request.getAttribute("user");
tbAsjJwdinfo.setPage((tbAsjJwdinfo.getPage()-1)*tbAsjJwdinfo.getLimit());
tbAsjJwdinfo.setLimit(tbAsjJwdinfo.getLimit());
Integer totalCount = 0;
totalCount = tbStAsjService.toQueryJwdinfoTotalCount(tbAsjJwdinfo, user);
List<TbAsjJwdinfo> jwdinfoList = new ArrayList<>();
if(totalCount>0){
jwdinfoList = tbStAsjService.toQueryJwdinfo(tbAsjJwdinfo, user);
}
return MapRestResult.build(200,"成功",totalCount,jwdinfoList);
}
@OperLog(message = "点位校验_保存经纬度/不予校验",operation = OperationType.UPDATE)
@ApiOperation(value = "点位校验_保存经纬度/不予校验")
@PostMapping("update")
public MapRestResult UpdateAsjxxByAsjbh(@RequestBody TbStAsj tbStAsj,HttpServletRequest request) {
if (tbStAsj.getFlag().equals("true")){
return MapRestResult.build(200,"flag为true","1","1");
}else if (tbStAsj.getFlag().equals("false")){
try {
//获取request中的用户信息
SysUser user = (SysUser)request.getAttribute("user");
TbAsjJwdInfo tbAsjJwdInfo = new TbAsjJwdInfo();
tbAsjJwdInfo.setAsjbh(tbStAsj.getAsjbh());
tbAsjJwdInfo.setGxrXm(user.getTrueName());
tbAsjJwdInfo.setGxrDwdm(user.getUnitcode());
tbAsjJwdInfo.setGxrZjhm(user.getIdentitycard());
tbAsjJwdInfo.setGxrDwmc(user.getUnitname());
tbAsjJwdInfo.setSfjyPdbz(tbStAsj.getSfjyPdbz());
tbAsjJwdInfo.setJyJd(String.valueOf(tbStAsj.getX()));
tbAsjJwdInfo.setJyWd(String.valueOf(tbStAsj.getY()));
if(tbStAsjService.updateJwdinfo(tbAsjJwdInfo)>0&&"1".equals(tbStAsj.getSfjyPdbz())){
tbStAsjService.updateById(tbStAsj);
}
} catch (Exception e) {
e.printStackTrace();
return MapRestResult.build(201,"修改失败","1",e);
}
return MapRestResult.build(200,"修改成功","1","1");
}else {
return new MapRestResult(201,"不ok,flag为空","");
}
}
@OperLog(message = "点位校验_获取案件经纬度",operation = OperationType.QUERY)
@ApiOperation(value = "点位校验_获取案件经纬度")
@PostMapping("getJwdinfoByAsjbh")
public MapRestResult getJwdinfoByAsjbh(@RequestBody TbStAsj tbStAsj) {
TbAsjJwdInfo tbAsjJwdinfo = tbStAsjService.getJwdinfoByAsjbh(tbStAsj.getAsjbh());
return MapRestResult.build(200,"成功获取经纬度校验信息","1",tbAsjJwdinfo);
}
@OperLog(message = "点位校验案件信息统计",operation = OperationType.QUERY)
@ApiOperation(value = "点位校验案件信息统计")
@RequestMapping("/toQueryJwdinfoTj")
@ResponseBody
public MapRestResult toQueryJwdinfoTj(@RequestBody TbAsjJwdinfo tbAsjJwdinfo, HttpServletRequest request) {
//获取request中的用户信息
SysUser user = (SysUser)request.getAttribute("user");
return MapRestResult.build(200,"成功",1,tbStAsjService.toQueryJwdinfoTj(tbAsjJwdinfo, user));
}
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml
......@@ -308,8 +308,7 @@
JQ_JD jqJd,
JQ_WD jqWd,
SFJY_PDBZ sfjyPdbz,
KYRXX kyrxx,
(SELECT JJYXM FROM tb_m_zhzx_jjxx jq WHERE jq.jjdbh=JJBH limit 1) sljjry
KYRXX kyrxx
FROM tb_asj_jwdinfo where ASJBH=#{asjbh,jdbcType=VARCHAR}
</select>
<!--sfjyPdbz等于1表示已校验，2表示不予校验 已校验时更新校验经纬度-->
......@@ -394,26 +393,40 @@
</foreach>
</foreach>
</if>
<if test="asjbh!=null and asjbh!=''"> and ASJBH like concat('%',#{asjbh, jdbcType=VARCHAR},'%')</if>
<if test="xkbh!=null and xkbh!=''"> and XKBH like concat('%',#{xkbh, jdbcType=VARCHAR},'%')</if>
<if test="jjbh!=null and jjbh!=''"> and JJBH like concat('%',#{jjbh, jdbcType=VARCHAR},'%')</if>
<if test="ajlbdm!=null and ajlbdm!=''"> and ajlbdm like concat(#{ajlbdm, jdbcType=VARCHAR},'%')</if>
<if test="lasjRqsjKssj!=null and lasjRqsjKssj!=''">and LARQ <![CDATA[>=]]>(DATE_FORMAT(#{lasjRqsjKssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))</if>
<if test="lasjRqsjJssj!=null and lasjRqsjJssj!=''">and LARQ <![CDATA[<]]>(DATE_FORMAT(#{lasjRqsjJssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))</if>
<if test="jyaq!=null and jyaq!=''"> and JYAQ like concat('%',#{jyaq, jdbcType=VARCHAR},'%')</if>
<if test="asjbh!=null and asjbh!=''">and ASJBH like concat('%',#{asjbh, jdbcType=VARCHAR},'%')</if>
<if test="xkbh!=null and xkbh!=''">and XKBH like concat('%',#{xkbh, jdbcType=VARCHAR},'%')</if>
<if test="jjbh!=null and jjbh!=''">and JJBH like concat('%',#{jjbh, jdbcType=VARCHAR},'%')</if>
<if test="ajlbdm!=null and ajlbdm!=''">and ajlbdm like concat(#{ajlbdm, jdbcType=VARCHAR},'%')</if>
<if test="lasjRqsjKssj!=null and lasjRqsjKssj!=''">and LARQ <![CDATA[>=]]>
(DATE_FORMAT(#{lasjRqsjKssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))
</if>
<if test="lasjRqsjJssj!=null and lasjRqsjJssj!=''">and LARQ <![CDATA[<]]>
(DATE_FORMAT(#{lasjRqsjJssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))
</if>
<if test="jyaq!=null and jyaq!=''">and JYAQ like concat('%',#{jyaq, jdbcType=VARCHAR},'%')</if>
<if test="sfjyPdbz!='3'.toString()">
<if test="sfjyPdbz!=null and sfjyPdbz!=''">and SFJY_PDBZ=#{sfjyPdbz, jdbcType=VARCHAR}</if>
<if test="sfjyPdbz==null or sfjyPdbz==''">and (SFJY_PDBZ is null or SFJY_PDBZ='')</if>
</if>
<if test="sfxkPdbz!='2'.toString()">
<if test="sfxkPdbz=='1'.toString()">and (XKBH IS NOT NULL or XKBH!='')</if>
<if test="sfxkPdbz==null or sfxkPdbz==''">and (XKBH IS NULL or XKBH='')</if>
</if>
<if test="asjfssjAsjfskssj!=null and asjfssjAsjfskssj!=''">and ASJFSSJ_ASJFSKSSJ <![CDATA[>=]]>(DATE_FORMAT(#{asjfssjAsjfskssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))</if>
<if test="asjfssjAsjfsjssj!=null and asjfssjAsjfsjssj!=''">and ASJFSSJ_ASJFSKSSJ <![CDATA[<]]>(DATE_FORMAT(#{asjfssjAsjfsjssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S')+1)</if>
<if test="asjfsddXzqhdm!=null and asjfsddXzqhdm!=''">and ASJFSDD_XZQHDM like concat(#{asjfsddXzqhdm, jdbcType=VARCHAR},'%')</if>
<if test="slsjKssj!=null and slsjKssj!=''">and SLSJ <![CDATA[>=]]>(DATE_FORMAT(#{slsjKssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))</if>
<if test="slsjJssj!=null and slsjJssj!=''">and SLSJ <![CDATA[<]]>(DATE_FORMAT(#{slsjJssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))</if>
<if test="sfxkPdbz=='1'.toString()">and (XKBH IS NOT NULL or XKBH!='')</if>
<if test="sfxkPdbz==null or sfxkPdbz==''">and (XKBH IS NULL or XKBH='')</if>
</if>
<if test="asjfssjAsjfskssj!=null and asjfssjAsjfskssj!=''">and ASJFSSJ_ASJFSKSSJ <![CDATA[>=]]>
(DATE_FORMAT(#{asjfssjAsjfskssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))
</if>
<if test="asjfssjAsjfsjssj!=null and asjfssjAsjfsjssj!=''">and ASJFSSJ_ASJFSKSSJ <![CDATA[<]]>
(DATE_FORMAT(#{asjfssjAsjfsjssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S')+1)
</if>
<if test="asjfsddXzqhdm!=null and asjfsddXzqhdm!=''">and ASJFSDD_XZQHDM like
concat(#{asjfsddXzqhdm, jdbcType=VARCHAR},'%')
</if>
<if test="slsjKssj!=null and slsjKssj!=''">and SLSJ <![CDATA[>=]]>
(DATE_FORMAT(#{slsjKssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))
</if>
<if test="slsjJssj!=null and slsjJssj!=''">and SLSJ <![CDATA[<]]>
(DATE_FORMAT(#{slsjJssj, jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%S'))
</if>
<if test="sldwGajgjgdm!=null and sldwGajgjgdm!=''">
<if test="sldwGajgjgdmList != null and sldwGajgjgdmList.size() > 0">
and
......@@ -427,14 +440,14 @@
</if>
<if test="xkdwGajgjgdm!=null and xkdwGajgjgdm!=''">
<if test="xkdwGajgjgdmList != null and xkdwGajgjgdmList.size() > 0">
and
<foreach collection="xkdwGajgjgdmList" item="dws" open="(" close=")" separator=" or ">
XKDW_GAJGJGDM in
<foreach collection="dws" item="dw" separator="," open="(" close=")">
#{dw,jdbcType=VARCHAR}
and
<foreach collection="xkdwGajgjgdmList" item="dws" open="(" close=")" separator=" or ">
XKDW_GAJGJGDM in
<foreach collection="dws" item="dw" separator="," open="(" close=")">
#{dw,jdbcType=VARCHAR}
</foreach>
</foreach>
</foreach>
</if>
</if>
</if>
<if test="ladwGajgjgdm!=null and ladwGajgjgdm!=''">
<if test="ladwGajgjgdmList != null and ladwGajgjgdmList.size() > 0">
......@@ -448,8 +461,6 @@
</if>
</if>
<if test="kyrxx!=null and kyrxx!=''">and KYRXX like ('%',kyrxx,'%')</if>
order by ASJFSSJ_ASJFSKSSJ desc
</sql>
<!--各市单位校验情况统计-->
<select id="toQueryJwdinfoTj" parameterType="com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo" resultType="Map">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment