From 23511541399d43babd626907eebabdebbbaa9280 Mon Sep 17 00:00:00 2001
From: zhang <431960018@qq.com>
Date: Tue, 28 Nov 2023 16:30:40 +0800
Subject: [PATCH] test drone

---
 .../test_zabbix/auto/IMediaTypeService.java   | 16 ----------
 .../test_zabbix/auto/MediaTypeController.java | 20 -------------
 .../auto/MediaTypeServiceImpl.java            | 19 ------------
 .../com/zh/test_zabbix/controller/Login_.java | 30 -------------------
 .../com/zh/test_zabbix/controller/Users.java  |  6 ++++
 .../zh/test_zabbix/service/IUsersService.java |  3 ++
 .../serviceImpl/UsersServiceImpl.java         | 15 ++++++++++
 7 files changed, 24 insertions(+), 85 deletions(-)
 delete mode 100644 src/main/java/com/zh/test_zabbix/auto/IMediaTypeService.java
 delete mode 100644 src/main/java/com/zh/test_zabbix/auto/MediaTypeController.java
 delete mode 100644 src/main/java/com/zh/test_zabbix/auto/MediaTypeServiceImpl.java
 delete mode 100644 src/main/java/com/zh/test_zabbix/controller/Login_.java

diff --git a/src/main/java/com/zh/test_zabbix/auto/IMediaTypeService.java b/src/main/java/com/zh/test_zabbix/auto/IMediaTypeService.java
deleted file mode 100644
index cfe98fd..0000000
--- a/src/main/java/com/zh/test_zabbix/auto/IMediaTypeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zh.test_zabbix.auto;
-
-import com.zh.test_zabbix.model.MediaType;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zh
- * @since 2023-11-24
- */
-public interface IMediaTypeService extends IService<MediaType> {
-
-}
diff --git a/src/main/java/com/zh/test_zabbix/auto/MediaTypeController.java b/src/main/java/com/zh/test_zabbix/auto/MediaTypeController.java
deleted file mode 100644
index 5084670..0000000
--- a/src/main/java/com/zh/test_zabbix/auto/MediaTypeController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zh.test_zabbix.auto;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zh
- * @since 2023-11-24
- */
-@RestController
-@RequestMapping("/media-type")
-public class MediaTypeController {
-
-}
diff --git a/src/main/java/com/zh/test_zabbix/auto/MediaTypeServiceImpl.java b/src/main/java/com/zh/test_zabbix/auto/MediaTypeServiceImpl.java
deleted file mode 100644
index becfb34..0000000
--- a/src/main/java/com/zh/test_zabbix/auto/MediaTypeServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zh.test_zabbix.auto;
-
-import com.zh.test_zabbix.mapper.MediaTypeMapper;
-import com.zh.test_zabbix.model.MediaType;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zh
- * @since 2023-11-24
- */
-@Service
-public class MediaTypeServiceImpl extends ServiceImpl<MediaTypeMapper, MediaType> implements IMediaTypeService {
-
-}
diff --git a/src/main/java/com/zh/test_zabbix/controller/Login_.java b/src/main/java/com/zh/test_zabbix/controller/Login_.java
deleted file mode 100644
index 74ad401..0000000
--- a/src/main/java/com/zh/test_zabbix/controller/Login_.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zh.test_zabbix.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.zh.test_zabbix.utils.ZabbixApi;
-import lombok.Data;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/user")
-public class Login_ {
-
-    @Data
-    static class argLogin{
-        String username;
-        String password;
-    }
-
-    @RequestMapping("/login")
-    public JSONObject login(@RequestBody argLogin arg){
-        JSONObject params = new JSONObject();
-        params.put("username",arg.getUsername());
-        params.put("password",arg.getPassword());
-        JSONObject result = ZabbixApi.login(params);
-        return result;
-    }
-
-}
diff --git a/src/main/java/com/zh/test_zabbix/controller/Users.java b/src/main/java/com/zh/test_zabbix/controller/Users.java
index 2937500..685ad6e 100644
--- a/src/main/java/com/zh/test_zabbix/controller/Users.java
+++ b/src/main/java/com/zh/test_zabbix/controller/Users.java
@@ -24,6 +24,12 @@ public class Users {
     @Autowired
     private IUsersService usersService;
 
+
+    @RequestMapping("/login")
+    public Result login(@RequestBody UsersServiceImpl.ArgLogin args){
+        return usersService.login(args);
+    }
+
     @RequestMapping("/get")
     public Result get(@RequestBody UsersServiceImpl.ArgGet args) {
         return usersService.get(args);
diff --git a/src/main/java/com/zh/test_zabbix/service/IUsersService.java b/src/main/java/com/zh/test_zabbix/service/IUsersService.java
index 53f0d6c..53553ab 100644
--- a/src/main/java/com/zh/test_zabbix/service/IUsersService.java
+++ b/src/main/java/com/zh/test_zabbix/service/IUsersService.java
@@ -15,6 +15,9 @@ import com.zh.test_zabbix.utils.result.Result;
  * @since 2023-11-22
  */
 public interface IUsersService extends IService<Users> {
+
+    Result<JSONObject> login(UsersServiceImpl.ArgLogin args);
+
     Result<JSONObject> get(UsersServiceImpl.ArgGet args);
 
     Result<JSONObject> medias();
diff --git a/src/main/java/com/zh/test_zabbix/serviceImpl/UsersServiceImpl.java b/src/main/java/com/zh/test_zabbix/serviceImpl/UsersServiceImpl.java
index 0d121cd..54574f0 100644
--- a/src/main/java/com/zh/test_zabbix/serviceImpl/UsersServiceImpl.java
+++ b/src/main/java/com/zh/test_zabbix/serviceImpl/UsersServiceImpl.java
@@ -14,6 +14,7 @@ import com.zh.test_zabbix.service.IUsersService;
 import com.zh.test_zabbix.serviceImpl.util.ServiceUtil;
 import com.zh.test_zabbix.utils.Common;
 import com.zh.test_zabbix.utils.Valid;
+import com.zh.test_zabbix.utils.ZabbixApi;
 import com.zh.test_zabbix.utils.result.Result;
 import lombok.Data;
 import org.springframework.stereotype.Service;
@@ -50,6 +51,20 @@ public class UsersServiceImpl extends ServiceImpl<UsersMapper, Users> implements
     @Resource
     private MediaTypeMapper  mediaTypeMapper;
 
+    @Data
+    public static class ArgLogin{
+        String username;
+        String password;
+    }
+
+    @Override
+    public Result<JSONObject> login(ArgLogin args) {
+        JSONObject params = new JSONObject();
+        params.put("username",args.getUsername());
+        params.put("password",args.getPassword());
+        return  Result.success(ZabbixApi.login(params));
+    }
+
     @Data
     public static class ArgGet {
         Integer pageNum;