From d8062519fe21bd1fa38b60eb28efaf524651a47f Mon Sep 17 00:00:00 2001 From: water <672684719@qq.com> Date: Thu, 12 Mar 2020 22:28:44 +0800 Subject: [PATCH] #40 --- .../admin/controller/JobGroupController.java | 9 +- .../wugui/datax/admin/entity/DataxPlugin.java | 9 +- .../datax/admin/mapper/JobGroupMapper.java | 18 ++-- .../admin/mapper/JobLogReportMapper.java | 11 ++- .../admin/service/impl/JobServiceImpl.java | 4 +- .../mybatis-mapper/JobGroupMapper.xml | 4 +- .../datax/admin/tool/query/KerberosLogin.java | 22 +++++ .../datax/admin/tool/query/QueryTool.java | 91 +++++++++++++++++++ doc/db/demo_job_info.sql | 82 +++++++++++++++++ 9 files changed, 222 insertions(+), 28 deletions(-) create mode 100644 datax-admin/src/test/java/com/wugui/datax/admin/tool/query/KerberosLogin.java create mode 100644 datax-admin/src/test/java/com/wugui/datax/admin/tool/query/QueryTool.java create mode 100644 doc/db/demo_job_info.sql diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java index bd5aa7d1..532b0f6c 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java @@ -34,7 +34,6 @@ public class JobGroupController { @GetMapping("/list") @ApiOperation("执行器列表") public ReturnT> getExecutorList() { - // job group (executor) return new ReturnT<>(jobGroupMapper.findAll()); } @@ -133,7 +132,7 @@ public class JobGroupController { return appAddressMap.get(appNameParam); } - @RequestMapping(value = "/remove", method = RequestMethod.POST) + @PostMapping("/remove") @ApiOperation("移除执行器") public ReturnT remove(int id) { @@ -153,14 +152,14 @@ public class JobGroupController { } @RequestMapping(value = "/loadById", method = RequestMethod.POST) - @ApiOperation("获取执行器") + @ApiOperation("根据id获取执行器") public ReturnT loadById(int id) { JobGroup jobGroup = jobGroupMapper.load(id); return jobGroup != null ? new ReturnT<>(jobGroup) : new ReturnT<>(ReturnT.FAIL_CODE, null); } - @GetMapping("/get") - @ApiOperation("执行器列表") + @GetMapping("/query") + @ApiOperation("查询执行器") public ReturnT> get(@ApiParam(value = "执行器AppName") @RequestParam(value = "appName", required = false) String appName, @ApiParam(value = "执行器名称") diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/entity/DataxPlugin.java b/datax-admin/src/main/java/com/wugui/datax/admin/entity/DataxPlugin.java index 7e1e6906..416c8b7f 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/entity/DataxPlugin.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/entity/DataxPlugin.java @@ -8,14 +8,15 @@ import java.io.Serializable; /** * datax插件信息表实体类 + * * @author huzekang@gz-yibo.com - * @since 2019-05-20 * @version v1.0 + * @since 2019-05-20 */ @TableName(value = "datax_plugin") @Data public class DataxPlugin extends Model { - + private Integer id; //插件类型，reader writer private String pluginType; @@ -27,8 +28,6 @@ public class DataxPlugin extends Model { private String comments; - - /** * 获取主键值 * @@ -38,4 +37,4 @@ public class DataxPlugin extends Model { protected Serializable pkVal() { return this.id; } - } \ No newline at end of file +} \ No newline at end of file diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobGroupMapper.java b/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobGroupMapper.java index 26413547..c3c5f644 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobGroupMapper.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobGroupMapper.java @@ -12,19 +12,19 @@ import java.util.List; @Mapper public interface JobGroupMapper { - public List findAll(); + List findAll(); - public List find(@Param("appName") String appName, - @Param("title") String title, - @Param("addressList") String addressList); + List find(@Param("appName") String appName, + @Param("title") String title, + @Param("addressList") String addressList); - public List findByAddressType(@Param("addressType") int addressType); + List findByAddressType(@Param("addressType") int addressType); - public int save(JobGroup xxlJobGroup); + int save(JobGroup xxlJobGroup); - public int update(JobGroup xxlJobGroup); + int update(JobGroup xxlJobGroup); - public int remove(@Param("id") int id); + int remove(@Param("id") int id); - public JobGroup load(@Param("id") int id); + JobGroup load(@Param("id") int id); } diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobLogReportMapper.java b/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobLogReportMapper.java index bae508f3..d938411c 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobLogReportMapper.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobLogReportMapper.java @@ -9,18 +9,19 @@ import java.util.List; /** * job log + * * @author xuxueli 2019-11-22 */ @Mapper public interface JobLogReportMapper { - public int save(JobLogReport xxlJobLogReport); + int save(JobLogReport xxlJobLogReport); - public int update(JobLogReport xxlJobLogReport); + int update(JobLogReport xxlJobLogReport); - public List queryLogReport(@Param("triggerDayFrom") Date triggerDayFrom, - @Param("triggerDayTo") Date triggerDayTo); + List queryLogReport(@Param("triggerDayFrom") Date triggerDayFrom, + @Param("triggerDayTo") Date triggerDayTo); - public JobLogReport queryLogReportTotal(); + JobLogReport queryLogReportTotal(); } diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobServiceImpl.java b/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobServiceImpl.java index 6888a4bc..24ccea4f 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobServiceImpl.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobServiceImpl.java @@ -327,7 +327,7 @@ public class JobServiceImpl implements JobService { } // executor count - Set executorAddressSet = new HashSet(); + Set executorAddressSet = new HashSet<>(); List groupList = jobGroupMapper.findAll(); if (groupList != null && !groupList.isEmpty()) { @@ -340,7 +340,7 @@ public class JobServiceImpl implements JobService { int executorCount = executorAddressSet.size(); - Map dashboardMap = new HashMap(); + Map dashboardMap = new HashMap<>(); dashboardMap.put("jobInfoCount", jobInfoCount); dashboardMap.put("jobLogCount", jobLogCount); dashboardMap.put("jobLogSuccessCount", jobLogSuccessCount); diff --git a/datax-admin/src/main/resources/mybatis-mapper/JobGroupMapper.xml b/datax-admin/src/main/resources/mybatis-mapper/JobGroupMapper.xml index 97b8cf0d..d731348f 100644 --- a/datax-admin/src/main/resources/mybatis-mapper/JobGroupMapper.xml +++ b/datax-admin/src/main/resources/mybatis-mapper/JobGroupMapper.xml @@ -30,8 +30,8 @@