gatewayAccess事件检测 支持 按照事件名称 搜索

+package com.monitor.model.request;
+
+import com.monitor.model.page.PageRequest;
+import lombok.Data;
+
+/**
+ * Created by meiling.ge on 2017/8/18.
+ */
+@Data
+public class GateWayTaskReq extends PageRequest {
+    private String eventName;
+//    private int dataSource;
+}

@@ -16,9 +16,9 @@ public interface TaskSheduleMapper {
 
     TaskModel selectById(int id);
 
-    List<TaskModel> selectByPageWithSourceTask(PageBean page);
+    List<TaskModel> selectByPageWithSourceTask(@Param("page")PageBean page);
 
-    List<TaskModel> selectByPageWithSourceGateway(PageBean page);
+//    List<TaskModel> selectByPageWithSourceGateway(@Param("page")PageBean page);
 
     int deleteById(int id);
 
@@ -26,7 +26,7 @@ public interface TaskSheduleMapper {
 
     int insert(TaskModel taskModel);
 
-    int selectCount(int addSource);
+    int selectCount(@Param("page")PageBean page);
 
     int updateLastTime(int id);
 }

@@ -25,7 +25,7 @@
         <result column="alarm_group_id" property="alarmGroupId" jdbcType="INTEGER"/>
         <result column="addsource" property="addSource" jdbcType="INTEGER"/>
         <result column="influx_sql_snd" property="influxSqlSnd" jdbcType="VARCHAR"/>
-        <result column="eventName" property="eventName" jdbcType="VARCHAR"/>
+        <result column="eventname" property="eventName" jdbcType="VARCHAR"/>
         <result column="operation" property="operation" jdbcType="INTEGER"/>
         <result column="data_interval_times" property="dataIntervalTimes" jdbcType="INTEGER"/>
     </resultMap>
@@ -47,25 +47,34 @@
     select
     *
     from task_shedule
-    where addsource = 0
-    order by id
-    limit #{startIndex},#{pageSize}
+    where addsource = #{page.params.addSource,jdbcType=INTEGER}
+     <if test="page.params.eventName != null &amp;&amp; page.params.eventName != ''" >
+            and  eventname like CONCAT('%',#{page.params.eventName,jdbcType=VARCHAR},'%' )
+     </if>
+        order by id
+        limit #{page.startIndex},#{page.pageSize}
   </select>
 
-    <select id="selectByPageWithSourceGateway" resultMap="BaseResultMap">
+    <!--<select id="selectByPageWithSourceGateway" resultMap="BaseResultMap">
         select
         *
         from task_shedule
         where addsource = 1
+        <if test="page.params.eventName != null &amp;&amp; page.params.eventName != ''" >
+            and  eventname like CONCAT('%',#{page.params.eventName,jdbcType=VARCHAR},'%' )
+        </if>
         order by id
-        limit #{startIndex},#{pageSize}
-    </select>
+        limit #{page.startIndex},#{page.pageSize}
+    </select>-->
 
     <select id="selectCount" resultType="java.lang.Integer">
     select
     count(1)
     from task_shedule
-    where addsource = #{addSource,jdbcType=INTEGER}
+    where addsource = #{page.params.addSource,jdbcType=INTEGER}
+    <if test="page.params.eventName != null &amp;&amp; page.params.eventName != ''" >
+        and eventname like  CONCAT('%',#{page.params.eventName,jdbcType=VARCHAR},'%' )
+   </if>
   </select>
 
     <delete id="deleteById" parameterType="java.lang.Integer">
@@ -93,7 +102,7 @@
     description = #{description,jdbcType=VARCHAR},
     inf_database = #{database,jdbcType=VARCHAR},
     alarm_group_id = #{alarmGroupId,jdbcType=INTEGER},
-    eventName = #{eventName,jdbcType=INTEGER},
+    eventname = #{eventName,jdbcType=INTEGER},
     operation = #{operation,jdbcType=INTEGER},
     data_interval_times = #{dataIntervalTimes,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
@@ -120,7 +129,7 @@
       alarm_group_id,
       addsource,
       influx_sql_snd,
-      eventName,
+      eventname,
       operation,
       data_interval_times)
     values

@@ -28,7 +28,7 @@ public class NewTask implements Runnable{
                 }
                 if (!TaskStroe.isOn(taskModel.getId())){
                     SingleTask singleTask = new SingleTask(taskModel.getId());
-                    ScheduledFuture scheduledFuture = taskScheduler.scheduleAtFixedRate(singleTask, taskModel.getInterval() * 60 * 1000);
+                     ScheduledFuture scheduledFuture = taskScheduler.scheduleAtFixedRate(singleTask, taskModel.getInterval() * 60 * 1000);
                     TaskStroe.addTask(taskModel.getId(),scheduledFuture);
                 }
             }

@@ -4,6 +4,7 @@ import com.model.TaskModel;
 import com.monitor.model.domain.PageBean;
 import com.monitor.model.page.PageRequest;
 import com.monitor.model.page.PageResponse;
+import com.monitor.model.request.GateWayTaskReq;
 import com.monitor.model.response.BaseResponse;
 import com.monitor.mysql.mapper.TaskSheduleMapper;
 import org.slf4j.Logger;
@@ -26,37 +27,35 @@ public class TaskConfigureCtrl {
 
     Logger log = LoggerFactory.getLogger(TaskConfigureCtrl.class);
 
-    private final int menu_task_addSource=0;//来源于任务管理的菜单数据
-    private final int menu_gateway_addSource=1;//来源于gataway任务管理菜单的数据
+    private static final int MENU_TASK_ADDSOURCE = 0;//来源于任务管理的菜单数据
+    private static final int MEBU_GATEWAY_ADDSOURCE = 1;//来源于gataway任务管理菜单的数据
 
     @Autowired
     private TaskSheduleMapper taskSheduleMapper;
 
+    //任务管理
     @RequestMapping("/getTaskConfigure")
     @ResponseBody
-    public BaseResponse<PageResponse<TaskModel>> getTaskConfigure(@RequestBody PageRequest request) {
-        return getTaskConfigureFromMenu(request,menu_task_addSource);
+    public BaseResponse<PageResponse<TaskModel>> getTaskConfigure(@RequestBody GateWayTaskReq request) {
+        return getTaskConfigureFromMenu(request,MENU_TASK_ADDSOURCE);
     }
 
-    private BaseResponse<PageResponse<TaskModel>> getTaskConfigureFromMenu(PageRequest request ,int addSource){
+    private BaseResponse<PageResponse<TaskModel>> getTaskConfigureFromMenu(GateWayTaskReq request , int addSource){
         try {
             // 组装分页对象
             PageBean page = PageBean.initPageInfo(request.getCurrentPage(),
                     request.getPageSize(), request);
+            page.getParams().put("addSource",addSource);//设置数据源
             // 先查询符合条件的总数量
-            int total = taskSheduleMapper.selectCount(addSource);
+            int total = taskSheduleMapper.selectCount(page);
             // 数量为0 直接返回
             if (total == 0) {
                 // 返回初始page对象
                 return null;
             }
             // 获取列表
-            List<TaskModel> taskModels =null;
-            if(menu_task_addSource==addSource){
-                taskModels=taskSheduleMapper.selectByPageWithSourceTask(page);
-            }else if(menu_gateway_addSource==addSource){
-                taskModels=taskSheduleMapper.selectByPageWithSourceGateway(page);
-            }
+            List<TaskModel> taskModels = null;
+            taskModels = taskSheduleMapper.selectByPageWithSourceTask(page);
             if (CollectionUtils.isEmpty(taskModels)) {
                 return null;
             }
@@ -115,11 +114,11 @@ public class TaskConfigureCtrl {
     }
 
 
-
+   //gateWay access事件检测----后续新增功能--MEBU_GATEWAY_ADDSOURCE区分数据源
     @RequestMapping("/getGatewayConfigure")
     @ResponseBody
-    public BaseResponse<PageResponse<TaskModel>> getGateWayTaskConfigure(@RequestBody PageRequest request) {
-        return getTaskConfigureFromMenu(request,menu_gateway_addSource);
+    public BaseResponse<PageResponse<TaskModel>> getGateWayTaskConfigure(@RequestBody GateWayTaskReq request) {
+        return getTaskConfigureFromMenu(request,MEBU_GATEWAY_ADDSOURCE);
 
     }
 }