From 3a710e5c990e10c2198e5dcd96a84bd43b33656c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 25 十一月 2023 14:34:43 +0800
Subject: [PATCH] 关键属性/，空值校验sql拼接修改
---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java | 8 +++++---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java | 17 ++++++++++++-----
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java | 13 ++++++++++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 4 ++--
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java | 3 +++
5 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java
index 2d9cac1..f7d063e 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java
+++ b/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;
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java
index 616af88..4b613ec 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/feign/LogClient.java
+++ b/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));
}
+
+
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java
index 6af6c3d..e10e6c0 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java
+++ b/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;
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java
index 9c02711..a7d5fd0 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java
+++ b/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);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index dd02c8d..c596095 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -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);
}
--
Gitblit v1.9.3