优化diamante

java110-bean/src/main/java/com/java110/dto/marketSmsValue/MarketSmsValueDto.java

@@ -21,6 +21,8 @@ public class MarketSmsValueDto extends PageDto implements Serializable {
     private String smsKey;
     private String smsValue;
 
+    private String name;
+
 
     private Date createTime;
 
@@ -83,4 +85,12 @@ public class MarketSmsValueDto extends PageDto implements Serializable {
     public void setSmsIds(String[] smsIds) {
         this.smsIds = smsIds;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }

java110-db/src/main/resources/mapper/common/MarketSmsValueV1ServiceDaoImplMapper.xml

@@ -18,8 +18,10 @@
     <!-- 查询营销信息值信息 add by wuxw 2018-07-03 -->
     <select id="getMarketSmsValueInfo" parameterType="Map" resultType="Map">
         select t.value_id,t.value_id valueId,t.sms_id,t.sms_id smsId,t.sms_key,t.sms_key smsKey,t.status_cd,t.status_cd
-        statusCd,t.sms_value,t.sms_value smsValue
+        statusCd,t.sms_value,t.sms_value smsValue,msk.`name`
         from market_sms_value t
+        LEFT JOIN market_sms ms on t.sms_id = ms.sms_id and ms.status_cd = '0'
+        LEFT JOIN market_sms_key msk on t.sms_key = msk.sms_key and ms.sms_type = msk.sms_type
         where 1 =1
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}
@@ -27,6 +29,13 @@
         <if test="smsId !=null and smsId != ''">
             and t.sms_id= #{smsId}
         </if>
+        <if test="smsIds !=null">
+            and t.sms_id in
+            <foreach collection="smsIds" open="(" close=")"
+                     separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
         <if test="smsKey !=null and smsKey != ''">
             and t.sms_key= #{smsKey}
         </if>

service-common/src/main/java/com/java110/common/cmd/marketSms/UpdateMarketSmsCmd.java

@@ -15,6 +15,7 @@
  */
 package com.java110.common.cmd.marketSms;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
@@ -23,10 +24,13 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.common.IMarketSmsV1InnerServiceSMO;
+import com.java110.intf.common.IMarketSmsValueV1InnerServiceSMO;
 import com.java110.po.marketSms.MarketSmsPo;
+import com.java110.po.marketSmsValue.MarketSmsValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
@@ -46,16 +50,35 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "marketSms.updateMarketSms")
 public class UpdateMarketSmsCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateMarketSmsCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(UpdateMarketSmsCmd.class);
 
 
     @Autowired
     private IMarketSmsV1InnerServiceSMO marketSmsV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IMarketSmsValueV1InnerServiceSMO marketSmsValueV1InnerServiceSMOImpl;
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "smsId", "smsId不能为空");
-Assert.hasKeyAndValue(reqJson, "smsId", "smsId不能为空");
+
+        if (!reqJson.containsKey("smsTypeValues")) {
+            throw new CmdException("未包含配置信息");
+        }
+
+        JSONArray smsTypeValues = reqJson.getJSONArray("smsTypeValues");
+
+        if (smsTypeValues == null || smsTypeValues.size() < 1) {
+            throw new CmdException("未包含配置信息");
+        }
+
+        for (int typeIndex = 0; typeIndex < smsTypeValues.size(); typeIndex++) {
+            if (StringUtil.isEmpty(smsTypeValues.getJSONObject(typeIndex).getString("smsValue"))) {
+                throw new CmdException("未填写" + smsTypeValues.getJSONObject(typeIndex).getString("name"));
+            }
+        }
 
     }
 
@@ -63,13 +86,29 @@ Assert.hasKeyAndValue(reqJson, "smsId", "smsId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       MarketSmsPo marketSmsPo = BeanConvertUtil.covertBean(reqJson, MarketSmsPo.class);
+        MarketSmsPo marketSmsPo = BeanConvertUtil.covertBean(reqJson, MarketSmsPo.class);
         int flag = marketSmsV1InnerServiceSMOImpl.updateMarketSms(marketSmsPo);
 
         if (flag < 1) {
             throw new CmdException("更新数据失败");
         }
 
+        JSONArray smsTypeValues = reqJson.getJSONArray("smsTypeValues");
+
+        JSONObject value = null;
+
+        MarketSmsValuePo marketSmsValuePo = null;
+        for (int typeIndex = 0; typeIndex < smsTypeValues.size(); typeIndex++) {
+            value = smsTypeValues.getJSONObject(typeIndex);
+            marketSmsValuePo = BeanConvertUtil.covertBean(value, MarketSmsValuePo.class);
+            marketSmsValuePo.setSmsId(marketSmsPo.getSmsId());
+            flag = marketSmsValueV1InnerServiceSMOImpl.updateMarketSmsValue(marketSmsValuePo);
+            if (flag < 1) {
+                throw new CmdException("保存数据失败");
+            }
+        }
+
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }