diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/LogInfoDTO.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/LogInfoDTO.java index e130e5268..b5b3b5175 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/LogInfoDTO.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/LogInfoDTO.java @@ -4,6 +4,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * @author hongawen * @version 1.0.0 @@ -12,24 +14,26 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -public class LogInfoDTO { +public class LogInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; /** * 登录名 */ private String userName; + private String ip; + private String operate; + private String operateType; + private String result; - private String ip; - - private String type; - private String level; - private String operateType; + private String type; private String serviceName; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/UserLogFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/UserLogFeignClient.java new file mode 100644 index 000000000..6b2869eeb --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/UserLogFeignClient.java @@ -0,0 +1,25 @@ +package com.njcn.system.api; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.dto.LogInfoDTO; +import com.njcn.system.api.fallback.UserLogFeignClientFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author hongawen + * @version 1.0.0 + * @date 2022年07月12日 15:20 + */ +@FeignClient(value = ServerInfo.SYSTEM,path = "/userLog",fallbackFactory = UserLogFeignClientFallbackFactory.class) +public interface UserLogFeignClient { + + /** + * 插入审计日志 + * @param logInfoDTO 日志详细信息 + */ + @PostMapping("/add") + void addUserLog(@RequestBody LogInfoDTO logInfoDTO); + +} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/UserLogFeignClientFallbackFactory.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/UserLogFeignClientFallbackFactory.java new file mode 100644 index 000000000..5aa7a5954 --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/UserLogFeignClientFallbackFactory.java @@ -0,0 +1,48 @@ +package com.njcn.system.api.fallback; + +import com.njcn.common.pojo.dto.LogInfoDTO; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.system.api.AreaFeignClient; +import com.njcn.system.api.UserLogFeignClient; +import com.njcn.system.pojo.dto.AreaTreeDTO; +import com.njcn.system.pojo.po.Area; +import com.njcn.system.utils.SystemEnumUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import feign.hystrix.FallbackFactory; + + +/** + * @author hongawen + * @version 1.0.0 + * @date 2022年07月12日 15:21 + */ +@Slf4j +@Component +public class UserLogFeignClientFallbackFactory implements FallbackFactory { + + /** + * 输出远程请求接口异常日志 + * @param cause RPC请求异常 + */ + @Override + public UserLogFeignClient create(Throwable cause) { + //判断抛出异常是否为解码器抛出的业务异常 + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if(cause.getCause() instanceof BusinessException){ + BusinessException businessException = (BusinessException) cause.getCause(); + exceptionEnum = SystemEnumUtil.getExceptionEnum(businessException.getResult()); + } + Enum finalExceptionEnum = exceptionEnum; + return new UserLogFeignClient() { + @Override + public void addUserLog(LogInfoDTO logInfoDTO) { + log.error("{}异常,降级处理,异常为:{}","插入审计日志",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + }; + } +} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/UserLog.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/UserLog.java new file mode 100644 index 000000000..27348baef --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/UserLog.java @@ -0,0 +1,66 @@ +package com.njcn.system.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author hongawen + * @version 1.0.0 + * @date 2022年07月12日 14:45 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_user_log") +public class UserLog extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 事件日志Id + */ + private String id; + + /** + * 用户已登录:用户名 + * 用户未登录:登录名 + */ + private String userName; + + /** + * 操作Ip + */ + private String ip; + + /** + * 操作内容 + */ + private String operate; + + /** + * 操作类型 比如:查询、新增、删除等等 + */ + private String operateType; + + /** + * 操作结果 0.失败 1.成功 + */ + private Integer result; + + /** + * 严重度 0.普通 1.中等 2.严重 + */ + private Integer level; + + /** + * 事件类型 0.业务事件 1.系统事件 + */ + private String type; + + /** + * 模块名 + */ + private String serviceName; + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java new file mode 100644 index 000000000..42034f200 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java @@ -0,0 +1,54 @@ +package com.njcn.system.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; +import com.njcn.common.pojo.dto.LogInfoDTO; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.system.pojo.po.Area; +import com.njcn.system.service.IUserLogService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.*; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + + +/** + *

+ * 前端控制器(行政区域) + *

+ * + * @author hongawen + * @since 2021-12-13 + */ +@Slf4j +@RestController +@RequestMapping("/userLog") +@Api(tags = "行政区域管理") +@AllArgsConstructor +public class UserLogController extends BaseController { + + private final IUserLogService userLogService; + + + /** + * 插入审计日志 + */ + @ApiIgnore + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) + @PostMapping("/add") + @ApiOperation("插入审计日志") + public void addUserLog(@RequestBody LogInfoDTO logInfoDTO) { + + System.out.println(logInfoDTO.toString()); + +// userLogService.addUserLog(logInfoDTO); + } + + +} + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java new file mode 100644 index 000000000..2b855d37b --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java @@ -0,0 +1,24 @@ +package com.njcn.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.system.pojo.dto.AreaTreeDTO; +import com.njcn.system.pojo.po.Area; +import com.njcn.system.pojo.po.UserLog; +import com.njcn.system.pojo.vo.AreaTreeVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author hongawen + * @since 2021-12-13 + */ +public interface UserLogMapper extends BaseMapper { + + + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/UserLogMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/UserLogMapper.xml new file mode 100644 index 000000000..b56f247cc --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/UserLogMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IUserLogService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IUserLogService.java new file mode 100644 index 000000000..e6c26c698 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IUserLogService.java @@ -0,0 +1,23 @@ +package com.njcn.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.common.pojo.dto.LogInfoDTO; +import com.njcn.system.pojo.po.UserLog; + + +/** + *

+ * 服务类 + *

+ * + * @author hongawen + * @since 2021-12-13 + */ +public interface IUserLogService extends IService { + + /** + * 插入审计日志 + * @param logInfoDTO . + */ + void addUserLog(LogInfoDTO logInfoDTO); +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/UserLogServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/UserLogServiceImpl.java new file mode 100644 index 000000000..691f34179 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/UserLogServiceImpl.java @@ -0,0 +1,31 @@ +package com.njcn.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.dto.LogInfoDTO; +import com.njcn.system.mapper.UserLogMapper; +import com.njcn.system.pojo.po.UserLog; +import com.njcn.system.service.IUserLogService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +/** + *

+ * 服务实现类 + *

+ * + * @author hongawen + * @since 2021-12-13 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class UserLogServiceImpl extends ServiceImpl implements IUserLogService { + + + @Override + public void addUserLog(LogInfoDTO logInfoDTO) { + + } +}