From 876a06a9cd2adfcdc390caeef50cfbfa2e8e860f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 四月 2021 17:14:50 +0800
Subject: [PATCH] update mp化
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java | 5
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java | 28 +
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java | 4
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java | 15
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java | 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 5
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java | 33 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 44 ++
ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml | 6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 19
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java | 30 --
ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml | 80 ------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java | 48 ----
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java | 8
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml | 38 ---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 3
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml | 83 ------
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml | 75 ------
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java | 69 -----
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java | 36 ---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java | 27 +-
29 files changed, 129 insertions(+), 556 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index 8db94da..5bfcb05 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -9,6 +9,7 @@
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.*;
/**
@@ -21,7 +22,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_dept")
-public class SysDept
+public class SysDept implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
index eb81dea..43ed6e0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -11,6 +11,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -25,13 +26,13 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_dict_data")
-public class SysDictData
+public class SysDictData implements Serializable
{
private static final long serialVersionUID = 1L;
/** 瀛楀吀缂栫爜 */
@Excel(name = "瀛楀吀缂栫爜", cellType = ColumnType.NUMERIC)
- @TableId(value = "dept_code",type = IdType.AUTO)
+ @TableId(value = "dict_code",type = IdType.AUTO)
private Long dictCode;
/** 瀛楀吀鎺掑簭 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
index 09ca5f1..af2dca8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@@ -10,6 +10,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -23,8 +24,8 @@
@Data
@NoArgsConstructor
@Accessors(chain = true)
-@TableName("sys_config")
-public class SysDictType
+@TableName("sys_dict_type")
+public class SysDictType implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 17e706d..aa60c2d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -8,6 +8,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.*;
/**
@@ -20,7 +21,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_menu")
-public class SysMenu
+public class SysMenu implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index 5c86436..ba89bec 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -10,6 +10,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -24,7 +25,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_role")
-public class SysRole
+public class SysRole implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 73a0561..f39fd23 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -15,6 +15,7 @@
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -30,7 +31,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_user")
-public class SysUser
+public class SysUser implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
index fb9c7f7..ea5e05b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
@@ -2,14 +2,7 @@
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
-import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
-import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
-import com.baomidou.mybatisplus.core.injector.ISqlInjector;
-import com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.IllegalSQLInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.ruoyi.framework.mybatisplus.CreateAndUpdateMetaObjectHandler;
@@ -29,7 +22,7 @@
// 涔愯閿佹彃浠�
interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
// 闃绘柇鎻掍欢
- interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+// interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
return interceptor;
}
@@ -58,9 +51,9 @@
* 濡傛灉鏄鍏ㄨ〃鐨勫垹闄ゆ垨鏇存柊鎿嶄綔锛屽氨浼氱粓姝㈣鎿嶄綔
* https://baomidou.com/guide/interceptor-block-attack.html
*/
- public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
- return new BlockAttackInnerInterceptor();
- }
+// public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
+// return new BlockAttackInnerInterceptor();
+// }
/**
* sql鎬ц兘瑙勮寖鎻掍欢(鍨冨溇SQL鎷︽埅)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index a931490..547e896 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -10,6 +10,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -24,7 +25,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_config")
-public class SysConfig {
+public class SysConfig implements Serializable {
private static final long serialVersionUID = 1L;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
index 22fb843..3182bc4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -11,6 +11,7 @@
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -25,7 +26,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_logininfor")
-public class SysLogininfor {
+public class SysLogininfor implements Serializable {
private static final long serialVersionUID = 1L;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
index a78636d..1efabf5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -8,6 +8,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -21,7 +22,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_notice")
-public class SysNotice {
+public class SysNotice implements Serializable {
private static final long serialVersionUID = 1L;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
index 87deccf..03e5d26 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@@ -11,6 +11,7 @@
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -25,7 +26,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_oper_log")
-public class SysOperLog {
+public class SysOperLog implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -50,6 +51,7 @@
/**
* 涓氬姟绫诲瀷鏁扮粍
*/
+ @TableField(exist = false)
private Integer[] businessTypes;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index cafd0a7..5957ed9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -10,6 +10,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -24,7 +25,7 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_post")
-public class SysPost {
+public class SysPost implements Serializable {
private static final long serialVersionUID = 1L;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
index fcc71f5..8658318 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
@@ -3,41 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysLogininfor;
-import java.util.List;
-
/**
* 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏁版嵁灞�
*
* @author ruoyi
*/
public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
- /**
- * 鏂板绯荤粺鐧诲綍鏃ュ織
- *
- * @param logininfor 璁块棶鏃ュ織瀵硅薄
- */
- public void insertLogininfor(SysLogininfor logininfor);
- /**
- * 鏌ヨ绯荤粺鐧诲綍鏃ュ織闆嗗悎
- *
- * @param logininfor 璁块棶鏃ュ織瀵硅薄
- * @return 鐧诲綍璁板綍闆嗗悎
- */
- public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
-
- /**
- * 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織
- *
- * @param infoIds 闇�瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID
- * @return 缁撴灉
- */
- public int deleteLogininforByIds(Long[] infoIds);
-
- /**
- * 娓呯┖绯荤粺鐧诲綍鏃ュ織
- *
- * @return 缁撴灉
- */
- public int cleanLogininfor();
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
index c1c0e42..9fe7165 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
@@ -3,59 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysNotice;
-import java.util.List;
-
/**
* 閫氱煡鍏憡琛� 鏁版嵁灞�
*
* @author ruoyi
*/
public interface SysNoticeMapper extends BaseMapper<SysNotice> {
- /**
- * 鏌ヨ鍏憡淇℃伅
- *
- * @param noticeId 鍏憡ID
- * @return 鍏憡淇℃伅
- */
- public SysNotice selectNoticeById(Long noticeId);
- /**
- * 鏌ヨ鍏憡鍒楄〃
- *
- * @param notice 鍏憡淇℃伅
- * @return 鍏憡闆嗗悎
- */
- public List<SysNotice> selectNoticeList(SysNotice notice);
-
- /**
- * 鏂板鍏憡
- *
- * @param notice 鍏憡淇℃伅
- * @return 缁撴灉
- */
- public int insertNotice(SysNotice notice);
-
- /**
- * 淇敼鍏憡
- *
- * @param notice 鍏憡淇℃伅
- * @return 缁撴灉
- */
- public int updateNotice(SysNotice notice);
-
- /**
- * 鎵归噺鍒犻櫎鍏憡
- *
- * @param noticeId 鍏憡ID
- * @return 缁撴灉
- */
- public int deleteNoticeById(Long noticeId);
-
- /**
- * 鎵归噺鍒犻櫎鍏憡淇℃伅
- *
- * @param noticeIds 闇�瑕佸垹闄ょ殑鍏憡ID
- * @return 缁撴灉
- */
- public int deleteNoticeByIds(Long[] noticeIds);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
index 6caf429..d2bae7d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
@@ -3,47 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysOperLog;
-import java.util.List;
-
/**
* 鎿嶄綔鏃ュ織 鏁版嵁灞�
*
* @author ruoyi
*/
public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
- /**
- * 鏂板鎿嶄綔鏃ュ織
- *
- * @param operLog 鎿嶄綔鏃ュ織瀵硅薄
- */
- public void insertOperlog(SysOperLog operLog);
- /**
- * 鏌ヨ绯荤粺鎿嶄綔鏃ュ織闆嗗悎
- *
- * @param operLog 鎿嶄綔鏃ュ織瀵硅薄
- * @return 鎿嶄綔鏃ュ織闆嗗悎
- */
- public List<SysOperLog> selectOperLogList(SysOperLog operLog);
-
- /**
- * 鎵归噺鍒犻櫎绯荤粺鎿嶄綔鏃ュ織
- *
- * @param operIds 闇�瑕佸垹闄ょ殑鎿嶄綔鏃ュ織ID
- * @return 缁撴灉
- */
- public int deleteOperLogByIds(Long[] operIds);
-
- /**
- * 鏌ヨ鎿嶄綔鏃ュ織璇︾粏
- *
- * @param operId 鎿嶄綔ID
- * @return 鎿嶄綔鏃ュ織瀵硅薄
- */
- public SysOperLog selectOperLogById(Long operId);
-
- /**
- * 娓呯┖鎿嶄綔鏃ュ織
- */
- public void cleanOperLog();
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
index b02a07c..d15facd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
@@ -11,28 +11,6 @@
* @author ruoyi
*/
public interface SysPostMapper extends BaseMapper<SysPost> {
- /**
- * 鏌ヨ宀椾綅鏁版嵁闆嗗悎
- *
- * @param post 宀椾綅淇℃伅
- * @return 宀椾綅鏁版嵁闆嗗悎
- */
- public List<SysPost> selectPostList(SysPost post);
-
- /**
- * 鏌ヨ鎵�鏈夊矖浣�
- *
- * @return 宀椾綅鍒楄〃
- */
- public List<SysPost> selectPostAll();
-
- /**
- * 閫氳繃宀椾綅ID鏌ヨ宀椾綅淇℃伅
- *
- * @param postId 宀椾綅ID
- * @return 瑙掕壊瀵硅薄淇℃伅
- */
- public SysPost selectPostById(Long postId);
/**
* 鏍规嵁鐢ㄦ埛ID鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
@@ -50,51 +28,4 @@
*/
public List<SysPost> selectPostsByUserName(String userName);
- /**
- * 鍒犻櫎宀椾綅淇℃伅
- *
- * @param postId 宀椾綅ID
- * @return 缁撴灉
- */
- public int deletePostById(Long postId);
-
- /**
- * 鎵归噺鍒犻櫎宀椾綅淇℃伅
- *
- * @param postIds 闇�瑕佸垹闄ょ殑宀椾綅ID
- * @return 缁撴灉
- */
- public int deletePostByIds(Long[] postIds);
-
- /**
- * 淇敼宀椾綅淇℃伅
- *
- * @param post 宀椾綅淇℃伅
- * @return 缁撴灉
- */
- public int updatePost(SysPost post);
-
- /**
- * 鏂板宀椾綅淇℃伅
- *
- * @param post 宀椾綅淇℃伅
- * @return 缁撴灉
- */
- public int insertPost(SysPost post);
-
- /**
- * 鏍￠獙宀椾綅鍚嶇О
- *
- * @param postName 宀椾綅鍚嶇О
- * @return 缁撴灉
- */
- public SysPost checkPostNameUnique(String postName);
-
- /**
- * 鏍￠獙宀椾綅缂栫爜
- *
- * @param postCode 宀椾綅缂栫爜
- * @return 缁撴灉
- */
- public SysPost checkPostCodeUnique(String postCode);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
index 56ceb31..1030270 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
@@ -20,14 +20,6 @@
public int deleteUserPostByUserId(Long userId);
/**
- * 閫氳繃宀椾綅ID鏌ヨ宀椾綅浣跨敤鏁伴噺
- *
- * @param postId 宀椾綅ID
- * @return 缁撴灉
- */
- public int countUserPostById(Long postId);
-
- /**
* 鎵归噺鍒犻櫎鐢ㄦ埛鍜屽矖浣嶅叧鑱�
*
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 4acfeb3..d5aeec2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -91,10 +91,10 @@
lqw.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType());
lqw.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey());
Map<String, Object> params = config.getParams();
- lqw.apply(params.get("beginTime") != null,
+ lqw.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
params.get("beginTime"));
- lqw.apply(params.get("endTime") != null,
+ lqw.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
params.get("endTime"));
return baseMapper.selectList(lqw);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 79a09e9..e554c00 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -32,8 +32,6 @@
*/
@Service
public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements ISysDeptService {
- @Autowired
- private SysDeptMapper deptMapper;
@Autowired
private SysRoleMapper roleMapper;
@@ -109,7 +107,7 @@
@Override
public List<Integer> selectDeptListByRoleId(Long roleId) {
SysRole role = roleMapper.selectRoleById(roleId);
- return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
+ return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index 935311c..1949d30 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,8 +30,6 @@
*/
@Service
public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
- @Autowired
- private SysDictTypeMapper dictTypeMapper;
@Autowired
private SysDictDataMapper dictDataMapper;
@@ -45,7 +44,7 @@
List<SysDictData> dictDatas = dictDataMapper.selectList(
new LambdaQueryWrapper<SysDictData>()
.eq(SysDictData::getStatus, 0)
- .eq(SysDictData::getDictType, dictType)
+ .eq(SysDictData::getDictType, dictType.getDictType())
.orderByAsc(SysDictData::getDictSort));
DictUtils.setDictCache(dictType.getDictType(), dictDatas);
}
@@ -61,13 +60,13 @@
public List<SysDictType> selectDictTypeList(SysDictType dictType) {
Map<String, Object> params = dictType.getParams();
return list(new LambdaQueryWrapper<SysDictType>()
- .like(SysDictType::getDictName, dictType.getDictName())
- .eq(SysDictType::getStatus, dictType.getStatus())
- .like(SysDictType::getDictType, dictType.getDictType())
- .apply(params.get("beginTime") != null,
+ .like(StrUtil.isNotBlank(dictType.getDictName()),SysDictType::getDictName, dictType.getDictName())
+ .eq(StrUtil.isNotBlank(dictType.getStatus()),SysDictType::getStatus, dictType.getStatus())
+ .like(StrUtil.isNotBlank(dictType.getDictType()),SysDictType::getDictType, dictType.getDictType())
+ .apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime"))
- .apply(params.get("endTime") != null,
+ .apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime")));
}
@@ -165,7 +164,7 @@
*/
@Override
public int insertDictType(SysDictType dictType) {
- int row = dictTypeMapper.insert(dictType);
+ int row = baseMapper.insert(dictType);
if (row > 0) {
DictUtils.clearDictCache();
}
@@ -185,7 +184,7 @@
dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>()
.set(SysDictData::getDictType, dictType.getDictType())
.eq(SysDictData::getDictType, oldDict.getDictType()));
- int row = dictTypeMapper.updateById(dictType);
+ int row = baseMapper.updateById(dictType);
if (row > 0) {
DictUtils.clearDictCache();
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
index 10ec41c..8acb14f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
@@ -1,13 +1,17 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.mapper.SysLogininforMapper;
import com.ruoyi.system.service.ISysLogininforService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞�
@@ -17,9 +21,6 @@
@Service
public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService {
- @Autowired
- private SysLogininforMapper logininforMapper;
-
/**
* 鏂板绯荤粺鐧诲綍鏃ュ織
*
@@ -27,7 +28,7 @@
*/
@Override
public void insertLogininfor(SysLogininfor logininfor) {
- logininforMapper.insertLogininfor(logininfor);
+ save(logininfor);
}
/**
@@ -38,7 +39,18 @@
*/
@Override
public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor) {
- return logininforMapper.selectLogininforList(logininfor);
+ Map<String, Object> params = logininfor.getParams();
+ return list(new LambdaQueryWrapper<SysLogininfor>()
+ .like(StrUtil.isNotBlank(logininfor.getIpaddr()),SysLogininfor::getIpaddr,logininfor.getIpaddr())
+ .eq(StrUtil.isNotBlank(logininfor.getStatus()),SysLogininfor::getStatus,logininfor.getStatus())
+ .like(StrUtil.isNotBlank(logininfor.getUserName()),SysLogininfor::getUserName,logininfor.getUserName())
+ .apply(Validator.isNotEmpty(params.get("beginTime")),
+ "date_format(login_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(Validator.isNotEmpty(params.get("endTime")),
+ "date_format(login_time,'%y%m%d') <= date_format({0},'%y%m%d'",
+ params.get("endTime"))
+ .orderByDesc(SysLogininfor::getInfoId));
}
/**
@@ -49,7 +61,7 @@
*/
@Override
public int deleteLogininforByIds(Long[] infoIds) {
- return logininforMapper.deleteLogininforByIds(infoIds);
+ return baseMapper.deleteBatchIds(Arrays.asList(infoIds));
}
/**
@@ -57,6 +69,6 @@
*/
@Override
public void cleanLogininfor() {
- logininforMapper.cleanLogininfor();
+ remove(new LambdaQueryWrapper<>());
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
index abd4a17..04184d7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
@@ -1,13 +1,15 @@
package com.ruoyi.system.service.impl;
-import java.util.List;
-
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.mapper.SysNoticeMapper;
import com.ruoyi.system.service.ISysNoticeService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 鍏憡 鏈嶅姟灞傚疄鐜�
@@ -16,8 +18,6 @@
*/
@Service
public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
- @Autowired
- private SysNoticeMapper noticeMapper;
/**
* 鏌ヨ鍏憡淇℃伅
@@ -27,7 +27,7 @@
*/
@Override
public SysNotice selectNoticeById(Long noticeId) {
- return noticeMapper.selectNoticeById(noticeId);
+ return getById(noticeId);
}
/**
@@ -38,7 +38,10 @@
*/
@Override
public List<SysNotice> selectNoticeList(SysNotice notice) {
- return noticeMapper.selectNoticeList(notice);
+ return list(new LambdaQueryWrapper<SysNotice>()
+ .like(StrUtil.isNotBlank(notice.getNoticeTitle()),SysNotice::getNoticeTitle,notice.getNoticeTitle())
+ .eq(StrUtil.isNotBlank(notice.getNoticeType()),SysNotice::getNoticeType,notice.getNoticeType())
+ .like(StrUtil.isNotBlank(notice.getCreateBy()),SysNotice::getCreateBy,notice.getCreateBy()));
}
/**
@@ -49,7 +52,7 @@
*/
@Override
public int insertNotice(SysNotice notice) {
- return noticeMapper.insertNotice(notice);
+ return baseMapper.insert(notice);
}
/**
@@ -60,7 +63,7 @@
*/
@Override
public int updateNotice(SysNotice notice) {
- return noticeMapper.updateNotice(notice);
+ return baseMapper.updateById(notice);
}
/**
@@ -71,7 +74,7 @@
*/
@Override
public int deleteNoticeById(Long noticeId) {
- return noticeMapper.deleteNoticeById(noticeId);
+ return baseMapper.deleteById(noticeId);
}
/**
@@ -82,6 +85,6 @@
*/
@Override
public int deleteNoticeByIds(Long[] noticeIds) {
- return noticeMapper.deleteNoticeByIds(noticeIds);
+ return baseMapper.deleteBatchIds(Arrays.asList(noticeIds));
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
index 95bf7f1..6b18056 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
@@ -1,13 +1,18 @@
package com.ruoyi.system.service.impl;
-import java.util.List;
-
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.service.ISysOperLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞�
@@ -16,8 +21,6 @@
*/
@Service
public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {
- @Autowired
- private SysOperLogMapper operLogMapper;
/**
* 鏂板鎿嶄綔鏃ュ織
@@ -26,7 +29,7 @@
*/
@Override
public void insertOperlog(SysOperLog operLog) {
- operLogMapper.insertOperlog(operLog);
+ save(operLog);
}
/**
@@ -37,7 +40,26 @@
*/
@Override
public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
- return operLogMapper.selectOperLogList(operLog);
+ Map<String, Object> params = operLog.getParams();
+ return list(new LambdaQueryWrapper<SysOperLog>()
+ .like(StrUtil.isNotBlank(operLog.getTitle()),SysOperLog::getTitle,operLog.getTitle())
+ .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
+ SysOperLog::getBusinessType,operLog.getBusinessType())
+ .func(f -> {
+ if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())){
+ f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
+ }
+ })
+ .eq(operLog.getStatus() != null && operLog.getStatus() > 0,
+ SysOperLog::getStatus,operLog.getStatus())
+ .like(StrUtil.isNotBlank(operLog.getOperName()),SysOperLog::getOperName,operLog.getOperName())
+ .apply(Validator.isNotEmpty(params.get("beginTime")),
+ "date_format(login_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(Validator.isNotEmpty(params.get("endTime")),
+ "date_format(login_time,'%y%m%d') <= date_format({0},'%y%m%d'",
+ params.get("endTime"))
+ .orderByDesc(SysOperLog::getOperId));
}
/**
@@ -48,7 +70,7 @@
*/
@Override
public int deleteOperLogByIds(Long[] operIds) {
- return operLogMapper.deleteOperLogByIds(operIds);
+ return baseMapper.deleteBatchIds(Arrays.asList(operIds));
}
/**
@@ -59,7 +81,7 @@
*/
@Override
public SysOperLog selectOperLogById(Long operId) {
- return operLogMapper.selectOperLogById(operId);
+ return getById(operId);
}
/**
@@ -67,6 +89,6 @@
*/
@Override
public void cleanOperLog() {
- operLogMapper.cleanOperLog();
+ remove(new LambdaQueryWrapper<>());
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
index 71035b9..7d37fab 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
@@ -1,16 +1,20 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.service.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
/**
@@ -20,8 +24,6 @@
*/
@Service
public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> implements ISysPostService {
- @Autowired
- private SysPostMapper postMapper;
@Autowired
private SysUserPostMapper userPostMapper;
@@ -34,7 +36,10 @@
*/
@Override
public List<SysPost> selectPostList(SysPost post) {
- return postMapper.selectPostList(post);
+ return list(new LambdaQueryWrapper<SysPost>()
+ .like(StrUtil.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
+ .eq(StrUtil.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
+ .like(StrUtil.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName()));
}
/**
@@ -44,7 +49,7 @@
*/
@Override
public List<SysPost> selectPostAll() {
- return postMapper.selectPostAll();
+ return list();
}
/**
@@ -55,7 +60,7 @@
*/
@Override
public SysPost selectPostById(Long postId) {
- return postMapper.selectPostById(postId);
+ return getById(postId);
}
/**
@@ -66,7 +71,7 @@
*/
@Override
public List<Integer> selectPostListByUserId(Long userId) {
- return postMapper.selectPostListByUserId(userId);
+ return baseMapper.selectPostListByUserId(userId);
}
/**
@@ -78,7 +83,8 @@
@Override
public String checkPostNameUnique(SysPost post) {
Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId();
- SysPost info = postMapper.checkPostNameUnique(post.getPostName());
+ SysPost info = getOne(new LambdaQueryWrapper<SysPost>()
+ .eq(SysPost::getPostName, post.getPostName()).last("limit 1"));
if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -94,7 +100,8 @@
@Override
public String checkPostCodeUnique(SysPost post) {
Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId();
- SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
+ SysPost info = getOne(new LambdaQueryWrapper<SysPost>()
+ .eq(SysPost::getPostCode, post.getPostCode()).last("limit 1"));
if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -109,7 +116,7 @@
*/
@Override
public int countUserPostById(Long postId) {
- return userPostMapper.countUserPostById(postId);
+ return userPostMapper.selectCount(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getPostId,postId));
}
/**
@@ -120,7 +127,7 @@
*/
@Override
public int deletePostById(Long postId) {
- return postMapper.deletePostById(postId);
+ return baseMapper.deleteById(postId);
}
/**
@@ -138,7 +145,7 @@
throw new CustomException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", post.getPostName()));
}
}
- return postMapper.deletePostByIds(postIds);
+ return baseMapper.deleteBatchIds(Arrays.asList(postIds));
}
/**
@@ -149,7 +156,7 @@
*/
@Override
public int insertPost(SysPost post) {
- return postMapper.insertPost(post);
+ return baseMapper.insert(post);
}
/**
@@ -160,6 +167,6 @@
*/
@Override
public int updatePost(SysPost post) {
- return postMapper.updatePost(post);
+ return baseMapper.updateById(post);
}
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index add7d53..a2e38bf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -16,42 +16,4 @@
<result property="loginTime" column="login_time"/>
</resultMap>
- <insert id="insertLogininfor" parameterType="SysLogininfor">
- insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
- values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
- </insert>
-
- <select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
- select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
- <where>
- <if test="ipaddr != null and ipaddr != ''">
- AND ipaddr like concat('%', #{ipaddr}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="userName != null and userName != ''">
- AND user_name like concat('%', #{userName}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(login_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(login_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
- </if>
- </where>
- order by info_id desc
- </select>
-
- <delete id="deleteLogininforByIds" parameterType="Long">
- delete from sys_logininfor where info_id in
- <foreach collection="array" item="infoId" open="(" separator="," close=")">
- #{infoId}
- </foreach>
- </delete>
-
- <update id="cleanLogininfor">
- truncate table sys_logininfor
- </update>
-
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index 9ae9fe0..be3cd08 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -17,84 +17,4 @@
<result property="remark" column="remark"/>
</resultMap>
- <sql id="selectNoticeVo">
- select notice_id,
- notice_title,
- notice_type,
- cast(notice_content as char) as notice_content,
- status,
- create_by,
- create_time,
- update_by,
- update_time,
- remark
- from sys_notice
- </sql>
-
- <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
- <include refid="selectNoticeVo"/>
- where notice_id = #{noticeId}
- </select>
-
- <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
- <include refid="selectNoticeVo"/>
- <where>
- <if test="noticeTitle != null and noticeTitle != ''">
- AND notice_title like concat('%', #{noticeTitle}, '%')
- </if>
- <if test="noticeType != null and noticeType != ''">
- AND notice_type = #{noticeType}
- </if>
- <if test="createBy != null and createBy != ''">
- AND create_by like concat('%', #{createBy}, '%')
- </if>
- </where>
- </select>
-
- <insert id="insertNotice" parameterType="SysNotice">
- insert into sys_notice (
- <if test="noticeTitle != null and noticeTitle != '' ">notice_title,</if>
- <if test="noticeType != null and noticeType != '' ">notice_type,</if>
- <if test="noticeContent != null and noticeContent != '' ">notice_content,</if>
- <if test="status != null and status != '' ">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle},</if>
- <if test="noticeType != null and noticeType != ''">#{noticeType},</if>
- <if test="noticeContent != null and noticeContent != ''">#{noticeContent},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateNotice" parameterType="SysNotice">
- update sys_notice
- <set>
- <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle},</if>
- <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType},</if>
- <if test="noticeContent != null">notice_content = #{noticeContent},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where notice_id = #{noticeId}
- </update>
-
- <delete id="deleteNoticeById" parameterType="Long">
- delete
- from sys_notice
- where notice_id = #{noticeId}
- </delete>
-
- <delete id="deleteNoticeByIds" parameterType="Long">
- delete from sys_notice where notice_id in
- <foreach item="noticeId" collection="array" open="(" separator="," close=")">
- #{noticeId}
- </foreach>
- </delete>
-
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index e6166ca..9d40c6d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -23,79 +23,4 @@
<result property="operTime" column="oper_time"/>
</resultMap>
- <sql id="selectOperLogVo">
- select oper_id,
- title,
- business_type,
- method,
- request_method,
- operator_type,
- oper_name,
- dept_name,
- oper_url,
- oper_ip,
- oper_location,
- oper_param,
- json_result,
- status,
- error_msg,
- oper_time
- from sys_oper_log
- </sql>
-
- <insert id="insertOperlog" parameterType="SysOperLog">
- insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name,
- oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg,
- oper_time)
- values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName},
- #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
- </insert>
-
- <select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
- <include refid="selectOperLogVo"/>
- <where>
- <if test="title != null and title != ''">
- AND title like concat('%', #{title}, '%')
- </if>
- <if test="businessType != null and businessType != ''">
- AND business_type = #{businessType}
- </if>
- <if test="businessTypes != null and businessTypes.length > 0">
- AND business_type in
- <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
- #{businessType}
- </foreach>
- </if>
- <if test="status != null">
- AND status = #{status}
- </if>
- <if test="operName != null and operName != ''">
- AND oper_name like concat('%', #{operName}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(oper_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(oper_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
- </if>
- </where>
- order by oper_id desc
- </select>
-
- <delete id="deleteOperLogByIds" parameterType="Long">
- delete from sys_oper_log where oper_id in
- <foreach collection="array" item="operId" open="(" separator="," close=")">
- #{operId}
- </foreach>
- </delete>
-
- <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
- <include refid="selectOperLogVo"/>
- where oper_id = #{operId}
- </select>
-
- <update id="cleanOperLog">
- truncate table sys_oper_log
- </update>
-
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index 4cefa34..c009a6c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -29,30 +29,6 @@
from sys_post
</sql>
- <select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- <where>
- <if test="postCode != null and postCode != ''">
- AND post_code like concat('%', #{postCode}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="postName != null and postName != ''">
- AND post_name like concat('%', #{postName}, '%')
- </if>
- </where>
- </select>
-
- <select id="selectPostAll" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- </select>
-
- <select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- where post_id = #{postId}
- </select>
-
<select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
select p.post_id
from sys_post p
@@ -68,64 +44,5 @@
left join sys_user u on u.user_id = up.user_id
where u.user_name = #{userName}
</select>
-
- <select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- where post_name=#{postName} limit 1
- </select>
-
- <select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- where post_code=#{postCode} limit 1
- </select>
-
- <update id="updatePost" parameterType="SysPost">
- update sys_post
- <set>
- <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
- <if test="postName != null and postName != ''">post_name = #{postName},</if>
- <if test="postSort != null and postSort != ''">post_sort = #{postSort},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where post_id = #{postId}
- </update>
-
- <insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
- insert into sys_post(
- <if test="postId != null and postId != 0">post_id,</if>
- <if test="postCode != null and postCode != ''">post_code,</if>
- <if test="postName != null and postName != ''">post_name,</if>
- <if test="postSort != null and postSort != ''">post_sort,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="postId != null and postId != 0">#{postId},</if>
- <if test="postCode != null and postCode != ''">#{postCode},</if>
- <if test="postName != null and postName != ''">#{postName},</if>
- <if test="postSort != null and postSort != ''">#{postSort},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <delete id="deletePostById" parameterType="Long">
- delete
- from sys_post
- where post_id = #{postId}
- </delete>
-
- <delete id="deletePostByIds" parameterType="Long">
- delete from sys_post where post_id in
- <foreach collection="array" item="postId" open="(" separator="," close=")">
- #{postId}
- </foreach>
- </delete>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
index 4b420b1..c893dcf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -15,12 +15,6 @@
where user_id = #{userId}
</delete>
- <select id="countUserPostById" resultType="Integer">
- select count(1)
- from sys_user_post
- where post_id = #{postId}
- </select>
-
<delete id="deleteUserPost" parameterType="Long">
delete from sys_user_post where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
--
Gitblit v1.9.3