复制场景

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

@@ -10,11 +10,8 @@ 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.SendMailAcceUtils;
-import com.fdkankan.ucenter.common.MailUtil;
-import com.fdkankan.ucenter.common.OssPath;
-import com.fdkankan.ucenter.common.RedisKeyUtil;
-import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.sms.SmsService;
+import com.fdkankan.ucenter.common.*;
 import com.fdkankan.ucenter.entity.ScenePlus;
 import com.fdkankan.ucenter.entity.ScenePlusExt;
 import com.fdkankan.ucenter.entity.ScenePro;
@@ -28,13 +25,15 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.servlet.http.HttpSession;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.*;
 
 @RestController
 @RequestMapping("/ucenter/test")
-public class TestController {
+public class TestController extends BaseController {
     @Autowired
     private IFolderSceneService folderSceneService;
     @Autowired
@@ -69,26 +68,6 @@ public class TestController {
 
     @RequestMapping("/sendMail")
     public Result sendMail() throws Exception {
-        Integer days =30;
-        String userName = "luomin@cgaii.com";
-        //String userName = "1413541360@qq.com";
-        String msgType = "premium";
-        if(days!=null && days >= 0){
-            if(days > 0){
-                String EN_CODE_MSG_EUR = MailUtil.EN_CODE_MSG_EUR.replace("${member}",msgType+" ");
-                SendMailAcceUtils.sendMail(userName,
-                        MailUtil.EN_CODE_SUBJECT_GQ, EN_CODE_MSG_EUR.replace("${code}",days.toString()),
-                        null);
-            }else{
-                SendMailAcceUtils.sendMail(userName,
-                        MailUtil.EN_CODE_SUBJECT_GQ, MailUtil.EN_CODE_MSG_EUR_TODAY.replace("${member}"," "+msgType),
-                        null);
-            }
-        }else{
-            String EN_CODE_MSG_EUR_GQ = MailUtil.EN_CODE_MSG_EUR_GQ.replace("${member}",msgType+" ");
-            SendMailAcceUtils.sendMail(userName,
-                    MailUtil.EN_CODE_SUBJECT_GQ, EN_CODE_MSG_EUR_GQ,null);
-        }
         return Result.success( );
     }
     @Autowired
@@ -119,5 +98,33 @@ public class TestController {
         mailTemplateService.sendCodeMail(userName,"123456","zh");
         return Result.success( );
     }
+    @Autowired
+    SmsService smsService;
+    @GetMapping("/sendMail3")
+    public Result sendMail3(@RequestParam(required = false)String userName) throws Exception {
+        //luomin@cgaii.com
+        String cnCode = "SMS_216275556";
+        String expireCode = "SMS_216425565";
+        smsService.sendSms(userName, "{\"time\":\"" + 1 + "\"}", expireCode);
+        smsService.sendSms(userName, "{\"time\":\"" + 1 + "\"}", cnCode);
+        return Result.success( );
+    }
+    @GetMapping("/test1")
+    public Result test1(@RequestParam(required = false)String userName) throws Exception {
+        //luomin@cgaii.com
+
+        return Result.success( );
+    }
+
+    public static void main(String[] args) {
+        String timeZone = "Asia/Tokyo";
+        TimeZone zone = TimeZone.getTimeZone(timeZone);
+        System.out.println("zone = " + zone.getID() );
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        sdf.setTimeZone(zone);
+        System.out.println(sdf.format(new Date()));
+
+    }
 
 }

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

@@ -10,12 +10,11 @@ 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.ucenter.common.MailUtil;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.sms.SendMailAcceUtils;
-import com.fdkankan.sms.SmsService;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.constant.LoginConstant;
@@ -23,10 +22,7 @@ import com.fdkankan.ucenter.constant.QrCodeFilePath;
 import com.fdkankan.ucenter.entity.Camera;
 import com.fdkankan.ucenter.entity.CameraDetail;
 import com.fdkankan.ucenter.entity.User;
-import com.fdkankan.ucenter.service.ICameraDetailService;
-import com.fdkankan.ucenter.service.ICameraService;
-import com.fdkankan.ucenter.service.ILoginLogService;
-import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.vo.request.LoginParam;
 import com.fdkankan.ucenter.vo.request.RegisterParam;
 import com.fdkankan.ucenter.vo.response.LoginVo;
@@ -65,6 +61,8 @@ public class LoginService {
     private String registerValidCode;
     @Autowired
     private FYunFileServiceInterface fYunFileServiceInterface;
+    @Autowired
+    private IMailTemplateService mailTemplateService;
 
 
     public LoginVo login(LoginParam param) {
@@ -247,13 +245,13 @@ public class LoginService {
         switch (country) {
             case "1":
             case "33":
-                SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, MailUtil.EN_CODE_MSG.replace("${code}", code), null);
+                mailTemplateService.sendCodeMail(email,code,"en");
                 break;
             case "2":
-                SendMailAcceUtils.sendMailUsa(email, SendMailAcceUtils.EN_CODE_SUBJECT_USA, SendMailAcceUtils.EN_CODE_MSG_USA.replace("${code}", code), null);
+                mailTemplateService.sendCodeMail(email,code,"en");
                 break;
             default:
-                SendMailAcceUtils.sendMail(email, SendMailAcceUtils.CN_CODE_SUBJECT, SendMailAcceUtils.CN_CODE_MSG.replace("${code}", code), null);
+                mailTemplateService.sendCodeMail(email,code,"zh");
                 break;
         }
 

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

@@ -649,15 +649,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(user == null || !user.getId().equals(userId) ){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5013, SceneConstant.FAILURE_MSG_5013);
         }
-        this.copySceneNoCheck(sceneNum);
-
-    }
-
-    @Override
-    public void copySceneNoCheck(String sceneNum) throws Exception {
-        ScenePro scenePro = this.getByNum(sceneNum);
-        ScenePlus scenePlus = scenePlusService.getByNum(sceneNum);
-        Long cameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
         CameraDetail detailEntity = cameraDetailService.getByCameraId(cameraId);
         if(detailEntity == null){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6029, CameraConstant.FAILURE_MSG_6029);
@@ -683,6 +674,20 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
 
+        this.copySceneNoCheck(sceneNum);
+
+    }
+
+    @Override
+    public void copySceneNoCheck(String sceneNum) throws Exception {
+        ScenePro scenePro = this.getByNum(sceneNum);
+        ScenePlus scenePlus = scenePlusService.getByNum(sceneNum);
+        Long cameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
+
+        CameraDetail detailEntity = cameraDetailService.getByCameraId(cameraId);
+        if(detailEntity == null){
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6029, CameraConstant.FAILURE_MSG_6029);
+        }
         String newNum = scene3dNumService.generateSceneNum(detailEntity.getType());
         String title = scenePro == null ? scenePlus.getTitle() : scenePro.getSceneName();
         String newTitle = title.concat("(copy)");

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
+import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.entity.VirtualOrder;