From 8d913e5594f45ca2a4ce656ea9feb99ffe715913 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 29 十一月 2024 18:44:58 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
index 876adb6..26729e4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskController.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
+import com.smartor.service.IServiceSubtaskService;
import com.smartor.service.ISvyTaskService;
import com.smartor.service.ISvyTaskSingleService;
import io.swagger.annotations.Api;
@@ -39,9 +40,14 @@
public class SvyTaskController extends BaseController {
@Autowired
private ISvyTaskService svyTaskService;
+//
+// @Autowired
+// private ISvyTaskSingleService iSvyTaskSingleService;
@Autowired
- private ISvyTaskSingleService iSvyTaskSingleService;
+ private IServiceSubtaskService serviceSubtaskService;
+
+
@Value("${pub_key}")
private String pub_key;
@@ -53,7 +59,7 @@
* 鏌ヨ闂嵎浠诲姟锛堜换鍔★級鍒楄〃
*/
@ApiOperation("鏌ヨ闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:task:list')")
+ //@PreAuthorize("@ss.hasPermi('system:task:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyTask svyTask) {
PageUtils.startPageByPost(svyTask.getPageNum(), svyTask.getPageSize());
@@ -61,9 +67,9 @@
List<SvyTaskVO> svyTaskVOS = DtoConversionUtils.sourceToTarget(list, SvyTaskVO.class);
if (CollectionUtils.isNotEmpty(svyTaskVOS)) {
for (SvyTaskVO svyTaskVO : svyTaskVOS) {
- SvyTaskSingle svyTaskSingle = new SvyTaskSingle();
- svyTaskSingle.setTaskid(svyTaskVO.getTaskid());
- List<SvyTaskSingle> svyTaskSingles = iSvyTaskSingleService.selectSvyTaskSingleList(svyTaskSingle);
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setTaskid(svyTaskVO.getTaskid());
+ List<ServiceSubtask> svyTaskSingles = serviceSubtaskService.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(svyTaskSingles)) {
//宸插彂閫�
long yfs = svyTaskSingles.stream().filter(svyTaskcall1 -> svyTaskcall1.getSendstate() != null && svyTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
@@ -95,7 +101,7 @@
* 瀵煎嚭闂嵎浠诲姟锛堜换鍔★級鍒楄〃
*/
@ApiOperation("瀵煎嚭闂嵎浠诲姟锛堜换鍔★級鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:task:export')")
+ //@PreAuthorize("@ss.hasPermi('system:task:export')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SvyTask svyTask) {
@@ -108,7 +114,7 @@
* 鑾峰彇闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇闂嵎浠诲姟锛堜换鍔★級璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:task:query')")
+ //@PreAuthorize("@ss.hasPermi('system:task:query')")
@GetMapping(value = "/{taskid}")
public AjaxResult getInfo(@PathVariable("taskid") Long taskid) {
return success(svyTaskService.selectSvyTaskByTaskid(taskid));
@@ -118,7 +124,7 @@
* 鏂板闂嵎浠诲姟锛堜换鍔★級
*/
@ApiOperation("鏂板闂嵎浠诲姟锛堜换鍔★級")
- @PreAuthorize("@ss.hasPermi('system:task:add')")
+ //@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SvyTask svyTask) {
@@ -129,7 +135,7 @@
* 淇敼闂嵎浠诲姟锛堜换鍔★級
*/
@ApiOperation("淇敼闂嵎浠诲姟锛堜换鍔★級")
- @PreAuthorize("@ss.hasPermi('system:task:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:task:edit')")
@Log(title = "缁煎悎闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyTask svyTask) {
@@ -140,7 +146,7 @@
* 鍒犻櫎闂嵎浠诲姟锛堜换鍔★級
*/
@ApiOperation("鍒犻櫎闂嵎浠诲姟锛堜换鍔★級")
- @PreAuthorize("@ss.hasPermi('system:task:remove')")
+ //@PreAuthorize("@ss.hasPermi('system:task:remove')")
@Log(title = "闂嵎浠诲姟锛堜换鍔★級", businessType = BusinessType.DELETE)
@GetMapping("/{taskids}")
public AjaxResult remove(@PathVariable Long[] taskids) {
--
Gitblit v1.9.3