From bc563a81ed6c022456f597eca9a7c2c9b506f8af Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 27 二月 2025 11:40:27 +0800
Subject: [PATCH] 短信
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java | 1 -
ruoyi-admin/src/main/resources/application-test.yml | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 2 +-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java | 23 +++++++++++++++++++++++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 2 +-
ruoyi-applet/src/main/resources/application-test.yml | 6 ++++++
6 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index 443cedc..ba57274 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -89,7 +89,7 @@
@PreAuthorize("@ss.hasPermi('system:bill:sendMailBatchByBillIds')")
- @ApiOperation("账单批量发送短信通知")
+ @ApiOperation("账单批量发送邮箱通知")
@PostMapping("sendMailBatchByBillIds")
public R sendMailBatchByBillIds(@Validated @RequestBody SmsByBillDto dto){
Integer failNum = tBillService.sendMailBatchByBillIds(dto);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java
index 894920c..aa4724e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java
@@ -57,7 +57,6 @@
public R<Boolean> updateHouse(@Validated @RequestBody THouseDTO dto) {
return R.ok(tHouseService.updateById(dto));
}
- @Log(title = "房屋基础信息管理-查询房屋信息", businessType = BusinessType.DELETE)
@ApiOperation(value = "查询房屋信息")
@GetMapping(value = "/getHouseById")
@PreAuthorize("@ss.hasPermi('system:house:detail')")
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 54159c4..ec0ed40 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -225,4 +225,4 @@
appId: 1400957506
secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
- sign: 四川金达通信工程
\ No newline at end of file
+ sign: 畅云出行
\ No newline at end of file
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java
index 5e7abda..176b1af 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java
@@ -1,8 +1,19 @@
package com.ruoyi.web.controller.api;
+import com.ruoyi.common.constant.DictConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.service.THouseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -13,9 +24,21 @@
* @author xiaochen
* @since 2025-01-17
*/
+@Api(tags = "房屋管理")
@RestController
@RequestMapping("/t-house")
public class THouseController {
+ @Autowired
+ private THouseService tHouseService;
+ @ApiOperation(value = "查询房屋信息")
+ @GetMapping(value = "/getHouseById")
+ @PreAuthorize("@ss.hasPermi('system:house:detail')")
+ public R<THouse> getHouseById(@RequestParam String id) {
+ THouse tHouse = tHouseService.getById(id);
+ tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
+ tHouse.setBusinessAttributes(DictUtils.getDictLabel(DictConstants.DICT_TYPE_BUSINESS_ATTRIBUTES,tHouse.getBusinessAttributes()));
+ return R.ok(tHouse);
+ }
}
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index b239bd0..c32e796 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -130,7 +130,7 @@
String code = String.valueOf((int) (Math.random() * 1000000));
redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
try {
- smsUtil.sendSms(phone, "", new String[]{code});
+ smsUtil.sendSms(phone, "2369926", new String[]{code});
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/ruoyi-applet/src/main/resources/application-test.yml b/ruoyi-applet/src/main/resources/application-test.yml
index 14afafa..e9018b1 100644
--- a/ruoyi-applet/src/main/resources/application-test.yml
+++ b/ruoyi-applet/src/main/resources/application-test.yml
@@ -220,3 +220,9 @@
bucketAddr: ap-chengdu
rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
location: xizang
+sms:
+ enable: true
+ appId: 1400957506
+ secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
+ secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
+ sign: 畅云出行
--
Gitblit v1.7.1