优化代码

java110-bean/src/main/java/com/java110/dto/marketSms/MarketSmsDto.java

@@ -1,8 +1,11 @@
 package com.java110.dto.marketSms;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.marketSmsValue.MarketSmsValueDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -15,38 +18,47 @@ import java.util.Date;
 public class MarketSmsDto extends PageDto implements Serializable {
 
     private String smsName;
-private String smsId;
-private String smsType;
-private String remark;
+    private String smsId;
+    private String smsType;
+    private String remark;
 
 
     private Date createTime;
 
     private String statusCd = "0";
 
+    private List<MarketSmsValueDto> values;
+
 
     public String getSmsName() {
         return smsName;
     }
-public void setSmsName(String smsName) {
+
+    public void setSmsName(String smsName) {
         this.smsName = smsName;
     }
-public String getSmsId() {
+
+    public String getSmsId() {
         return smsId;
     }
-public void setSmsId(String smsId) {
+
+    public void setSmsId(String smsId) {
         this.smsId = smsId;
     }
-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;
     }
 
@@ -66,4 +78,12 @@ public void setRemark(String remark) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<MarketSmsValueDto> getValues() {
+        return values;
+    }
+
+    public void setValues(List<MarketSmsValueDto> values) {
+        this.values = values;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.java110.dto.marketSmsValue;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,9 +16,10 @@ import java.util.Date;
 public class MarketSmsValueDto extends PageDto implements Serializable {
 
     private String valueId;
-private String smsId;
-private String smsKey;
-private String smsValue;
+    private String smsId;
+    private String[] smsIds;
+    private String smsKey;
+    private String smsValue;
 
 
     private Date createTime;
@@ -28,25 +30,32 @@ 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 getSmsValue() {
+
+    public String getSmsValue() {
         return smsValue;
     }
-public void setSmsValue(String smsValue) {
+
+    public void setSmsValue(String smsValue) {
         this.smsValue = smsValue;
     }
 
@@ -66,4 +75,12 @@ public void setSmsValue(String smsValue) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getSmsIds() {
+        return smsIds;
+    }
+
+    public void setSmsIds(String[] smsIds) {
+        this.smsIds = smsIds;
+    }
 }

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

@@ -71,6 +71,7 @@ public class ListMarketSmsCmd extends Cmd {
 
            if (count > 0) {
                marketSmsDtos = marketSmsV1InnerServiceSMOImpl.queryMarketSmss(marketSmsDto);
+
            } else {
                marketSmsDtos = new ArrayList<>();
            }
@@ -81,4 +82,6 @@ public class ListMarketSmsCmd extends Cmd {
 
            cmdDataFlowContext.setResponseEntity(responseEntity);
     }
+
+
 }

service-common/src/main/java/com/java110/common/smo/impl/MarketSmsV1InnerServiceSMOImpl.java

@@ -17,8 +17,10 @@ package com.java110.common.smo.impl;
 
 
 import com.java110.common.dao.IMarketSmsV1ServiceDao;
+import com.java110.dto.marketSmsValue.MarketSmsValueDto;
 import com.java110.intf.common.IMarketSmsV1InnerServiceSMO;
 import com.java110.dto.marketSms.MarketSmsDto;
+import com.java110.intf.common.IMarketSmsValueV1InnerServiceSMO;
 import com.java110.po.marketSms.MarketSmsPo;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
@@ -45,6 +47,9 @@ public class MarketSmsV1InnerServiceSMOImpl extends BaseServiceSMO implements IM
     @Autowired
     private IMarketSmsV1ServiceDao marketSmsV1ServiceDaoImpl;
 
+    @Autowired
+    private IMarketSmsValueV1InnerServiceSMO marketSmsValueV1InnerServiceSMOImpl;
+
 
     @Override
     public int saveMarketSms(@RequestBody  MarketSmsPo marketSmsPo) {
@@ -78,9 +83,45 @@ public class MarketSmsV1InnerServiceSMOImpl extends BaseServiceSMO implements IM
 
         List<MarketSmsDto> marketSmss = BeanConvertUtil.covertBeanList(marketSmsV1ServiceDaoImpl.getMarketSmsInfo(BeanConvertUtil.beanCovertMap(marketSmsDto)), MarketSmsDto.class);
 
+        refreshMarketValues(marketSmss);
         return marketSmss;
     }
 
+    /**
+     * 输入 值
+     * @param marketSmss
+     */
+    private void refreshMarketValues(List<MarketSmsDto> marketSmss) {
+
+        if(marketSmss == null || marketSmss.size() <1){
+            return ;
+        }
+
+        List<String> smsIds = new ArrayList<>();
+
+        for(MarketSmsDto marketSmsDto : marketSmss){
+            smsIds.add(marketSmsDto.getSmsId());
+        }
+
+
+        MarketSmsValueDto marketSmsValueDto = new MarketSmsValueDto();
+        marketSmsValueDto.setSmsIds(smsIds.toArray(new String[smsIds.size()]));
+        List<MarketSmsValueDto> smsValueDtos = marketSmsValueV1InnerServiceSMOImpl.queryMarketSmsValues(marketSmsValueDto);
+
+        List<MarketSmsValueDto> marketSmsValueDtos = null;
+        for(MarketSmsDto marketSmsDto : marketSmss){
+            marketSmsValueDtos = new ArrayList<>();
+            for(MarketSmsValueDto smsValueDto : smsValueDtos){
+                if(!marketSmsDto.getSmsId().equals(smsValueDto.getSmsId())){
+                    continue;
+                }
+                marketSmsValueDtos.add(smsValueDto);
+            }
+
+            marketSmsDto.setValues(marketSmsValueDtos);
+        }
+    }
+
 
     @Override
     public int queryMarketSmssCount(@RequestBody MarketSmsDto marketSmsDto) {