From dbbb114c25b2406b6d1fd52019d2f2228ffcacd0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 十一月 2024 18:04:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index f3b4d20..2a3f0ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.common.SendService;
import com.smartor.domain.*;
import com.smartor.service.IServiceSubtaskService;
import com.smartor.service.IServiceTaskService;
@@ -24,6 +25,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.List;
import java.util.stream.Collectors;
@@ -54,11 +56,24 @@
@Autowired
private RSAPublicKeyExample rsaPublicKeyExample;
+ @Autowired
+ private SendService sendService;
+
+ @PostMapping("/test")
+ public TableDataInfo test(@RequestBody SendMagParam sendMagParam) {
+ try {
+ Boolean aBoolean = sendService.sendMsg(sendMagParam);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
/**
* 鏌ヨ璇煶浠诲姟鍒楄〃
*/
@ApiOperation("鏌ヨ浠诲姟鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody ServiceTask serviceTask) {
PageUtils.startPageByPost(serviceTask.getPageNum(), serviceTask.getPageSize());
@@ -67,9 +82,11 @@
if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
for (ServiceTaskVO ServiceTaskVO : serviceTaskVOS) {
- ServiceSubtaskVO ServiceTaskcall = new ServiceSubtaskVO();
- ServiceTaskcall.setTaskid(ServiceTaskVO.getTaskid());
- List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(ServiceTaskcall);
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
+ serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
+ serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
+ List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) {
//宸插彂閫�
long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
@@ -99,7 +116,7 @@
* 瀵煎嚭浠诲姟鍒楄〃
*/
@ApiOperation("瀵煎嚭浠诲姟鍒楄〃")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:export')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ServiceTask ServiceTask) {
@@ -112,7 +129,7 @@
* 鑾峰彇浠诲姟璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇浠诲姟璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:query')")
@GetMapping(value = "/{taskid}")
public AjaxResult getInfo(@PathVariable("taskid") Long taskid) {
return success(serviceTaskService.selectServiceTaskByTaskid(taskid));
@@ -122,7 +139,7 @@
* 鏂板浠诲姟
*/
@ApiOperation("鏂板浠诲姟")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:add')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody ServiceTask ServiceTask) {
@@ -133,7 +150,7 @@
* 淇敼璇煶浠诲姟
*/
@ApiOperation("淇敼浠诲姟")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:edit')")
@Log(title = "浠诲姟", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceTask ServiceTask) {
@@ -144,7 +161,7 @@
// * 鍒犻櫎璇煶浠诲姟
// */
// @ApiOperation("鍒犻櫎浠诲姟")
-// @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:remove')")
+// //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:remove')")
// @Log(title = "璇煶浠诲姟", businessType = BusinessType.DELETE)
// @GetMapping("/remove/{taskids}")
// public AjaxResult remove(@PathVariable Long[] taskids) {
@@ -156,7 +173,7 @@
* 鍒犻櫎浠诲姟(鍖呮嫭瀹冨搴旂殑鎮ｈ�呬俊鎭�)
*/
@ApiOperation("鍒犻櫎浠诲姟(鍖呮嫭瀹冨搴旂殑鎮ｈ�呬俊鎭�)")
- @PreAuthorize("@ss.hasPermi('smartor:ServiceTask:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:remove')")
@Log(title = "璇煶浠诲姟", businessType = BusinessType.DELETE)
@GetMapping("/remove/{taskId}")
public AjaxResult removeTask(@PathVariable("taskId") String taskId) {
@@ -177,18 +194,16 @@
public AjaxResult getScriptInfoByCondition(@RequestBody ServiceTaskScriptQues serviceTaskScriptQues) {
Long tid = null;
Long pid = null;
- log.info("getScriptInfoByCondition鍏ュ弬涓猴細{}", serviceTaskScriptQues);
+ log.error("getScriptInfoByCondition鍏ュ弬涓猴細{}", serviceTaskScriptQues);
try {
-// tid = Long.valueOf(rsaPublicKeyExample.decryptedData(URLDecoder.decode(serviceTaskScriptQues.getParam1(), "UTF-8"), pri_key));
-// pid = Long.valueOf(rsaPublicKeyExample.decryptedData(URLDecoder.decode(serviceTaskScriptQues.getParam2(), "UTF-8"), pri_key));
tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam1(), pri_key));
pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam2(), pri_key));
} catch (Exception e) {
log.error("getScriptInfoByCondition鎶ラ敊浜嗭細{}", e.getMessage());
}
- log.info("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
- return success(serviceTaskService.getScriptInfoByCondition(tid, pid));
+ log.error("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
+ return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true));
}
}
--
Gitblit v1.9.3