feat：“添加七云科技短信签名”

src/main/java/com/szwl/controller/AlarmRecordIndexController.java

@@ -76,6 +76,7 @@ public class AlarmRecordIndexController {
         TAdmin admin = adminService.getById(adminId);
         String email = admin.getEmail();
         String ifForeign = admin.getIfForeign();
+        String companyType = admin.getCompanyType();
         if(ifForeign.equals("1")){
             if(email!=null){
                 String subject = "Error message from Magic Candy Machine";
@@ -111,7 +112,13 @@ public class AlarmRecordIndexController {
                         if (StringUtils.isNotEmpty(split[i])) {
                             Long id = alarmRecord.getId();
                             String mess = ";序号："+String.valueOf(id);
-                            result = YunPianSms.sendSms(appid, getMessage(alarmContent+mess, name, clientId), split[i]);
+                            if (StringUtils.isNotEmpty(companyType) && companyType.equals("1")) {
+                                // 如果是七云科技的用户
+                                result = YunPianSms.sendSms(appid, getSCMessage(alarmContent, name, clientId), split[i]);
+                            } else {
+                                // 如果是申泽智能的用户
+                                result = YunPianSms.sendSms(appid, getMessage(alarmContent+mess, name, clientId), split[i]);
+                            }
                         }
                     }
                 }
@@ -123,8 +130,12 @@ public class AlarmRecordIndexController {
     }
 
     private String getMessage(String content, String name, String clientId) {
+        String message = "【申泽智能】您好,机器" + content + ",机器名:" + name + ",设备号:" + clientId;
+        return message;
+    }
 
-        String message = "您好,机器" + content + ",机器名:" + name + ",设备号:" + clientId;
+    private String getSCMessage(String content, String name, String clientId) {
+        String message = "【七云科技】您好，机器报警：" + content + "，机器名：" + name + "，设备编号：" + clientId + "。";
         return message;
     }
 
@@ -154,9 +165,9 @@ public class AlarmRecordIndexController {
         TEquipment equipment = list.get(0);
         Date endDate = equipment.getEndDate();
         long endDateTime = endDate.getTime();
-        long time = new Date().getTime();
+        long time = System.currentTimeMillis();
         if(endDateTime>time){
-            if(endDateTime-time<=3*24*3600*1000l){
+            if(endDateTime-time<=3*24*3600*1000L){
                 //发短信
                 String result = null;
                 try {

src/main/java/com/szwl/controller/TMessageCodeController.java

@@ -58,7 +58,7 @@ public class TMessageCodeController {
 
     @ApiOperation(value = "发送注册验证码")
     @PostMapping("/sentRegisterCode")
-    public ResponseModel<?> sentRegisterCode(String ifForeign, String phoneOrEmail) {
+    public ResponseModel<?> sentRegisterCode(String ifForeign, String phoneOrEmail, String hostName) {
         if (StringUtils.isEmpty(phoneOrEmail)) {
             // 说明参数为空
             return R.fail(ResponseCodesEnum.A0100, "手机号或邮箱为空！");
@@ -66,10 +66,17 @@ public class TMessageCodeController {
         // 查询该 手机号/邮箱 最后一次发送验证码的时间
         Date lastSendTime = tMessageCodeService.getLastSendTime(phoneOrEmail);
         long lastTime = lastSendTime.getTime();
-        long currentTime = new Date().getTime();
+        long currentTime = System.currentTimeMillis();
         if (currentTime - lastTime < 10 * 60 * 1000) {
             return R.fail("请勿频繁发送,10分钟后再试");
         }
+        String SZ = "Sunzee";
+        String companyType = "";
+        if (StringUtils.isNotEmpty(hostName) && SZ.equals(hostName)) {
+            companyType = "0";
+        } else {
+            companyType = "1";
+        }
         // 如果是国内
         if (ifForeign.equals("0")) {
             // 定义国内手机号和邮箱的正则表达式
@@ -86,7 +93,7 @@ public class TMessageCodeController {
                     return R.fail(ResponseCodesEnum.A0202, "用户手机号已存在");
                 }
                 // 国内发送短信
-                String result = tMessageCodeService.sentMessage("0", phoneOrEmail);
+                String result = tMessageCodeService.sentMessage("0", phoneOrEmail, companyType);
                 return R.ok(result);
             } else if (Pattern.matches(emailReg, phoneOrEmail)) {
                 // 检测是否已有邮箱注册
@@ -104,10 +111,6 @@ public class TMessageCodeController {
                 return R.fail(ResponseCodesEnum.A0100, "不是有效的手机号或邮箱地址");
             }
         } else {
-            // 海外
-//            if (StringUtils.isEmpty(phoneOrEmail)) {
-//                return R.fail(ResponseCodesEnum.A0100, "邮箱为空！");
-//            }
             //检测是否已有邮箱注册
             LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
             query.eq(TAdmin::getEmail, phoneOrEmail);
@@ -123,7 +126,7 @@ public class TMessageCodeController {
 
     @ApiOperation(value = "发送忘记密码验证码")
     @PostMapping("/sentForgetCode")
-    public ResponseModel<?> sentForgetCode(String ifForeign, String username, String phoneOrEmail) {
+    public ResponseModel<?> sentForgetCode(String ifForeign, String username, String phoneOrEmail, String hostName) {
 
         if (StringUtils.isEmpty(username)) {
             return R.fail(ResponseCodesEnum.A0100, "用户名为空！");
@@ -131,6 +134,13 @@ public class TMessageCodeController {
         if (ifForeign.equals("2")) {
             ifForeign = "0";
         }
+        String SZ = "Sunzee";
+        String companyType = "";
+        if (StringUtils.isNotEmpty(hostName) && SZ.equals(hostName)) {
+            companyType = "0";
+        } else {
+            companyType = "1";
+        }
         // 如果是国内
         if (ifForeign.equals("0")) {
             if (StringUtils.isEmpty(phoneOrEmail)) {
@@ -152,7 +162,7 @@ public class TMessageCodeController {
                     return R.fail(ResponseCodesEnum.A0001, "登录名或手机号出错");
                 }
                 //国内发送短信
-                String result = tMessageCodeService.sentMessage("1", phoneOrEmail);
+                String result = tMessageCodeService.sentMessage("1", phoneOrEmail, companyType);
                 return R.ok(result);
             } else if (Pattern.matches(emailReg, phoneOrEmail)) {
                 System.out.println("忘记密码 >>> 这是一个邮箱地址");

src/main/java/com/szwl/service/TMessageCodeService.java

@@ -18,7 +18,7 @@ public interface TMessageCodeService extends MyIService<TMessageCode> {
     /*
     * 发送短信验证码
     * */
-    String sentMessage(String type, String phone);
+    String sentMessage(String type, String phone, String companyType);
     /*
      * 发送邮箱验证码
      * */

src/main/java/com/szwl/service/impl/TMessageCodeServiceImpl.java

@@ -33,16 +33,16 @@ public class TMessageCodeServiceImpl extends ServiceImpl<TMessageCodeMapper, TMe
      * 发送短信验证码
      * */
     @Override
-    public String sentMessage(String type, String phone) {
+    public String sentMessage(String type, String phone, String companyType) {
         String result = null;
         String retu = null;
         try {
             String code = addCode();
-            result = YunPianSms.sendSms(appid, getMessage(type, code), phone);
+            result = YunPianSms.sendSms(appid, getMessage(companyType, code), phone);
             JSONObject sult = JSONObject.parseObject(result);
             Object msg = sult.get("msg");
             Object mobile = sult.get("mobile");
-            retu = (msg+":"+mobile).toString();
+            retu = msg+":" + phone;
             if(mobile!=null){
                 TMessageCode tMessageCode = new TMessageCode();
                 tMessageCode.setType(type);
@@ -119,13 +119,13 @@ public class TMessageCodeServiceImpl extends ServiceImpl<TMessageCodeMapper, TMe
         return retu;
     }
 
-    private String getMessage(String type, String code) {
+    private String getMessage(String companyType, String code) {
         String message = "";
-        if(StringUtils.isNotEmpty(type)&&type.equals("0")){
-            message = "您好，您的验证码是"+code+"，请于3分钟内输入。";
+        if(StringUtils.isNotEmpty(companyType)&&companyType.equals("0")){
+            message = "【申泽智能】您好，您的验证码是"+code+"，请于3分钟内输入。";
         }
-        if(StringUtils.isNotEmpty(type)&&type.equals("1")){
-            message = "您好，您的验证码是"+code+"，请于3分钟内输入。";
+        if(StringUtils.isNotEmpty(companyType)&&companyType.equals("1")){
+            message = "【七云科技】您好，您的验证码是"+code+"，请于3分钟内输入。";
         }
         return message;
     }