From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/data/TaskController.java | 104 ++++++++++++++++++++++++----------------------------
1 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/TaskController.java b/src/main/java/com/lf/server/controller/data/TaskController.java
index 9c07a52..6c08bda 100644
--- a/src/main/java/com/lf/server/controller/data/TaskController.java
+++ b/src/main/java/com/lf/server/controller/data/TaskController.java
@@ -3,18 +3,22 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.ctrl.PubEntity;
import com.lf.server.entity.data.TaskEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.WebHelper;
+import com.lf.server.service.data.PublishService;
import com.lf.server.service.data.TaskService;
import com.lf.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.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -25,85 +29,39 @@
@RestController
@RequestMapping("/task")
public class TaskController extends BaseController {
- @Autowired
+ @Resource
TaskService taskService;
- @Autowired
+ @Resource
TokenService tokenService;
- @SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "浠诲姟鍚嶇О", dataType = "String", paramType = "query", required = false, example = "")
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String name) {
- try {
- int count = taskService.selectCount(name);
-
- 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 = "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<TaskEntity>> selectByPage(String name, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
-
- List<TaskEntity> rs = taskService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
-
- return success(rs);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
+ @Resource
+ PublishService publishService;
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "浠诲姟鍚嶇О", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "status", value = "浠诲姟鐘舵��", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "type", value = "浠诲姟绫诲埆", dataType = "String", paramType = "query", example = ""),
@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<TaskEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<TaskEntity>> selectByPageAndCount(String name, Integer status, String type, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = taskService.selectCount(name);
+ int count = taskService.selectCount(name, status, type);
if (count == 0) {
return success(0, null);
}
- List<TaskEntity> rs = taskService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+ List<TaskEntity> rs = taskService.selectByPage(name, status, type, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈�")
- @GetMapping(value = "/selectAll")
- public ResponseMsg<List<TaskEntity>> selectAll() {
- try {
- List<TaskEntity> list = taskService.selectAll();
-
- return success(list);
} catch (Exception ex) {
return fail(ex, null);
}
@@ -206,6 +164,40 @@
}
@SysLog()
+ @ApiOperation(value = "鍒犻櫎浠诲姟")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/deleteTask")
+ public ResponseMsg<Object> deleteTask(int id, HttpServletRequest req) {
+ try {
+ TaskEntity task = taskService.selectById(id);
+ if (null == task || 1 != task.getStatus()) {
+ return fail("浠诲姟涓嶅瓨鍦ㄦ垨鏃犻渶缁撴潫", -1);
+ }
+
+ List<Integer> ids = new ArrayList<>();
+ ids.add(id);
+
+ PubEntity entity = new PubEntity();
+ entity.setIds(ids);
+ entity.setDircode("00");
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUserId(ue.getId());
+ entity.setToken(WebHelper.getToken(req));
+ }
+
+ long rows = publishService.postForPub(entity, "/Convert/DeleteTask");
+
+ return success(rows);
+ } catch (Exception ex) {
+ return fail(ex, -1);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏇存柊涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "TaskEntity", paramType = "body")
--
Gitblit v1.9.3