From 2baa05224b72fbae849678e338bbc85506a9cfe6 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 29 九月 2025 18:31:55 +0800 Subject: [PATCH] 新增Orgid --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 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 90b3e21..7f2c848 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 @@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -135,6 +136,19 @@ } /** + * 鑾峰彇闅忚鍙婃椂鐜� + */ + @ApiOperation("鑾峰彇闅忚鍙婃椂鐜�") + //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:add')") + @Log(title = "鑾峰彇闅忚鍙婃椂鐜�", businessType = BusinessType.INSERT) + @PostMapping("/selectTimelyRate") + public AjaxResult selectTimelyRate(@RequestBody ServiceSubtask serviceSubtask) { + SysUser user = getLoginUser().getUser(); + serviceSubtask.setOrgid(user.getOrgid()); + return success(serviceTaskService.selectTimelyRate(serviceSubtask)); + } + + /** * 淇敼璇煶浠诲姟 */ @ApiOperation("淇敼浠诲姟") @@ -219,4 +233,31 @@ return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom())); } + + /** + * 閫氳繃浠诲姟ID鍜屾偅鑰匢D鑾峰彇鍗曚釜浜虹殑棰樼洰淇℃伅 + * + * @return + */ + @ApiOperation("閫氳繃浠诲姟ID鍜岃瘖鐤楄褰曞彿鑾峰彇鍗曚釜浜虹殑棰樼洰淇℃伅") + @PostMapping("/getScriptByCondition") + public AjaxResult getScriptByCondition(@RequestBody ServiceTaskScriptQues serviceTaskScriptQues) { + RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample(); + Long taskId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam1(), pri_key)); + String zyserialnum = null; + String mzserialnum = null; + String tsserialnum = null; + if (StringUtils.isNotEmpty(serviceTaskScriptQues.getParam2())) + zyserialnum = rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam2(), pri_key); + if (StringUtils.isNotEmpty(serviceTaskScriptQues.getParam3())) + mzserialnum = rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam3(), pri_key); + if (StringUtils.isNotEmpty(serviceTaskScriptQues.getParam4())) + tsserialnum = rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam4(), pri_key); + Map<String, Object> scriptByCondition = serviceTaskService.getScriptByCondition(taskId, zyserialnum, mzserialnum, tsserialnum); + scriptByCondition.put("zy", serviceTaskScriptQues.getParam2()); + scriptByCondition.put("mz", serviceTaskScriptQues.getParam3()); + scriptByCondition.put("tid", serviceTaskScriptQues.getParam1()); + return success(scriptByCondition); + } + } -- Gitblit v1.9.3