日志列表接口增加condition

bi-server/src/main/java/com/usoftchina/bi/server/controller/common/MessageLogController.java

@@ -10,12 +10,8 @@ import com.usoftchina.bi.server.service.common.MessageLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 /**
  * @Author chenwei
@@ -32,8 +28,8 @@ public class MessageLogController {
     @GetMapping("/list")
     @CheckToken
     @ApiOperation(value = "操作日志列表", notes = "操作日志列表(分页)", response = RepEntity.class)
-    public RepEntity<PageInfo<MessageLog>> list(@RequestHeader String token, TestPage testPage){
-        return new RepEntity<>(RepCode.success, messageLogService.list(testPage));
+    public RepEntity<PageInfo<MessageLog>> list(@RequestHeader String token, @RequestParam String condition, TestPage testPage){
+        return new RepEntity<>(RepCode.success, messageLogService.list(condition, testPage));
     }
 
 }

bi-server/src/main/java/com/usoftchina/bi/server/dao/common/MessageLogMapper.java

@@ -19,7 +19,7 @@ public interface MessageLogMapper {
     void insert(MessageLog messageLog);
 
 
-    @Select("SELECT * FROM BI_MESSAGELOG ORDER BY BML_ID DESC")
+    @Select("SELECT * FROM BI_MESSAGELOG ${condition} ORDER BY BML_ID DESC")
     @Results(id = "BaseResultMap", value = {
             @Result(id = true, column = "BML_ID", property = "id", jdbcType = JdbcType.INTEGER),
             @Result(column = "BML_DATE", property = "date", jdbcType = JdbcType.TIMESTAMP),
@@ -30,5 +30,5 @@ public interface MessageLogMapper {
             @Result(column = "BML_MODULE", property = "module", jdbcType = JdbcType.VARCHAR),
             @Result(column = "BML_ORDER", property = "order", jdbcType = JdbcType.VARCHAR),
     })
-    List<MessageLog> list(TestPage testPage);
+    List<MessageLog> list(@Param("condition") String condition, TestPage testPage);
 }

bi-server/src/main/java/com/usoftchina/bi/server/service/common/MessageLogService.java

@@ -20,8 +20,8 @@ public class MessageLogService {
     @Autowired
     private MessageLogMapper messageLogMapper;
 
-    public PageInfo<MessageLog> list(TestPage testPage) {
-        List<MessageLog> messageLogList = messageLogMapper.list(testPage.enablePaging());
+    public PageInfo<MessageLog> list(String condition, TestPage testPage) {
+        List<MessageLog> messageLogList = messageLogMapper.list(condition, testPage.enablePaging());
         return new PageInfo<MessageLog>(messageLogList);
     }