From 827ac521835b2c581e1134bb2e865bfcb7778be7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:51:57 +0800
Subject: [PATCH] screen-manage 修改日志插入工具类 规范日志插入格式
---
screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java | 18 -
screen-manage/src/main/java/com/moral/api/pojo/dto/system/ManageLogQueryDTO.java | 31 +++
screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java | 23 +-
screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java | 1
screen-manage/src/main/java/com/moral/api/entity/ManageLog.java | 17 +
screen-manage/src/main/resources/mapper/ManageLogMapper.xml | 1
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 8
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java | 12 +
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 20 +-
screen-manage/src/main/java/com/moral/api/mapper/ManageLogMapper.java | 2
/dev/null | 157 -------------------
screen-manage/src/main/java/com/moral/api/util/LogUtils.java | 18 +
screen-manage/src/main/java/com/moral/api/controller/SystemController.java | 30 +++
screen-manage/src/main/java/com/moral/api/service/ManageLogService.java | 6
screen-manage/src/main/java/com/moral/api/pojo/form/system/ManageLogQueryForm.java | 44 +++++
screen-manage/src/main/java/com/moral/api/service/impl/ManageLogServiceImpl.java | 8
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 3
screen-manage/src/main/java/com/moral/api/entity/ManageRole.java | 3
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 6
screen-common/src/main/java/com/moral/constant/Constants.java | 19 +-
20 files changed, 195 insertions(+), 232 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/Constants.java b/screen-common/src/main/java/com/moral/constant/Constants.java
index 0227b33..a059de1 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -60,28 +60,25 @@
public static final String VERIFICATION_TYPE = "front_verificationCode";
/*
- * ������������������
+ * ������������������Key
* */
- public static final String INSERT_OPERATE_TYPE = "������";
+ public static final String LOGIN_OPERTATE_TYPE = "0";
/*
- * ������������������
+ * ������������������
* */
- public static final String DELETE_OPERATE_TYPE = "������";
+ public static final String INSERT_OPERATE_TYPE = "1";
/*
* ������������������
* */
- public static final String UPDATE_OPERATE_TYPE = "������";
+ public static final String UPDATE_OPERATE_TYPE = "2";
/*
- * ������������������
+ * ������������������
* */
- public static final String QUERY_OPERATE_TYPE = "������";
+ public static final String DELETE_OPERATE_TYPE = "3";
- /*
- * Organization������������
- * */
- public static final String ORGANIZATION_MODULE_NAME = "������";
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/aop/log/OperationLogAnno.java b/screen-manage/src/main/java/com/moral/api/aop/log/OperationLogAnno.java
deleted file mode 100644
index 4e884d7..0000000
--- a/screen-manage/src/main/java/com/moral/api/aop/log/OperationLogAnno.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.moral.api.aop.log;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface OperationLogAnno {
- /*
- * ���������������
- * */
- String module() default "";
-
- /*
- * ���������������
- * */
- String type() default "";
-}
diff --git a/screen-manage/src/main/java/com/moral/api/aop/log/OperationLogAspect.java b/screen-manage/src/main/java/com/moral/api/aop/log/OperationLogAspect.java
deleted file mode 100644
index 8ac76a1..0000000
--- a/screen-manage/src/main/java/com/moral/api/aop/log/OperationLogAspect.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.moral.api.aop.log;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.moral.api.entity.ManageLog;
-import com.moral.api.entity.Organization;
-import com.moral.api.mapper.ManageLogMapper;
-import com.moral.api.mapper.OrganizationMapper;
-import com.moral.api.pojo.dto.login.AccountInfoDTO;
-import com.moral.api.pojo.form.organization.OrganizationDeleteForm;
-import com.moral.api.pojo.form.organization.OrganizationInsertForm;
-import com.moral.api.pojo.form.organization.OrganizationUpdateForm;
-import com.moral.constant.Constants;
-import com.moral.constant.ResponseCodeEnum;
-import com.moral.util.TokenUtils;
-import com.moral.util.WebUtils;
-import lombok.Data;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * @ClassName OperationLogAspect
- * @Description ���������������������
- * @Author ���������
- * @Date 2021/3/31 13:54
- * @Version TODO
- **/
-@Aspect
-@Component
-@ConfigurationProperties(prefix = "log-aspect")
-@Data
-public class OperationLogAspect {
-
- @Autowired
- ManageLogMapper manageLogMapper;
-
- @Autowired
- OrganizationMapper organizationMapper;
-
- Map<String,String> organizationFormMap;
-
-
- /**
- * @Description: ������������������OperationLogAnno���������������������
- * @Param: []
- * @return: void
- * @Author: ���������
- * @Date: 2021/3/31
- */
- @Pointcut("@annotation(com.moral.api.aop.log.OperationLogAnno)")
- public void pointCut() {
- }
-
-
- /**
- * @Description: ������������������������������������
- * @Param: [joinPoint, result]���������������������������������
- * @return: void
- * @Author: ���������
- * @Date: 2021/3/31
- */
- @AfterReturning(returning = "result", value = "pointCut()")
- @Transactional
- public void saveOperLog(JoinPoint joinPoint, Object result) throws Throwable {
- //������������������������������������������������
- Map resultMap = JSONObject.parseObject(JSONObject.toJSONString(result), Map.class);
- if (!ResponseCodeEnum.SUCCESS.getCode().equals(resultMap.get("code")))
- return;
- //������������������
- RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
- HttpServletRequest request = (HttpServletRequest) requestAttributes.resolveReference(RequestAttributes.REFERENCE_REQUEST);
- Object parameters = request.getAttribute("parameters");
- String token = request.getHeader("token");
- //������module���type
- MethodSignature signature = (MethodSignature) joinPoint.getSignature();//���������������������������
- Method method = signature.getMethod();//������������������������
- OperationLogAnno anno = method.getAnnotation(OperationLogAnno.class);//���������������������
- String module = anno.module();//���������������������
- String type = anno.type();//���������������������
- //������������������id ip ������
- Integer id = Integer.parseInt(TokenUtils.getUidByToken(token));
- String ip = WebUtils.getIpAddr(request);
- AccountInfoDTO account = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
- String accountName = account.getAccount().getUserName();
- //������content
- String content = getContent(type,module,parameters);
- content = content+"���������������"+accountName+";";
- //���������������
- ManageLog manageLog = new ManageLog();
- manageLog.setContent(content);
- manageLog.setIp(ip);
- manageLog.setAccountId(id);
- manageLogMapper.insert(manageLog);
-
- }
-
- public String getContent(String type, String module,Object parameters) {
- String content = "";
- if (module.equals(Constants.ORGANIZATION_MODULE_NAME)) {
- content = getOrganizationContent(type,parameters);
- }
-
- return content;
- }
-
- /**
- * @Description: ������������������������������
- * @Param: [type, parameters]
- * @return: java.lang.String
- * @Author: ���������
- * @Date: 2021/4/1
- */
- public String getOrganizationContent(String type,Object parameters) {
- StringBuilder content = new StringBuilder();
- if (type.equals(Constants.INSERT_OPERATE_TYPE)) {//������������������������������
- OrganizationInsertForm form = JSON.parseObject(JSON.toJSONString(parameters), OrganizationInsertForm.class);
- String organizationName = form.getName();
- content.append("������������������").append(organizationName).append(";");
- } else if (type.equals(Constants.DELETE_OPERATE_TYPE)) { //������������������������
- OrganizationDeleteForm form = JSON.parseObject(JSON.toJSONString(parameters), OrganizationDeleteForm.class);
- Organization organization = organizationMapper.selectById(form.getOrganizationId());
- String organizationName = organization.getName();
- content.append("������������������").append(organizationName).append(";");
- } else if (type.equals(Constants.UPDATE_OPERATE_TYPE)) { //������������������������
- OrganizationUpdateForm form = JSON.parseObject(JSON.toJSONString(parameters), OrganizationUpdateForm.class);
- Map<String,Object> formMap = JSON.parseObject(JSON.toJSONString(parameters), Map.class);
- Organization organization = organizationMapper.selectById(form.getOrganizationId());
- String organizationName = organization.getName();
- content.append("������������������").append(organizationName).append(";");
- //���formMap������Key���������������������������������
- formMap.forEach((k,v)->{
- String key = organizationFormMap.get(k);
- if(key!=null)
- content.append(key).append("->").append(v).append(";");
- });
- }
-
- return content.toString();
- }
-
-
-}
diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
index be45676..ced4963 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
@@ -1,5 +1,6 @@
package com.moral.api.controller;
+import com.moral.api.entity.SysArea;
import com.moral.api.pojo.dto.account.*;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.form.account.AccountDeleteForm;
@@ -11,12 +12,15 @@
import com.moral.api.pojo.vo.account.AccountQueryVO;
import com.moral.api.pojo.vo.account.AccountUpdateVO;
import com.moral.api.service.ManageAccountService;
+import com.moral.api.service.SysAreaService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@Slf4j
@Api(tags = {"������������������"})
@@ -103,9 +107,5 @@
return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
}
-
-
-
-
}
diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
index 39abdd6..eb0f530 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -1,6 +1,5 @@
package com.moral.api.controller;
-import com.moral.api.aop.log.OperationLogAnno;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
import com.moral.api.pojo.form.organization.OrganizationDeleteForm;
diff --git a/screen-manage/src/main/java/com/moral/api/controller/SystemController.java b/screen-manage/src/main/java/com/moral/api/controller/SystemController.java
index 58acc60..e832326 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/SystemController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/SystemController.java
@@ -1,9 +1,14 @@
package com.moral.api.controller;
import com.moral.api.entity.SysArea;
+import com.moral.api.pojo.dto.login.AccountInfoDTO;
+import com.moral.api.pojo.dto.system.ManageLogQueryDTO;
+import com.moral.api.pojo.form.system.ManageLogQueryForm;
+import com.moral.api.service.ManageLogService;
import com.moral.api.service.SysAreaService;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
-import io.swagger.annotations.Api;
+import com.moral.util.TokenUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -21,18 +26,35 @@
* @Version TODO
**/
@Slf4j
-@Api(tags = {"���������������������"})
-@CrossOrigin(origins = "*", maxAge = 3600)
@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
@RequestMapping("/system")
public class SystemController {
@Autowired
SysAreaService sysAreaService;
+ @Autowired
+ ManageLogService manageLogService;
+
@GetMapping("area/query")
- public ResultMessage query(){
+ public ResultMessage queryArea() {
List<SysArea> sysAreas = sysAreaService.querySysArea();
return ResultMessage.ok(sysAreas);
}
+
+ @GetMapping("log/query")
+ public ResultMessage queryLog(ManageLogQueryForm form) {
+
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ //������������������
+ ManageLogQueryDTO dto = manageLogService.queryManageLog(form);
+ return null;
+ }
+
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java b/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java
index 37920ae..ade2ae0 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +16,7 @@
* </p>
*
* @author moral
- * @since 2021-04-02
+ * @since 2021-04-12
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -33,10 +35,21 @@
*/
private Integer accountId;
+ /*
+ * ������������������
+ * */
+ private String account;
+
/**
* ������������
*/
private String userName;
+
+ /**
+ * ������������
+ */
+ private String type;
+
/**
* ������������
@@ -51,7 +64,7 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
@Override
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java b/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java
index 50bbedc..8aefd79 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java
@@ -22,8 +22,11 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class ManageRole extends Model<ManageRole> {
+
+
private static final long serialVersionUID = 1L;
/**
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/ManageLogMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/ManageLogMapper.java
index f84f78c..d05ac74 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/ManageLogMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/ManageLogMapper.java
@@ -9,7 +9,7 @@
* </p>
*
* @author moral
- * @since 2021-04-02
+ * @since 2021-04-12
*/
public interface ManageLogMapper extends BaseMapper<ManageLog> {
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/system/ManageLogQueryDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/system/ManageLogQueryDTO.java
new file mode 100644
index 0000000..adc8e81
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/system/ManageLogQueryDTO.java
@@ -0,0 +1,31 @@
+package com.moral.api.pojo.dto.system;
+
+import com.moral.api.entity.ManageLog;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName ManageLogQueryDTO
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/4/12 13:23
+ * @Version TODO
+ **/
+@Data
+public class ManageLogQueryDTO {
+
+ private Integer code;
+
+ private String msg;
+
+ private long page;
+
+ private long total;
+
+ private long current;
+
+ private long size;
+
+ private List<ManageLog> manageLogs;
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java
index 26824d9..a4aff0e 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java
@@ -1,11 +1,13 @@
package com.moral.api.pojo.form.organization;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.entity.Organization;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.DateUtils;
import com.moral.util.RegexUtils;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.ObjectUtils;
import java.io.Serializable;
@@ -50,7 +52,9 @@
private String wechat;
- private String expireTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date expireTime;
public boolean valid() {
if (
@@ -82,8 +86,7 @@
organization.setPhone(phone);
organization.setEmail(email);
organization.setWechat(wechat);
- Date expireTimeDate = DateUtils.getDate(expireTime + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
- organization.setExpireTime(expireTimeDate);
+ organization.setExpireTime(expireTime);
return organization;
}
@@ -106,16 +109,9 @@
return dto;
}
}
- //������������������������
- if (!RegexUtils.checkDate(expireTime)) {
- dto.setCode(ResponseCodeEnum.TIME_FORMAT_INVALID.getCode());
- dto.setMsg(ResponseCodeEnum.TIME_FORMAT_INVALID.getMsg());
- return dto;
- }
//������������������������������������������
- Date expireDate = DateUtils.getDate(expireTime, "yyyy-MM-dd");
Date currentDate = new Date();
- if (DateUtils.compareDateStr(expireDate, currentDate) >= 0) {
+ if (DateUtils.compareDateStr(expireTime, currentDate) >= 0) {
dto.setCode(ResponseCodeEnum.TIME_INVALID.getCode());
dto.setMsg(ResponseCodeEnum.TIME_INVALID.getMsg());
return dto;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java
index 66c5d6e..b90948c 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java
@@ -1,11 +1,13 @@
package com.moral.api.pojo.form.organization;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.entity.Organization;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.DateUtils;
import com.moral.util.RegexUtils;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.ObjectUtils;
import java.util.Date;
@@ -50,7 +52,9 @@
private String wechat;
- private String expireTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date expireTime;
public boolean valid() {
if (ObjectUtils.isEmpty(organizationId))
@@ -89,10 +93,8 @@
organization.setPhone(phone);
organization.setEmail(email);
organization.setWechat(wechat);
- if (!ObjectUtils.isEmpty(expireTime)) {
- Date expireTimeDate = DateUtils.getDate(expireTime + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
- organization.setExpireTime(expireTimeDate);
- }
+ organization.setExpireTime(expireTime);
+
return organization;
}
@@ -115,17 +117,10 @@
return dto;
}
}
- //������������������������
+ //������������������������������������������
if (!ObjectUtils.isEmpty(expireTime)) {
- if (!RegexUtils.checkDate(expireTime)) {
- dto.setCode(ResponseCodeEnum.TIME_FORMAT_INVALID.getCode());
- dto.setMsg(ResponseCodeEnum.TIME_FORMAT_INVALID.getMsg());
- return dto;
- }
- //������������������������������������������
- Date expireDate = DateUtils.getDate(expireTime, "yyyy-MM-dd");
Date currentDate = new Date();
- if (DateUtils.compareDateStr(expireDate, currentDate) >= 0) {
+ if (DateUtils.compareDateStr(expireTime, currentDate) >= 0) {
dto.setCode(ResponseCodeEnum.TIME_INVALID.getCode());
dto.setMsg(ResponseCodeEnum.TIME_INVALID.getMsg());
return dto;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/system/ManageLogQueryForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/system/ManageLogQueryForm.java
new file mode 100644
index 0000000..c690d9f
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/system/ManageLogQueryForm.java
@@ -0,0 +1,44 @@
+package com.moral.api.pojo.form.system;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Date;
+
+/**
+ * @ClassName ManageLogQueryForm
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/4/12 9:33
+ * @Version TODO
+ **/
+public class ManageLogQueryForm {
+
+ private Integer page;
+
+ private Integer size;
+
+ private String id;
+
+ private String type;
+
+ private String ip;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date startTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date endTime;
+
+ public boolean valid() {
+ if (
+ ObjectUtils.isEmpty(page) ||
+ ObjectUtils.isEmpty(size)
+ )
+ return false;
+ return true;
+ }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
index 7df374e..501c78f 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
@@ -66,16 +66,20 @@
AccountInsertVO vo = new AccountInsertVO();
ManageAccount account = dto.getAccount();
List<ManageRole> roles = dto.getRoles();
- List<String> roleNames = new ArrayList<>();
- if (!ObjectUtils.isEmpty(roles)) {
- roles.forEach(role -> roleNames.add(role.getName()));
+ if(!ObjectUtils.isEmpty(roles)){
+ roles.forEach(value-> {
+ value.setIsDelete(null);
+ value.setCreateTime(null);
+ value.setUpdateTime(null);
+ value.setDesc(null);
+ });
}
vo.setId(account.getId());
vo.setUserName(account.getUserName());
vo.setEmail(account.getEmail());
vo.setMobile(account.getMobile());
vo.setWechat(account.getWechat());
- vo.setRoleNames(roleNames);
+ vo.setRoles(roles);
//Date������String
Date createTime = account.getCreateTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
index e2de4d8..479beb2 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
@@ -33,11 +33,12 @@
private String wechat;
+ private List<ManageRole> roles;
+
private List<String> roleNames;
private String createTime;
private String updateTime;
-
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageLogService.java b/screen-manage/src/main/java/com/moral/api/service/ManageLogService.java
index 7eefb9b..29a922c 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageLogService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageLogService.java
@@ -2,6 +2,8 @@
import com.moral.api.entity.ManageLog;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.pojo.dto.system.ManageLogQueryDTO;
+import com.moral.api.pojo.form.system.ManageLogQueryForm;
/**
* <p>
@@ -9,8 +11,8 @@
* </p>
*
* @author moral
- * @since 2021-04-02
+ * @since 2021-04-12
*/
public interface ManageLogService extends IService<ManageLog> {
-
+ ManageLogQueryDTO queryManageLog(ManageLogQueryForm form);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index 5b50ee5..6bbb7cf 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -142,7 +142,7 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
content.append(manageAccount.getUserName()).append("���������������������;");
- logUtils.saveLoginForManage(request, content.toString(), manageAccount.getId(), manageAccount.getUserName());
+ logUtils.saveLoginForManage(request, content.toString(), manageAccount, manageAccount.getUserName());
return loginDTO;
}
@@ -221,9 +221,9 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(manageAccount.getUserName() + ";")
- .append("id���" + manageAccount.getId() + ";");
- logUtils.saveOperationForManage(request, content.toString());
+ content.append("������������������").append(manageAccount.getUserName() + ";")
+ .append("account���" + manageAccount.getAccount() + ";");
+ logUtils.saveOperationForManage(request, content.toString(),Constants.INSERT_OPERATE_TYPE);
return accountDTO;
}
@@ -344,9 +344,9 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(existManageAccount.getUserName() + ";")
- .append("id���" + existManageAccount.getId() + ";");
- logUtils.saveOperationForManage(request, content.toString());
+ content.append("������������������").append(existManageAccount.getUserName() + ";")
+ .append("���������" + existManageAccount.getAccount() + ";");
+ logUtils.saveOperationForManage(request, content.toString(),Constants.DELETE_OPERATE_TYPE);
return accountDTO;
}
@@ -436,8 +436,8 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(oldAccount.getUserName() + ";")
- .append("id���" + oldAccount.getId() + ";");
+ content.append("������������������").append(oldAccount.getUserName() + ";")
+ .append("���������" + oldAccount.getAccount() + ";");
//������������Map,���������������������������������
Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldAccount), Map.class);
@@ -500,7 +500,7 @@
}
}
}
- logUtils.saveOperationForManage(request, content.toString());
+ logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageLogServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageLogServiceImpl.java
index 56b13a1..059b2cb 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageLogServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageLogServiceImpl.java
@@ -2,6 +2,8 @@
import com.moral.api.entity.ManageLog;
import com.moral.api.mapper.ManageLogMapper;
+import com.moral.api.pojo.dto.system.ManageLogQueryDTO;
+import com.moral.api.pojo.form.system.ManageLogQueryForm;
import com.moral.api.service.ManageLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -12,9 +14,13 @@
* </p>
*
* @author moral
- * @since 2021-04-02
+ * @since 2021-04-12
*/
@Service
public class ManageLogServiceImpl extends ServiceImpl<ManageLogMapper, ManageLog> implements ManageLogService {
+ @Override
+ public ManageLogQueryDTO queryManageLog(ManageLogQueryForm form) {
+ return null;
+ }
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 21cc479..9a6a587 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -109,7 +109,7 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
content.append("������������������").append(organization.getName()+";");
- logUtils.saveOperationForManage(request, content.toString());
+ logUtils.saveOperationForManage(request, content.toString(),Constants.INSERT_OPERATE_TYPE);
return organizationDTO;
}
@@ -227,7 +227,7 @@
content.append("������������������").append(existOrganization.getName()+";");
if(form.getDeleteChildren().equals(Constants.DELETE_CHILDREN_ORG))
content.append("���������������������;");
- logUtils.saveOperationForManage(request, content.toString());
+ logUtils.saveOperationForManage(request, content.toString(),Constants.DELETE_OPERATE_TYPE);
return dto;
}
@@ -397,7 +397,7 @@
}
}
}
- logUtils.saveOperationForManage(request, content.toString());
+ logUtils.saveOperationForManage(request, content.toString(),Constants.UPDATE_OPERATE_TYPE);
}
diff --git a/screen-manage/src/main/java/com/moral/api/util/LogUtils.java b/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
index 90c800a..da15277 100644
--- a/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
@@ -4,6 +4,7 @@
import com.moral.api.entity.ManageLog;
import com.moral.api.mapper.ManageLogMapper;
import com.moral.api.pojo.dto.login.AccountInfoDTO;
+import com.moral.constant.Constants;
import com.moral.util.TokenUtils;
import com.moral.util.WebUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,18 +35,21 @@
* @Date: 2021/4/8
*/
@Transactional
- public void saveOperationForManage(HttpServletRequest request, String content) {
+ public void saveOperationForManage(HttpServletRequest request, String content,String type) {
String token = request.getHeader("token");
AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
- ManageAccount account = accountInfoDTO.getAccount();
- Integer id = account.getId();
- String userName = account.getUserName();
+ ManageAccount manageAccount = accountInfoDTO.getAccount();
+ Integer id = manageAccount.getId();
+ String userName = manageAccount.getUserName();
+ String account = manageAccount.getAccount();
String ip = WebUtils.getIpAddr(request);
ManageLog log = new ManageLog();
+ log.setType(type);
log.setUserName(userName);
log.setAccountId(id);
log.setIp(ip);
+ log.setAccount(account);
log.setContent(content);
manageLogMapper.insert(log);
}
@@ -58,14 +62,16 @@
* @Date: 2021/4/8
*/
@Transactional
- public void saveLoginForManage(HttpServletRequest request,String content,Integer id,String userName){
+ public void saveLoginForManage(HttpServletRequest request,String content,ManageAccount account,String userName){
ManageLog log = new ManageLog();
String ip = WebUtils.getIpAddr(request);
- log.setAccountId(id);
+ log.setAccountId(account.getId());
+ log.setAccount(account.getAccount());
log.setUserName(userName);
log.setIp(ip);
log.setContent(content);
+ log.setType(Constants.LOGIN_OPERTATE_TYPE);
manageLogMapper.insert(log);
}
}
diff --git a/screen-manage/src/main/resources/mapper/ManageLogMapper.xml b/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
index 708e835..1077bed 100644
--- a/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageLogMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.moral.api.entity.ManageLog">
<id column="id" property="id" />
<result column="account_id" property="accountId" />
+ <result column="type" property="type" />
<result column="user_name" property="userName" />
<result column="content" property="content" />
<result column="ip" property="ip" />
--
Gitblit v1.8.0