Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java
@@ -1,10 +1,14 @@ package com.vci.ubcs.log.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Date; /** * 操作日志管理:(包括登录日志、操作日志、授权日志，以及管理员的以上三种日志) @@ -14,6 +18,7 @@ @Data @AllArgsConstructor @NoArgsConstructor @TableName("PL_LOG_OPERATE") public class LogOperate implements Serializable { /** @@ -24,6 +29,7 @@ /** * 主键 */ @TableId("OID") private String oid; /** @@ -54,7 +60,7 @@ /** * 时间 */ private String time; private Date time; /** * 操作结果 @@ -66,4 +72,9 @@ */ private String description; /** * 日志类型 */ private String logType; } Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java
@@ -67,4 +67,7 @@ log.setParams(log.getParams().replace("&", "&")); return R.data(errorLogService.save(log)); } } Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java
@@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.log.entity.LogOperate; import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject; import org.springblade.core.log.exception.ServiceException; import java.util.List; @@ -17,13 +19,13 @@ * @param logOperate * @return */ boolean saveLogOperate(LogOperate logOperate); boolean saveLogOperate(LogOperate logOperate) throws ServiceException; /** * 条件查询获取日志列表 * @param logOperate * @param bladeQueryObject * @return */ List<LogOperate> listByCondition(LogOperate logOperate); List<LogOperate> listByCondition(BladeQueryObject bladeQueryObject) throws ServiceException; } Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java
@@ -6,12 +6,15 @@ import com.vci.ubcs.log.entity.LogOperate; import com.vci.ubcs.log.mapper.LogOperateMapper; import com.vci.ubcs.log.service.ILogOperateService; import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.utils.Func; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; /** * 操作日志管理:(包括登录日志、操作日志、授权日志，以及管理员的以上三种日志) @@ -30,7 +33,7 @@ * @return */ @Override public boolean saveLogOperate(LogOperate logOperate) { public boolean saveLogOperate(LogOperate logOperate)throws ServiceException { if(Func.isEmpty(logOperate)){ return false; } @@ -39,13 +42,17 @@ /** * 条件查询获取日志列表 * @param logOperate * @param bladeQueryObject * @return */ @Override public List<LogOperate> listByCondition(LogOperate logOperate) { QueryWrapper<LogOperate> queryWrapper = Condition.getQueryWrapper(logOperate); this.list(queryWrapper); public List<LogOperate> listByCondition(BladeQueryObject bladeQueryObject) throws ServiceException{ Map<String, Object> conditionMap = bladeQueryObject.getConditionMap(); if(conditionMap.isEmpty() || Func.isBlank(conditionMap.get("logType").toString())){ throw new ServiceException("日志查询必传参数【日志类型】不能为空！"); } // map对象转换为查询对象 QueryWrapper<LogOperate> queryWrapper = Condition.getQueryWrapper(bladeQueryObject.getConditionMap(),LogOperate.class); return this.list(queryWrapper); }
@@ -873,13 +873,13 @@ //不忽略大小写、不去空、不忽略全半角 temp = "%s"; } queryKey = String.format(temp, "t." + attrId); queryKey = String.format(temp, "nvl("+ "t." + attrId +",'/')"); queryValue = String.format(temp, "'" + (trim ? value.trim() : value) + "'"); conditionMap.put(queryKey, queryValue); } else { if(StringUtils.isNotBlank(value)) { //为空的时候不代表不校验，只是不去除相关的信息 conditionMap.put("t." + attrId, "'" + value + "'"); conditionMap.put("nvl("+ "t." + attrId+",'/')", "'" + value + "'"); }else{ conditionMap.put("t." + attrId, QueryOptionConstant.ISNULL); }
