From 7d98f48d82a5b2d0b4c42ea412fa160e41e3be9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 10:54:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 7 ++-
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 7 ++-
flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java | 6 ++
flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java | 2
flower_city/src/main/java/com/dg/core/util/SmsUtil.java | 44 ++++++++++++++++++++++
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java | 2
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 5 +-
7 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
index db89d01..7100120 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -48,11 +48,12 @@
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<ElseAccessoryEntity> list;
- if (sysUser.getUserType().equals("2")){
- list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());}
- else {
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
}
+ else {
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());
+ }
int num=iElseAccessoryService.countNum(name,ids);
return getDataTable(list,num);
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
index fb1fc73..2b1a29a 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
@@ -46,11 +46,12 @@
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<ReplyTemplateEntity> list;
- if (sysUser.getUserType().equals("2")){
- list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());}
- else {
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
}
+ else {
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());
+ }
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
index ae227e7..fb48c6d 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
@@ -31,7 +31,11 @@
List<String> areaCodes = new ArrayList<>();
TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
eq(TransactionEvent::getId, transactionId));
- List<String> departmentIds = new ArrayList<>(Arrays.asList(transactionEvent.getDepartmentIds().split(",")));
+ List<String> departmentIds = new ArrayList<>();
+ if (transactionEvent.getDepartmentIds() != null) {
+ departmentIds = new ArrayList<>(Arrays.asList(transactionEvent.getDepartmentIds().split(",")));
+ }
+
departmentIds.add(transactionEvent.getDepartmentId());
for (String departmentId : departmentIds) {
OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
index 351a0ca..eb62e65 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
@@ -23,7 +23,7 @@
if(sysUser.getUserType().equals("1")){//超级管理员
automessagePolicyDocuments.setIsDelete(1);
}else if ( sysUser.getIsDivisionHead().equals("1")){//部门领导
- if (sysUser.getDepartmentId().equals(automessagePolicyDocuments.getDepartmentId())){//如果是一个部门则可以删除
+ if (sysUser.getDepartmentId().equals(automessagePolicyDocuments.getDepartmentId().toString())){//如果是一个部门则可以删除
automessagePolicyDocuments.setIsDelete(1);
}else {
automessagePolicyDocuments.setIsDelete(2);
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
index 389d9cd..a2d416b 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
@@ -26,7 +26,7 @@
@Override
public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
List<GuideEvolveEntity> guideEvolveEntities;
- if (sysUser.getUserType().equals("4")){
+ if ((sysUser.getUserType().equals("3")&&sysUser.getIsDivisionHead().equals("2"))||(sysUser.getUserType().equals("4"))){
guideEvolveEntities=baseMapper.selectHideList(guideId);
}else {
guideEvolveEntities = baseMapper.selectConfigList(guideId);
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index 61423d3..f3ec58d 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -55,7 +55,8 @@
@Override
public ResultData smsSend(SysUser user){
- return smsUtil.sendSms(user.getPhonenumber());
+ return smsUtil.sendSmsNew(user.getPhonenumber());
+
}
@Override
@@ -68,7 +69,7 @@
List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
HuaChengSysUser huaChengSysUser=null;
- if(list!=null || list.size()>0 )
+ if( list.size()>0 )
{
huaChengSysUser=list.get(0);
}
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 5f439db..397d64e 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
@@ -1,5 +1,6 @@
package com.dg.core.util;
+import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.CommonRequest;
import com.aliyuncs.CommonResponse;
import com.aliyuncs.DefaultAcsClient;
@@ -11,6 +12,9 @@
import com.dg.core.ResultData;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +22,9 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.io.IOException;
import java.util.HashMap;
+import java.util.Map;
import java.util.Random;
import java.util.concurrent.TimeUnit;
@@ -37,6 +43,12 @@
// 注入redisTemplate
@Resource
RedisTemplate<String, Object> redisTemplate;
+
+ private String LoginName="DSCJKCSZH";
+
+ private String Pwd="dx@2020";
+
+ private String FeeType="2";
/**
* 发送短信登录验证码
@@ -88,6 +100,38 @@
return ResultData.error("短信发送失败");
}
+ public ResultData sendSmsNew(String tel) {
+ 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分钟内有效，请勿向他人泄露。";
+ 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();
+ redisTemplate.opsForValue().set(tel, code + "", 5, TimeUnit.MINUTES);
+// rsa = response.body().string().split("|")[0];
+ rsa = response.message();
+ if (!rsa.equals("OK")){
+ return ResultData.success("短信发送失败");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResultData.success("短信发送失败");
+ }
+ return ResultData.success("短信发送成功");
+ }
+
/**
* 发送工单超时短信
*
--
Gitblit v1.7.1