Skip to content

X
xzxt-app-report
Commit 6cec85df by libin
Options

案件信息提取和法律文书新增、删除添加操作日志记录。操作日志记录表添加字段。

parent 6c5946e8
Showing with 104 additions and 7 deletions
src/main/java/org/springblade/Application.java
......@@ -18,6 +18,7 @@ package org.springblade;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.core.launch.BladeApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
......@@ -27,6 +28,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
*/
@EnableScheduling
@SpringBootApplication
@EnableAsync
public class Application {
public static void main(String[] args) {
......
src/main/java/org/springblade/founder/asj/controller/StAsjXxtqController.java
......@@ -15,7 +15,6 @@
*/
package org.springblade.founder.asj.controller;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
......@@ -23,14 +22,13 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.asj.entity.StAsj;
import org.springblade.founder.asj.service.IStAsjService;
import org.springblade.founder.asj.service.StAsjXxtqService;
import org.springblade.founder.ba.entity.XwBa;
import org.springblade.founder.ba.service.ITbXwBaService;
import org.springblade.founder.glasjry.service.ITbGlAsjRyService;
import org.springblade.founder.log.entity.SysRecordLog;
import org.springblade.founder.log.service.LogRecordService;
import org.springblade.founder.rybh.entity.XwRybh;
import org.springblade.founder.rybh.service.IXwRybhService;
import org.springblade.founder.utils.R;
......@@ -69,6 +67,8 @@ public class StAsjXxtqController extends BladeController {
@Autowired
private StAsjXxtqService xxtqService;
@Autowired
private LogRecordService logRecordService;
@GetMapping("/queryAsjByAsjbh")
@ApiOperationSupport(order = 1)
......@@ -90,6 +90,15 @@ public class StAsjXxtqController extends BladeController {
String ssdw = unitCode.substring(0,2);
if(ssdw.startsWith("01")||asjbh.substring(1,3).equals(ssdw)){
R result = querySsdwAsjxxByAsjbh(asjbh,"StAsj");
if(result.getSuccess()){
SysRecordLog sysRecordLog = new SysRecordLog();
sysRecordLog.setGnmc("案事件信息提取");
sysRecordLog.setKeyvalue(asjbh);
sysRecordLog.setColunmname("asjbh");
sysRecordLog.setTablename("TB_ST_ASJ");
sysRecordLog.setUpdaterecords("{\"asjbh\":[null,\""+asjbh+"\"]}");
logRecordService.saveLog(sysRecordLog,xzxtUser);
}
return result;
}else{//用户不是本省系统不能提取
System.out.println(xzxtUser.getUnitcode()+":"+xzxtUser.getIdentitycard());
......
src/main/java/org/springblade/founder/flwsfj/controller/TbStAsjFlwsController.java
......@@ -15,6 +15,7 @@
*/
package org.springblade.founder.flwsfj.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -36,6 +37,8 @@ import org.springblade.founder.flwsfj.service.IOssService;
import org.springblade.founder.flwsfj.vo.TbStAsjFlwsVO;
import org.springblade.founder.la.entity.XwLa;
import org.springblade.founder.la.service.IXwLaService;
import org.springblade.founder.log.entity.SysRecordLog;
import org.springblade.founder.log.service.LogRecordService;
import org.springblade.founder.ocr.OcrFounder;
import org.springblade.founder.utils.OcrFounderByte;
import org.springblade.founder.utils.*;
......@@ -48,12 +51,10 @@ import org.springblade.founder.flwsfj.entity.TbStAsjFlws;
import org.springblade.founder.flwsfj.service.ITbStAsjFlwsService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springframework.web.multipart.MultipartFile;
import sun.misc.BASE64Encoder;
import java.io.*;
import java.time.LocalDateTime;
import java.util.Base64;
import java.util.List;
import java.util.*;
/**
* 控制器
......@@ -78,6 +79,8 @@ public class TbStAsjFlwsController extends BladeController {
private SysXxzjbhService xxzjbhService;
@Autowired
private IOssService ossService;
@Autowired
private LogRecordService logRecordService;
/**
......@@ -120,12 +123,50 @@ public class TbStAsjFlwsController extends BladeController {
}
}
if(tbStAsjFlwsService.save(tbStAsjFlws)){
SysRecordLog sysRecordLog = new SysRecordLog();
sysRecordLog.setGnmc("法律文书新增");
sysRecordLog.setKeyvalue(tbStAsjFlws.getXxzjbh());
sysRecordLog.setColunmname("xxzjbh");
sysRecordLog.setTablename("TB_ST_ASJ_FLWS");
sysRecordLog.setUpdaterecords(createUpdateRecord(tbStAsjFlws));
logRecordService.saveLog(sysRecordLog,xzxtUser);
return R.ok().data("xxzjbh",tbStAsjFlws.getXxzjbh());
}else{
return R.error();
}
}
private String createUpdateRecord(TbStAsjFlws entity) {
Map<String,Object> map = new HashMap<>();
List list = new ArrayList();
list.add(null);
list.add(entity.getXxzjbh());
map.put("xxzjbh",list.toArray());
list.clear();
list.add(null);
list.add(entity.getAsjbh());
map.put("asjbh",list.toArray());
list.clear();
list.add(null);
list.add(entity.getFlwsAsjflwsdm());
map.put("flwsAsjflwsdm",list.toArray());
list.clear();
list.add(null);
list.add(entity.getFlwsAsjzcxwlbdm());
map.put("flwsAsjzcxwlbdm",list.toArray());
list.clear();
list.add(null);
list.add(entity.getFlwsBt());
map.put("flwsBt",list.toArray());
list.clear();
list.add(null);
list.add(entity.getFlwsDzwjbt());
map.put("flwsDzwjbt",list.toArray());
list.clear();
return JSON.toJSONString(map);
}
/**
* 修改
*/
......@@ -180,6 +221,14 @@ public class TbStAsjFlwsController extends BladeController {
entity.setGxsj(LocalDateTime.now());
boolean r = tbStAsjFlwsService.update(entity,wrapper);
if(r){
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
SysRecordLog sysRecordLog = new SysRecordLog();
sysRecordLog.setGnmc("法律文书删除");
sysRecordLog.setKeyvalue(xxzjbh);
sysRecordLog.setColunmname("xxzjbh");
sysRecordLog.setTablename("TB_ST_ASJ_FLWS");
sysRecordLog.setUpdaterecords("{\"xxscPdbz\":[0,1]}");
logRecordService.saveLog(sysRecordLog,xzxtUser);
return R.ok();
}else{
return R.error().message("删除法律文书失败！");
......
src/main/java/org/springblade/founder/log/Controller/LogController.java
......@@ -44,6 +44,9 @@ public class LogController {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
sysRecordLog.setXxczrq(new Date());
sysRecordLog.setXxczryxm(xzxtUser.getRealname());
sysRecordLog.setXxczrdwmc(xzxtUser.getUnitname());
sysRecordLog.setXxczrdwdm(xzxtUser.getUnitcode());
sysRecordLog.setXxczrjh(xzxtUser.getAccount());
//System.out.println(sysRecordLog);
if(StringUtils.isEmpty(sysRecordLog.getUpdaterecords())){
return R.fail("没有字段更新日志需要记录。");
......@@ -79,6 +82,9 @@ public class LogController {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
sysRecordLog.setXxczrq(new Date());
sysRecordLog.setXxczryxm(xzxtUser.getRealname());
sysRecordLog.setXxczrdwmc(xzxtUser.getUnitname());
sysRecordLog.setXxczrdwdm(xzxtUser.getUnitcode());
sysRecordLog.setXxczrjh(xzxtUser.getAccount());
//System.out.println(sysRecordLog);
if(StringUtils.isEmpty(sysRecordLog.getUpdaterecords())){
return R.fail("没有字段更新日志需要记录。");
......
src/main/java/org/springblade/founder/log/entity/SysRecordLog.java
......@@ -33,4 +33,10 @@ public class SysRecordLog extends BaseEntity {
private Date xxczrq;
@ApiModelProperty("功能名称")
private String gnmc;
@ApiModelProperty("信息操作人单位名称")
private String xxczrdwmc;
@ApiModelProperty("信息操作人单位代码")
private String xxczrdwdm;
@ApiModelProperty("信息操作人警号")
private String xxczrjh;
}
src/main/java/org/springblade/founder/log/service/LogRecordService.java
......@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.founder.log.entity.SysRecordLog;
import org.springblade.modules.system.entity.XzxtUser;
public interface LogRecordService extends BaseService<SysRecordLog> {
boolean JaSave(SysRecordLog sysRecordLog);
IPage JaPage(IPage pages, QueryWrapper queryWrapper);
Boolean saveLog(SysRecordLog sysRecordLog,XzxtUser xzxtUser);
}
src/main/java/org/springblade/founder/log/service/impl/LogRecordServiceImpl.java
......@@ -7,7 +7,13 @@ import org.springblade.founder.base.BaseServiceImpl;
import org.springblade.founder.log.mapper.LogMapper;
import org.springblade.founder.log.entity.SysRecordLog;
import org.springblade.founder.log.service.LogRecordService;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.UUID;
@Service
public class LogRecordServiceImpl extends BaseServiceImpl<LogMapper, SysRecordLog> implements LogRecordService {
......@@ -23,4 +29,20 @@ public class LogRecordServiceImpl extends BaseServiceImpl<LogMapper, SysRecordLo
public IPage JaPage(IPage pages, QueryWrapper queryWrapper) {
return this.page(pages,queryWrapper);
}
@Override
@Async
public Boolean saveLog(SysRecordLog sysRecordLog,XzxtUser xzxtUser) {
if(StringUtils.isEmpty(sysRecordLog.getXxzjbh())){
String xxzjbh = UUID.randomUUID().toString().replaceAll("-","");
sysRecordLog.setXxzjbh(xxzjbh);
}
sysRecordLog.setXxczrq(new Date());
sysRecordLog.setXxczryxm(xzxtUser.getRealname());
sysRecordLog.setXxczrdwmc(xzxtUser.getUnitname());
sysRecordLog.setXxczrdwdm(xzxtUser.getUnitcode());
sysRecordLog.setXxczrjh(xzxtUser.getAccount());
Boolean r = this.save(sysRecordLog);
return r;
}
}
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