1

src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -11,7 +11,7 @@ import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.sms.SmsService;
+import com.fdkankan.sms.SmsServiceHuawei;
 import com.fdkankan.ucenter.common.*;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.service.*;
@@ -109,13 +109,13 @@ public class TestController extends BaseController {
         return Result.success( );
     }
     @Autowired
-    SmsService smsService;
+    SmsServiceHuawei smsService;
     @GetMapping("/sendMail3")
     public Result sendMail3(@RequestParam(required = false)String userName,
                             @RequestParam(required = false)String templateParam,
                             @RequestParam(required = false)String templateCode) throws Exception {
         //luomin@cgaii.com
-        smsService.sendSms(userName, templateParam, templateCode);
+        smsService.sendSms(userName, templateCode);
         return Result.success( );
     }
     @GetMapping("/test1")

src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -10,7 +10,7 @@ import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
-import com.fdkankan.sms.SmsService;
+import com.fdkankan.sms.SmsServiceHuawei;
 import com.fdkankan.ucenter.common.MailUtil;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
 import com.fdkankan.redis.constant.RedisKey;
@@ -33,6 +33,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +42,7 @@ import org.springframework.stereotype.Service;
 
 
 @Service
+@Slf4j
 public class LoginService {
 
     @Autowired
@@ -48,7 +50,7 @@ public class LoginService {
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
-    private SmsService smsService;
+    private SmsServiceHuawei smsService;
     @Autowired
     private ICameraService cameraService;
     @Autowired
@@ -126,26 +128,10 @@ public class LoginService {
             throw new BusinessException(LoginConstant.FAILURE_CODE_3033, String.valueOf(value));
         }
         String code = String.valueOf((int)((Math.random()*9+1)*100000));
-        if(StringUtils.isBlank(areaNum)){
-            areaNum = "86";
-        }
-        if ("86".equals(areaNum)){
-            String sendCode = null;
-            try {
-                sendCode = smsService.sendSms(phoneNum, "{\"code\":\"" + code + "\"}", cnCode);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            if("isv.BUSINESS_LIMIT_CONTROL".equals(sendCode)){
-                throw new BusinessException(LoginConstant.FAILURE_CODE_3023, LoginConstant.FAILURE_MSG_3023);
-            }
-        }else{
-            try{
-                smsService.sendSMSMessage(areaNum + phoneNum, code);
-            }catch (Exception e){
-                e.printStackTrace();
-                throw new BusinessException(LoginConstant.FAILURE_CODE_3013, LoginConstant.FAILURE_MSG_3013);
-            }
+        try {
+            smsService.sendSms(phoneNum, code);
+        } catch (Exception e) {
+            log.info("短信发送失败：{}",e);
         }
         if(redisUtil.hasKey(redisKeyMsg)){
             redisUtil.del(redisKeyMsg);

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -147,11 +147,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         SceneNumVo sceneNumVoKj = getSceneNumVoByType(Collections.singletonList(3), user.getId());
 
-        SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token,4);
-        SceneNumVo sceneNumVoSSObj = getSceneNumVoByObjType(Arrays.asList(4), user.getId());
+        SceneNumVo sceneNumVoSS = getSceneNumVoByObjType(Arrays.asList(4), user.getId(),0);
+        SceneNumVo sceneNumVoSSObj = getSceneNumVoByObjType(Arrays.asList(4), user.getId(),1);
 
-        SceneNumVo sceneNumVoSG = fdkkLaserService.getLaserSceneNumByUser(token,5);
-        SceneNumVo sceneNumVoSGObj = getSceneNumVoByObjType(Arrays.asList(5), user.getId());
+        SceneNumVo sceneNumVoSG = getSceneNumVoByObjType(Arrays.asList(5), user.getId(),0);
+        SceneNumVo sceneNumVoSGObj = getSceneNumVoByObjType(Arrays.asList(5), user.getId(),1);
         HashMap<String, SceneNumVo> hashMap = new HashMap<>();
         hashMap.put("kk",sceneNumVoKk);
         hashMap.put("kJ",sceneNumVoKj);
@@ -176,17 +176,21 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
         return sceneNumVo;
     }
-    private SceneNumVo getSceneNumVoByObjType(List<Integer> sceneSourceList, Long userId){
+    private SceneNumVo getSceneNumVoByObjType(List<Integer> sceneSourceList, Long userId,Integer isObj){
         SceneNumVo sceneNumVo = new SceneNumVo();
         LambdaQueryWrapper<ScenePro> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ScenePro::getUserId, userId);
         queryWrapper.in(ScenePro::getSceneSource, sceneSourceList);
         queryWrapper.eq(ScenePro::getIsUpgrade, 0);
-        queryWrapper.eq(ScenePro::getIsObj,1);
+        if(isObj ==1){
+            queryWrapper.eq(ScenePro::getIsObj,isObj);
+        }
         Integer sceneNum = Math.toIntExact(this.count(queryWrapper));
 
         LambdaQueryWrapper<ScenePlusExt> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ScenePlusExt::getIsObj,1);
+        if(isObj ==1){
+            wrapper.eq(ScenePlusExt::getIsObj,isObj);
+        }
         List<ScenePlusExt> list = scenePlusExtService.list(wrapper);
         List<Long> plusIds = list.stream().map(ScenePlusExt::getPlusId).collect(Collectors.toList());
         long plusCount = 0L;

src/main/java/com/fdkankan/ucenter/service/impl/UserIncrementServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.sms.SmsService;
+import com.fdkankan.sms.SmsServiceHuawei;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.ucenter.common.ResultData;
@@ -51,7 +51,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     @Autowired
     ISceneProService sceneProService;
     @Autowired
-    SmsService smsService;
+    SmsServiceHuawei smsService;
     @Autowired
     IMailTemplateService mailTemplateService;
     @Autowired
@@ -357,10 +357,10 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             if(userEntity != null){
                 if("oss".equals(NacosProperty.uploadType) && StringUtil.isNotBlank(userEntity.getUserName()) && StringUtils.isNumeric(userEntity.getUserName())){
                     if(userIds.get(userId) == -1){
-                        smsService.sendSms(userEntity.getUserName(), "{\"time\":\"" + userIds.get(userId) + "\"}", expireCode);
+                        smsService.sendSms(userEntity.getUserName(), cnCode);
                         continue;
                     }
-                    smsService.sendSms(userEntity.getUserName(), "{\"time\":\"" + userIds.get(userId) + "\"}", cnCode);
+                    smsService.sendSms(userEntity.getUserName(), cnCode);
                 }
                 if("aws".equals(NacosProperty.uploadType)  && StringUtil.isNotBlank(userEntity.getUserName())){
                     Integer days = userIds.get(userId);