diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctAddAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctAddAction.java index 84b23d95..4e6fb407 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctAddAction.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctAddAction.java @@ -69,8 +69,8 @@ public class BuiDctAddAction extends BaseAction { String[] tmp1s = StringUtils.split(tmp, "="); BuiHlpDO hlpDO = new BuiHlpDO(); hlpDO.setFldNm(reqBO.getDctNm()); - hlpDO.setFldExp(tmp1s[0]); - hlpDO.setFldVal(tmp1s[1]); + hlpDO.setFldVal(tmp1s[0]); + hlpDO.setFldExp(tmp1s[1]); buiHlpMapper.insertSelective(hlpDO); } diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctQueryAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctQueryAction.java index 793a4783..feede187 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctQueryAction.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctQueryAction.java @@ -6,8 +6,11 @@ import com.murong.ecp.netpay.mbu.web.common.utils.CommonMessageCode; import com.murong.ecp.netpay.mbu.web.common.utils.ResultT; import com.murong.ecp.netpay.mbu.web.common.utils.ValidatorUtil; import com.murong.ecp.netpay.mbu.web.pub.dal.dao.BuiDctMapper; +import com.murong.ecp.netpay.mbu.web.pub.dal.dao.BuiHlpMapper; import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiDctDO; +import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiHlpDO; import com.murong.ecp.netpay.mbu.web.pub.model.BuiDctQueryReqBO; +import com.murong.ecp.netpay.mbu.web.pub.model.BuiDctQueryRspBO; import com.yuangou.ecp.bp.core.common.exception.YGException; import com.yuangou.ecp.bp.core.common.message.YGBizMessage; import com.yuangou.ecp.bp.core.common.message.YGBizMessageContext; @@ -18,9 +21,12 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 字典表管理服务 * Created by xu_lw on 2019-08-25 20:20:51. + * @Author xu_lw */ @Service("buiDctQuery") @Slf4j @@ -28,6 +34,9 @@ public class BuiDctQueryAction extends BaseAction { @Autowired private BuiDctMapper buiDctMapper; + @Autowired + private BuiHlpMapper buiHlpMapper; + /** * 查询单笔 * @@ -48,12 +57,18 @@ public class BuiDctQueryAction extends BaseAction { entity = buiDctMapper.selectByPrimaryKey(entity); ResultT resultT = new ResultT(); - if (entity != null) { - resultT.setMsgCod(CommonMessageCode.SUCC); - resultT.setData(entity); - } else { + if (entity == null) { resultT.setMsgCod(CommonMessageCode.REC_NFND); + return resultT; } + BuiDctQueryRspBO rspBO = new BuiDctQueryRspBO(); + BeanUtils.copyProperties(entity, rspBO); + List buiHlpDOList = buiHlpMapper.selectByName(entity.getDctNm()); + rspBO.setFldhlp(buiHlpDOList); + + resultT.setData(rspBO); + + resultT.setMsgCod(CommonMessageCode.SUCC); return resultT; } diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctUpdateAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctUpdateAction.java index 472c4cba..2ea3ad2b 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctUpdateAction.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiDctUpdateAction.java @@ -3,7 +3,9 @@ package com.murong.ecp.netpay.mbu.web.pub.action.buipubbpc1; import com.alibaba.fastjson.JSONObject; import com.murong.ecp.netpay.mbu.web.common.utils.*; import com.murong.ecp.netpay.mbu.web.pub.dal.dao.BuiDctMapper; +import com.murong.ecp.netpay.mbu.web.pub.dal.dao.BuiHlpMapper; import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiDctDO; +import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiHlpDO; import com.murong.ecp.netpay.mbu.web.pub.model.BuiDctUpdateReqBO; import com.murong.ecp.netpay.mbu.web.pub.model.BuiOperDTO; import com.yuangou.ecp.bp.core.common.exception.YGException; @@ -12,6 +14,7 @@ import com.yuangou.ecp.bp.core.common.message.YGBizMessageContext; import com.yuangou.ecp.bp.core.common.yglog4j.Logger; import com.yuangou.ecp.bp.core.common.yglog4j.YGLogger; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,7 +28,8 @@ import org.springframework.stereotype.Service; public class BuiDctUpdateAction extends BaseAction { @Autowired private BuiDctMapper buiDctMapper; - + @Autowired + private BuiHlpMapper buiHlpMapper; /** * 更新单笔 * @@ -48,12 +52,27 @@ public class BuiDctUpdateAction extends BaseAction { int retCode = buiDctMapper.updateByPrimaryKeySelective(entity); ResultT resultT = new ResultT(); - if (retCode > 0) { - resultT.setMsgCod(CommonMessageCode.SUCC); - } else { + if (retCode <= 0) { + resultT.setMsgCod(CommonMessageCode.REC_NFND); } + String fldHlp = reqBO.getFldHlp(); + + String[] tmps = StringUtils.split(fldHlp, "&"); + + buiHlpMapper.deleteByName(entity.getDctNm()); + + for( String tmp : tmps ) { + String[] tmp1s = StringUtils.split(tmp, "="); + BuiHlpDO hlpDO = new BuiHlpDO(); + hlpDO.setFldNm(reqBO.getDctNm()); + hlpDO.setFldVal(tmp1s[0]); + hlpDO.setFldExp(tmp1s[1]); + buiHlpMapper.insertSelective(hlpDO); + } + + resultT.setMsgCod(CommonMessageCode.SUCC); return resultT; } diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiConfigMapper.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiConfigMapper.java index a79b0bc7..b58eaa2b 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiConfigMapper.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiConfigMapper.java @@ -21,7 +21,7 @@ public interface BuiConfigMapper { int updateByPrimaryKeySelective(BuiConfigDO entity); - int deleteByPrimaryKey(BuiConfigDO entity); + int deleteByPrimaryKey(String ids); int insertSelective(BuiConfigDO entity); diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiHlpMapper.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiHlpMapper.java index 17745abf..1466fa78 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiHlpMapper.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiHlpMapper.java @@ -35,4 +35,6 @@ public interface BuiHlpMapper { List selectByName(String fldNm); + int deleteByName(String fldNm); + } diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiDctQueryRspBO.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiDctQueryRspBO.java new file mode 100644 index 00000000..28f2c362 --- /dev/null +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiDctQueryRspBO.java @@ -0,0 +1,16 @@ +package com.murong.ecp.netpay.mbu.web.pub.model; + +import com.murong.ecp.bp.common.dict.ECPDict; +import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiDctDO; +import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiHlpDO; +import lombok.Data; + +import java.util.List; + +/** + * Created by syxlw on 2018/4/28. + */ +@Data +public class BuiDctQueryRspBO extends BuiDctDO { + private List fldhlp; +} diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiDctUpdateReqBO.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiDctUpdateReqBO.java index f7b150e5..b68ee831 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiDctUpdateReqBO.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiDctUpdateReqBO.java @@ -33,6 +33,7 @@ public class BuiDctUpdateReqBO { @ECPDict(required = true, length = 1, message = "dctTyp值不合法") private String dctTyp; + /** * 字典中文名 */ @@ -48,31 +49,31 @@ public class BuiDctUpdateReqBO { /** * 符号 */ - @ECPDict(required = true, length = 1, message = "dctSign值不合法") + @ECPDict(required = false, length = 1, message = "dctSign值不合法") private String dctSign; /** * 格式 */ - @ECPDict(required = true, length = 1, message = "dctFormat值不合法") + @ECPDict(required = false, length = 1, message = "dctFormat值不合法") private String dctFormat; /** * 功能描述 */ - @ECPDict(required = true, length = 30, message = "dctFunc值不合法") + @ECPDict(required = false, length = 30, message = "dctFunc值不合法") private String dctFunc; /** * 数据类型 */ - @ECPDict(required = true, length = 1, message = "dataTyp值不合法") + @ECPDict(required = false, length = 1, message = "dataTyp值不合法") private String dataTyp; /** * 模块 */ - @ECPDict(required = true, length = 20, message = "dctMod值不合法") + @ECPDict(required = false, length = 20, message = "dctMod值不合法") private String dctMod; /** @@ -82,21 +83,8 @@ public class BuiDctUpdateReqBO { private String dctDesc; /** - * 请求id + * 枚举值 */ - @ECPDict(required = true, length = 64, message = "reqId值不合法") - private String reqId; - - /** - * 更新操作员 - */ - @ECPDict(required = true, length = 10, message = "updOper值不合法") - private String updOper; - - /** - * 更新描述 - */ - @ECPDict(required = true, length = 80, message = "updDesc值不合法") - private String updDesc; - + @ECPDict(required = true, message = "fldHlp值不合法") + private String fldHlp; }