Skip to content

X
xzxt-app-report
Commit 2247e7e7 by wang_jiaxing
Options

增加历史版本查询和版本升级，原接口全部加入日志记录

parent efaf115b
Showing with 322 additions and 81 deletions
src/main/java/org/springblade/founder/ajda/controller/AjdaController.java
......@@ -4,6 +4,7 @@ import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
import org.springblade.founder.ajda.model.*;
import org.springblade.founder.ajda.service.IAjdaService;
import org.springblade.founder.log.LogOper;
import org.springblade.founder.redis.service.IDicItemService;
import org.springblade.founder.utils.R;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -38,6 +39,7 @@ public class AjdaController {
*/
@RequestMapping("/queryAjdaxxs")
@ResponseBody
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询案件档案")
public R queryAjdaxx(String asjbh) {
try {
HashMap<String, Object> resultMap = new HashMap<>();
......
src/main/java/org/springblade/founder/asj/controller/KyxsController.java
......@@ -2,6 +2,7 @@ package org.springblade.founder.asj.controller;
import org.springblade.founder.asj.entity.AsjQueryParam;
import org.springblade.founder.asj.service.KyxsService;
import org.springblade.founder.log.LogOper;
import org.springblade.founder.utils.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -24,6 +25,7 @@ public class KyxsController {
private KyxsService kyxsService;
@PostMapping("/saveNewKyxs")
@LogOper(czxxLbdm = "02", yymcJyqk = "0701", czxxJyqk = "新增可疑线索")
public R saveNewKyxs(String asjbh, String type,
@RequestParam(required = false) String kyhm, String kyyj,
@RequestParam(required = false) MultipartFile file,
......@@ -42,6 +44,7 @@ public class KyxsController {
}
@PostMapping("/getKyxsByAsjbh")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询可疑线索")
public R getKyxsByAsjbh(String asjbh) {
try {
Map<String, Object> resultMap = kyxsService.getKyxsByAsjbh(asjbh);
......@@ -86,6 +89,7 @@ public class KyxsController {
}
@RequestMapping("/getFile/{xxzjbh}")
@LogOper(czxxLbdm = "07", yymcJyqk = "0701", czxxJyqk = "可疑线索附件下载")
public R getFile(@PathVariable String xxzjbh) {
try {
HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
......
src/main/java/org/springblade/founder/asj/controller/TbStAsjController.java
......@@ -3,6 +3,7 @@ package org.springblade.founder.asj.controller;
import org.springblade.founder.asj.VO.AsjVO;
import org.springblade.founder.asj.entity.TbStAsjQgccj;
import org.springblade.founder.asj.service.TbStAsjService;
import org.springblade.founder.log.LogOper;
import org.springblade.founder.utils.R;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
......@@ -35,6 +36,7 @@ public class TbStAsjController {
* @return 单条数据
*/
@PostMapping("queryByXxzjbh")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询案件详情")
public R queryById(String asjbh) {
try{
TbStAsjQgccj tbStAsjQgccj= tbStAsjService.queryById(asjbh);
......
src/main/java/org/springblade/founder/bbgx/controller/AppBbgxController.java 0 → 100644
package org.springblade.founder.bbgx.controller;
import org.springblade.founder.bbgx.service.AppBbgxService;
import org.springblade.founder.utils.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
@RestController
@RequestMapping("/bbgx")
public class AppBbgxController {
@Autowired
private AppBbgxService appBbgxService;
@PostMapping("/getBbgxList")
public R getBbgxList(String version,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "5") Integer limit){
try {
Map<String, Object> resultMap = appBbgxService.getBbgxList(version, page, limit);
return R.ok().data(resultMap);
} catch (Exception e){
e.printStackTrace();
return R.error(e.getMessage());
}
}
@PostMapping("/fileUpload")
public R fileUpload(String version, String gxbz, MultipartFile file){
try {
String result = appBbgxService.fileUpload(version, gxbz, file);
if (result == null){
return R.error("该版本已经存在");
}
return R.ok().data("version", result);
} catch (Exception e){
e.printStackTrace();
return R.error(e.getMessage());
}
}
@RequestMapping("/getXbbwj/{version}")
public R getXbbwj(@PathVariable String version){
try {
HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
appBbgxService.getXbbwj(version, response);
return R.ok();
} catch (Exception e){
e.printStackTrace();
return R.error(e.getMessage());
}
}
}
src/main/java/org/springblade/founder/bbgx/entity/AppBbgx.java 0 → 100644
package org.springblade.founder.bbgx.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName("TB_ST_APP_BFGX")
public class AppBbgx {
@TableId(type = IdType.INPUT)
private String appVersion;//版本号
private String appGxbz;//更新备注
private byte[] appGxwj;//更新文件
private Date rksj;//入库时间
private String xxscPdbz;//删除标志
}
src/main/java/org/springblade/founder/bbgx/mapper/AppBbgxMapper.java 0 → 100644
package org.springblade.founder.bbgx.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springblade.founder.bbgx.entity.AppBbgx;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface AppBbgxMapper extends BaseMapper<AppBbgx> {
}
src/main/java/org/springblade/founder/bbgx/mapper/AppBbgxMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.springblade.founder.bbgx.mapper.AppBbgxMapper">
</mapper>
src/main/java/org/springblade/founder/bbgx/service/AppBbgxService.java 0 → 100644
package org.springblade.founder.bbgx.service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
public interface AppBbgxService {
Map<String, Object> getBbgxList(String version, Integer page, Integer limit);
void getXbbwj(String version, HttpServletResponse response) throws IOException;
String fileUpload(String version, String gxbz, MultipartFile file) throws IOException;
}
src/main/java/org/springblade/founder/bbgx/service/impl/AppBbgxServiceImpl.java 0 → 100644
package org.springblade.founder.bbgx.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.io.IOUtils;
import org.springblade.founder.bbgx.entity.AppBbgx;
import org.springblade.founder.bbgx.mapper.AppBbgxMapper;
import org.springblade.founder.bbgx.service.AppBbgxService;
import org.springblade.founder.xcxx.entity.TbStAppXcxxFj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class AppBbgxServiceImpl extends ServiceImpl<AppBbgxMapper, AppBbgx> implements AppBbgxService {
@Autowired
private AppBbgxMapper appBbgxMapper;
@Override
public Map<String, Object> getBbgxList(String version, Integer page, Integer limit) {
HashMap<String, Object> resultMap = new HashMap<>();
LambdaQueryWrapper<AppBbgx> queryWrapper = Wrappers.lambdaQuery(AppBbgx.class);
queryWrapper.eq(AppBbgx::getXxscPdbz, "0");
queryWrapper.orderByDesc(AppBbgx::getRksj);
queryWrapper.select(AppBbgx::getAppVersion
, AppBbgx::getAppGxbz
, AppBbgx::getRksj
, AppBbgx::getXxscPdbz);
Page<AppBbgx> bbgxPage = super.page(new Page<>(page, limit), queryWrapper);
long total = bbgxPage.getTotal();
List<AppBbgx> rows = bbgxPage.getRecords();
resultMap.put("sfksj", "1");
if (rows != null && !rows.isEmpty()){
AppBbgx bbgx = rows.get(0);
if (version != null && version.equals(bbgx.getAppVersion())){
resultMap.put("sfksj", "0");
}
}
resultMap.put("total", total);
resultMap.put("rows", rows);
return resultMap;
}
@Override
public void getXbbwj(String version, HttpServletResponse response) throws IOException {
AppBbgx bbgx = appBbgxMapper.selectById(version);
InputStream inputStream = new ByteArrayInputStream(bbgx.getAppGxwj());
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("智慧警务app" + version + ".apk", "UTF-8"));
ServletOutputStream outputStream = response.getOutputStream();
IOUtils.copy(inputStream, outputStream);
try {
IOUtils.closeQuietly(inputStream);
IOUtils.closeQuietly(outputStream);
} catch (Exception ignored) {
}
}
@Override
public String fileUpload(String version, String gxbz, MultipartFile file) throws IOException {
byte[] bytes = file.getBytes();
AppBbgx bbgx = new AppBbgx();
bbgx.setAppVersion(version);
bbgx.setAppGxbz(gxbz);
bbgx.setAppGxwj(bytes);
int insert;
try {
insert = appBbgxMapper.insert(bbgx);
} catch (Exception e){
e.printStackTrace();
insert = 0;
}
if (insert == 0){
return null;
}
return version;
}
}
src/main/java/org/springblade/founder/dzbl/controller/TbStAppDzblController.java
......@@ -3,6 +3,7 @@ package org.springblade.founder.dzbl.controller;
import org.springblade.founder.dzbl.entity.TbStAppDzbl;
import org.springblade.founder.dzbl.entity.ZcyEntity;
import org.springblade.founder.dzbl.service.TbStAppDzblService;
import org.springblade.founder.log.LogOper;
import org.springblade.founder.utils.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -20,6 +21,7 @@ public class TbStAppDzblController {
private TbStAppDzblService tbStAppDzblService;
@PostMapping("/saveNewDzbl")
@LogOper(czxxLbdm = "02", yymcJyqk = "0701", czxxJyqk = "新增电子笔录")
public R saveNewDzbl(TbStAppDzbl dzbl) {
try {
String xxzjbh = tbStAppDzblService.saveNewDzbl(dzbl);
......@@ -31,6 +33,7 @@ public class TbStAppDzblController {
}
@PostMapping("/updateDzbl")
@LogOper(czxxLbdm = "03", yymcJyqk = "0701", czxxJyqk = "修改电子笔录")
public R updateDzbl(TbStAppDzbl dzbl) {
try {
String xxzjbh = tbStAppDzblService.updateDzbl(dzbl);
......@@ -53,6 +56,7 @@ public class TbStAppDzblController {
}
@PostMapping("/getDzblByXxzjbh")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询电子笔录")
public R getDzblByXxzjbh(String xxzjbh) {
try {
TbStAppDzbl dzbl = tbStAppDzblService.getDzblByXxzjbh(xxzjbh);
......@@ -64,6 +68,7 @@ public class TbStAppDzblController {
}
@PostMapping("/deleteDzbl")
@LogOper(czxxLbdm = "04", yymcJyqk = "0701", czxxJyqk = "删除电子笔录")
public R deleteDzbl(String xxzjbh) {
try {
tbStAppDzblService.deleteDzbl(xxzjbh);
......
src/main/java/org/springblade/founder/log/EventLogAspect.java
package org.springblade.founder.log;
import com.alibaba.druid.sql.visitor.functions.Char;
import com.baomidou.dynamic.datasource.annotation.DS;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.aspectj.lang.JoinPoint;
......@@ -11,7 +12,6 @@ import org.aspectj.lang.reflect.MethodSignature;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.log.dao.LogDao;
import org.springblade.founder.log.entity.SysGnsyrz;
import org.springblade.founder.log.entity.SysOperationLog;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -20,9 +20,9 @@ import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
......@@ -33,6 +33,7 @@ import java.util.UUID;
@Aspect
@Component
@Slf4j
@DS("db1")
public class EventLogAspect {
@Value("${gnsyrzFlag}")
......@@ -68,7 +69,7 @@ public class EventLogAspect {
private void addServiceLog(LogOper oper, JoinPoint joinPoint) throws Exception {
String projectName = "扫黑除恶";
String yymcJyqk = oper.yymcJyqk();
//CZLXDM 01 查询类，02 新增信息类，03 修改信息类，04删除信息类
String czxxLbdm = oper.czxxLbdm();
......@@ -99,9 +100,6 @@ public class EventLogAspect {
if (map != null && map.size() > 0) {
objParam.append(",").append(map.get("objParam"));
}
if (StringUtils.isNotBlank(map.get("czxxJyqk"))) {
czxxJyqk = map.get("czxxJyqk");
}
}
}
}
......@@ -124,21 +122,56 @@ public class EventLogAspect {
czxxParam = czxxParam.substring(1);
}
}
// HttpServletRequest request = ((ServletRequestAttributes)
// RequestContextHolder.getRequestAttributes()).getRequest();
// HttpSession session = request.getSession();
String ip = getIp();
// String ip = (String) request.getSession().getAttribute("userIp");
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
if (xzxtUser != null) {
insertSysLog(xzxtUser, ip, czxxLbdm,
yymcJyqk, czxxJyqk,czxxParam);
}
}
public String getIp() throws Exception {
HttpServletRequest request = ((ServletRequestAttributes)
RequestContextHolder.getRequestAttributes()).getRequest();
HttpSession session = request.getSession();
String ip = (String) request.getSession().getAttribute("userIp");
XzxtUser user = SecureUtil.getUserXzxt();
if (user != null) {
insertSysLog(user, ip, czxxLbdm,
yymcJyqk, czxxParam);
String ip = request.getHeader("X-Forwarded-For");
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("X-Real-IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
//有些网络通过多层代理，那么获取到的ip就会有多个，一般都是通过逗号（,）分割开来，并且第一个ip为客户端的真实IP
if (ip != null && ip.length() != 0) {
ip = ip.split(",")[0];
}
if ("127.0.0.1".equals(ip) || ip == "127.0.0.1" || "0:0:0:0:0:0:0:1".equals(ip)
|| ip == "0:0:0:0:0:0:0:1") {
ip = InetAddress.getLocalHost().getHostAddress();
}
return ip;
}
private void insertSysLog(XzxtUser user, String ip,
String czxxLbdm,
String yymcJyqk, String czxxParam) {
String yymcJyqk,String czxxJyqk, String czxxParam) {
//拼接日志流水号
//公安机关机构代码（前6位）
String qlw = user.getUnitcode().substring(0, 6);
......@@ -154,7 +187,7 @@ public class EventLogAspect {
sysGnsyrz.setYymcJyqk(yymcJyqk);
sysGnsyrz.setYhGmsfhm(user.getIdentitycard());
// 1.6新增字段
sysGnsyrz.setYhXm(user.getRealname());
sysGnsyrz.setYhXm(user.getUserName());
sysGnsyrz.setYymcdm("");
sysGnsyrz.setYwbhlxdm("");
sysGnsyrz.setYwbh("");
......@@ -166,62 +199,28 @@ public class EventLogAspect {
sysGnsyrz.setYhdwGajgjgdm(user.getUnitcode());
sysGnsyrz.setYhdwGajgmc(user.getUnitname());
sysGnsyrz.setCzlxdm(czxxLbdm);
sysGnsyrz.setCzxxJyqk(czxxParam);
sysGnsyrz.setCzxxJyqk(czxxJyqk);
sysGnsyrz.setCzxxParam(czxxParam);
sysGnsyrz.setXxscPdbz("0");
sysGnsyrz.setXxdjdwGajgjgdm(user.getUnitcode());
sysGnsyrz.setXxdjdwGajgmc(user.getUnitname());
sysGnsyrz.setXxdjryXm(user.getRealname());
sysGnsyrz.setXxdjryXm(user.getUserName());
sysGnsyrz.setXxdjryGmsfhm(user.getIdentitycard());
sysGnsyrz.setXxdjryLxdh(user.getPhone());
sysGnsyrz.setXxczdwGajgjgdm(user.getUnitcode());
sysGnsyrz.setXxczdwGajgmc(user.getUnitname());
sysGnsyrz.setXxczryXm(user.getRealname());
sysGnsyrz.setXxczryXm(user.getUserName());
sysGnsyrz.setXxczryGmsfhm(user.getIdentitycard());
sysGnsyrz.setXxlyms("系统功能日志");
sysGnsyrz.setXtlx("SHCE");
try {
logDao.addGnsyrz(sysGnsyrz);
} catch (Exception e) {
log.error("记录功能日志发生异常" + e.getMessage());
log.error("记录录入功能日志发生异常" + e.getMessage());
}
}
private void insertSysLog(XzxtUser user,String projectName,
String moduleName,String ip,String czxxLbdm,
String czxxJyqk,String czxxParam,
MethodSignature methodSignature){
//拼接日志流水号
//公安机关机构代码（前6位）
String qlw = user.getUnitcode().substring(0, 6);
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
//8位年月日
String sjdate = formatter.format(new Date());
String lsh = getOrderIdByUuid();
String yrzlsh = qlw + sjdate + lsh;
String rzlsh = yrzlsh.replace(" ", "");
SysOperationLog sysOperationLog = new SysOperationLog();
sysOperationLog.setRzlsh(rzlsh);
sysOperationLog.setYhPolicemanid(user.getAccount());
sysOperationLog.setYhName(user.getRealname());
sysOperationLog.setProjectName(projectName);
sysOperationLog.setModuleName(moduleName);
sysOperationLog.setYhGmsfhm(user.getIdentitycard());
sysOperationLog.setYhIp(ip);
sysOperationLog.setYhdwGajgjgdm(user.getUnitcode());
sysOperationLog.setYhdwGajgmc(user.getUnitname());
sysOperationLog.setCzxxLxdm(czxxLbdm);
sysOperationLog.setCzxxJyqk(czxxJyqk);
sysOperationLog.setCzxxParam(czxxParam);
sysOperationLog.setCzxxUrl(methodSignature.getMethod().getName());
try {
logDao.insertSysLog(sysOperationLog);
} catch (Exception e) {
log.error("记录功能日志发生异常" + e.getMessage());
}
}
private Map<String, String> getObjParam(Object data) {
......
src/main/java/org/springblade/founder/log/entity/SysGnsyrz.java
package org.springblade.founder.log.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springblade.founder.entity.BaseModel;
......@@ -14,74 +15,71 @@ import org.springblade.founder.entity.BaseModel;
@Setter
public class SysGnsyrz extends BaseModel {
//日志流水号
@ApiModelProperty(value = "日志流水号")
private String rzlsh;
//访问时间
@ApiModelProperty(value = "访问时间")
private String fwsj;
private String fwsjkssj;
private String fwsjjssj;
//应用名称
@ApiModelProperty(value = "应用名称")
private String yymcJyqk;
//用户_公民身份号码
@ApiModelProperty(value = "用户_公民身份号码")
private String yhGmsfhm;
//用户IP
@ApiModelProperty(value = "用户IP")
private String yhIp;
//用户单位公安机关机构代码
@ApiModelProperty(value = "用户单位公安机关机构代码")
private String yhdwGajgjgdm;
//用户单位名称
@ApiModelProperty(value = "用户单位名称")
private String yhdwGajgmc;
//操作类型代码
@ApiModelProperty(value = "操作类型代码")
private String czlxdm;
//操作信息
@ApiModelProperty(value = "操作信息")
private String czxxJyqk;
//信息来源描述
private String xxlyms;
private String czxxParam;
//应用名称代码
@ApiModelProperty(value = "应用名称代码")
private String yymcdm;
//业务编号类型代码
@ApiModelProperty(value = "业务编号类型代码")
private String ywbhlxdm;
//业务编号
@ApiModelProperty(value = "业务编号")
private String ywbh;
//用户_姓名
@ApiModelProperty(value = "用户_姓名")
private String yhXm;
//查询内容类别代码
@ApiModelProperty(value = "查询内容类别代码")
private String cxnrlbdm;
//查询内容编号
@ApiModelProperty(value = "查询内容编号")
private String cxnrbh;
//操作(查询）信息结果
@ApiModelProperty(value = "操作(查询）信息结果")
private String cxxxjg;
//系统类型
private String xtlx;
// 操作开始时间
private String kssj;
// 操作结束时间
private String jssj;
//用户姓名
private String userName;
// unitcode用户单位
private String unitcode;
// 操作类型czlx
private String czlx;
// czmk 操作模块
private String czmk;
......
src/main/java/org/springblade/founder/ryythcj/controller/TbStAppRyxxController.java
package org.springblade.founder.ryythcj.controller;
import org.springblade.founder.log.LogOper;
import org.springblade.founder.ryythcj.entity.TbStAppRyxx;
import org.springblade.founder.ryythcj.entity.TbStAppRyzpfj;
import org.springblade.founder.ryythcj.service.TbStAppRyxxService;
......@@ -19,6 +20,7 @@ public class TbStAppRyxxController {
private TbStAppRyxxService tbStAppRyxxService;
@PostMapping("/saveNewRyxx")
@LogOper(czxxLbdm = "02", yymcJyqk = "0701", czxxJyqk = "新增人员信息")
public R saveNewRyxx(TbStAppRyxx ryxx){
try {
String xxzjbh = tbStAppRyxxService.saveNewRyxx(ryxx);
......@@ -58,6 +60,7 @@ public class TbStAppRyxxController {
}
@PostMapping("/getRyxxByXxzjbh")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询人员信息")
public R getYrxxByXxzjbh(String xxzjbh){
try {
TbStAppRyxx ryxx = tbStAppRyxxService.getYrxxByXxzjbh(xxzjbh);
......@@ -80,6 +83,7 @@ public class TbStAppRyxxController {
}
@PostMapping("/updateRyxxByXxzjbh")
@LogOper(czxxLbdm = "03", yymcJyqk = "0701", czxxJyqk = "修改人员信息")
public R updateYrxxByXxzjbh(TbStAppRyxx ryxx){
try {
String xxzjbh = tbStAppRyxxService.updateYrxxByXxzjbh(ryxx);
......@@ -102,6 +106,7 @@ public class TbStAppRyxxController {
}
@PostMapping("/deleteRyxx")
@LogOper(czxxLbdm = "04", yymcJyqk = "0701", czxxJyqk = "删除人员信息")
public R deleteRyxx(String xxzjbh){
try {
tbStAppRyxxService.deleteRyxx(xxzjbh);
......@@ -113,6 +118,7 @@ public class TbStAppRyxxController {
}
@PostMapping("/tqQgryxx")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "提取人员信息")
public R tqQgryxx(String sfzh){
try {
TbStAppRyxx ryxx = tbStAppRyxxService.tqQgryxx(sfzh);
......
src/main/java/org/springblade/founder/xcxt/controller/TbStAppXsController.java
package org.springblade.founder.xcxt.controller;
import org.springblade.founder.log.LogOper;
import org.springblade.founder.utils.R;
import org.springblade.founder.xcxt.entity.TbStAppXs;
import org.springblade.founder.xcxt.entity.TbStAppXsFj;
......@@ -19,6 +20,7 @@ public class TbStAppXsController {
private TbStAppXsService tbStAppXsService;
@PostMapping("/saveNewXs")
@LogOper(czxxLbdm = "02", yymcJyqk = "0701", czxxJyqk = "新增线索协同线索")
public R saveNewXs(TbStAppXs xs){
try {
String xxzjbh = tbStAppXsService.saveNewXs(xs);
......@@ -41,6 +43,7 @@ public class TbStAppXsController {
}
@PostMapping("/updateXs")
@LogOper(czxxLbdm = "03", yymcJyqk = "0701", czxxJyqk = "修改线索协同线索")
public R updateXs(TbStAppXs xs){
try {
String xxzjbh = tbStAppXsService.updateXs(xs);
......@@ -52,6 +55,7 @@ public class TbStAppXsController {
}
@PostMapping("/deleteXs")
@LogOper(czxxLbdm = "04", yymcJyqk = "0701", czxxJyqk = "删除线索协同线索")
public R deleteXs(String xxzjbh){
try {
tbStAppXsService.deleteXs(xxzjbh);
......@@ -85,6 +89,7 @@ public class TbStAppXsController {
}
@PostMapping("/selectXsByXxzjbh")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询线索协同线索")
public R selectXsByXxzjbh(String xxzjbh){
try {
TbStAppXs xs = tbStAppXsService.selectXsByXxzjbh(xxzjbh);
......@@ -96,6 +101,7 @@ public class TbStAppXsController {
}
@PostMapping("/reportToXs")
@LogOper(czxxLbdm = "03", yymcJyqk = "0701", czxxJyqk = "上报线索协同线索")
public R reportToXs(String xxzjbh){
try {
tbStAppXsService.reportToXs(xxzjbh);
......
src/main/java/org/springblade/founder/xcxx/controller/TbStAppWzxxController.java
package org.springblade.founder.xcxx.controller;
import org.springblade.founder.log.LogOper;
import org.springblade.founder.utils.R;
import org.springblade.founder.xcxx.entity.TbStAppWzxx;
import org.springblade.founder.xcxx.service.TbStAppWzxxService;
......@@ -18,6 +19,7 @@ public class TbStAppWzxxController {
private TbStAppWzxxService tbStAppWzxxService;
@PostMapping("/saveNewWzxx")
@LogOper(czxxLbdm = "02", yymcJyqk = "0701", czxxJyqk = "新增位置信息")
public R saveNewWzxx(TbStAppWzxx wzxx){
try {
String xxzjbh = tbStAppWzxxService.saveNewWzxx(wzxx);
......@@ -32,6 +34,7 @@ public class TbStAppWzxxController {
}
@PostMapping("/updateWzxx")
@LogOper(czxxLbdm = "03", yymcJyqk = "0701", czxxJyqk = "更新位置信息")
public R updateWzxx(TbStAppWzxx wzxx){
try {
String xxzjbh = tbStAppWzxxService.updateWzxx(wzxx);
......@@ -43,6 +46,7 @@ public class TbStAppWzxxController {
}
@PostMapping("/deleteWzxx")
@LogOper(czxxLbdm = "04", yymcJyqk = "0701", czxxJyqk = "修改位置信息")
public R deleteWzxx(String xxzjbh){
try {
tbStAppWzxxService.deleteWzxx(xxzjbh);
......@@ -54,6 +58,7 @@ public class TbStAppWzxxController {
}
@PostMapping("/selectList")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询位置信息")
public R selectList(TbStAppWzxx wzxx){
try {
Map<String, Object> resultMap = tbStAppWzxxService.selectList(wzxx);
......
src/main/java/org/springblade/founder/xcxx/controller/XcxxController.java
......@@ -25,7 +25,7 @@ public class XcxxController {
private XcxxService xcxxService;
@PostMapping("/saveXcxx")
@LogOper(czxxLbdm = "02", yymcJyqk = "新增app现场信息")
@LogOper(czxxLbdm = "02", yymcJyqk = "0701", czxxJyqk = "新增app现场信息")
public R saveXcxx(TbStAppXcxx tbStAppXcxx){
try {
String xcbh = xcxxService.saveXcxx(tbStAppXcxx);
......@@ -51,7 +51,7 @@ public class XcxxController {
}
@PostMapping("/getXcxxListByParam")
@LogOper(czxxLbdm = "01", yymcJyqk = "查询app现场信息列表")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询app现场信息列表")
public R getXcxxListByParam(TbStAppXcxx tbStAppXcxx){
try {
Map<String, Object> resultMap = xcxxService.getXcxxListByParam(tbStAppXcxx);
......@@ -63,7 +63,7 @@ public class XcxxController {
}
@PostMapping("/getXcxxListByGlxx")
@LogOper(czxxLbdm = "01", yymcJyqk = "查询关联下的现场信息")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询关联下的现场信息")
public R getXcxxListByGlxx(String glxxXxzjbh, String glxxlx){
try {
Map<String, Object> resultMap = xcxxService.getXcxxListByAsjbh(glxxXxzjbh, glxxlx);
......@@ -75,7 +75,7 @@ public class XcxxController {
}
@PostMapping("/getXcxxByXcbh")
@LogOper(czxxLbdm = "01", yymcJyqk = "查询app现场信息详情")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询app现场信息详情")
public R getXcxxByXcbh(String xcbh){
try {
TbStAppXcxx tbStAppXcxx = xcxxService.getXcxxByXcbh(xcbh);
......@@ -87,7 +87,7 @@ public class XcxxController {
}
@PostMapping("/updateXcxx")
@LogOper(czxxLbdm = "03", yymcJyqk = "修改app现场信息")
@LogOper(czxxLbdm = "03", yymcJyqk = "0701", czxxJyqk = "修改app现场信息")
public R updateXcxx(TbStAppXcxx tbStAppXcxx){
try {
xcxxService.updateXcxx(tbStAppXcxx);
......@@ -99,7 +99,7 @@ public class XcxxController {
}
@PostMapping("/deleteXcxx")
@LogOper(czxxLbdm = "04", yymcJyqk = "删除app现场信息")
@LogOper(czxxLbdm = "04", yymcJyqk = "0701", czxxJyqk = "删除app现场信息")
public R deleteXcxx(String xcbh){
try {
xcxxService.deleteXcxx(xcbh);
......@@ -122,6 +122,7 @@ public class XcxxController {
}
@RequestMapping("/getFile/{xxzjbh}")
@LogOper(czxxLbdm = "07", yymcJyqk = "0701", czxxJyqk = "app现场信息附件下载")
public R getFile(@PathVariable String xxzjbh){
try {
HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
......
src/main/java/org/springblade/founder/ydjwhc/controller/BjHcController.java
......@@ -2,6 +2,7 @@ package org.springblade.founder.ydjwhc.controller;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.springblade.founder.log.LogOper;
import org.springblade.founder.utils.R;
import org.springblade.founder.ydjwhc.entity.TbStAppRxhcrw;
import org.springblade.founder.ydjwhc.service.BjHcService;
......@@ -25,6 +26,7 @@ public class BjHcController {
private TbStAppRxhcrwService tbStAppRxhcrwService;
@PostMapping("/rybjhcBySfzh")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "人员背景核查")
public R rybjhcBySfzh(String sfzh){
try {
if (StringUtils.isEmpty(sfzh)){
......@@ -42,6 +44,7 @@ public class BjHcController {
}
@PostMapping("/clsahcByCphm")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "车辆背景核查")
public R clsahcByCphm(String cphm){
try {
if (StringUtils.isEmpty(cphm)){
......@@ -59,6 +62,7 @@ public class BjHcController {
}
@PostMapping("/znjsByHm")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "智能检索")
public R znjsByHm(String hm){
try {
if (StringUtils.isEmpty(hm)){
......@@ -76,6 +80,7 @@ public class BjHcController {
}
@PostMapping("/saveRxbdTask")
@LogOper(czxxLbdm = "02", yymcJyqk = "0701", czxxJyqk = "人像比对")
public R saveRxbdTask(TbStAppRxhcrw rxhcrw){
try {
if (StringUtils.isEmpty(rxhcrw.getTaskId())){
......@@ -93,6 +98,7 @@ public class BjHcController {
}
@PostMapping("/getRxhcList")
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "查询人像比对任务")
public R getRxhcList(TbStAppRxhcrw rxhcrw){
try {
Map<String, Object> resultMap = tbStAppRxhcrwService.getRxhcList(rxhcrw);
......@@ -104,6 +110,7 @@ public class BjHcController {
}
@PostMapping("/deleteRxhcrw/{taskId}")
@LogOper(czxxLbdm = "04", yymcJyqk = "0701", czxxJyqk = "删除人像比对任务")
public R deleteRxhcrw(@PathVariable String taskId){
try {
tbStAppRxhcrwService.deleteRxhcrw(taskId);
......
src/main/java/org/springblade/founder/ydjwhc/controller/ZbxxjsController.java
package org.springblade.founder.ydjwhc.controller;
import org.springblade.founder.log.LogOper;
import org.springblade.founder.utils.R;
import org.springblade.founder.ydjwhc.entity.HcAjJg;
import org.springblade.founder.ydjwhc.entity.Xzgzry;
......@@ -19,6 +20,7 @@ public class ZbxxjsController {
private ZbxxjsService zbxxjsService;
@RequestMapping("/zbajjs")//周边案件检索
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "周边案件检索")
public R getZbAjxxByJwd(ZbxxjsQueryParam queryParam) {
try {
if (queryParam.isEmpty()){
......@@ -33,6 +35,7 @@ public class ZbxxjsController {
}
@RequestMapping("/zbryjs")//周边刑侦关注人员检索
@LogOper(czxxLbdm = "01", yymcJyqk = "0701", czxxJyqk = "周边刑侦关注人员检索")
public R getZbRyxxByJwd(ZbxxjsQueryParam queryParam) {
try {
if (queryParam.isEmpty()){
......
src/main/java/org/springblade/modules/auth/controller/AuthController.java
......@@ -32,6 +32,7 @@ import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.RedisUtil;
import org.springblade.core.tool.utils.WebUtil;
import org.springblade.founder.log.LogOper;
import org.springblade.modules.auth.granter.ITokenGranter;
import org.springblade.modules.auth.granter.TokenGranterBuilder;
import org.springblade.modules.auth.granter.TokenParameter;
......@@ -69,6 +70,7 @@ public class AuthController {
@PostMapping("token")
@ApiOperation(value = "获取认证token", notes = "传入租户ID:tenantId,账号:account,密码:password")
@LogOper(czxxLbdm = "05", yymcJyqk = "0701", czxxJyqk = "登陆")
public R<AuthInfo> token(@ApiParam(value = "授权类型", required = true) @RequestParam(defaultValue = "password", required = false) String grantType,
@ApiParam(value = "刷新令牌") @RequestParam(required = false) String refreshToken,
@ApiParam(value = "租户ID", required = true) @RequestParam(defaultValue = "000000", required = false) String tenantId,
......
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