From 30a8692a3aa23118d7c7c33c6d84327e5e199612 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 17:28:45 +0800
Subject: [PATCH] 发送短信开关
---
project-system/src/main/java/com/project/system/sms/YPSmsApi.java | 41 +++++++++----
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 18 ++++++
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 41 ++++++++-----
project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java | 7 +-
project-admin/src/main/java/com/project/admin/controller/system/SysLoginController.java | 4
project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java | 12 ++++
project-enforce/src/main/java/com/project/enforce/service/impl/YPSmsService.java | 11 ++-
7 files changed, 95 insertions(+), 39 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index ed62903..cd15977 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -64,6 +64,24 @@
return AjaxResult.success(list);
}
+ @ApiOperation("鍒楄〃鈥斺�旀棤鐗规畩鏌ヨ")
+ @GetMapping("/commonList")
+ public TableDataInfo commonList(EnforceOrderQueryBo bo)
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.queryCommonList(bo);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("鍒楄〃鈥斺�斾紒涓氭墽娉曡褰�")
+ @GetMapping("/companyList")
+ public TableDataInfo companyList(EnforceOrderQueryBo bo)
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.queryCompanyList(bo);
+ return getDataTable(list);
+ }
+
@ApiOperation("鍒楄〃鈥斺�旀墽娉曠敵璇峰崟")
@GetMapping("/list")
public TableDataInfo list(EnforceOrderQueryBo bo)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysLoginController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysLoginController.java
index 283da0f..34bd6c8 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysLoginController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysLoginController.java
@@ -53,7 +53,7 @@
@RepeatSubmit
public AjaxResult getVerifyCode(@RequestParam("phone") String phone)
{
- return AjaxResult.success(loginService.getVerifyCode(phone));
+ return AjaxResult.success(loginService.getVerifyCode(phone)?"鍙戦�佹垚鍔�":"鍙戦�佸け璐�");
}
@ApiOperation("鏂版敞鍐岃幏鍙栭獙璇佺爜")
@@ -61,7 +61,7 @@
@RepeatSubmit
public AjaxResult getVerifyCodeNew(@RequestParam("phone") String phone)
{
- return AjaxResult.success(loginService.getVerifyCodeNew(phone));
+ return AjaxResult.success(loginService.getVerifyCodeNew(phone)?"鍙戦�佹垚鍔�":"鍙戦�佸け璐�");
}
@ApiOperation("鏍￠獙楠岃瘉鐮�")
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
index 93d3cea..be219d7 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
@@ -21,6 +21,11 @@
public interface IEnforceOrderService extends IBaseService<EnforceOrder> {
/**
+ * 浼佷笟鎵ф硶璁板綍鍒楄〃
+ */
+ List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo);
+
+ /**
* 鏌ヨ鍒楄〃
*/
List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo);
@@ -130,4 +135,11 @@
* @return 鑺傜偣
*/
List<OrderNodeVo> orderComplaintNodeList(Long orderId);
+
+ /**
+ * 閫氱敤鍒楄〃鏃犳潈闄�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo);
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index c470d09..adf2027 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -8,13 +8,15 @@
import com.project.common.core.domain.entity.SysUser;
import com.project.common.enums.OrderPre;
import com.project.common.exception.base.BaseException;
-import com.project.common.sms.YPSmsApi;
import com.project.common.utils.DateUtils;
import com.project.common.utils.JsonUtils;
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.StringUtils;
import com.project.enforce.domain.*;
-import com.project.enforce.domain.bo.editBo.*;
+import com.project.enforce.domain.bo.editBo.EnforceComplaintLogBo;
+import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
+import com.project.enforce.domain.bo.editBo.OrderComplaintBo;
+import com.project.enforce.domain.bo.editBo.OrderResultBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceEvaluateVo;
@@ -27,7 +29,6 @@
import com.project.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +52,24 @@
private final IEnforceCheckLogService checkLogService;
private final IEnforceComplaintLogService complaintLogService;
private final IEnforceEvaluateLogService evaluateLogService;
+ private final YPSmsService smsService;
+
+ @Override//閫氱敤鍒楄〃
+ public List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo)
+ {
+ QueryWrapper<EnforceOrder> qw = getQw(bo);
+ List<EnforceOrder> list = this.list(qw);
+ return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ @Override//浼佷笟鍒楄〃
+ public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo)
+ {
+ QueryWrapper<EnforceOrder> qw = getQw(bo);
+ qw.ge("order_status",2);
+ List<EnforceOrder> list = this.list(qw);
+ return Convert.toList(EnforceOrderVo.class , list);
+ }
@Override//鍒楄〃鏌ヨ
@DataScope(deptAlias = "apply_dept_id", userAlias = "apply_id")
@@ -156,7 +175,7 @@
}
boolean savePeers = peerService.saveOrUpdateBatch(bo.getPeers());
if (savePeers && StringUtils.isNotEmpty(phones)) {
- sendApplyMsg(phones, add.getApplyUser());
+ smsService.sendApplyMsg(phones, add.getApplyUser());
}
return savePeers;
}
@@ -301,20 +320,10 @@
}
+
+
//-------------------------------------------------------------------------------------
-
- /**
- * 鍙戦�佸鎵圭煭淇�
- * @param phones 鎵嬫満鍙�
- * @param applyUser 鐢宠浜�
- */
- @Async
- public void sendApplyMsg(List<String> phones, String applyUser)
- {
- String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.APPLY_TMP, applyUser));
- phones.forEach(phone-> YPSmsApi.sendSms(phone, applyMsg));
- }
//淇濆瓨鍓嶆牎楠�
private void validEntityBeforeSave(EnforceOrder entity)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/YPSmsService.java b/project-enforce/src/main/java/com/project/enforce/service/impl/YPSmsService.java
index ae27e73..5d014f5 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/YPSmsService.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/YPSmsService.java
@@ -1,8 +1,9 @@
package com.project.enforce.service.impl;
-import com.project.common.sms.YPSmsApi;
import com.project.common.utils.DateUtils;
import com.project.common.utils.StringUtils;
+import com.project.system.sms.YPSmsApi;
+import lombok.RequiredArgsConstructor;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -17,8 +18,10 @@
*/
@Service
+@RequiredArgsConstructor
public class YPSmsService
{
+ private final YPSmsApi smsApi;
/**
* 鐢宠鍙戦�佸鎵圭煭淇�
* @param phones 鎵嬫満鍙�
@@ -29,7 +32,7 @@
{
String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.APPLY_TMP, applyUser));
phones.forEach(phone->{
- YPSmsApi.sendSms(phone, applyMsg) ;
+ smsApi.sendSms(phone, applyMsg) ;
});
}
@@ -46,7 +49,7 @@
result = "瀹℃壒閫氳繃";
}
String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.CHECK_TMP, result));
- YPSmsApi.sendSms(phone, applyMsg) ;
+ smsApi.sendSms(phone, applyMsg) ;
}
/**
@@ -60,6 +63,6 @@
{
String date = DateUtils.getFormatDatedd(planTime);
String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.COMPANY_TMP, applyDeptName, date));
- YPSmsApi.sendSms(phone, applyMsg) ;
+ smsApi.sendSms(phone, applyMsg) ;
}
}
diff --git a/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java b/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
index 49e14fb..35217de 100644
--- a/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
+++ b/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
@@ -21,7 +21,6 @@
import com.project.common.exception.user.CaptchaException;
import com.project.common.exception.user.CaptchaExpireException;
import com.project.common.exception.user.UserPasswordNotMatchException;
-import com.project.common.sms.YPSmsApi;
import com.project.common.utils.DateUtils;
import com.project.common.utils.MessageUtils;
import com.project.common.utils.ServletUtils;
@@ -34,6 +33,7 @@
import com.project.system.mapper.SysUserMapper;
import com.project.system.service.ISysConfigService;
import com.project.system.service.ISysUserService;
+import com.project.system.sms.YPSmsApi;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.AuthenticationManager;
@@ -61,6 +61,7 @@
private final ISysUserService userService;
private final SysUserMapper userMapper;
private final ISysConfigService configService;
+ private final YPSmsApi smsApi;
/**
@@ -149,8 +150,8 @@
return getVerifyCodeNew(phone);
}
- private boolean sendYp(String phone, String code ){
- String result = YPSmsApi.sendSms(phone, StringUtils.format(YPSmsApi.CODE_TMP, code, Constants.PHONE_EXPIRATION));
+ private boolean sendYp(String phone, String code){
+ String result = smsApi.sendSms(phone, StringUtils.format(YPSmsApi.CODE_TMP, code, Constants.PHONE_EXPIRATION));
if (result.contains("\"code\":0,\"msg\":\"OK\"")){
log.info("鍙戦�佹垚鍔� ->楠岃瘉鐮侊細"+code);
return true;
diff --git a/project-common/src/main/java/com/project/common/sms/YPSmsApi.java b/project-system/src/main/java/com/project/system/sms/YPSmsApi.java
similarity index 79%
rename from project-common/src/main/java/com/project/common/sms/YPSmsApi.java
rename to project-system/src/main/java/com/project/system/sms/YPSmsApi.java
index ce14141..5d39f36 100644
--- a/project-common/src/main/java/com/project/common/sms/YPSmsApi.java
+++ b/project-system/src/main/java/com/project/system/sms/YPSmsApi.java
@@ -1,7 +1,9 @@
-package com.project.common.sms;
+package com.project.system.sms;
import com.project.common.constant.Constants;
import com.project.common.utils.SslUtils;
+import com.project.system.service.ISysConfigService;
+import lombok.RequiredArgsConstructor;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -10,6 +12,7 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
+import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
@@ -24,7 +27,13 @@
* @author Mr.Zhao
*/
+@Service
+@RequiredArgsConstructor
public class YPSmsApi {
+
+
+ private final ISysConfigService configService;
+
/**
* 鏅鸿兘鍖归厤妯℃澘鍙戦�佸湴鍧�
@@ -75,19 +84,18 @@
* @param mobile 銆�鎺ュ彈鐨勬墜鏈哄彿
* @param msg 銆�鐭俊鍐呭
*/
- public static String sendSms(String mobile, String msg)
+ public String sendSms(String mobile, String msg)
{
- Map<String, String> params = new HashMap<>(3);
- params.put("apikey", API_KEY);
- params.put("text", msg);
- params.put("mobile", mobile);
- return post(YP_SMS_URI, params);
+ String smsFlag = configService.selectConfigByKey("sys.sms.flag");
+ if ("1".equals(smsFlag)) {
+ Map<String, String> params = new HashMap<>(3);
+ params.put("apikey", API_KEY);
+ params.put("text", msg);
+ params.put("mobile", mobile);
+ return post(YP_SMS_URI, params);
+ }
+ return "";
}
-
- public static void main(String[] args) {
- sendSms("18537821663", "銆愰噾鏄庢簮銆戞偍鐨勯獙璇佺爜鏄�1234");
- }
-
/**
* 鍩轰簬HttpClient 4.3鐨勯�氱敤POST鏂规硶
@@ -116,8 +124,13 @@
}
method.setEntity(new UrlEncodedFormEntity(paramList, Constants.UTF8));
}
- response = client.execute(method);
- HttpEntity entity = response.getEntity();
+ if (client != null) {
+ response = client.execute(method);
+ }
+ HttpEntity entity = null;
+ if (response != null) {
+ entity = response.getEntity();
+ }
if (entity != null) {
responseText = EntityUtils.toString(entity);
}
--
Gitblit v1.9.1