Skip to content

X
xzxt-app-report
Commit dfe9500c by lilei
Options

数据流接口

parent cf1d7c1b
Showing with 285 additions and 14 deletions
src/main/java/org/springblade/founder/asj/controller/MaAsjglController.java
......@@ -17,6 +17,7 @@ package org.springblade.founder.asj.controller;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
......@@ -25,6 +26,7 @@ import lombok.AllArgsConstructor;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.asj.dto.TbXwRybhDTO;
import org.springblade.founder.asj.dto.TbXwZbfzxyrDTO;
import org.springblade.founder.asj.entity.SjlResult;
import org.springblade.founder.asj.entity.TbXwZbfzxyr;
import org.springblade.founder.asj.entity.TbYwMaglBqxgsq;
import org.springblade.founder.utils.*;
......@@ -282,4 +284,23 @@ public class MaAsjglController extends BladeController {
}
}
/**
* 查询数据流
* @param tbStAsj
* @return
*/
@PostMapping(value = "/getSjlByasjbh")
@ResponseBody
@LogOper(czxxLbdm = "01",yymcJyqk = "查询数据流")
public R getSjlByasjbh(@RequestBody TbStAsj tbStAsj){
try {
List<SjlResult> list = tbStAsjService.getSjlByasjbh(tbStAsj.getAsjbh());
return R.ok().data("rows",list);
}catch (Exception e){
e.printStackTrace();
return R.error(e.getMessage());
}
}
}
src/main/java/org/springblade/founder/asj/entity/SjlResult.java 0 → 100644
package org.springblade.founder.asj.entity;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @auther: Lilei
* @date: 2021/8/19 16:46
*/
@Data
public class SjlResult {
//主键编号
private String zjbh;
//操作人员
private String czry;
//操作时间
private String czsj;
//操作名称
private String czmc;
//操作单位名称
private String czdwmc;
//是否通过
private String sftg;
//更新字段内容
private String updaterecords;
//更新字段内容转换格式
private List<Map<String,Object>> gxnr;
}
src/main/java/org/springblade/founder/asj/mapper/MaAsjglMapper.java
......@@ -21,10 +21,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springblade.founder.asj.dto.TbXwRybhDTO;
import org.springblade.founder.asj.dto.TbXwZbfzxyrDTO;
import org.springblade.founder.asj.entity.TbStAsj;
import org.springblade.founder.asj.entity.TbXwRybh;
import org.springblade.founder.asj.entity.TbXwZbfzxyr;
import org.springblade.founder.asj.entity.TbYwMaglBqxgsq;
import org.springblade.founder.asj.entity.*;
import org.springblade.founder.asj.vo.TbStAsjVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -72,4 +69,8 @@ public interface MaAsjglMapper extends BaseMapper<TbStAsj> {
// 被害人
@SqlParser(filter=true)
public List<TbXwRybhDTO> exprotBhr(TbStAsj tbStAsj);
public List<SjlResult> getSjlByasjbh(String asjbh);
}
src/main/java/org/springblade/founder/asj/mapper/MaAsjglMapper.xml
......@@ -427,6 +427,98 @@
<include refid="maasjxx-public-where"/>
</select>
<select id="getSjlByasjbh" parameterType="java.lang.String" resultType="org.springblade.founder.asj.entity.SjlResult">
select xxczryxm as czry,
DATE_FORMAT(xxczrq,'%Y-%m-%d %H:%i:%S') as czsj,
CONCAT(gnmc,'修改') as czmc,
updaterecords as updaterecords,
xxczrdwmc as czdwmc,
'' as zjbh,
'' as sftg
from sys_record_log where keyvalue in((select xxzjbh from tb_xw_rybh where asjbh = #{asjbh, jdbcType=VARCHAR}))
UNION
select xxczryxm as czry,
DATE_FORMAT(xxczrq,'%Y-%m-%d %H:%i:%S') as czsj,
CONCAT(gnmc,'修改') as czmc,
updaterecords as updaterecords,
xxczrdwmc as czdwmc,
'' as zjbh,
'' as sftg
from sys_record_log where keyvalue in((select xxzjbh from tb_xw_zbfzxyr where asjbh = #{asjbh, jdbcType=VARCHAR}))
UNION
select xxczryxm as czry,
DATE_FORMAT(xxczrq,'%Y-%m-%d %H:%i:%S') as czsj,
CONCAT(gnmc,'修改') as czmc,
updaterecords as updaterecords,
xxczrdwmc as czdwmc,
'' as zjbh,
'' as sftg
from sys_record_log where keyvalue = #{asjbh, jdbcType=VARCHAR} and gnmc not like '%提取%'
UNION
select xxczryxm as czry,
DATE_FORMAT(xxczrq,'%Y-%m-%d %H:%i:%S') as czsj,
gnmc as czmc,
updaterecords as updaterecords,
xxczrdwmc as czdwmc,
'' as zjbh,
'' as sftg
from sys_record_log where keyvalue in((select xxzjbh from tb_st_asj_flws where asjbh =#{asjbh, jdbcType=VARCHAR}))
UNION
select xxdjry_xm as czry,
DATE_FORMAT(xxrsksj,'%Y-%m-%d %H:%i:%S') as czsj,
'添加案件' as czmc,
'' as updaterecords,
xxdjdw_gajgmc as czdwmc,
'' as zjbh,
'' as sftg
from tb_st_asj where xxsc_pdbz = '0' and xxrsksj is not null and asjbh = #{asjbh, jdbcType=VARCHAR}
UNION
select xxdjry_xm as czry,
DATE_FORMAT(xxrsksj,'%Y-%m-%d %H:%i:%S') as czsj,
'添加犯罪嫌疑人' as czmc,
'' as updaterecords,
xxdjdw_gajgmc as czdwmc,
xxzjbh as zjbh,
'' as sftg
from tb_xw_zbfzxyr where xxsc_pdbz = '0' and xxrsksj is not null and asjbh = #{asjbh, jdbcType=VARCHAR}
UNION
select xxdjry_xm as czry,
DATE_FORMAT(xxrsksj,'%Y-%m-%d %H:%i:%S') as czsj,
'添加被害人' as czmc,
'' as updaterecords,
xxdjdw_gajgmc as czdwmc,
xxzjbh as zjbh,
'' as sftg
from tb_xw_rybh where xxsc_pdbz = '0' and xxrsksj is not null and asjbh = #{asjbh, jdbcType=VARCHAR}
UNION
select xxdjry_xm as czry,
DATE_FORMAT(djsj,'%Y-%m-%d %H:%i:%S') as czsj,
yymc_jyqk as czmc,
'' as updaterecords,
xxdjdw_gajgmc as czdwmc,
'' as zjbh,
'' as sftg
from sys_gnsyrz where xxsc_pdbz = '0' and czxx_jyqk = #{asjbh, jdbcType=VARCHAR}
UNION
select spr_xm as czry,
DATE_FORMAT(spsj,'%Y-%m-%d %H:%i:%S') as czsj,
case sp_type when '00' THEN '立案审批'
when '01' THEN '立案提请审批'
when '02' THEN '侦查终结审批'
when '03' THEN '侦查终结提请审批'
when '04' THEN '部权修改省级审批'
when '05' THEN '部权修改提请省级审批'
when '06' THEN '部权修改部级审批' END as czmc,
'' as updaterecords,
spdw_gajgmc as czdwmc,
'' as zjbh,
SPSFTG_PDBZ as sftg
from tb_yw_blgc where ASJBH = #{asjbh, jdbcType=VARCHAR}
ORDER BY czsj ASC
</select>
<sql id="bqxgsq-public-where">
<if test="asjbh!=null and asjbh!=''"> and asj.asjbh = #{asjbh, jdbcType=VARCHAR}</if>
<if test="ladwGajgjgdm!=null and ladwGajgjgdm!=''">
......
src/main/java/org/springblade/founder/asj/service/IMaAsjglService.java
......@@ -17,6 +17,7 @@ package org.springblade.founder.asj.service;
import org.springblade.founder.asj.dto.TbXwRybhDTO;
import org.springblade.founder.asj.dto.TbXwZbfzxyrDTO;
import org.springblade.founder.asj.entity.SjlResult;
import org.springblade.founder.asj.entity.TbStAsj;
import org.springblade.founder.asj.entity.TbXwZbfzxyr;
import org.springblade.founder.asj.entity.TbYwMaglBqxgsq;
......@@ -63,4 +64,5 @@ public interface IMaAsjglService {
public Integer deleteFzxyrByzjbh(List<String> xxzjbhList);
public Map<String, Object> queryBhrByAsjbh(TbStAsj tbStAsj);
public Integer deleteBhrByzjbh(List<String> xxzjbhList);
public List<SjlResult> getSjlByasjbh(String asjbh);
}
src/main/java/org/springblade/founder/asj/service/StAsjXxtqService.java
......@@ -203,7 +203,7 @@ public class StAsjXxtqService {
TbStAsj tbStAsj = getTbStAsj(asjbh);
if (tbStAsj==null){
XzxtUser user = SecureUtil.getUserXzxt();
xtrzService.addAjtqGnsyrz(user,"01","提取案件基本信息",asjbh);
xtrzService.addAjtqGnsyrz(user,"01","提取案件基本信息",asjbh,asjbh);
getSysjjcUrl(asjbh,token);
}
if(data!=null){
......@@ -235,7 +235,7 @@ public class StAsjXxtqService {
TbStAsj tbStAsj = getTbStAsj(asjbh);
if (tbStAsj!=null){
XzxtUser user = SecureUtil.getUserXzxt();
xtrzService.addAjtqGnsyrz(user,"01","提取犯罪嫌疑人信息",asjbh);
xtrzService.addAjtqGnsyrz(user,"01","提取犯罪嫌疑人信息",asjbh,asjbh);
getSysjjcUrl(asjbh,token);
}
if(data!=null && !data.isEmpty()){
......@@ -325,7 +325,7 @@ public class StAsjXxtqService {
TbStAsj tbStAsj = getTbStAsj(asjbh);
if (tbStAsj!=null){
XzxtUser user = SecureUtil.getUserXzxt();
xtrzService.addAjtqGnsyrz(user,"01","提取案件被害人信息",asjbh);
xtrzService.addAjtqGnsyrz(user,"01","提取案件被害人信息",asjbh,asjbh);
getSysjjcUrl(asjbh,token);
}
if(data!=null && !data.isEmpty()){
......
src/main/java/org/springblade/founder/asj/service/impl/MaAsjglServiceImpl.java
......@@ -15,14 +15,13 @@
*/
package org.springblade.founder.asj.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.asj.dto.TbXwRybhDTO;
import org.springblade.founder.asj.dto.TbXwZbfzxyrDTO;
import org.springblade.founder.asj.entity.TbStAsj;
import org.springblade.founder.asj.entity.TbXwRybh;
import org.springblade.founder.asj.entity.TbXwZbfzxyr;
import org.springblade.founder.asj.entity.TbYwMaglBqxgsq;
import org.springblade.founder.asj.entity.*;
import org.springblade.founder.asj.mapper.MaAsjglMapper;
import org.springblade.founder.asj.service.IMaAsjglService;
import org.springblade.founder.asj.util.StringUtil;
......@@ -32,6 +31,7 @@ import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.util.*;
......@@ -296,4 +296,121 @@ public class MaAsjglServiceImpl implements IMaAsjglService {
return integer;
}
@Override
public List<SjlResult> getSjlByasjbh(String asjbh) {
List<SjlResult> list = tbStAsjMapper.getSjlByasjbh(asjbh);
for (SjlResult sjlResult:list) {
List<Map<String,Object>> gxnr = new ArrayList<>();
String updaterecords = sjlResult.getUpdaterecords();
if (!StringUtils.isEmpty(updaterecords)) {
Map<String,List> recordsMap = JSONObject.parseObject(updaterecords, Map.class);
Set<String> keys = recordsMap.keySet();
for (String key:keys) {
Object oldValue = recordsMap.get(key).get(0);
Object newValue = recordsMap.get(key).get(1);
if (!(ObjectUtils.isEmpty(oldValue)&&ObjectUtils.isEmpty(newValue))) {
Map<String,Object> map = new HashMap<>();
String value = getValue(key);
map.put("name",value);
map.put("oldValue", oldValue);
map.put("key", key);
map.put("newValue", newValue);
gxnr.add(map);
}
}
sjlResult.setGxnr(gxnr);
}
}
return list;
}
private String getValue(String key){
Map<String,String> map = new HashMap<>();
map.put("asjbh","案件编号");
map.put("xckybh","现场勘验编号");
map.put("ajlbdm","案件类别");
map.put("zatzJyqk","案件性质");
map.put("ajmc","案件名称");
map.put("jyaq","简要案情");
map.put("asjfssjAsjfskssj","案发时间开始时间");
map.put("asjfssjAsjfsjssj","案发时间结束时间");
map.put("asjfssjAsjfskssj-asjfssjAsjfsjssj","案发时间");
map.put("larq","立案日期");
map.put("ladwGajgjgdm","立案单位");
map.put("ladwGajgmc","立案单位详称");
map.put("asjfsddXzqhdm","案发地区划");
map.put("asjfsddDzmc","案发地详址");
map.put("asjfsddDylbdm","案件地域");
map.put("asjfsddSacsSacslbdm","涉案场所");
map.put("asjfsddSacsDmbcms","涉案场所补充");
map.put("tssddm","作案工具");
map.put("tssddmbcms","作案工具补充");
map.put("zadjdm","发案原因");
map.put("zadjdmbcms","发案原因补充");
map.put("gajgfzrXm","公安机关负责人");
map.put("gajgfzrLxdh","办公电话");
map.put("xsjsfzrXm","刑事技术负责人");
map.put("xsjsfzrLxdh","办公电话");
map.put("zbrXm","主办人姓名");
map.put("zbrLxdh","主办人联系电话");
map.put("xbrXm","协办人姓名");
map.put("xbrLxdh","协办人联系电话");
map.put("bhrCyzjCyzjdm","证件类型");
map.put("bhrCyzjZjhm","证件号码");
map.put("bhrXm","姓名");
map.put("bhrJyzkdm","婚姻状况");
map.put("bhrCsrqRqgzsx","出生时间起始时间");
map.put("bhrCsrqRqgzxx","出生时间结束时间");
map.put("bhrCsrqRqgzsx-bhrCsrqRqgzxx","出生时间");
map.put("bhrJgdm","籍贯");
map.put("bhrXbdm","性别");
map.put("bhrNl","年龄");
map.put("bhrGjdm","国籍");
map.put("bhrMzdm","民族");
map.put("rsshcddm","人身伤害程度");
map.put("bhrXldm","文化程度");
map.put("bhrHjdzXzqhdm","户籍地");
map.put("bhrHjdzDzmc","户籍地详址");
map.put("bhrAsjxgrysfAsjxgrysfdm","职业信息");
map.put("bhrAsjxgrysfDmbcms","职业信息补充");
map.put("bhrXzzXzqhdm","现住址区划");
map.put("zhfzxyrCyzjCyzjdm","证件类型");
map.put("zhfzxyrCyzjZjhm","证件号码");
map.put("zhfzxyrFzxyrdaztdm","到案状态");
map.put("zhfzxyrXm","姓名");
map.put("zhfzxyrBmch","别名/绰号");
map.put("zhfzxyrXbdm","性别");
map.put("rqgzxxCsrqRqgzsx","出生时间起始时间");
map.put("zhfzxyrCsrqRqgzxx","出生时间结束时间");
map.put("zhfzxyrCsrqRqgzxx-rqgzxxCsrqRqgzsx","出生时间");
map.put("zhfzxyrNl","年龄");
map.put("zhfzxyrHjlx","户籍类型");
map.put("zhfzxyrGjdm","国籍");
map.put("zhfzxyrMzdm","民族");
map.put("zhfzxyrZtrybh","在逃人员编号");
map.put("zhfzxyrGtfzfzxyrsadwzydm","地位作用");
map.put("zhfzxyrHjdzXzqhdm","户籍地区划");
map.put("zhfzxyrHjdzDzmc","户籍地详址");
map.put("zhfzxyrXzzXzqhdm","现住址区划");
map.put("zhfzxyrXzzDzmc","现住址详址");
map.put("zhfzxyrJyzkdm","婚姻状况");
map.put("zhfzxyrXldm","文化程度");
map.put("zhfzxyrYbhrgx","与被害人是否熟人关系");
map.put("zhfzxyrSfqk","是否前科人员");
map.put("zhfzxyrSfjsbrPdbz","是否精神病患");
map.put("zhfzxyrAsjxgrysfAsjxgrysfdm","职业信息");
map.put("zhfzxyrAsjxgrysfDmbcms","职业信息补充");
map.put("zhrq","抓获日期");
map.put("zhddXzqhdm","抓获地点区划");
map.put("zhdwGajgjgdm","抓获单位");
map.put("zhdwGajgmc","抓获单位详称");
String value = map.get(key);
return value;
}
}
src/main/java/org/springblade/founder/xtrz/service/IXtrzService.java
......@@ -10,5 +10,5 @@ public interface IXtrzService {
String saveSysDlrz(XzxtUser user) throws Exception;
void addAjtqGnsyrz(XzxtUser user,String czxxLbdm,String yymcJyqk,String czxxParam);
void addAjtqGnsyrz(XzxtUser user,String czxxLbdm,String yymcJyqk,String czxxParam,String ywbh);
}
src/main/java/org/springblade/founder/xtrz/service/impl/XtrzServiceImpl.java
......@@ -68,7 +68,7 @@ public class XtrzServiceImpl implements IXtrzService {
@DS("db1")
public void addAjtqGnsyrz(XzxtUser user,
String czxxLbdm,
String yymcJyqk, String czxxParam) {
String yymcJyqk, String czxxParam,String ywbh) {
//拼接日志流水号
//公安机关机构代码（前6位）
String qlw = user.getUnitcode().substring(0, 6);
......@@ -88,7 +88,7 @@ public class XtrzServiceImpl implements IXtrzService {
sysGnsyrz.setYhXm(user.getRealname());
sysGnsyrz.setYymcdm("");
sysGnsyrz.setYwbhlxdm("");
sysGnsyrz.setYwbh("");
sysGnsyrz.setYwbh(ywbh);
sysGnsyrz.setCxnrlbdm("");
sysGnsyrz.setCxnrbh("");
sysGnsyrz.setCxxxjg("");
......
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