ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

基础insert和update自动填充用户信息时增加判断

This commit is contained in:
zhujj 2019-01-25 15:43:56 +08:00
parent 86b0893d8b
commit b6a3a5df35
4 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-cms/src/main/java/com/ruoyi/cms/controller/ApiWxPayController.java
View File

@ -70,7 +70,7 @@ public class ApiWxPayController extends BaseController {
courseUser.setCreateDate(new Date()); courseUser.setCreateDate(new Date());
courseUser.setUpdateDate(new Date()); courseUser.setUpdateDate(new Date());
courseUser.setRemarks("微信支付成功回调，订单ID:"+vipUserOrders.getId()); courseUser.setRemarks("微信支付成功回调，订单ID:"+vipUserOrders.getId());
trainCourseUserService.insertSelectiveNormal(courseUser); trainCourseUserService.insertSelective(courseUser);
} }
return WxPayNotifyResponse.success("成功"); return WxPayNotifyResponse.success("成功");
} }

17
ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java
View File

@ -64,19 +64,6 @@ public abstract interface AbstractBaseService<T> {
* @return * @return
*/ */
public int insertSelective(T entity); public int insertSelective(T entity);
/**
* 保存
* @param entity
* @return
*/
public int insertNormal(T entity);
/**
* 保存不为null的数据
* @param entity
* @return
*/
public int insertSelectiveNormal(T entity);
/** /**
* 删除符合条件的数据 * 删除符合条件的数据
@ -101,7 +88,7 @@ public abstract interface AbstractBaseService<T> {
public int deleteByIds(String ids); public int deleteByIds(String ids);
/** /**
* 根据编码ID全部字段更新 * 根据编码ID全部字段更新（自动填充用户信息）
* 包含（NULL） * 包含（NULL）
* @param entity * @param entity
* @return * @return
@ -109,7 +96,7 @@ public abstract interface AbstractBaseService<T> {
public int updateById(T entity) ; public int updateById(T entity) ;
/** /**
* 根据编码ID更新 * 根据编码ID更新（自动填充用户信息）
* 不包含（NULL） * 不包含（NULL）
* @param entity * @param entity
* @return * @return

10
ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
View File

@ -68,14 +68,7 @@ public abstract class AbstractBaseServiceImpl<M extends MyMapper<T>, T> implemen
EntityUtils.setCreateAndUpdateInfo(entity); EntityUtils.setCreateAndUpdateInfo(entity);
return mapper.insertSelective(entity); return mapper.insertSelective(entity);
} }
@Override
public int insertNormal(T entity) {
return mapper.insert(entity);
}
@Override
public int insertSelectiveNormal(T entity) {
return mapper.insertSelective(entity);
}
@Override @Override
public int delete(T entity) { public int delete(T entity) {
@ -104,7 +97,6 @@ public abstract class AbstractBaseServiceImpl<M extends MyMapper<T>, T> implemen
EntityUtils.setUpdatedInfo(entity); EntityUtils.setUpdatedInfo(entity);
return mapper.updateByPrimaryKeySelective(entity); return mapper.updateByPrimaryKeySelective(entity);
} }
@Override @Override
public List<T> selectByExample(Object example) { public List<T> selectByExample(Object example) {
return mapper.selectByExample(example); return mapper.selectByExample(example);

4
ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
View File

@ -36,7 +36,9 @@ public class EntityUtils {
Method[] methods = entity.getClass().getMethods(); Method[] methods = entity.getClass().getMethods();
for (Method m : methods) { for (Method m : methods) {
if (m.getName().equals("setCreateBy")) { if (m.getName().equals("setCreateBy")) {
if (null != com.ruoyi.framework.web.util.ShiroUtils.getSysUser()) {
m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getLoginName()); m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getLoginName());
}
} else if (m.getName().equals("setCreateDate")) { } else if (m.getName().equals("setCreateDate")) {
m.invoke(entity, new Date()); m.invoke(entity, new Date());
} else if (m.getName().equals("setCreateTime")) { } else if (m.getName().equals("setCreateTime")) {
@ -61,7 +63,9 @@ public class EntityUtils {
Method[] methods = entity.getClass().getMethods(); Method[] methods = entity.getClass().getMethods();
for (Method m : methods) { for (Method m : methods) {
if (m.getName().equals("setUpdateBy")) { if (m.getName().equals("setUpdateBy")) {
if (null != com.ruoyi.framework.web.util.ShiroUtils.getSysUser()) {
m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getLoginName()); m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getLoginName());
}
} else if (m.getName().equals("setUpdateDate")) { } else if (m.getName().equals("setUpdateDate")) {
m.invoke(entity, new Date()); m.invoke(entity, new Date());
} else if (m.getName().equals("setUpdateTime")) { } else if (m.getName().equals("setUpdateTime")) {