diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 8f6a21449..9aae4a0b7 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -69,6 +69,12 @@
org.yaml
snakeyaml
+
+
+ cn.hutool
+ hutool-all
+ 4.2.1
+
tk.mybatis
diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCategoryController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCategoryController.java
index 15c66dd19..c3583384e 100644
--- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCategoryController.java
+++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionCategoryController.java
@@ -86,7 +86,7 @@ public class ExamQuestionCategoryController extends BaseController
@ResponseBody
public AjaxResult addSave(ExamQuestionCategory examQuestionCategory)
{
- return toAjax(examQuestionCategoryService.insertExamQuestionCategory(examQuestionCategory));
+ return toAjax(examQuestionCategoryService.insert(examQuestionCategory));
}
/**
@@ -121,7 +121,7 @@ public class ExamQuestionCategoryController extends BaseController
@ResponseBody
public AjaxResult remove(String ids)
{
- return toAjax(examQuestionCategoryService.deleteExamQuestionCategoryByIds(ids));
+ return toAjax(examQuestionCategoryService.deleteByIds(ids));
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
index db2572cab..f165c2178 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
@@ -58,14 +58,14 @@ public abstract class AbstractBaseServiceImpl, T> implemen
@Override
public int insert(T entity) {
- EntityUtils.setCreatAndUpdatInfo(entity);
+ EntityUtils.setCreateAndUpdatInfo(entity);
return mapper.insert(entity);
}
@Override
public int insertSelective(T entity) {
- EntityUtils.setCreatAndUpdatInfo(entity);
+ EntityUtils.setCreateAndUpdatInfo(entity);
return mapper.insertSelective(entity);
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
index d37f2af2d..c7c7a6479 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
@@ -1,65 +1,71 @@
package com.ruoyi.framework.web.util;
+import cn.hutool.core.util.RandomUtil;
+
import java.lang.reflect.Method;
/**
- * 实体类相关工具类
+ * 实体类相关工具类
* 解决问题: 1、快速对实体的常驻字段,如:createUser、updateUser等值快速注入
- *
+ *
* @author Ace
* @version 1.0
* @date 2016年4月18日
* @since 1.7
*/
public class EntityUtils {
- /**
- * 快速将bean的crtUser、crtHost、crtTime、updUser、updHost、updTime附上相关值
- *
- * @param entity 实体bean
- * @author 王浩彬
- */
- public static void setCreatAndUpdatInfo(T entity) {
- setCreateInfo(entity);
- setUpdatedInfo(entity);
- }
-
- /**
- * 快速将bean的crtUser、crtHost、crtTime附上相关值
- *
- * @param entity 实体bean
- * @author 王浩彬
- */
- public static void setCreateInfo(T entity){
- try {
- Method[] methods = entity.getClass().getMethods();
- for(Method m : methods){
- if(m.getName().equals("setCreateBy")){
- m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getUserId());
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+ /**
+ * 快速将bean的crtUser、crtHost、crtTime、updUser、updHost、updTime附上相关值
+ *
+ * @param entity 实体bean
+ * @author 王浩彬
+ */
+ public static void setCreateAndUpdatInfo(T entity) {
+ setCreateInfo( entity );
+ setUpdatedInfo( entity );
+ }
- /**
- * 快速将bean的updUser、updHost、updTime附上相关值
- *
- * @param entity 实体bean
- * @author 王浩彬
- */
- public static void setUpdatedInfo(T entity){
- try {
- Method[] methods = entity.getClass().getMethods();
- for(Method m : methods){
- if(m.getName().equals("setUpdateBy")){
- m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getUserId());
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+ /**
+ * 快速将bean的crtUser、crtHost、crtTime附上相关值
+ *
+ * @param entity 实体bean
+ * @author 王浩彬
+ */
+ public static void setCreateInfo(T entity) {
+ try {
+ Method[] methods = entity.getClass().getMethods();
+ for (Method m : methods) {
+ if (m.getName().equals( "setCreateBy" )) {
+ m.invoke( entity, com.ruoyi.framework.web.util.ShiroUtils.getUserId() );
+ } else if (m.getName().equals( "setId" )) {
+ m.invoke( entity, RandomUtil.randomUUID() );
+ }
+
+
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 快速将bean的updUser、updHost、updTime附上相关值
+ *
+ * @param entity 实体bean
+ * @author 王浩彬
+ */
+ public static void setUpdatedInfo(T entity) {
+ try {
+ Method[] methods = entity.getClass().getMethods();
+ for (Method m : methods) {
+ if (m.getName().equals( "setUpdateBy" )) {
+ m.invoke( entity, com.ruoyi.framework.web.util.ShiroUtils.getUserId() );
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}