Merge remote-tracking branch 'origin/branch_20190822' into branch_20190822

2019-08-29 11:45:41 +08:00
parent da36fdcd96 7b6b020e04
commit 75dec7348a
5 changed files with 127 additions and 6 deletions
@@ -0,0 +1,114 @@
+package com.murong.ecp.netpay.mbu.web.interceptor;
+
+import com.murong.ecp.bp.common.annotation.ECPInterceptorMapping;
+import com.murong.ecp.netpay.mbu.web.common.utils.CommonMessageCode;
+import com.yuangou.ecp.biz.transengine.YGAbstractBizIntercetpor;
+import com.yuangou.ecp.biz.transengine.sqlsession.YGSqlSession;
+import com.yuangou.ecp.biz.transengine.util.GDAUtil;
+import com.yuangou.ecp.bp.comp.expr.YGExpUtil;
+import com.yuangou.ecp.bp.comp.pubatc.YGPUBATCUtil;
+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;
+import com.yuangou.ecp.bp.core.common.message.YGEDB;
+import com.yuangou.ecp.bp.core.common.yglog4j.Logger;
+import com.yuangou.ecp.bp.core.common.yglog4j.YGLogger;
+import com.yuangou.ecp.bp.database.YGDatabaseUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
+
+/**
+ * 公共处理
+ */
+@ECPInterceptorMapping({".*"})
+public class BUIInterceptor extends YGAbstractBizIntercetpor {
+
+	@Override
+	public void onError(YGBizMessageContext bizCtx, Throwable t) throws YGException {
+
+		YGBizMessage msg = bizCtx.getCurrentMsg();
+
+		Logger logger = YGLogger.getLogger(msg);
+
+		if (logger.isInfoEnabled()) {
+			logger.info("执行异常处理:[" + this.getClass().getSimpleName() + ".onError]");
+			logger.info("运行时异常，回滚数据库事务");
+		}
+
+		YGPUBATCUtil.rollbackWork(bizCtx);
+		GDAUtil.setMsg_cd(msg, CommonMessageCode.FAIL.getMsgCod());
+		GDAUtil.setMsg_inf(msg, CommonMessageCode.FAIL.getMsgInf());
+
+		if (logger.isErrorEnabled()) {
+			logger.error(ExceptionUtils.getFullStackTrace(t));
+		}
+
+		if (logger.isInfoEnabled()) {
+			logger.info("异常处理结束:[" + this.getClass().getSimpleName() + ".onError]");
+		}
+	}
+
+	@Override
+	public boolean onRequest(YGBizMessageContext bizCtx) throws YGException {
+
+		YGBizMessage msg = bizCtx.getCurrentMsg();
+		Logger logger = YGLogger.getLogger(msg);
+
+		if (logger.isInfoEnabled()) {
+			logger.info("执行前处理:[" + this.getClass().getSimpleName() + ".onRequest]");
+		}
+
+		YGPUBATCUtil.initGDS(bizCtx);
+		if (logger.isInfoEnabled()) {
+			logger.info("初始化GDA成功");
+			logger.info("前处理结束:[" + this.getClass().getSimpleName() + ".onRequest]");
+		}
+
+		YGDatabaseUtil dbUtlil = bizCtx.getDataBaseUtil();
+		dbUtlil.insert("insert t(a,b) values(?,?)", new String[]{"a", "b"});
+
+		return true;
+	}
+
+	@Override
+	public void onResponse(YGBizMessageContext bizCtx) throws YGException {
+		// 公共后处理
+
+		YGBizMessage msg = bizCtx.getCurrentMsg();
+		YGEDB edb = msg.getEDBBody();
+
+		Logger logger = YGLogger.getLogger(msg);
+		logger.info("执行后处理:[" + this.getClass().getSimpleName() + ".onResponse]");
+
+		String msg_cd = GDAUtil.getMsg_cd(msg);
+
+		if (StringUtils.isBlank(msg_cd)) {
+			if (logger.isInfoEnabled()) {
+				logger.info("消息编码为空");
+			}
+
+			GDAUtil.setMsg_cd(msg, CommonMessageCode.FAIL.getMsgCod());
+			GDAUtil.setMsg_inf(msg, CommonMessageCode.FAIL.getMsgInf());
+		}
+
+		edb.setData("msg_cd", msg_cd);
+
+		if (YGExpUtil.is_succ(msg_cd)) {
+			if (logger.isInfoEnabled()) {
+				logger.info("业务处理成功,提交数据库事务");
+			}
+
+			edb.setData("gda.msg_typ", "N");
+			YGPUBATCUtil.commitWork(bizCtx);
+		} else {
+			if (logger.isInfoEnabled()) {
+				logger.info("业务处理失败,回滚数据库事务");
+			}
+			edb.setData("gda.msg_typ", "E");
+			YGPUBATCUtil.rollbackWork(bizCtx);
+		}
+
+		logger.info("后处理结束:[" + this.getClass().getSimpleName() + ".onResponse]");
+
+	}
+}
@@ -45,7 +45,8 @@ public class BuiMenuDeleteAction extends BaseAction {
 		BuiMenuDO entity = new BuiMenuDO();
 		BeanUtils.copyProperties(reqBO, entity);

-		int retCod = buiMenuMapper.deleteByPrimaryKey(entity);
+
+		int retCod = buiMenuMapper.deleteByIdCascade(entity.getMenuId());

 		ResultT resultT = new ResultT();
 		if (retCod > 0) {
@@ -37,4 +37,7 @@ public interface BuiMenuMapper {

 	List<BuiMenuDO> selectByRoleId(Long roleId);

+	int deleteByIdCascade(Long menuId);
+
+
 }
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
-    <param name="GenerateFieldHelp" interval="600" class="com.murong.ecp.netpay.mbu.web.handler.GenerateFieldHelpHandler">
-        <property name="sqlCmd" value="select fld_nm,fld_val,fld_exp from t_bui_hlp order by fld_nm"/>
-        <property name="dsNam" value="${_DB_NAME}"/>
-        <property name="fileName" value="js/dict/dict.js"/>
-    </param>
+    <!--<param name="GenerateFieldHelp" interval="600" class="com.murong.ecp.netpay.mbu.web.handler.GenerateFieldHelpHandler">-->
+        <!--<property name="sqlCmd" value="select fld_nm,fld_val,fld_exp from t_bui_hlp order by fld_nm"/>-->
+        <!--<property name="dsNam" value="${_DB_NAME}"/>-->
+        <!--<property name="fileName" value="js/dict/dict.js"/>-->
+    <!--</param>-->
 </root>
@@ -138,4 +138,7 @@
        select b.* from t_bui_role_menu a, t_bui_menu b where a.role_id=#{roleId} and b.menu_id=a.menu_id order by b.menu_id
    </select>

+    <delete id="deleteByIdCascade" parameterType="java.lang.Long">
+        delete from t_bui_menu where menu_id in (select menu_id from t_bui_menu start with menu_id=${menuId} connect by prior menu_id = parent_id)
+    </delete>
 </mapper>