From 55f5271f893a25a7be671b24938e49976936a67b Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 29 九月 2025 18:30:00 +0800 Subject: [PATCH] 新增Orgid --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 63 +++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java index 7353768..8c3a964 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java @@ -2,12 +2,17 @@ import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.RSAPublicKeyExample; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.sms.smsUtils; import com.ruoyi.framework.config.ServerConfig; import com.smartor.domain.HtmlContentVO; +import com.smartor.domain.ServiceOutPath; +import com.smartor.domain.ServiceTask; import com.smartor.domain.smsVO; +import com.smartor.mapper.ServiceTaskMapper; +import com.smartor.service.IServiceOutPathService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -17,6 +22,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.Date; @RestController @Api(description = "鐭ヤ俊鎺ュ彛") @@ -31,6 +40,22 @@ @Value("${xhsmsPwd}") private String xhsmsPwd; + @Value("${localIP}") + private String ip; + + @Value("${req_path}") + private String req_path; + + @Value("${pub_key}") + private String pub_key; + + @Autowired + private IServiceOutPathService iServiceOutPathService; + + @Autowired + private ServiceTaskMapper serviceTaskMapper; + + /** * @param * @return @@ -38,9 +63,45 @@ @ApiOperation("鐭俊鍙戦��") @PostMapping("/send") public AjaxResult send(@RequestBody smsVO vo) { - String sendMsg=smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,vo.getPhone(),vo.getContent()); + String sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), vo.getContent()); return AjaxResult.success(sendMsg); } + /** + * @param + * @return + */ + @ApiOperation("鐭俊鍙戦��") + @PostMapping("/sendAsk") + public AjaxResult sendAsk(@RequestBody smsVO vo) throws UnsupportedEncodingException { + RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample(); + String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key); + String patid = rsaPublicKeyExample.encryptedData(vo.getPatId().toString(), pub_key); + String subId = rsaPublicKeyExample.encryptedData(vo.getSubId().toString(), pub_key); + ServiceOutPath serviceOutPath = new ServiceOutPath(); + serviceOutPath.setParam1(taskId); + serviceOutPath.setParam2(patid); + serviceOutPath.setParam3(vo.getTaskName()); + serviceOutPath.setParam6(subId); + serviceOutPath.setCreateTime(new Date()); + iServiceOutPathService.insertServiceOutPath(serviceOutPath); + String format = String.format("%03X", serviceOutPath.getId()); + serviceOutPath.setRadix(format); + serviceOutPath.setUpdateTime(new Date()); + iServiceOutPathService.updateServiceOutPath(serviceOutPath); + String url = ip + ":" + req_path + "/wt?p=" + format; + ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(Long.valueOf(taskId)); + //濡傛灉type鏄闊抽殢璁跨殑璇濓紙璇存槑琛ュ伩鍙戦�佹柟寮忎腑鏈夌數璇濋殢璁跨殑鏂瑰紡锛岃繖閲岀殑澶栭摼灏卞湴鍧�鍙兘鐢�/sf锛� + if (serviceTask.getType().equals("1")) { + url = ip + ":" + req_path + "/sf?p=" + format; + } + + //String url = = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(vo.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false"; + + String content = "鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�"; + + String sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), content); + return AjaxResult.success(sendMsg); + } } -- Gitblit v1.9.3