cnas-server/src/main/java/com/yuanchu/mom/dto/PageTestObjectDto.java
@@ -13,9 +13,9 @@ public class PageTestObjectDto extends StructureTestObject { @ValueTableShow(2) @ApiModelProperty(value = "å建人") private Integer createUserName; private String createUserName; @ValueTableShow(4) @ApiModelProperty(value = "æ´æ°äºº") private Integer updateUserName; private String updateUserName; } cnas-server/src/main/resources/mapper/StructureTestMapper.xml
@@ -5,15 +5,17 @@ <mapper namespace="com.yuanchu.mom.mapper.StructureTestObjectMapper"> <select id="selectTestObjectList" resultType="com.yuanchu.mom.dto.PageTestObjectDto"> select * from ( select sto.id, sto.specimen_name, u1.name createUserName, sto.create_time, u2.name updateUserName, sto.update_time sto.specimen_name, u1.name create_user_name, sto.create_time, u2.name update_user_name, sto.update_time from structure_test_object sto left join user u1 on sto.create_user = u1.id left join user u2 on sto.update_user = u2.id left join user u1 on sto.create_user = u1.id left join user u2 on sto.update_user = u2.id ) a <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} </if> framework/src/main/java/com/yuanchu/mom/config/LogConfig.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,59 @@ package com.yuanchu.mom.config; import com.yuanchu.mom.exception.ErrorException; import com.yuanchu.mom.mapper.SystemLogMapper; import com.yuanchu.mom.pojo.SystemLog; import io.swagger.annotations.ApiOperation; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Method; /** * @Author æ´å * @Date 2024/2/27 */ @Component public class LogConfig implements HandlerInterceptor { @Resource private SystemLogMapper systemLogMapper; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { if (handler instanceof HandlerMethod) { if (request.getRequestURL().toString().contains("/error") || request.getRequestURL().toString().contains("/outPath") || request.getRequestURL().toString().contains("/user/enter")) { return HandlerInterceptor.super.preHandle(request, response, handler); } HandlerMethod h = (HandlerMethod)handler; Method method = h.getMethod(); ApiOperation annotation = method.getAnnotation(ApiOperation.class); if (annotation == null) { return HandlerInterceptor.super.preHandle(request, response, handler); } SystemLog systemLog = new SystemLog(); systemLog.setMethod(method.getName()); systemLog.setMethodName(annotation.value()); systemLogMapper.insert(systemLog); } return HandlerInterceptor.super.preHandle(request, response, handler); } @Override public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { HandlerInterceptor.super.postHandle(request, response, handler, modelAndView); } @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { HandlerInterceptor.super.afterCompletion(request, response, handler, ex); } } framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
@@ -18,6 +18,9 @@ @Resource private PowerConfig powerConfig; @Resource private LogConfig logConfig; @Value("${file.path}") private String filePath; @@ -41,6 +44,7 @@ protected void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(fiferConfig).addPathPatterns("/**"); registry.addInterceptor(powerConfig).addPathPatterns("/**"); registry.addInterceptor(logConfig).addPathPatterns("/**"); super.addInterceptors(registry); } } framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ package com.yuanchu.mom.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.pojo.PageSystemLogDto; import com.yuanchu.mom.pojo.SystemLog; import org.apache.ibatis.annotations.Mapper; /** * ç³»ç»æ¥å¿(SystemLog)è¡¨æ°æ®åºè®¿é®å± * * @author makejava * @since 2024-02-27 15:33:14 */ @Mapper public interface SystemLogMapper extends BaseMapper<SystemLog> { IPage<PageSystemLogDto> selectSystemLogList(Page page, QueryWrapper<PageSystemLogDto> ew); } framework/src/main/java/com/yuanchu/mom/pojo/PageSystemLogDto.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ package com.yuanchu.mom.pojo; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.yuanchu.mom.annotation.ValueTableShow; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @Author æ´å * @Date 2024/2/27 */ @Data public class PageSystemLogDto extends SystemLog { @ValueTableShow(3) @ApiModelProperty(value = "å建人") @TableField(fill = FieldFill.INSERT) private String createUserName; } framework/src/main/java/com/yuanchu/mom/pojo/SystemLog.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,47 @@ package com.yuanchu.mom.pojo; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.yuanchu.mom.annotation.ValueTableShow; import com.yuanchu.mom.common.OrderBy; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; /** * ç³»ç»æ¥å¿(SystemLog)表对象 * * @author makejava * @since 2024-02-27 15:33:14 */ @Data public class SystemLog extends OrderBy implements Serializable { @ApiModelProperty(value = "主é®") @TableId(type = IdType.AUTO) private Integer id; @ValueTableShow(1) @ApiModelProperty(value = "æ¹æ³") private String method; @ValueTableShow(2) @ApiModelProperty(value = "æ¹æ³æè¿°") private String methodName; @ApiModelProperty(value = "å建人id") @TableField(fill = FieldFill.INSERT) private Integer createUser; @ValueTableShow(4) @ApiModelProperty(value = "å建æ¶é´") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } framework/src/main/resources/mapper/AuthMapper.xml
framework/src/main/resources/mapper/SystemLogMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ <?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="com.yuanchu.mom.mapper.SystemLogMapper"> <select id="selectSystemLogList" resultType="com.yuanchu.mom.pojo.PageSystemLogDto"> select * from ( select sl.id, sl.method, sl.method_name, u.name create_user_name, sl.create_time from system_log sl left join user u on sl.create_user = u.id ) a <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} </if> </select> </mapper> user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,39 @@ package com.yuanchu.mom.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.pojo.PageSystemLogDto; import com.yuanchu.mom.service.SystemLogService; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.Map; /** * ç³»ç»æ¥å¿(SystemLog)表æ§å¶å± * * @author makejava * @since 2024-02-27 17:04:09 */ @RestController @RequestMapping("/systemLog") @Api(tags = "ç³»ç»æ¥å¿") @AllArgsConstructor public class SystemLogController { private SystemLogService systemLogService; @ApiOperation(value = "è·åç³»ç»æ¥å¿å表") @PostMapping("/selectSystemLogList") public Result selectSystemLogList(@RequestBody Map<String, Object> data) throws Exception { Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); PageSystemLogDto pageSystemLogDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), PageSystemLogDto.class); return Result.success(systemLogService.selectSystemLogList(page, pageSystemLogDto)); } } user-server/src/main/java/com/yuanchu/mom/service/SystemLogService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.yuanchu.mom.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.yuanchu.mom.pojo.PageSystemLogDto; import com.yuanchu.mom.pojo.SystemLog; import java.util.Map; /** * ç³»ç»æ¥å¿(SystemLog)表æå¡æ¥å£ * * @author makejava * @since 2024-02-27 17:04:09 */ public interface SystemLogService extends IService<SystemLog> { Map<String, Object> selectSystemLogList(Page page, PageSystemLogDto pageSystemLogDto); } user-server/src/main/java/com/yuanchu/mom/service/impl/PowerServiceImpl.java
ÎļþÃû´Ó user-server/src/main/java/com/yuanchu/mom/service/imp/PowerServiceImpl.java ÐÞ¸Ä @@ -1,4 +1,4 @@ package com.yuanchu.mom.service.imp; package com.yuanchu.mom.service.impl; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
ÎļþÃû´Ó user-server/src/main/java/com/yuanchu/mom/service/imp/RoleServiceImp.java ÐÞ¸Ä @@ -1,4 +1,4 @@ package com.yuanchu.mom.service.imp; package com.yuanchu.mom.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; user-server/src/main/java/com/yuanchu/mom/service/impl/SystemLogServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,42 @@ package com.yuanchu.mom.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; import com.yuanchu.mom.mapper.SystemLogMapper; import com.yuanchu.mom.pojo.PageSystemLogDto; import com.yuanchu.mom.pojo.SystemLog; import com.yuanchu.mom.service.SystemLogService; import com.yuanchu.mom.utils.QueryWrappers; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; /** * ç³»ç»æ¥å¿(SystemLog)表æå¡å®ç°ç±» * * @author makejava * @since 2024-02-27 17:04:09 */ @Service @AllArgsConstructor public class SystemLogServiceImpl extends ServiceImpl<SystemLogMapper, SystemLog> implements SystemLogService { private GetLook getLook; private SystemLogMapper systemLogMapper; @Override public Map<String, Object> selectSystemLogList(Page page, PageSystemLogDto pageSystemLogDto) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(PageSystemLogDto.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectSystemLogList"); if(map1.get("look")==1) pageSystemLogDto.setCreateUser(map1.get("userId")); map.put("body", systemLogMapper.selectSystemLogList(page, QueryWrappers.queryWrappers(pageSystemLogDto))); return map; } } user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
ÎļþÃû´Ó user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java ÐÞ¸Ä @@ -1,4 +1,4 @@ package com.yuanchu.mom.service.imp; package com.yuanchu.mom.service.impl; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper;