From 197a81cfae40fc12e9b80c0e18f7f6a29dda5e25 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 05 七月 2023 17:56:04 +0800
Subject: [PATCH] 1
---
/dev/null | 236 -----------------------------------------------
src/main/java/com/moon/server/service/all/ScheduleService.java | 8
2 files changed, 4 insertions(+), 240 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/sys/ResOpController.java b/src/main/java/com/moon/server/controller/sys/ResOpController.java
deleted file mode 100644
index 079fbf5..0000000
--- a/src/main/java/com/moon/server/controller/sys/ResOpController.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package com.moon.server.controller.sys;
-
-import com.moon.server.annotation.SysLog;
-import com.moon.server.controller.all.BaseController;
-import com.moon.server.entity.all.ResponseMsg;
-import com.moon.server.entity.sys.ResOpEntity;
-import com.moon.server.entity.sys.UserEntity;
-import com.moon.server.service.sys.ResOpService;
-import com.moon.server.service.sys.TokenService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.sql.Timestamp;
-import java.util.List;
-
-/**
- * 璧勬簮鎿嶄綔
- * @author SWS
- * @date 2022-09.28
- */
-@Api(tags = "杩愮淮绠＄悊\\璧勬簮鎿嶄綔")
-@RestController
-@RequestMapping("/resOp")
-public class ResOpController extends BaseController {
- @Autowired
- ResOpService resOpService;
-
- @Autowired
- TokenService tokenService;
-
- @SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "璧勬簮鍚嶇О", dataType = "String", paramType = "query", example = "澶╁湴鍥�"),
- @ApiImplicitParam(name = "type", value = "鎿嶄綔绫诲瀷", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-10-09 09:00:00"),
- @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-10-10 18:00:00"),
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String name, Integer type, Timestamp start, Timestamp end) {
- try {
- int count = resOpService.selectCount(name, type, start, end);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex, -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "璧勬簮鍚嶇О", dataType = "String", paramType = "query", example = "澶╁湴鍥�"),
- @ApiImplicitParam(name = "type", value = "鎿嶄綔绫诲瀷", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-10-09 09:00:00"),
- @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-10-10 18:00:00"),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
- @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectByPage")
- public ResponseMsg<List<ResOpEntity>> selectByPage(String name, Integer type, Timestamp start, Timestamp end, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
- List<ResOpEntity> rs = resOpService.selectByPage(name, type, start, end, pageSize, pageSize * (pageIndex - 1));
- return success(rs);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "璧勬簮鍚嶇О", dataType = "String", paramType = "query", example = "澶╁湴鍥�"),
- @ApiImplicitParam(name = "type", value = "鎿嶄綔绫诲瀷", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-10-09 09:00:00"),
- @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-10-10 18:00:00"),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
- @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<ResOpEntity>> selectByPageAndCount(String name, Integer type, Timestamp start, Timestamp end, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
-
- int count = resOpService.selectCount(name, type, start, end);
- if (count == 0) {
- return success(0, null);
- }
-
- List<ResOpEntity> rs = resOpService.selectByPage(name, type, start, end, pageSize, pageSize * (pageIndex - 1));
-
- return success(count, rs);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鎻掑叆涓�鏉�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ResOpEntity", paramType = "body", example = "")
- })
- @PostMapping(value = "/insertResOp", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertResOp(@RequestBody ResOpEntity entity, HttpServletRequest req) {
- try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- entity.setUserid(ue.getId());
- }
-
- int count = resOpService.insertResOp(entity);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex, -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鎻掑叆澶氭潯")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<ResOpEntity>", paramType = "body", example = "")
- })
- @PostMapping(value = "/insertResOps", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertResOps(@RequestBody List<ResOpEntity> list, HttpServletRequest req) {
- try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- for (ResOpEntity entity : list) {
- entity.setUserid(ue.getId());
- }
- }
-
- int count = resOpService.insertResOps(list);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex, -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒犻櫎涓�鏉�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/deleteLogin")
- public ResponseMsg<Integer> deleteResOp(int id) {
- try {
- int count = resOpService.deleteResOp(id);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex, -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒犻櫎澶氭潯")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2")
- })
- @GetMapping(value = "/deleteResOps")
- public ResponseMsg<Integer> deleteResOps(@RequestParam List<Integer> ids) {
- try {
- if (ids == null || ids.isEmpty()) {
- return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
- }
- int count = resOpService.deleteResOps(ids);
- return success(count);
- } catch (Exception ex) {
- return fail(ex, -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏇存柊涓�鏉�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "ID鏁扮粍", dataType = "LoginEntity", paramType = "body", example = "")
- })
- @ResponseBody
- @PostMapping(value = "/updateResOp", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updateResOp(@RequestBody ResOpEntity entity, HttpServletRequest req) {
- try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- entity.setUserid(ue.getId());
- }
-
- int count = resOpService.updateResOp(entity);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex, -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectResOp")
- public ResponseMsg<ResOpEntity> selectResOp(int id) {
- try {
- ResOpEntity resOpEntity = resOpService.selectResOp(id);
-
- return success(resOpEntity);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈�")
- @GetMapping(value = "/selectResOpAll")
- public ResponseMsg<List<ResOpEntity>> selectResOpAll() {
- try {
- List<ResOpEntity> list = resOpService.selectResOpAll();
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-}
diff --git a/src/main/java/com/moon/server/service/all/ScheduleService.java b/src/main/java/com/moon/server/service/all/ScheduleService.java
index 32eb04b..9c44f53 100644
--- a/src/main/java/com/moon/server/service/all/ScheduleService.java
+++ b/src/main/java/com/moon/server/service/all/ScheduleService.java
@@ -152,7 +152,7 @@
* 鏌ヨ鏈嶅姟璧勬簮鐘舵��
*/
public List<ResEntity> selectResStatus() {
- List<ResEntity> resList = resService.selectResAll();
+ List<ResEntity> resList = resService.selectAll();
return testResStatus(resList);
}
@@ -162,12 +162,12 @@
for (ResEntity re : resList) {
Socket socket = new Socket();
try {
- if (StringHelper.isEmpty(re.getServer())) {
+ if (StringHelper.isEmpty(re.getTest())) {
list.add(re);
continue;
}
- URI uri = new URI(re.getServer());
+ URI uri = new URI(re.getTest());
SocketAddress add = new InetSocketAddress(uri.getHost(), uri.getPort() == -1 ? 80 : uri.getPort());
// Ping閫氬湴鍧�
@@ -191,7 +191,7 @@
* 缁熻鏈嶅姟璧勬簮鐘舵��
*/
public JSONObject countResStatus() {
- List<ResEntity> resList = resService.selectResAll();
+ List<ResEntity> resList = resService.selectAll();
List<ResEntity> unableList = testResStatus(resList);
JSONObject jsonObject = new JSONObject();
--
Gitblit v1.9.3