修改权限

@@ -23,7 +23,7 @@ public class JavaServiceAlarm {
     private SnsMobileConfig snsMobileConfig;
 
 
-    @Scheduled(fixedRate = 30 * 1000)
+    @Scheduled(cron="${cron_task_javaservice_alarm}")
     public void run() {
         boolean flag = snsMobileConfig.isJavaServiceFlag();
         if(!flag)

@@ -59,7 +59,7 @@ public class MemcachedMonitorImpl {
     private SnsMobileConfig snsMobileConfig;
 
 
-    @Scheduled(fixedRate = 60 * 1000)
+    @Scheduled(cron="${cron_task_memcached}")
     public void monitor() {
         MemConstants.MEMCACHED_NAME_MAP.clear();
 

@@ -45,7 +45,7 @@ public class RabbitScanTask {
     RabbitAlertMapper rabbitAlertMapper;
 
     //自动发现rabbit监控对象,下发监控任务
-    @Scheduled(fixedRate = 60 * 1000)
+    @Scheduled(cron="${cron_task_rabbit_scan}")
     public void doTask() {
 
         catchAllRabbit();

@@ -45,7 +45,7 @@ public class RedisMonitorImpl {
     @Getter
     private AtomicLong update=new AtomicLong();
 
-    @Scheduled(fixedRate = 10 * 1000)
+    @Scheduled(cron="${cron_task_redis_monitor}")
     public void monitor() {
         update.set(System.currentTimeMillis());
 

@@ -12,6 +12,12 @@ public class AuthModule {
 
     private String moduleName;
 
+    private String moduleCName;
+
+    private String moduleGroup;
+
+    private String moduleGroupName;
+
     private int moduleLevel;
 
 }

+package com.model;
+
+import lombok.Data;
+
+/**
+ * Created by zhengyouwei on 2016/7/14.
+ */
+@Data
+public class ModuleGroup {
+
+    private int id;
+
+    private String name;
+
+    private String cname;
+
+}

@@ -30,4 +30,14 @@ public class User {
      */
     private String cName;
 
+    /**
+     * 有权限的模块组
+     */
+    private String moduleGroups;
+
+    /**
+     * 有权限的模块
+     */
+    private String modules;
+
 }

+package com.monitor.mysql.mapper;
+
+import com.model.ModuleGroup;
+
+import java.util.List;
+
+/**
+ * Created by zhengyouwei on 2016/7/13.
+ */
+public interface ModuleGroupMapper {
+
+    List<ModuleGroup> selectAll();
+
+    ModuleGroup selectByName(String name);
+
+
+}

@@ -4,11 +4,14 @@
   <resultMap id="BaseResultMap" type="com.model.AuthModule" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="module_name" property="moduleName" jdbcType="VARCHAR" />
+    <result column="module_cname" property="moduleCName" jdbcType="VARCHAR" />
+    <result column="module_group" property="moduleGroup" jdbcType="VARCHAR" />
+    <result column="module_group_name" property="moduleGroupName" jdbcType="VARCHAR" />
     <result column="module_level" property="moduleLevel" jdbcType="INTEGER" />
   </resultMap>
 
   <sql id="Base_Column_List" >
-    id, module_name, module_level
+    id, module_name, module_level, module_cname, module_group, module_group_name
   </sql>
 
   <select id="selectById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -33,14 +36,20 @@
 
   <insert id="insert" parameterType="com.model.AuthModule" >
     insert into auth_module
-     (module_name,module_level, create_time, update_time)
+     (module_name,module_level,module_cname, module_group, module_group_name, create_time, update_time)
     values
-     (#{moduleName,jdbcType=VARCHAR},#{moduleLevel,jdbcType=INTEGER}, now(),now())
+     (#{moduleName,jdbcType=VARCHAR},#{moduleLevel,jdbcType=INTEGER},
+     #{moduleCName,jdbcType=VARCHAR},#{moduleGroup,jdbcType=VARCHAR},
+      #{moduleGroupName,jdbcType=VARCHAR},
+      now(),now())
   </insert>
 
   <update id="updateLevel" parameterType="com.model.AuthModule" >
     update auth_module
     set module_level = #{moduleLevel,jdbcType=VARCHAR},
+    module_cname = #{moduleCName,jdbcType=VARCHAR},
+    module_group = #{moduleGroup,jdbcType=VARCHAR},
+    module_group_name = #{moduleGroupName,jdbcType=VARCHAR},
     update_time = now()
     where id = #{id,jdbcType=INTEGER}
   </update>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.monitor.mysql.mapper.ModuleGroupMapper" >
+  <resultMap id="BaseResultMap" type="com.model.ModuleGroup" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="cname" property="cname" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <sql id="Base_Column_List" >
+    id, name, cname
+  </sql>
+
+  <select id="selectAll" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from module_group
+  </select>
+
+  <select id="selectByName" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from module_group
+    where name = #{name,jdbcType=VARCHAR}
+  </select>
+</mapper>
\ No newline at end of file

@@ -10,11 +10,13 @@
     <result column="mobile" property="mobile" jdbcType="VARCHAR" />
     <result column="c_name" property="cName" jdbcType="VARCHAR" />
     <result column="role" property="role" jdbcType="VARCHAR" />
+    <result column="modules" property="modules" jdbcType="VARCHAR" />
+    <result column="module_groups" property="moduleGroups" jdbcType="VARCHAR" />
 
   </resultMap>
 
   <sql id="Base_Column_List" >
-    id, name, pwd, level, email, mobile,c_name,role
+    id, name, pwd, level, email, mobile,c_name,role,modules,module_groups
   </sql>
 
   <select id="selectById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -64,10 +66,12 @@
 
   <insert id="insert" parameterType="com.model.User" >
     insert into user
-     (name,pwd,level,email,mobile,c_name,role, create_time, update_time)
+     (name,pwd,level,email,mobile,c_name,role,modules,module_groups, create_time, update_time)
     values
      (#{name,jdbcType=VARCHAR},#{pwd,jdbcType=VARCHAR},#{level,jdbcType=INTEGER},
-     #{email,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR},#{cName,jdbcType=VARCHAR},#{role,jdbcType=VARCHAR},now(),now())
+     #{email,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR},#{cName,jdbcType=VARCHAR},#{role,jdbcType=VARCHAR},
+     #{modules,jdbcType=VARCHAR},#{moduleGroups,jdbcType=VARCHAR},
+     now(),now())
   </insert>
 
   <update id="update" parameterType="com.model.User" >
@@ -77,6 +81,8 @@
         mobile = #{mobile,jdbcType=VARCHAR},
         role= #{role,jdbcType=VARCHAR},
         c_name= #{cName,jdbcType=VARCHAR},
+        modules= #{modules,jdbcType=VARCHAR},
+        module_groups= #{moduleGroups,jdbcType=VARCHAR},
         update_time = now()
     where id = #{id,jdbcType=INTEGER}
   </update>

 package com.monitor.user.ctrl;
 
 import com.model.AuthModule;
+import com.model.ModuleGroup;
 import com.model.User;
 import com.monitor.model.domain.PageBean;
 import com.monitor.model.page.PageRequest;
 import com.monitor.model.page.PageResponse;
 import com.monitor.model.response.BaseResponse;
 import com.monitor.mysql.mapper.AuthModuleMapper;
+import com.monitor.mysql.mapper.ModuleGroupMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,9 @@ public class ModuleCtrl {
     @Autowired
     AuthModuleMapper authModuleMapper;
 
+    @Autowired
+    ModuleGroupMapper moduleGroupMapper;
+
     @RequestMapping("/getAll")
     @ResponseBody
     public BaseResponse getAll() {
@@ -72,6 +77,8 @@ public class ModuleCtrl {
     @ResponseBody
     public BaseResponse insert(@RequestBody AuthModule authModule) {
         try{
+            String cname = moduleGroupMapper.selectByName(authModule.getModuleGroup()).getCname();
+            authModule.setModuleGroupName(cname);
            int result =  authModuleMapper.insert(authModule);
             return new BaseResponse<Integer>(result);
         }catch (Exception e){
@@ -84,6 +91,8 @@ public class ModuleCtrl {
     @ResponseBody
     public BaseResponse updateLevel(@RequestBody AuthModule authModule) {
         try{
+            String cname = moduleGroupMapper.selectByName(authModule.getModuleGroup()).getCname();
+            authModule.setModuleGroupName(cname);
             int result =  authModuleMapper.updateLevel( authModule);
             return new BaseResponse<Integer>(result);
         }catch (Exception e){
@@ -96,7 +105,6 @@ public class ModuleCtrl {
     @ResponseBody
     public BaseResponse<PageResponse<AuthModule>> getAuthModules(@RequestBody PageRequest req) {
         try{
-            log.info("getAuthModules with param is {}", req);
             // 组装分页对象
             PageBean page = PageBean.initPageInfo(req.getCurrentPage(),
                     req.getPageSize(), req);
@@ -138,5 +146,22 @@ public class ModuleCtrl {
         }
     }
 
+    @RequestMapping("/getAllGroups")
+    @ResponseBody
+    public BaseResponse getAllGroups() {
+        try{
+            List<ModuleGroup> list=moduleGroupMapper.selectAll();
+
+            if (list == null || CollectionUtils.isEmpty(list)) {
+                return new BaseResponse<List<User>>();
+            }
+
+            return new BaseResponse<List<ModuleGroup>>(list);
+        }catch (Exception e){
+            log.error("getAllGroups error",e);
+            return null;
+        }
+    }
+
 }
 

@@ -219,93 +219,5 @@ public class UserCtrl {
         return new BaseResponse<>(list);
     }
 
-    /**
-     * 测试邮件
-     */
-    //@RequestMapping("/testMail")
-    public void testMail() {
-        List<User> list = userMapper.selectAll();
-        for (User user : list) {
-            Mail.Builder builder = new Mail.Builder("TEST 邮件");
-            builder.receiver(user.getEmail());
-            builder.message("这是一封测试邮箱是否可用的邮件，无需关注！");
-            boolean result = mailService.sendHTMLMail(builder.build());
-            if (!result) {
-                log.info("error mail:" + user.getName() + "---" + user.getEmail());
-            }
-        }
-    }
-
-    //@Scheduled(fixedDelay = 10*1000*60)
-    public void gatewayacess() {
-        try {
-            QueryResult queryResult = commonQuery.query(InfluxDBContants.AWS, "SHOW TAG VALUES FROM \"gateway_access\" WITH KEY = \"event\"", "yoho_event");
-            List<List<Object>> tags = QueryResultUtil.getValues(queryResult);
-            BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream("e:/tags", true)));
-            for (List<Object> tag : tags) {
-                String sql = "SELECT count(\"ip\") FROM \"gateway_access\" WHERE \"event\" = '" + tag.get(1) + "' AND time > now() - 1d";
-                QueryResult queryResult2 = commonQuery.query(InfluxDBContants.AWS, sql, "yoho_event");
-                List<List<Object>> list2 = QueryResultUtil.getValues(queryResult2);
-                Object total = list2.get(0).get(1);
-
-                String sql2 = "SELECT count(\"ip\") FROM \"gateway_access\" WHERE \"event\" = '" + tag.get(1) + "' AND time > now() - 1d GROUP BY time(10s) fill(null)";
-                QueryResult queryResult3 = commonQuery.query(InfluxDBContants.AWS, sql2, "yoho_event");
-                List<List<Object>> list3 = QueryResultUtil.getValues(queryResult3);
-                List<countClass> countClassesss = new ArrayList<>();
-                for (List<Object> list : list3) {
-                    Object time = list.get(0);
-                    int count = (int) (double) list.get(1);
-                    countClass countClasss = new countClass();
-                    countClasss.setTime(time);
-                    countClasss.setCount(count);
-                    countClassesss.add(countClasss);
-                }
-                Collections.sort(countClassesss);
-                String text = StringUtils.rightPad(String.valueOf(tag.get(1)), 40) + "            " + total + "             " + countClassesss.get(0).getCount() + "\r\n";
-                bufferedWriter.write(text);
-            }
-            bufferedWriter.flush();
-            bufferedWriter.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.out.println("end");
-
-    }
-
-    public class countClass implements Comparable<countClass> {
-        private Object time;
-
-        private int count;
-
-        public Object getTime() {
-            return time;
-        }
-
-        public void setTime(Object time) {
-            this.time = time;
-        }
-
-        public int getCount() {
-            return count;
-        }
-
-        public void setCount(int count) {
-            this.count = count;
-        }
-
-        @Override
-        public int compareTo(countClass o) {
-            if (this.count > o.count) {
-                return -1;
-            } else if (this.count == o.count) {
-                return 0;
-            } else {
-                return 1;
-            }
-        }
-    }
-
-
 }
 

 cron_task_zookeeper_monitor=0 0/2 * * * ?
 
-cron_task_redis_monitor=0 0/3 * * * ?
+cron_task_redis_monitor=0/10 * * * * ?
 
 cron_task_nginx_scan=0 0/1 * * * ?
 
@@ -18,5 +18,9 @@ cron.task.bandwidth=1 0/5 * * * ?
 
 cron_task_javaapi_monitor=0 0/1 * * * ?
 
+cron_task_zabbix_scan=0 0/1 * * * ?
 
+cron_task_javaservice_alarm=0/30 * * * * ?
+
+cron_task_memcached=0 0/1 * * * ?
 

@@ -23,4 +23,10 @@ cron_task_project_status=0 0 0 * * ?
 
 cron.task.bandwidth=0 0 0 * * ?
 
-cron_task_javaapi_monitor=0 0/1 * * * ?
+cron_task_javaapi_monitor=0 0 0 * * ?
+
+cron_task_zabbix_scan=0 0 0 * * ?
+
+cron_task_javaservice_alarm=0 0 0 * * ?
+
+cron_task_memcached=0 0 0 * * ?
\ No newline at end of file

@@ -100,7 +100,7 @@ public class ZabbixAlarm {
     }
 
 
-    @Scheduled(fixedRate = 60 * 1000)
+    @Scheduled(cron = "${cron_task_zabbix_scan}")
     public void dispatchAlarm() {
 
         queryAllHostInfo();

@@ -52,7 +52,7 @@ public class ZabbixTaskService {
     @Autowired
     InfluxdbComp influxdbComp;
 
-    @Scheduled(fixedRate = 1 * 60 * 1000)
+    @Scheduled(cron = "${cron_task_zabbix_scan}")
     public void doTask() {
         String[] zTypes = StringUtils.split(this.zabbixTypes, ",");