From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-order/src/main/java/com/java110/order/dao/impl/CenterServiceDAOImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/service-order/src/main/java/com/java110/order/dao/impl/CenterServiceDAOImpl.java b/service-order/src/main/java/com/java110/order/dao/impl/CenterServiceDAOImpl.java
old mode 100644
new mode 100755
index 9dde2d6..6097a1a
--- a/service-order/src/main/java/com/java110/order/dao/impl/CenterServiceDAOImpl.java
+++ b/service-order/src/main/java/com/java110/order/dao/impl/CenterServiceDAOImpl.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.businessDatabus.BusinessDatabusDto;
import com.java110.entity.mapping.Mapping;
import com.java110.order.dao.ICenterServiceDAO;
import com.java110.utils.constant.ResponseConstant;
@@ -51,6 +53,9 @@
throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "淇濆瓨璁㈠崟椤逛俊鎭け璐ワ細" + JSONObject.toJSONString(orderItem));
}
+
+
+
if (!orderItem.containsKey("logText") || StringUtil.isEmpty(orderItem.get("logText") + "")) {
return;
}
@@ -67,9 +72,9 @@
@Override
public void updateOrderItem(Map orderItem) throws DAOException {
int saveFlag = sqlSessionTemplate.update("centerServiceDAOImpl.updateOrderItem", orderItem);
- if (saveFlag < 1) {
- throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "淇敼璁㈠崟椤瑰け璐ワ細" + JSONObject.toJSONString(orderItem));
- }
+// if (saveFlag < 1) {
+// throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "淇敼璁㈠崟椤瑰け璐ワ細" + JSONObject.toJSONString(orderItem));
+// }
}
@Override
@@ -194,10 +199,10 @@
public void updateBusiness(Map order) throws DAOException {
logger.debug("----銆怌enterServiceDAOImpl.updateBusiness銆戜繚瀛樻暟鎹叆鍙� : " + JSONObject.toJSONString(order));
- int saveFlag = sqlSessionTemplate.update("centerServiceDAOImpl.updateBusiness", order);
- if (saveFlag < 1) {
- throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏇存柊璁㈠崟椤逛俊鎭け璐ワ細" + JSONObject.toJSONString(order));
- }
+ sqlSessionTemplate.update("centerServiceDAOImpl.updateBusiness", order);
+// if (saveFlag < 1) {
+// throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏇存柊璁㈠崟椤逛俊鎭け璐ワ細" + JSONObject.toJSONString(order));
+// }
}
/**
@@ -350,6 +355,16 @@
return sqlSessionTemplate.selectList("centerServiceDAOImpl.getMappingInfoAll");
}
+ @Override
+ public List<BasePrivilegeDto> getPrivilegeAll() {
+ return sqlSessionTemplate.selectList("centerServiceDAOImpl.getPrivilegeAll");
+ }
+
+ @Override
+ public List<BusinessDatabusDto> getDatabusAll() {
+ return sqlSessionTemplate.selectList("centerServiceDAOImpl.getDatabusAll");
+ }
+
/**
* 鏌ヨ涓氫富璁㈠崟
*
--
Gitblit v1.8.0