短信签名调整

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseSmsController.java

 package com.gic.operation.web.controller;
 
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.constant.EnterpriseInitCodeEnum;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.EnterpriseInitDTO;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.enterprise.service.EnterpriseInitApiService;
-import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.marketing.api.dto.sms.EnterpriseSmsSignDTO;
 import com.gic.marketing.api.dto.sms.SmsApplicationDTO;
-import com.gic.operation.web.vo.EnterpriseSmsSignVO;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.gic.commons.webapi.reponse.RestResponse;
-import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.marketing.api.service.sms.SmsOuterApiService;
+import com.gic.operation.web.vo.EnterpriseSmsSignVO;
+import com.gic.operation.web.vo.sms.SmsChannelVO;
 
-import java.util.List;
 /**
  *
  * @ClassName: EnterpriseSmsController
@@ -48,6 +49,33 @@ public class EnterpriseSmsController {
         return ResultControllerUtils.commonResult(smsOuterApiService.saveEnterpriseSmsApp(enterpriseId, appid, appkey));
     }
 
+    @RequestMapping("/list-sms-channel")
+    public RestResponse listSmsChannel() {
+        return ResultControllerUtils.commonResult(smsOuterApiService.listGicSmsChannel(), SmsChannelVO.class);
+    }
+
+    /**
+     * 设置优先使用配置
+     * @param enterpriseId
+     * @param channelType 短信通道类型(1:腾讯云, 2:大汉三通)
+     * @return
+     */
+    @RequestMapping("/set-sms-use-default")
+    public RestResponse setUseFirstSmsApp(Integer enterpriseId, Integer channelType) {
+        return ResultControllerUtils.commonResult(smsOuterApiService.setUseFirstSmsApp(enterpriseId, channelType));
+    }
+
+    @RequestMapping("/get-sms-template-max-count")
+    public RestResponse getSmsTemplateMaxCount(Integer enterpriseId) {
+        return ResultControllerUtils.commonResult(smsOuterApiService.getSmsTempalteMaxCount(enterpriseId));
+    }
+
+    @RequestMapping("/get-sms-app-info")
+    public RestResponse getAllSmsAppInfoByEid(Integer enterpriseId) {
+        return ResultControllerUtils.commonResult(smsOuterApiService.getAllSmsAppInfoByEid(enterpriseId));
+    }
+
+    @Deprecated
     @RequestMapping("/get-app")
     public RestResponse getApp(Integer enterpriseId) {
         return ResultControllerUtils.commonResult(smsOuterApiService.getEnterpriseSmsApp(enterpriseId));
@@ -64,17 +92,13 @@ public class EnterpriseSmsController {
      * @Description: 
     
 * @author guojuxing 
      * @param enterpriseId
-     * @param smsSignId 短信签名id
+     * @param tencentSignId 腾讯云短信签名id
      * @param smsSignText 短信签名
-     * @param useType
 签名用途 1: 国内短信; 2: 海外短信
      * @return  com.gic.commons.webapi.reponse.RestResponse

     
 */
     @RequestMapping("/add-sms")
-    public RestResponse addSms(Integer enterpriseId, String smsSignId, String smsSignText, Integer useType) {
-        //写死，没有业务，无用。
-        useType = 1;
-        ServiceResponse<Void> smsResult = smsOuterApiService.saveEnterpriseSmsSign(enterpriseId, smsSignId, smsSignText,
-                useType);
+    public RestResponse addSms(Integer enterpriseId, String tencentSignId, String smsSignText) {
+        ServiceResponse<Void> smsResult = smsOuterApiService.saveEnterpriseSmsSign(enterpriseId, tencentSignId, smsSignText);
         if (smsResult.isSuccess()) {
             //新增之前判断是否已经初始化完毕
             ServiceResponse<EnterpriseInitDTO> result = enterpriseInitApiService
@@ -99,11 +123,9 @@ public class EnterpriseSmsController {
     }
 
     @RequestMapping("/edit-sms")
-    public RestResponse editSms(Long signId, String smsSignId, String smsSignText, Integer useType, Integer enterpriseId) {
-        //写死，没有业务，无用。
-        useType = 1;
+    public RestResponse editSms(Integer enterpriseId, Long signId, String tencentSignId, String smsSignText) {
         return ResultControllerUtils
-                .commonResult(smsOuterApiService.editEnterpriseSmsSign(enterpriseId, signId, smsSignId, smsSignText, useType));
+                .commonResult(smsOuterApiService.editEnterpriseSmsSign(enterpriseId, signId, tencentSignId, smsSignText));
     }
 
     @RequestMapping("/delete-sms")

gic-platform-operation-web/src/main/java/com/gic/operation/web/vo/EnterpriseSmsSignVO.java

@@ -15,87 +15,84 @@ import java.util.Date;
 public class EnterpriseSmsSignVO implements Serializable{
     private static final long serialVersionUID = -4600331112299383689L;
 
+    /**
+     * 短信签名主键id
+     */
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long signId;
+
+    /**
+     * 企业主键id
+     */
     private Integer enterpriseId;
-    private String smsSignId;
+
+    /**
+     * 短信签名
+     */
     private String smsSignText;
-    private String smsAppid;
-    private Integer useType;
-    private Date createTime;
-    private Date updateTime;
-    private Integer deleteFlag;
+
+    /**
+     * 腾讯云短信签名id
+     */
+    private String tencentSignId;
+
+    /**是否勾选了腾讯云签名**/
+    private Integer tencentUseFlag;
+    /**是否勾选了大汉三通签名**/
+    private Integer dhstUseFlag;
 
     public Long getSignId() {
         return signId;
     }
 
-    public void setSignId(Long signId) {
+    public EnterpriseSmsSignVO setSignId(Long signId) {
         this.signId = signId;
+        return this;
     }
 
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
 
-    public void setEnterpriseId(Integer enterpriseId) {
+    public EnterpriseSmsSignVO setEnterpriseId(Integer enterpriseId) {
         this.enterpriseId = enterpriseId;
-    }
-
-    public String getSmsSignId() {
-        return smsSignId;
-    }
-
-    public void setSmsSignId(String smsSignId) {
-        this.smsSignId = smsSignId;
+        return this;
     }
 
     public String getSmsSignText() {
         return smsSignText;
     }
 
-    public void setSmsSignText(String smsSignText) {
+    public EnterpriseSmsSignVO setSmsSignText(String smsSignText) {
         this.smsSignText = smsSignText;
+        return this;
     }
 
-    public String getSmsAppid() {
-        return smsAppid;
-    }
-
-    public void setSmsAppid(String smsAppid) {
-        this.smsAppid = smsAppid;
-    }
-
-    public Integer getUseType() {
-        return useType;
-    }
-
-    public void setUseType(Integer useType) {
-        this.useType = useType;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
+    public String getTencentSignId() {
+        return tencentSignId;
     }
 
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+    public EnterpriseSmsSignVO setTencentSignId(String tencentSignId) {
+        this.tencentSignId = tencentSignId;
+        return this;
     }
 
-    public Date getUpdateTime() {
-        return updateTime;
+    public Integer getTencentUseFlag() {
+        return tencentUseFlag;
     }
 
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
+    public EnterpriseSmsSignVO setTencentUseFlag(Integer tencentUseFlag) {
+        this.tencentUseFlag = tencentUseFlag;
+        return this;
     }
 
-    public Integer getDeleteFlag() {
-        return deleteFlag;
+    public Integer getDhstUseFlag() {
+        return dhstUseFlag;
     }
 
-    public void setDeleteFlag(Integer deleteFlag) {
-        this.deleteFlag = deleteFlag;
+    public EnterpriseSmsSignVO setDhstUseFlag(Integer dhstUseFlag) {
+        this.dhstUseFlag = dhstUseFlag;
+        return this;
     }
 
     @Override
@@ -103,13 +100,10 @@ public class EnterpriseSmsSignVO implements Serializable{
         return "EnterpriseSmsSignVO{" +
                 "signId=" + signId +
                 ", enterpriseId=" + enterpriseId +
-                ", smsSignId='" + smsSignId + '\'' +
                 ", smsSignText='" + smsSignText + '\'' +
-                ", smsAppid='" + smsAppid + '\'' +
-                ", useType=" + useType +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                ", deleteFlag=" + deleteFlag +
+                ", tencentSignId='" + tencentSignId + '\'' +
+                ", tencentUseFlag=" + tencentUseFlag +
+                ", dhstUseFlag=" + dhstUseFlag +
                 '}';
     }
 }

gic-platform-operation-web/src/main/java/com/gic/operation/web/vo/sms/SmsChannelVO.java

+package com.gic.operation.web.vo.sms;
+
+import java.io.Serializable;
+
+/**
+ * 短信通道
+ * @ClassName: SmsChannelVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/11/10 1:42 PM

+ */
+public class SmsChannelVO implements Serializable{
+    private static final long serialVersionUID = -2927365477049477598L;
+
+    /**
+     * 短信通道类型(1:腾讯云, 2:大汉三通)
+     */
+    private Integer channelType;
+
+    /**
+     * 短信通道类型名称
+     */
+    private String channelName;
+
+    public Integer getChannelType() {
+        return channelType;
+    }
+
+    public SmsChannelVO setChannelType(Integer channelType) {
+        this.channelType = channelType;
+        return this;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public SmsChannelVO setChannelName(String channelName) {
+        this.channelName = channelName;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "SmsChannelVO{" +
+                "channelType=" + channelType +
+                ", channelName='" + channelName + '\'' +
+                '}';
+    }
+}