Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DataConfigApiServiceImpl.java

@@ -28,6 +28,8 @@ import com.gic.enterprise.entity.*;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.*;
 import com.gic.member.config.api.dto.ExecParamsDTO;
+import org.springframework.transaction.annotation.Transactional;
+
 /**
  *
  * @ClassName: DataConfigApiServiceImpl
@@ -326,6 +328,7 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Void> saveGenerationConfig(List<DataGenerationConfigDTO> dtoList) {
         if (CollectionUtils.isEmpty(dtoList)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "年龄段配置内容为空");

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

 package com.gic.operation.web.controller;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.beans.propertyeditors.CustomDateEditor;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -27,10 +13,25 @@ import com.gic.enterprise.service.EnterpriseInitApiService;
 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.marketing.api.dto.sms.SmsGicChannelDTO;
 import com.gic.marketing.api.service.sms.SmsOuterApiService;
 import com.gic.operation.web.vo.EnterpriseSmsSignVO;
 import com.gic.operation.web.vo.sms.SmsChannelVO;
 import com.gic.operation.web.vo.sms.SmsTemplateVO;
+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.beans.propertyeditors.CustomDateEditor;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -59,15 +60,18 @@ public class EnterpriseSmsController {
     }
 
     @RequestMapping("/save-app")
-    public RestResponse saveApp(Integer enterpriseId, String appid, String appkey) {
-        return ResultControllerUtils.commonResult(smsOuterApiService.saveEnterpriseSmsApp(enterpriseId, appid, appkey));
+    public RestResponse saveApp(Integer enterpriseId, String appid, String appkey,Integer channelType) {
+        return ResultControllerUtils.commonResult(smsOuterApiService.saveEnterpriseSmsApp(enterpriseId, appid, appkey,channelType));
     }
 
     @RequestMapping("/list-sms-channel")
     public RestResponse listSmsChannel() {
-        return ResultControllerUtils.commonResult(smsOuterApiService.listGicSmsChannel(), SmsChannelVO.class);
+        ServiceResponse<List<SmsGicChannelDTO>> resp = smsOuterApiService.listGicSmsChannel();
+        LOGGER.info("测试数据 === 》 {}",JSON.toJSONString(resp));
+        return ResultControllerUtils.commonResult(resp, SmsChannelVO.class);
     }
 
+    // TODO 弃用
     /**
      * 设置优先使用配置
      * @param enterpriseId

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

@@ -22,6 +22,32 @@ public class SmsChannelVO implements Serializable{
      */
     private String channelName;
 
+    /**
+     * 是否要查询商户短信通道配置信息(0:不用; 1:需要)
+     */
+    private Integer needConfig;
+
+    /**
+     * 是否需要配置sign信息(0:不用; 1:需要)
+     */
+    private Integer needSignSetting;
+
+    public Integer getNeedConfig() {
+        return needConfig;
+    }
+
+    public void setNeedConfig(Integer needConfig) {
+        this.needConfig = needConfig;
+    }
+
+    public Integer getNeedSignSetting() {
+        return needSignSetting;
+    }
+
+    public void setNeedSignSetting(Integer needSignSetting) {
+        this.needSignSetting = needSignSetting;
+    }
+
     public Integer getChannelType() {
         return channelType;
     }