From 4b92c6f30a86ad0f804614b2659c1dda368b8fdd Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:02 +0800
Subject: [PATCH] 更换短信平台
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 2
flower_city/src/main/java/com/dg/core/util/SmsUtil.java | 120 ++++++++++++++++++++++++++++++++++++++-
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 2
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 36 ++++++-----
4 files changed, 136 insertions(+), 24 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index fe35f40..33eb40a 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -199,7 +199,7 @@
wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
}
else if (order.getSubmitType().equals(2)){
- smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
+ smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
}
//待评价
order.setState("4");
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index cc23be9..12f8fd3 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -245,7 +245,7 @@
wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
}
else if (order.getSubmitType().equals(2)){
- smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
+ smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
}
order.setState("4");
entity.setState("7");
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index c3bde4d..683e8a6 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -145,7 +145,7 @@
//消息推送
this.sendGuideRepairOrderSubmit(sysUser.getOpenid(), guideRepairOrder);
//短信发送
- smsUtil.sendSmsSubmit(sysUser.getPhonenumber(), sysUser.getUserName());
+ smsUtil.sendSmsSubmitNew(sysUser.getPhonenumber(), sysUser.getUserName());
guideEvolveMapper.insertConfig(entity);
}
} else {//如果该办事指南用户所选所属地区无导半部门则为特殊单据需要手动分配
@@ -260,7 +260,7 @@
this.sendGuideRepairOrderSubmit(sysUser.getOpenid(), guideRepairOrder);
}
//短信发送
- smsUtil.sendSmsSubmit(sysUser.getPhonenumber(), sysUser.getUserName());
+ smsUtil.sendSmsSubmitNew(sysUser.getPhonenumber(), sysUser.getUserName());
sysUser.setTransactionNum(sysUser.getTransactionNum() + 1);
return sysUserMapper.updateById(sysUser);
} else if (order.getState().equals("10")) {
@@ -274,7 +274,7 @@
GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
.eq(GuideRepairOrder::getId, order.getGuideId()));
//短信发送
- smsUtil.sendSmsSubmit(sysUserTo.getPhonenumber(), sysUserTo.getUserName());
+ smsUtil.sendSmsSubmitNew(sysUserTo.getPhonenumber(), sysUserTo.getUserName());
if (guideRepairOrder != null) {
this.sendGuideRepairOrderSubmit(sysUserTo.getOpenid(), guideRepairOrder);
}
@@ -378,8 +378,7 @@
//删除进展记录
guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id));
TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId()));
- if (transactionEvent.getTransactionNum()>0)
- {
+ if (transactionEvent.getTransactionNum() > 0) {
transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1);
}
//对应办事指南减一
@@ -404,14 +403,19 @@
throw new RuntimeException(e);
}
for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
- transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
- SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
- if (sysUser != null) {
- smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
- wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser);
- guideRepairOrder.setIsPush(1);
- guideRepairOrder.setIsTimeout("2");
- baseMapper.updateById(guideRepairOrder);
+ List<SysUser> sysUsers = sysUserMapper.selectList(new QueryWrapper<SysUser>().lambda().eq(SysUser::getDepartmentId, guideRepairOrder.getGuideUserPhone()).eq(SysUser::getIsDivisionHead, 1));
+ if (sysUsers != null && sysUsers.size() > 0) {
+ for (SysUser sysUser : sysUsers) {
+// transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
+// SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
+ if (sysUser != null) {
+ smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
+ wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser);
+ guideRepairOrder.setIsPush(1);
+ guideRepairOrder.setIsTimeout("2");
+ baseMapper.updateById(guideRepairOrder);
+ }
+ }
}
}
return ResultData.success();
@@ -444,7 +448,7 @@
public ResultData deleteComment(Integer id, SysUser sysUser) {
if (sysUser.getUserType().equals("1") || sysUser.getIsDivisionHead().equals("1")) {
GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
- if (guideRepairOrder!=null&&guideRepairOrder.getState().equals("3")) {
+ if (guideRepairOrder != null && guideRepairOrder.getState().equals("3")) {
guideRepairOrder.setIsHideComments(1);
baseMapper.updateById(guideRepairOrder);
//新增删除评论进展
@@ -458,15 +462,13 @@
baseMapper.updateById(guideRepairOrder);
return ResultData.success("删除评论成功");
} else {
- return ResultData.error("已办结的单据才能进行删除评论操作");
+ return ResultData.error("已办结的单据才能进行删除评论操作");
}
} else {
return ResultData.error("只能部门领导和超级管理员才能删除评论");
}
}
-
-
}
diff --git a/flower_city/src/main/java/com/dg/core/util/SmsUtil.java b/flower_city/src/main/java/com/dg/core/util/SmsUtil.java
index 4f29fa5..483471c 100644
--- a/flower_city/src/main/java/com/dg/core/util/SmsUtil.java
+++ b/flower_city/src/main/java/com/dg/core/util/SmsUtil.java
@@ -44,9 +44,9 @@
@Resource
RedisTemplate<String, Object> redisTemplate;
- private String LoginName="DSCJKCSZH";
+ private String LoginName="DSC1210052";
- private String Pwd="dx@2020";
+ private String Pwd="pzhsjj@123";
private String FeeType="2";
@@ -111,9 +111,8 @@
String url =
"https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
Random rd = new Random();
- // int code = rd.nextInt(900000) + 100000;测试账号模板验证码数值固定等有正式账号才能进行随机数
- int code=181326;
- String content="验证码："+code+"，您正在进行注册操作，验证码5分钟内有效，请勿向他人泄露。";
+ int code = rd.nextInt(900000) + 100000;
+ String content="您的验证码为："+code+"，用于手机验证，15分钟内有效，请勿泄露于他人！";
url=url+content;
OkHttpClient client = new OkHttpClient();
Response response;
@@ -189,6 +188,43 @@
return ResultData.error("短信发送失败");
}
+
+ /**
+ * 发送工单超时短信(电信)
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsOvertimeNew(String tel,String name) {
+ String url =
+ "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
+ Random rd = new Random();
+ String content=name+"的导办工单超时未处理，请及时通知！";
+ url=url+content;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.message();
+ if (!rsa.equals("OK")){
+ return ResultData.success("短信发送失败");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResultData.success("短信发送失败");
+ }
+ return ResultData.success("短信发送成功");
+ }
+
/**
* 发送工单完成短信
*
@@ -241,6 +277,43 @@
/**
+ * 发送工单完成短信
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsCompleteNew(String tel,String name) {
+ String url =
+ "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
+ Random rd = new Random();
+ String content="您的"+name+"导办工单已由工作人员处理完成，请通过个人中心-我的申请导办查询。";
+ url=url+content;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.message();
+ if (!rsa.equals("OK")){
+ return ResultData.success("短信发送失败");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResultData.success("短信发送失败");
+ }
+ return ResultData.success("短信发送成功");
+ }
+
+
+ /**
* 发送工单提交短信
*
* @param tel
@@ -289,4 +362,41 @@
}
return ResultData.error("短信发送失败");
}
+
+
+ /**
+ * 发送工单提交短信(电信平台)
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsSubmitNew(String tel,String name) {
+ String url =
+ "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
+ Random rd = new Random();
+ String content="您有新的导办工单，请"+name+"尽快处理。";
+ url=url+content;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.message();
+ if (!rsa.equals("OK")){
+ return ResultData.success("短信发送失败");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResultData.success("短信发送失败");
+ }
+ return ResultData.success("短信发送成功");
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1