优化代码

java110-bean/src/main/java/com/java110/dto/marketSmsKey/MarketSmsKeyDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.marketSmsKey;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,10 +16,10 @@ import java.util.Date;
 public class MarketSmsKeyDto extends PageDto implements Serializable {
 
     private String smsKey;
-private String name;
-private String keyId;
-private String smsType;
-private String remark;
+    private String name;
+    private String keyId;
+    private String smsType;
+    private String remark;
 
 
     private Date createTime;
@@ -29,31 +30,40 @@ private String remark;
     public String getSmsKey() {
         return smsKey;
     }
-public void setSmsKey(String smsKey) {
+
+    public void setSmsKey(String smsKey) {
         this.smsKey = smsKey;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getKeyId() {
+
+    public String getKeyId() {
         return keyId;
     }
-public void setKeyId(String keyId) {
+
+    public void setKeyId(String keyId) {
         this.keyId = keyId;
     }
-public String getSmsType() {
+
+    public String getSmsType() {
         return smsType;
     }
-public void setSmsType(String smsType) {
+
+    public void setSmsType(String smsType) {
         this.smsType = smsType;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 

java110-bean/src/main/java/com/java110/po/marketSmsValue/MarketSmsValuePo.java

@@ -17,6 +17,7 @@ package com.java110.po.marketSmsValue;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2022-10-23 17:57:54 mail: 928255095@qq.com
@@ -28,41 +29,50 @@ import java.util.Date;
 public class MarketSmsValuePo implements Serializable {
 
     private String valueId;
-private String smsId;
-private String smsKey;
-private String statusCd = "0";
-private String smsValue;
-public String getValueId() {
+    private String smsId;
+    private String smsKey;
+    private String statusCd = "0";
+    private String smsValue;
+
+    public String getValueId() {
         return valueId;
     }
-public void setValueId(String valueId) {
+
+    public void setValueId(String valueId) {
         this.valueId = valueId;
     }
-public String getSmsId() {
+
+    public String getSmsId() {
         return smsId;
     }
-public void setSmsId(String smsId) {
+
+    public void setSmsId(String smsId) {
         this.smsId = smsId;
     }
-public String getSmsKey() {
+
+    public String getSmsKey() {
         return smsKey;
     }
-public void setSmsKey(String smsKey) {
+
+    public void setSmsKey(String smsKey) {
         this.smsKey = smsKey;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getSmsValue() {
+
+    public String getSmsValue() {
         return smsValue;
     }
-public void setSmsValue(String smsValue) {
+
+    public void setSmsValue(String smsValue) {
         this.smsValue = smsValue;
     }
 
 
-
 }

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

@@ -22,6 +22,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.intf.common.IMarketSmsKeyV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,7 @@ public class ListMarketSmsKeyCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson,"smsType","未包含类型");
     }
 
     @Override

service-common/src/main/java/com/java110/common/cmd/marketSms/SaveMarketSmsCmd.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;
@@ -52,11 +56,30 @@ public class SaveMarketSmsCmd extends Cmd {
     @Autowired
     private IMarketSmsV1InnerServiceSMO marketSmsV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IMarketSmsValueV1InnerServiceSMO marketSmsValueV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "smsName", "请求报文中未包含smsName");
-Assert.hasKeyAndValue(reqJson, "smsType", "请求报文中未包含smsType");
-Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");
+        Assert.hasKeyAndValue(reqJson, "smsType", "请求报文中未包含smsType");
+        Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");
+
+        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"));
+            }
+        }
 
     }
 
@@ -64,7 +87,7 @@ Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");
     @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);
         marketSmsPo.setSmsId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = marketSmsV1InnerServiceSMOImpl.saveMarketSms(marketSmsPo);
 
@@ -72,6 +95,22 @@ Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");
             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.setValueId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+            marketSmsValuePo.setSmsId(marketSmsPo.getSmsId());
+            flag = marketSmsValueV1InnerServiceSMOImpl.saveMarketSmsValue(marketSmsValuePo);
+            if (flag < 1) {
+                throw new CmdException("保存数据失败");
+            }
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }