验证码相关调整

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxApiServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -79,6 +80,9 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
                 return R.error("501","用户名密码不正确");
             }
         }
+        if("1".equals(sysUserDo.getEnabled())){
+            return R.error("501","此用户已被禁用，请联系系统管理员");
+        }
         String secPas = SecurityUtil.getSaltMd5AndSha(password, sysUserDo.getId());
         if (!secPas.equals(sysUserDo.getPassword())) {
             sendCodeTime += 1;
@@ -184,6 +188,7 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
 
     private R sendSmsCode(String templateId, String redisKeyName, String mobile, String redisLabelName) {
         boolean exists = redisService.hasKey(redisKeyName);
+        List<String> list = new ArrayList<>();
         String sendCodeTimeObj = (String) redisService.getRedisCatchObj(redisKeyName);
         int sendCodeTime = StringUtils.isBlank(sendCodeTimeObj) ? 0 : Integer.parseInt(sendCodeTimeObj);
         if( exists && sendCodeTime >= 20 ){
@@ -198,7 +203,8 @@ public class ZhcxApiServiceImpl implements ZhcxApiService {
            log.info("生成短信验证码失败"+e);
         }
         try {
-            JSONObject jsonObject = HwSmsUtil.sendSms(templateId,null, code, mobile);
+            list.add(code);
+            JSONObject jsonObject = HwSmsUtil.sendSms(templateId,null, list, mobile);
             String returnCode = jsonObject.getString("code");
             if("000000".equals(returnCode)){
                 if(!exists){

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -212,6 +212,10 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                     sb.append("单据号:"+inspectioncode+"已被派单,不能取消,请刷新数据查看<br>");
                     continue;
                 }
+                if("task".equals(vo.get(i).getPageType()) && "30".equals(cancelSource)){
+                    sb.append("单据号:"+inspectioncode+"已被拒收,不能取消,请刷新数据查看<br>");
+                    continue;
+                }
                 //获取邮件发送信息
                 NotifyDto mailInfo4Cancel = getMailInfo4Cancel(vo.get(i), inspectionItpDo, dispatchDo, user);
                 if(ObjectUtil.isNotNull(mailInfo4Cancel)) {
@@ -605,10 +609,10 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
         List<String> fileIds = new ArrayList<>();
         if(dispatchDo != null){
             String sfiles = dispatchDo.getSfiles();
-            String signature = dispatchDo.getSignature();
-            if(StringUtils.isNotBlank(signature)){
-                getIds(signature, fileIds);
-            }
+//            String signature = dispatchDo.getSignature();
+//            if(StringUtils.isNotBlank(signature)){
+//                getIds(signature, fileIds);
+//            }
             if(StringUtils.isNotBlank(sfiles)){
                 getIds(sfiles, fileIds);
             }
@@ -660,6 +664,9 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                             }
                         );
                         // 设置响应的一些格式
+                        String fileFullName = inspectionItpDo.getProjectcode()+"-"+inspectionItpDo.getProjectname()+
+                                "-"+inspectionItpDo.getStructurename()+"-"+inspectionItpDo.getInspectioncontent()+
+                                "-"+inspectionItpDo.getReservationinspectiontime();
                         String encodedFileName = URLEncoder.encode(inspectionItpDo.getInspectioncode()+".zip", "UTF-8").replaceAll("\\+", "%20");
                         response.setContentType("application/octet-stream");
                         response.setHeader("content-type", "application/octet-stream");

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxRegisterServiceImpl.java

@@ -135,8 +135,10 @@ public class ZhcxRegisterServiceImpl implements ZhcxRegisterService {
             return R.error("501", "验证码发送频繁,请过5分钟后再尝试");
         }
         String code = SmsCodeGenerateUtils.generateVerificationCode(6);
+        List<String> list = new ArrayList<>();
         try {
-            JSONObject jsonObject = HwSmsUtil.sendSms(null,null, code.toString(), mobile);
+            list.add(code);
+            JSONObject jsonObject = HwSmsUtil.sendSms(null,null, list, mobile);
             String returnCode = jsonObject.getString("code");
             if(CxConstants.SUCCESS_CODE.equals(returnCode)){
                 if(!exists){
@@ -178,18 +180,22 @@ public class ZhcxRegisterServiceImpl implements ZhcxRegisterService {
         List<SysUserDo> userList = sysUserService.list(queryWrapper);
         userList.forEach((item)->{
             String pwd = PasswordGenerator.generatePassword(12);
+            String password = pwd;
             String saltPwd = SecurityUtil.getSaltMd5AndSha(pwd, item.getId());
             item.setPassword(saltPwd);
             item.setEnabled("0");
             sysUserService.updateById(item);
-            sendSmsAsync(item);
+            sendSmsAsync(item,password);
         });
     }
 
-    private void sendSmsAsync(SysUserDo item) {
+    private void sendSmsAsync(SysUserDo item, String pwd) {
         new Thread(() -> {
             try {
-                JSONObject jsonObject = HwSmsUtil.sendSms("7133b7ce87a84896a143b02edf5a4757", "8823102504763", item.getAccount() + "," + "123", item.getMobile());
+                List<String> list = new ArrayList<>();
+                list.add(item.getAccount());
+                list.add(pwd);
+                JSONObject jsonObject = HwSmsUtil.sendSms("8a3df3ba13e94963a9b028185877a136", "8823102504763", list, item.getMobile());
                 String returnCode = jsonObject.getString("code");
                 if(CxConstants.SUCCESS_CODE.equals(returnCode)){
                     log.info("发送用户注册信息成功");

business-common/src/main/java/com/rongwei/bscommon/sys/utils/HwSmsUtil.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.rongwei.rwcommon.utils.StringUtils;
 import org.apache.commons.codec.binary.Hex;
@@ -46,8 +47,11 @@ public class HwSmsUtil {
 //        TEMPLATE_ID = templateId;
 //    }
     public static void main(String[] args) throws Exception{
-
-        sendSms("7133b7ce87a84896a143b02edf5a4757","8823102504763", "13720166098,13720166098","13720166098");
+        List<String> list = new ArrayList<>();
+        list.add("123asd");
+        list.add("123asd");
+        String s = JSON.toJSON(list).toString();
+        sendSms("8a3df3ba13e94963a9b028185877a136","8823102504763", list,"13720166098");
 //        sendSms("[\"17623778642\",\"蓉A-7823\"]","17623778642","8819122535459","6c848255000c4619833ab690e393f906");
 //        sendSms("[\"17623778642\",\"蓉A-7823\",\"2019/12/27\",\"14:00\"]","17623778642","8819122535459","bb13d00d11e043659001a89c72d54cab");
     }
@@ -61,7 +65,7 @@ public class HwSmsUtil {
      * @throws Exception
      * @return
      */
-    public static JSONObject sendSms(String templateId,String sender, String code, String phone) throws Exception{
+    public static JSONObject sendSms(String templateId,String sender, List<String> code, String phone) throws Exception{
         //必填,请参考"开发准备"获取如下数据,替换为实际值
         String url = "https://smsapi.cn-south-1.myhuaweicloud.com:443/sms/batchSendSms/v1"; //APP接入地址+接口访问URI
         String appKey = "iZA4u69023CpkvGGxrXxrBuNMp1B"; //APP_Key
@@ -89,7 +93,7 @@ public class HwSmsUtil {
          * ${DATE}${TIME}变量不允许取值为空,${TXT_20}变量可以使用英文空格或点号替代空值,${NUM_6}变量可以使用0替代空值
          * 查看更多模板和变量规范:产品介绍>模板和变量规范
          */
-        String templateParas = "["+code+"]"; //模板变量
+        String templateParas = JSON.toJSON(code).toString();; //模板变量
 
         //请求Body,不携带签名名称时,signature请填null
         String body = buildRequestBody(sender, receiver, templateId, templateParas, statusCallBack, signature);