日志查询增加条件，角色新增修改，添加角色代码

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/LogController.java

@@ -19,10 +19,10 @@ public class LogController {
     private LogService logService;
 
     @GetMapping("/getLogPage")
-    public Result getLogPage(int page, int limit) {
+    public Result getLogPage(int page, int limit, String serverName, String modelName, String content, String userId, String createTime, String ipAddress, String methodName) {
         if (Blank.isEmpty(page, limit) || page < 1 || limit < 1) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
         }
-        return logService.getLogPage(page, limit);
+        return logService.getLogPage(page, limit, serverName, modelName, content, userId, createTime, ipAddress, methodName);
     }
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/LogDao.java

@@ -8,9 +8,9 @@ import java.util.List;
 @Repository
 public interface LogDao {
 
-    Long getLogCount();
+    Long getLogCount(String serverName, String modelName, String content, String userId, String createTime, String ipAddress, String methodName);
 
-    List<Log> getLogPage(Long startNum, Long limitNum);
+    List<Log> getLogPage(Long startNum, Long limitNum, String serverName, String modelName, String content, String userId, String createTime, String ipAddress, String methodName);
 
     Integer insertLog(Log log);
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/RoleDao.java

@@ -12,7 +12,7 @@ public interface RoleDao {
 
     Role getRoleByName(String roleName);
 
-    Integer addRole(String roleName);
+    Integer addRole(Role role);
 
     Role getRoleByNoIdName(int id, String roleName);
 

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/LogService.java

@@ -5,7 +5,7 @@ import com.judong.chuanyiserver.util.Result;
 
 public interface LogService {
 
-    Result getLogPage(int page, int limit);
+    Result getLogPage(int page, int limit, String serverName, String modelName, String content, String userId, String createTime, String ipAddress, String methodName);
 
     Result insertLog(Log log);
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/LogServiceImpl.java

@@ -20,11 +20,11 @@ public class LogServiceImpl implements LogService {
     private LogDao logDao;
 
     @Override
-    public Result getLogPage(int page, int limit) {
+    public Result getLogPage(int page, int limit, String serverName, String modelName, String content, String userId, String createTime, String ipAddress, String methodName) {
         JSONObject jsonObject = new JSONObject();
-        Long count = logDao.getLogCount();
+        Long count = logDao.getLogCount(serverName, modelName, content, userId, createTime, ipAddress, methodName);
         Long startNum = Long.valueOf((page - 1) * limit);
-        List<Log> logList = logDao.getLogPage(startNum, Long.valueOf(limit));
+        List<Log> logList = logDao.getLogPage(startNum, Long.valueOf(limit), serverName, modelName, content, userId, createTime, ipAddress, methodName);
         jsonObject.put("count", count);
         jsonObject.put("logList", logList);
         return Result.ok(jsonObject);

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/RoleServiceImpl.java

@@ -29,7 +29,7 @@ public class RoleServiceImpl implements RoleService {
         if (Blank.isNotEmpty(roleDao.getRoleByName(role.getRoleName()))) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "该角色名已被使用，请更换其他角色名");
         }
-        if (roleDao.addRole(role.getRoleName()) <= 0) {
+        if (roleDao.addRole(role) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增失败");
         }
         return Result.ok("添加角色成功");
@@ -37,7 +37,7 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     public synchronized Result updateRole(Role role) {
-        if (Blank.isEmpty(role.getId()) || Blank.isEmpty(role.getRoleName())) {
+        if (Blank.isEmpty(role.getId(), role.getRoleName(), role.getRoleCode())) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "角色Id和角色名称不能为空");
         }
         if (Blank.isNotEmpty(roleDao.getRoleByNoIdName(role.getId(), role.getRoleName()))) {

chuanyi_server/src/main/resources/mapper/LogDao.xml

@@ -12,6 +12,28 @@
     <select id="getLogCount" resultType="java.lang.Long">
         select count(*)
         from sys_log
+        where 1=1
+        <if test="serverName != null">
+            AND server_name LIKE CONCAT('%', #{serverName}, '%')
+        </if>
+        <if test="modelName != null">
+            AND model_name LIKE CONCAT('%', #{modelName}, '%')
+        </if>
+        <if test="content != null">
+            AND content LIKE CONCAT('%', #{content}, '%')
+        </if>
+        <if test="userId != null">
+            AND user_id =#{userId}
+        </if>
+        <if test="createTime != null">
+            AND create_time LIKE CONCAT('%', #{createTime}, '%')
+        </if>
+        <if test="ipAddress != null">
+            AND ip_address LIKE CONCAT('%', #{ipAddress}, '%')
+        </if>
+        <if test="methodName != null">
+            AND method_name LIKE CONCAT('%', #{methodName}, '%')
+        </if>
     </select>
 
     <select id="getLogPage" resultType="com.judong.chuanyiserver.entity.Log">
@@ -26,6 +48,28 @@
                method_name,
                remark
         from sys_log
+        where 1=1
+        <if test="serverName != null">
+            AND server_name LIKE CONCAT('%', #{serverName}, '%')
+        </if>
+        <if test="modelName != null">
+            AND model_name LIKE CONCAT('%', #{modelName}, '%')
+        </if>
+        <if test="content != null">
+            AND content LIKE CONCAT('%', #{content}, '%')
+        </if>
+        <if test="userId != null">
+            AND user_id =#{userId}
+        </if>
+        <if test="createTime != null">
+            AND create_time LIKE CONCAT('%', #{createTime}, '%')
+        </if>
+        <if test="ipAddress != null">
+            AND ip_address LIKE CONCAT('%', #{ipAddress}, '%')
+        </if>
+        <if test="methodName != null">
+            AND method_name LIKE CONCAT('%', #{methodName}, '%')
+        </if>
         order by create_time DESC
         limit #{startNum},#{limitNum}
     </select>

chuanyi_server/src/main/resources/mapper/RoleDao.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.judong.chuanyiserver.dao.RoleDao">
 
     <insert id="addRole">
-        INSERT INTO sys_role (role_name)
-            VALUE (#{roleName})
+        INSERT INTO sys_role (role_name, role_code)
+            VALUE (#{roleName}, #{roleCode})
     </insert>
 
     <insert id="addRoleMenuList">
@@ -16,7 +16,8 @@
 
     <update id="updateRole">
         update sys_role
-        set role_name=#{roleName}
+        set role_name=#{roleName},
+            role_code=#{roleCode}
         where id = #{id}
     </update>
     <update id="deleteRoleById">
@@ -41,7 +42,8 @@
 
     <select id="getRoleByName" resultType="com.judong.chuanyiserver.entity.Role">
         SELECT id,
-               role_name
+               role_name,
+               role_code
         FROM sys_role
         WHERE role_name = #{roleName}
     </select>