添加基础单元监听模块;

添加包部署和简单监控功能;

添加基础单元监听模块;
添加包部署和简单监控功能;
Liu Haoyu
1 parent d7b1d619
Showing 13 changed files with 602 additions and 15 deletions
src/main/java/com/objecteye/VehicleApplication.java → src/main/java/com/objecteye/LinuxListenerApplication.java
src/main/java/com/objecteye/common/GeneralContent.java
src/main/java/com/objecteye/controller/BackGroundController.java
src/main/java/com/objecteye/controller/LogFileListenerController.java
src/main/java/com/objecteye/controller/OccupationOfBasicResourcesController.java
src/main/java/com/objecteye/entity/SyBasicResourceHistory.java
src/main/java/com/objecteye/mapper/SyBasicResourceHistoryMapper.java
src/main/java/com/objecteye/service/IBackGroundService.java
src/main/java/com/objecteye/service/IOccupationOfBasicResourcesService.java
src/main/java/com/objecteye/service/impl/BackGroundServiceImpl.java
src/main/java/com/objecteye/service/impl/LogFileListenerServiceImpl.java
src/main/java/com/objecteye/service/impl/OccupationOfBasicResourcesServiceImpl.java
src/main/resources/com.objecteye.mapper/SyBasicResourceHistoryMapper.xml
@@ -14,10 +14,10 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 @EnableScheduling
 @EnableAsync
-public class VehicleApplication {
+public class LinuxListenerApplication {
     public static void main(String[] args) {
-        ConfigurableApplicationContext run = SpringApplication.run(VehicleApplication.class, args);
+        ConfigurableApplicationContext run = SpringApplication.run(LinuxListenerApplication.class, args);
     }
     @Bean
@@ -9,6 +9,14 @@ public class GeneralContent {
      */
     public final static String REDIS_LOG_KEY_PATH = "redisLogKeyPath";
     /**
+     * key: 发布项目的Linux中进程号, value: 拥有者id
+     */
+    public final static String REDIS_TASK_ID_OWNER = "redisTaskIdOwner";
+    /**
+     * 需要保存到数据库中的监控信息key(shell文件对应的module. eg: arp_cache,bandwidth)
+     */
+    public final static String REDIS_RECORD_MODULE = "redisRecordModule";
+    /**
      * sh功能脚本map
      */
     public final static Map<String, String> MODULE_MAP = new HashMap<>();
+package com.objecteye.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.objecteye.common.CommonResult;
+import com.objecteye.service.IBackGroundService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@Api(tags = "background", description = "监控器调度")
+@RequestMapping("/background")
+@CrossOrigin
+public class BackGroundController {
+    @Autowired
+    private IBackGroundService iBackGroundService;
+
+    @ApiOperation("获取正在生效的监控功能")
+    @RequestMapping(value = "/getWorkingListener", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public CommonResult getWorkingListener() {
+        JSONObject resultObj = iBackGroundService.getWorkingListener();
+        if (resultObj.containsKey("error")) {
+            return CommonResult.success(201, resultObj.getString("error"), null);
+        }
+        return CommonResult.success(resultObj);
+    }
+
+    @ApiOperation("添加新的监控器")
+    @RequestMapping(value = "/addWorkingListener", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public CommonResult addWorkingListener(@RequestBody Map<String, Object> requestMap) {
+        JSONObject resultObj = iBackGroundService.addWorkingListener(requestMap);
+        if (resultObj.containsKey("error")) {
+            return CommonResult.success(201, resultObj.getString("error"), null);
+        }
+        return CommonResult.success(resultObj);
+    }
+
+    @ApiOperation("删除存在的监控器")
+    @RequestMapping(value = "/removeWorkingListener", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public CommonResult removeWorkingListener(@RequestBody Map<String, Object> requestMap) {
+        JSONObject resultObj = iBackGroundService.removeWorkingListener(requestMap);
+        if (resultObj.containsKey("error")) {
+            return CommonResult.success(201, resultObj.getString("error"), null);
+        }
+        return CommonResult.success(resultObj);
+    }
+}
 package com.objecteye.controller;
+import com.alibaba.fastjson.JSONObject;
 import com.objecteye.common.CommonResult;
 import com.objecteye.service.ILogFileListenerService;
 import io.swagger.annotations.Api;
@@ -21,7 +22,11 @@ public class LogFileListenerController {
     @ApiOperation("设置log文件所在位置信息")
     @RequestMapping(value = "/setLogMsg", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public CommonResult setLogMsg(@RequestBody Map<String, Object> requestMap) {
-        return CommonResult.success(iLogFileListenerService.setLogMsg(requestMap));
+        JSONObject resultObj = iLogFileListenerService.setLogMsg(requestMap);
+        if (resultObj.containsKey("error")) {
+            return CommonResult.success(201, resultObj.getString("error"), null);
+        }
+        return CommonResult.success(resultObj);
     }
     @ApiOperation("开启日志监控输出")
 package com.objecteye.controller;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.objecteye.common.CommonResult;
 import com.objecteye.service.IOccupationOfBasicResourcesService;
 import io.swagger.annotations.Api;
@@ -28,4 +29,24 @@ public class OccupationOfBasicResourcesController {
             return CommonResult.success(201, "未获取输出信息", null);
         }
     }
+
+    @ApiOperation("jar包发布")
+    @RequestMapping(value = "/deployJarFile", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public CommonResult deployJarFile(@RequestBody Map<String, Object> requestMap) {
+        JSONObject resultObj = iOccupationOfBasicResourcesService.deployJarFile(requestMap);
+        if (resultObj.containsKey("error")) {
+            return CommonResult.success(201, resultObj.getString("error"), null);
+        }
+        return CommonResult.success(resultObj);
+    }
+
+    @ApiOperation("获取当前进行中的java服务")
+    @RequestMapping(value = "/getJpsInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public CommonResult getJpsInfo() {
+        JSONObject resultObj = iOccupationOfBasicResourcesService.getJpsInfo();
+        if (resultObj.containsKey("error")) {
+            return CommonResult.success(201, resultObj.getString("error"), null);
+        }
+        return CommonResult.success(resultObj);
+    }
 }
+package com.objecteye.entity;
+
+import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * sy_basic_resource_history
+ * @author 
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class SyBasicResourceHistory implements Serializable {
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 类型
+     */
+    private String moduleId;
+
+    /**
+     * 对应时间戳
+     */
+    private Long occurrenceTime;
+
+    /**
+     * 占用率
+     */
+    private Double occupancy;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.objecteye.mapper;
+
+import com.objecteye.entity.SyBasicResourceHistory;
+
+public interface SyBasicResourceHistoryMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(SyBasicResourceHistory record);
+
+    int insertSelective(SyBasicResourceHistory record);
+
+    SyBasicResourceHistory selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(SyBasicResourceHistory record);
+
+    int updateByPrimaryKey(SyBasicResourceHistory record);
+
+    /**
+     * 删除时间点之前的数据
+     *
+     * @param time 时间戳
+     * @return 操作数量
+     */
+    int deleteLteTime(long time);
+}
 \ No newline at end of file
+package com.objecteye.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.Map;
+
+public interface IBackGroundService {
+
+    /**
+     * 定时写入的定制信息
+     */
+    void jobController();
+
+    /**
+     * 删除24小时之前的数据
+     */
+    void removeOverTimeData();
+
+    /**
+     * 获取正在生效的监控功能
+     *
+     * @return 监控功能数组
+     */
+    JSONObject getWorkingListener();
+
+    /**
+     * 添加新的监控器
+     *
+     * @param requestMap 请求参数
+     * @return 返回信息
+     */
+    JSONObject addWorkingListener(Map<String, Object> requestMap);
+
+    /**
+     * 删除存在的监控器
+     *
+     * @param requestMap 请求参数
+     * @return 返回信息
+     */
+    JSONObject removeWorkingListener(Map<String, Object> requestMap);
+}
 package com.objecteye.service;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import java.util.Map;
@@ -16,4 +17,27 @@ public interface IOccupationOfBasicResourcesService {
      * @return 输出结果
      */
     JSONArray getInfoByModule(Map<String, Object> requestMap);
+
+    /**
+     * jar包发布
+     *
+     * @param requestMap 请求参数
+     * @return 发包后日志地址
+     */
+    JSONObject deployJarFile(Map<String, Object> requestMap);
+
+    /**
+     * 停止jar包进程
+     *
+     * @param requestMap 请求参数
+     * @return 操作结果
+     */
+    JSONObject killJarTask(Map<String, Object> requestMap);
+
+    /**
+     * 获取当前进行中的jar包
+     *
+     * @return 进行中的jar包信息
+     */
+    JSONObject getJpsInfo();
 }
+package com.objecteye.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.objecteye.common.GeneralContent;
+import com.objecteye.entity.SyBasicResourceHistory;
+import com.objecteye.mapper.SyBasicResourceHistoryMapper;
+import com.objecteye.service.IBackGroundService;
+import com.objecteye.service.IOccupationOfBasicResourcesService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+@Component
+@Slf4j
+public class BackGroundServiceImpl implements IBackGroundService {
+    @Autowired
+    private SyBasicResourceHistoryMapper syBasicResourceHistoryMapper;
+    @Autowired
+    private IOccupationOfBasicResourcesService iOccupationOfBasicResourcesService;
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    /**
+     * 定时写入的定制信息
+     */
+    @Override
+    @Scheduled(fixedRate = 3 * 1000)
+    public void jobController() {
+        String moduleStr = (String) redisTemplate.opsForValue().get(GeneralContent.REDIS_RECORD_MODULE);
+        if (moduleStr == null || "".equals(moduleStr)) {
+            return;
+        }
+        String[] moduleList = moduleStr.split(",");
+        Map<String, Object> requestMap = new HashMap<>();
+        for (String module : moduleList) {
+            requestMap.put("module", module);
+            switch (module) {
+                default:
+                    break;
+                case "cpu_utilization":
+                    doCpuUtilization(requestMap);
+                    break;
+                case "memory_info":
+                    doMemoryInfo(requestMap);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * 删除24小时之前的数据
+     */
+    @Override
+    @Scheduled(fixedRate = 1000 * 60)
+    public void removeOverTimeData() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(System.currentTimeMillis());
+        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 1);
+        long lastTime = calendar.getTimeInMillis();
+        syBasicResourceHistoryMapper.deleteLteTime(lastTime);
+    }
+
+    /**
+     * 获取正在生效的监控功能
+     *
+     * @return 监控功能数组
+     */
+    @Override
+    public JSONObject getWorkingListener() {
+        String workingListenerStr = (String) redisTemplate.opsForValue().get(GeneralContent.REDIS_RECORD_MODULE);
+        JSONObject resultObj = new JSONObject();
+        if (workingListenerStr == null || "".equals(workingListenerStr)) {
+            resultObj.put("error", "There is no listener working");
+        } else {
+            resultObj.put("result", workingListenerStr.split(","));
+        }
+        return resultObj;
+    }
+
+    /**
+     * 添加新的监控器
+     *
+     * @param requestMap 请求参数
+     * @return 返回信息
+     */
+    @Override
+    public JSONObject addWorkingListener(Map<String, Object> requestMap) {
+        List<String> addModules = new ArrayList<>((List<String>) requestMap.get("modules"));
+        String workingListenerStr = (String) redisTemplate.opsForValue().get(GeneralContent.REDIS_RECORD_MODULE);
+        if (workingListenerStr == null || "".equals(workingListenerStr)) {
+            workingListenerStr = String.join(",", addModules);
+        } else {
+            List<String> workingListenerList = Arrays.asList(workingListenerStr.split(","));
+            addModules.removeIf(workingListenerList::contains);
+            workingListenerStr += "," + String.join(",", addModules);
+        }
+        redisTemplate.opsForValue().set(GeneralContent.REDIS_RECORD_MODULE, workingListenerStr);
+        return new JSONObject();
+    }
+
+    /**
+     * 删除存在的监控器
+     *
+     * @param requestMap 请求参数
+     * @return 返回信息
+     */
+    @Override
+    public JSONObject removeWorkingListener(Map<String, Object> requestMap) {
+        List<String> removeModules = (List<String>) requestMap.get("modules");
+        String workingListenerStr = (String) redisTemplate.opsForValue().get(GeneralContent.REDIS_RECORD_MODULE);
+        JSONObject resultObj = new JSONObject();
+        if (workingListenerStr == null || "".equals(workingListenerStr)) {
+            resultObj.put("error", "There is no listener working");
+        } else {
+            List<String> workingListenerList = new ArrayList<>(Arrays.asList(workingListenerStr.split(",")));
+            workingListenerList.removeIf(removeModules::contains);
+            redisTemplate.opsForValue().set(GeneralContent.REDIS_RECORD_MODULE, String.join(",", workingListenerList));
+        }
+        return resultObj;
+    }
+
+    /**
+     * cpu信息记录
+     *
+     * @param requestMap 请求参数
+     */
+    @Async("taskExecutor")
+    public void doCpuUtilization(Map<String, Object> requestMap) {
+        JSONArray resultArr = iOccupationOfBasicResourcesService.getInfoByModule(requestMap);
+        if (resultArr.size() > 0) {
+            JSONObject resultObj = resultArr.getJSONObject(0);
+            SyBasicResourceHistory syBasicResourceHistory = new SyBasicResourceHistory(UUID.randomUUID().toString(), (String) requestMap.get("module"),
+                    System.currentTimeMillis(), resultObj.getDoubleValue("result"));
+            syBasicResourceHistoryMapper.insertSelective(syBasicResourceHistory);
+        }
+    }
+
+    /**
+     * 内存信息记录
+     *
+     * @param requestMap 请求参数
+     */
+    @Async("taskExecutor")
+    public void doMemoryInfo(Map<String, Object> requestMap) {
+        JSONArray resultArr = iOccupationOfBasicResourcesService.getInfoByModule(requestMap);
+        if (resultArr.size() > 0) {
+            JSONObject resultObj = resultArr.getJSONObject(0);
+            double memTotal = Double.parseDouble(resultObj.getString("MemTotal").replaceAll("kB", "").trim());
+            double memFree = Double.parseDouble(resultObj.getString("MemFree").replaceAll("kB", "").trim());
+            double memUseQuality = Math.round((1 - memFree / memTotal) * 100);
+            SyBasicResourceHistory syBasicResourceHistory = new SyBasicResourceHistory(UUID.randomUUID().toString(), (String) requestMap.get("module"),
+                    System.currentTimeMillis(), memUseQuality);
+            syBasicResourceHistoryMapper.insertSelective(syBasicResourceHistory);
+        }
+    }
+}
@@ -31,15 +31,16 @@ public class LogFileListenerServiceImpl implements ILogFileListenerService {
     public JSONObject setLogMsg(Map<String, Object> requestMap) {
         String filePath = (String) requestMap.get("filePath");
         File file = new File(filePath);
+        JSONObject resultObj = new JSONObject();
         if (!file.exists()) {
-            throw new RuntimeException("file is not exists! Please confirm your path");
+            resultObj.put("error", "file is not exists! Please confirm your path");
+            return resultObj;
         } else if (file.isDirectory()) {
-            throw new RuntimeException("Can not analysis directory, please insert a file path");
+            resultObj.put("error", "Can not analysis directory, please insert a file path");
+            return resultObj;
         }
         String key = file.getName() + "|" + System.currentTimeMillis();
         redisTemplate.opsForHash().put(GeneralContent.REDIS_LOG_KEY_PATH, key, filePath);
-
-        JSONObject resultObj = new JSONObject();
         resultObj.put("logKey", key);
         return resultObj;
     }
@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.objecteye.common.GeneralContent;
 import com.objecteye.service.IOccupationOfBasicResourcesService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import java.io.BufferedReader;
@@ -14,10 +16,13 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 @Component
 @Slf4j
 public class OccupationOfBasicResourcesServiceImpl implements IOccupationOfBasicResourcesService {
+    @Autowired
+    private RedisTemplate redisTemplate;
     /**
      * 获取指定module的输出
@@ -34,11 +39,17 @@ public class OccupationOfBasicResourcesServiceImpl implements IOccupationOfBasic
             List<String> outList = new ArrayList<>();
             executeLinuxCmd(cmd, outList);
             if (outList.size() > 0) {
-                Object object = JSON.parse(outList.get(0));
+                String outStr = String.join("", outList);
+                log.debug("OccupationOfBasicResourcesServiceImpl|getInfoByModule|outStr: {}", outStr);
+                Object object = JSON.parse(outStr);
                 if (object instanceof JSONObject) {
                     resultArr.add(object);
                 } else if (object instanceof JSONArray) {
                     resultArr = (JSONArray) object;
+                } else {
+                    JSONObject tempObj = new JSONObject();
+                    tempObj.put("result", outStr);
+                    resultArr.add(tempObj);
                 }
             }
         }
@@ -46,6 +57,115 @@ public class OccupationOfBasicResourcesServiceImpl implements IOccupationOfBasic
     }
     /**
+     * jar包发布
+     *
+     * @param requestMap 请求参数
+     * @return 发包后日志地址
+     */
+    @Override
+    public JSONObject deployJarFile(Map<String, Object> requestMap) {
+        String jarPath = (String) requestMap.get("filePath");
+        String logPath = (String) requestMap.get("logPath");
+        String owner = (String) requestMap.getOrDefault("user", "-1");
+        if (logPath == null || "".equals(logPath)) {
+            logPath = jarPath.substring(0, jarPath.lastIndexOf("//")) + jarPath.substring(jarPath.lastIndexOf("//")).replaceAll("jar", "log");
+        }
+
+        JSONObject resultObj = new JSONObject();
+        String jarName = jarPath.substring(jarPath.lastIndexOf("//") + 1);
+        if (!jarName.endsWith("\\.jar")) {
+            resultObj.put("error", "File type error. Please confirm your jar file is right.");
+        }
+
+        List<String> outList = new ArrayList<>();
+        String cmd = "nohup java -jar " + jarPath + " > " + logPath + " 2>&1 &";
+        executeLinuxCmd(cmd, outList);
+
+        String outStr;
+        if (outList.size() > 0) {
+            outStr = outList.get(0);
+            String regex = "^[[0-9]*] [0-9]*$";
+            if (outStr.matches(regex)) {
+                resultObj.put("logPath", logPath);
+                String taskId = outStr.split(" ")[1];
+                resultObj.put("taskId", taskId);
+                redisTemplate.opsForHash().put(GeneralContent.REDIS_TASK_ID_OWNER, taskId, owner);
+            } else {
+                resultObj.put("error", "linux error: " + outStr);
+            }
+        } else {
+            resultObj.put("error", "There is no response from Linux");
+        }
+
+        return resultObj;
+    }
+
+    /**
+     * 停止jar包进程
+     *
+     * @param requestMap 请求参数
+     * @return 操作结果
+     */
+    @Override
+    public JSONObject killJarTask(Map<String, Object> requestMap) {
+        String user = (String) requestMap.get("user");
+        String taskId = (String) requestMap.get("taskId");
+        boolean superPower = ifSuperPower(user);
+
+        JSONObject resultObj = new JSONObject();
+        if (redisTemplate.opsForHash().hasKey(GeneralContent.REDIS_TASK_ID_OWNER, taskId)) {
+            String owner = (String) redisTemplate.opsForHash().get(GeneralContent.REDIS_TASK_ID_OWNER, taskId);
+            if (Objects.equals(owner, user) || superPower) {
+                String cmd = "kill -9 " + taskId;
+                List<String> outList = new ArrayList<>();
+                executeLinuxCmd(cmd, outList);
+                if (outList.size() > 0) {
+                    resultObj.put("error", outList);
+                }
+            } else {
+                resultObj.put("error", "No authority. The owner is " + owner);
+            }
+        } else {
+            resultObj.put("error", "illegal taskId");
+        }
+        return resultObj;
+    }
+
+    /**
+     * 是否拥有超级管理员权限
+     *
+     * @param user 当前用户id
+     * @return 是否拥有超级管理员权限
+     */
+    private boolean ifSuperPower(String user) {
+        // 超级管理员
+        boolean superPower = false;
+        if (Objects.equals(user, "-1")) {
+            superPower = true;
+        }
+        return superPower;
+    }
+
+    /**
+     * 获取当前进行中的jar包
+     *
+     * @return 进行中的jar包信息
+     */
+    @Override
+    public JSONObject getJpsInfo() {
+        String cmd = "jps";
+        List<String> outList = new ArrayList<>();
+        executeLinuxCmd(cmd, outList);
+        JSONObject resultObj = new JSONObject();
+        if (outList.size() > 0) {
+            resultObj.put("process", outList);
+        } else {
+            resultObj.put("error", "Get no Message");
+        }
+        return resultObj;
+    }
+
+    /**
      * 执行Linux语句并获取返回值
      *
      * @param cmd     linux语句
@@ -54,22 +174,27 @@ public class OccupationOfBasicResourcesServiceImpl implements IOccupationOfBasic
     private void executeLinuxCmd(String cmd, List<String> outList) {
         Runtime run = Runtime.getRuntime();
         try {
-            ProcessBuilder builder = new ProcessBuilder("/bin/chmod", "755", cmd);
-            Process permission = builder.start();
-            permission.waitFor();
-
-            Process process = run.exec("sh " + cmd);
-            log.info("OccupationOfBasicResourcesServiceImpl|executeLinuxCmd|cmd: {}", cmd);
+            Process process;
+            if (cmd.endsWith("\\.sh")) {
+                ProcessBuilder builder = new ProcessBuilder("/bin/chmod", "755", cmd);
+                Process permission = builder.start();
+                permission.waitFor();
+                process = run.exec("sh " + cmd);
+            } else {
+                process = run.exec(cmd);
+            }
+            log.debug("OccupationOfBasicResourcesServiceImpl|executeLinuxCmd|cmd: {}", cmd);
             String line;
             BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
             while ((line = stdoutReader.readLine()) != null) {
-                log.info("OccupationOfBasicResourcesServiceImpl|executeLinuxCmd|line: {}", line);
+                log.debug("OccupationOfBasicResourcesServiceImpl|executeLinuxCmd|line: {}", line);
                 outList.add(line);
             }
             process.waitFor();
             process.destroy();
         } catch (IOException | InterruptedException e) {
             e.printStackTrace();
+            log.error(e.getMessage());
         }
     }
 }
+<?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.objecteye.mapper.SyBasicResourceHistoryMapper">
+  <resultMap id="BaseResultMap" type="com.objecteye.entity.SyBasicResourceHistory">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="module_id" jdbcType="VARCHAR" property="moduleId" />
+    <result column="occurrence_time" jdbcType="BIGINT" property="occurrenceTime" />
+    <result column="occupancy" jdbcType="DOUBLE" property="occupancy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, module_id, occurrence_time, occupancy
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sy_basic_resource_history
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from sy_basic_resource_history
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteLteTime"><![CDATA[
+    delete from sy_basic_resource_history where occurrence_time <= #{time,jdbcType=BIGINT}
+  ]]></delete>
+  <insert id="insert" parameterType="com.objecteye.entity.SyBasicResourceHistory">
+    insert into sy_basic_resource_history (id, module_id, occurrence_time, 
+      occupancy)
+    values (#{id,jdbcType=VARCHAR}, #{moduleId,jdbcType=VARCHAR}, #{occurrenceTime,jdbcType=BIGINT}, 
+      #{occupancy,jdbcType=DOUBLE})
+  </insert>
+  <insert id="insertSelective" parameterType="com.objecteye.entity.SyBasicResourceHistory">
+    insert into sy_basic_resource_history
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="moduleId != null">
+        module_id,
+      </if>
+      <if test="occurrenceTime != null">
+        occurrence_time,
+      </if>
+      <if test="occupancy != null">
+        occupancy,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="moduleId != null">
+        #{moduleId,jdbcType=VARCHAR},
+      </if>
+      <if test="occurrenceTime != null">
+        #{occurrenceTime,jdbcType=BIGINT},
+      </if>
+      <if test="occupancy != null">
+        #{occupancy,jdbcType=DOUBLE},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.objecteye.entity.SyBasicResourceHistory">
+    update sy_basic_resource_history
+    <set>
+      <if test="moduleId != null">
+        module_id = #{moduleId,jdbcType=VARCHAR},
+      </if>
+      <if test="occurrenceTime != null">
+        occurrence_time = #{occurrenceTime,jdbcType=BIGINT},
+      </if>
+      <if test="occupancy != null">
+        occupancy = #{occupancy,jdbcType=DOUBLE},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.objecteye.entity.SyBasicResourceHistory">
+    update sy_basic_resource_history
+    set module_id = #{moduleId,jdbcType=VARCHAR},
+      occurrence_time = #{occurrenceTime,jdbcType=BIGINT},
+      occupancy = #{occupancy,jdbcType=DOUBLE}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
 \ No newline at end of file