From 70862b9228ccb2156971a22085ac31b6c8b6d2cd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 07 七月 2020 19:35:42 +0800
Subject: [PATCH] 优化代码
---
java110-bean/src/main/java/com/java110/dto/order/OrderDto.java | 1
java110-service/src/main/java/com/java110/service/smo/IQueryServiceSMO.java | 10
service-order/src/main/java/com/java110/order/api/OIdApi.java | 12
java110-db/pom.xml | 16
java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java | 29 +
service-order/src/main/java/com/java110/order/smo/impl/CenterServiceCacheSMOImpl.java | 2
service-order/src/main/java/com/java110/order/dao/impl/CenterServiceDAOImpl.java | 17 +
service-order/src/main/java/com/java110/order/smo/IOIdServiceSMO.java | 8
java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java | 191 ++++++++++
java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java | 24
java110-service/src/main/java/com/java110/service/context/DataQuery.java | 2
java110-db/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml | 28 +
java110-bean/src/main/java/com/java110/dto/appraise/AppraiseDto.java | 14
service-common/src/main/java/com/java110/common/service/appraise/SaveAppraiseServiceImpl.java | 5
java110-service/src/main/java/com/java110/service/api/BusinessApi.java | 21
service-community/src/main/java/com/java110/community/service/repair/AppraiseRepairServiceImpl.java | 46 ++
java110-db/src/main/java/com/java110/db/dao/IQueryServiceDAO.java | 3
service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java | 9
java110-core/src/main/java/com/java110/core/aop/Java110TransactionalInterceptor.java | 34 ++
java110-interface/src/main/java/com/java110/intf/community/repair/IAppraiseRepairService.java | 24 +
service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java | 181 ++++++++++
service-order/src/main/java/com/java110/order/dao/ICenterServiceDAO.java | 17 +
service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java | 14
java110-utils/src/main/java/com/java110/utils/exception/InterceptorException.java | 189 +++++++++++
java110-bean/src/main/java/com/java110/dto/order/OrderItemDto.java | 6
java110-utils/pom.xml | 1
java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java | 78 ++++
java110-db/src/main/resources/mapper/common/AppraiseServiceDaoImplMapper.xml | 4
java110-db/src/main/java/com/java110/db/dao/impl/QueryServiceDAOImpl.java | 4
29 files changed, 917 insertions(+), 73 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/appraise/AppraiseDto.java b/java110-bean/src/main/java/com/java110/dto/appraise/AppraiseDto.java
index 6a1eed1..9207926 100644
--- a/java110-bean/src/main/java/com/java110/dto/appraise/AppraiseDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/appraise/AppraiseDto.java
@@ -8,6 +8,11 @@
*/
public class AppraiseDto implements Serializable {
+ //璇勪环鍗�
+ public static final String OBJ_TYPE_REPAIR = "10001";
+
+ public static final String APPRAISE_TYPE_PUBLIC = "10000"; // 璇勪环绫诲瀷 鏅�氱被鍨�
+
private String appraiseId;
private int appraiseScore;
@@ -19,6 +24,7 @@
private String appraiseUserName;
private String objType;
private String objId;
+ private String statusCd;
public String getAppraiseId() {
@@ -100,4 +106,12 @@
public void setObjId(String objId) {
this.objId = objId;
}
+
+ public String getStatusCd() {
+ return statusCd;
+ }
+
+ public void setStatusCd(String statusCd) {
+ this.statusCd = statusCd;
+ }
}
diff --git a/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java b/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java
index 2c24f5f..3520f97 100644
--- a/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/order/OrderDto.java
@@ -9,6 +9,7 @@
public static final String APP_ID = "APP-ID";
public static final String TRANSACTION_ID = "TRANSACTION-ID";
public static final String REQUEST_TIME = "REQUEST-TIME";
+ public static final String USER_ID = "USER-ID";
public static final String O_ID = "O-ID";
diff --git a/java110-bean/src/main/java/com/java110/dto/order/OrderItemDto.java b/java110-bean/src/main/java/com/java110/dto/order/OrderItemDto.java
index 6b6db48..5f077ba 100644
--- a/java110-bean/src/main/java/com/java110/dto/order/OrderItemDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/order/OrderItemDto.java
@@ -1,5 +1,6 @@
package com.java110.dto.order;
+import com.alibaba.fastjson.JSONObject;
import com.java110.dto.PageDto;
import java.io.Serializable;
@@ -88,4 +89,9 @@
public void setLogText(String logText) {
this.logText = logText;
}
+
+ @Override
+ public String toString() {
+ return JSONObject.toJSONString(this);
+ }
}
diff --git a/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java b/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
index 50066f9..1e583e9 100644
--- a/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
+++ b/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
@@ -4,13 +4,7 @@
import com.java110.dto.order.OrderDto;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.annotation.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
@@ -69,6 +63,9 @@
if (OrderDto.O_ID.equals(key.toUpperCase())) {
orderDto.setoId(value);
}
+ if (OrderDto.USER_ID.equals(key.toUpperCase())) {
+ orderDto.setUserId(value);
+ }
}
orderDto.setOrderTypeCd(OrderDto.ORDER_TYPE_DEAL);
//鍏ㄥ眬浜嬪姟ID鐢宠
@@ -86,8 +83,7 @@
public void throwException(JoinPoint jp) {
logger.debug("鏂规硶璋冪敤寮傚父鎵цthrowException锛堬級");
- //鍥為��浜嬪姟
- Java110TransactionalFactory.fallbackOId();
+
}
//鍚庣疆鏈�缁堥�氱煡,final澧炲己锛屼笉绠℃槸鎶涘嚭寮傚父鎴栬�呮甯搁��鍑洪兘浼氭墽琛�
@@ -95,8 +91,6 @@
public void after(JoinPoint jp) throws IOException {
// 鎺ユ敹鍒拌姹傦紝璁板綍璇锋眰鍐呭
logger.debug("鏂规硶璋冪敤鍚庢墽琛宎fter锛堬級");
-
-
}
//鐜粫閫氱煡,鐜粫澧炲己锛岀浉褰撲簬MethodInterceptor
@@ -104,9 +98,17 @@
public Object around(ProceedingJoinPoint pjp) {
try {
Object o = pjp.proceed();
+ //瑙傚療鑰呬笉鍋氬鐞�
+ if (Java110TransactionalFactory.ROLE_OBSERVER.equals(Java110TransactionalFactory.getServiceRole())) {
+ return o;
+ }
+ //瀹屾垚浜嬪姟
+ Java110TransactionalFactory.finishOId();
return o;
} catch (Throwable e) {
logger.error("鎵ц鏂规硶寮傚父", e);
+ //鍥為��浜嬪姟
+ Java110TransactionalFactory.fallbackOId();
return new ResponseEntity("鍐呴儴寮傚父" + e.getLocalizedMessage(), HttpStatus.BAD_REQUEST);
}
}
diff --git a/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalInterceptor.java b/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalInterceptor.java
new file mode 100644
index 0000000..2222295
--- /dev/null
+++ b/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalInterceptor.java
@@ -0,0 +1,34 @@
+package com.java110.core.aop;
+
+import com.java110.core.factory.Java110TransactionalFactory;
+import com.java110.dto.order.OrderDto;
+import com.java110.utils.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 鍐欎笂灞備簨鍔D
+ */
+@Component
+public class Java110TransactionalInterceptor implements HandlerInterceptor {
+
+ @Override
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+
+ //璇存槑宸茬粡寮�鍚簨鍔�
+ if (!StringUtils.isEmpty(Java110TransactionalFactory.getOId())) {
+ return true;
+ }
+ String oId = request.getHeader(OrderDto.O_ID);
+
+ if (!StringUtil.isEmpty(oId)) {
+ Java110TransactionalFactory.put(Java110TransactionalFactory.O_ID, oId);
+ }
+
+ return true;
+ }
+}
diff --git a/java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java b/java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java
index d49dcc9..25fa152 100644
--- a/java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java
@@ -8,11 +8,7 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -44,12 +40,25 @@
*/
private static final String FALLBACK_O_ID = URL_API + "/fallBackOId";
+ /**
+ * 鍥為��浜嬪姟ID
+ */
+ private static final String FINISH_O_ID = URL_API + "/finishOId";
+
//鍏ㄥ眬浜嬪姟ID
public static final String O_ID = "O-ID";
//褰撳墠鏈嶅姟ID
public static final String SERVICE_ID = "SERVICE-ID";
+
+ //鏈嶅姟瑙掕壊 鍒涘缓浜嬪姟鑰� 杩樻槸 瑙傚療鑰�
+ public static final String SERVICE_ROLE = "SERVICE-ROLE";
+
+ //鍒涘缓鑰�
+ public static final String ROLE_CREATE = "creator";
+
+ public static final String ROLE_OBSERVER = "observer";
private static ThreadLocal<Map<String, String>> threadLocal = new ThreadLocal<Map<String, String>>() {
@Override
@@ -78,9 +87,13 @@
//鍏ㄥ眬浜嬪姟寮�鍚��
if (StringUtils.isEmpty(orderDto.getoId())) {
createOId(orderDto);
+ put(SERVICE_ROLE, ROLE_CREATE);
+ } else {
+ put(SERVICE_ROLE, ROLE_OBSERVER);//瑙傚療鑰�
}
- String oId = get(O_ID);
- return oId;
+ //灏嗕簨鍔D 瀛樻斁璧锋潵
+ put(O_ID, orderDto.getoId());
+ return orderDto.getoId();
}
/**
@@ -90,6 +103,17 @@
*/
public static String getOId() {
String oId = get(O_ID);
+ return oId;
+ }
+
+
+ /**
+ * 鑾峰彇浜嬪姟ID
+ *
+ * @return
+ */
+ public static String getServiceRole() {
+ String oId = get(SERVICE_ROLE);
return oId;
}
@@ -130,7 +154,7 @@
*/
public static void fallbackOId() {
String oId = getOId();
- if (StringUtil.isEmpty(oId)) {
+ if (StringUtil.isEmpty(oId) || ROLE_OBSERVER.equals(getServiceRole())) {
//褰撳墠娌℃湁寮�鍚簨鍔℃棤闇�鍥為��
logger.debug("褰撳墠娌℃湁寮�鍚簨鍔℃棤闇�鍥為��");
return;
@@ -162,4 +186,42 @@
}
}
+
+ /**
+ * 澶勭悊澶辫触锛屽洖閫�浜嬪姟
+ */
+ public static void finishOId() {
+ String oId = getOId();
+ if (StringUtil.isEmpty(oId) || ROLE_OBSERVER.equals(getServiceRole())) {
+ //褰撳墠娌℃湁寮�鍚簨鍔℃棤闇�鍥為��
+ logger.debug("褰撳墠娌℃湁寮�鍚簨鍔℃棤闇�鍥為��");
+ return;
+ }
+ OrderDto orderDto = new OrderDto();
+ orderDto.setoId(oId);
+ RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
+ HttpHeaders header = new HttpHeaders();
+ HttpEntity<String> httpEntity = new HttpEntity<String>(JSONObject.toJSONString(orderDto), header);
+ ResponseEntity<String> responseEntity = null;
+ try {
+ responseEntity = restTemplate.exchange(FINISH_O_ID, HttpMethod.POST, httpEntity, String.class);
+ } catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
+ responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
+ } catch (Exception e) {
+ responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ } finally {
+ logger.debug("瀹屾垚浜嬪姟 璇锋眰鍦板潃涓�,{} 璇锋眰璁㈠崟鏈嶅姟淇℃伅锛寋},璁㈠崟鏈嶅姟杩斿洖淇℃伅锛寋}", FINISH_O_ID, httpEntity, responseEntity);
+ }
+
+ if (responseEntity.getStatusCode() == HttpStatus.NOT_FOUND) {
+ //褰撳墠娌℃湁寮�鍚簨鍔℃棤闇�鍥為��
+ logger.debug("褰撳墠娌℃湁寮�鍚簨鍔℃棤闇�澶勭悊");
+ return;
+ }
+
+ if (responseEntity.getStatusCode() == HttpStatus.BAD_REQUEST) {
+ throw new IllegalArgumentException("瀹屾垚浜嬪姟澶辫触" + responseEntity.getBody());
+ }
+
+ }
}
diff --git a/java110-db/pom.xml b/java110-db/pom.xml
index 3f68755..07c3677 100644
--- a/java110-db/pom.xml
+++ b/java110-db/pom.xml
@@ -73,5 +73,21 @@
<artifactId>java110-interface</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.java110</groupId>
+ <artifactId>java110-bean</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.java110</groupId>
+ <artifactId>java110-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java b/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
index 9714206..f7da7c4 100644
--- a/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
+++ b/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
@@ -1,30 +1,45 @@
package com.java110.db;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.client.RestTemplate;
+import com.java110.core.factory.Java110TransactionalFactory;
+import com.java110.db.dao.IQueryServiceDAO;
+import com.java110.dto.order.OrderItemDto;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.factory.ApplicationContextFactory;
+import com.java110.utils.util.StringUtil;
import org.apache.ibatis.executor.Executor;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.SqlCommandType;
import org.apache.ibatis.plugin.*;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.type.TypeHandlerRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.http.*;
import java.text.DateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
+import java.util.*;
@Intercepts({
@Signature(type = Executor.class, method = "update", args = {MappedStatement.class,
Object.class})
})
-
public class Java110MybatisInterceptor implements Interceptor {
private static Logger logger = LoggerFactory.getLogger(Java110MybatisInterceptor.class);
+ IQueryServiceDAO queryServiceDAOImpl;
+ RestTemplate restTemplate;
+
@Override
public Object intercept(Invocation invocation) throws Throwable {
+ if (StringUtil.isEmpty(Java110TransactionalFactory.getOId())) { //鏈紑鍚簨鍔�
+ return invocation.proceed();
+ }
MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
Object parameter = null;
@@ -36,16 +51,16 @@
Configuration configuration = mappedStatement.getConfiguration();
//鑾峰彇sql璇彞
String sql = showSql(configuration, boundSql);
-
+ restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
switch (sqlCommandType) {
case INSERT:
- dealInsertSql(mappedStatement, parameter,sql);
+ dealInsertSql(mappedStatement, parameter, sql);
break;
case UPDATE:
- dealUpdateSql(mappedStatement, parameter,sql);
+ dealUpdateSql(mappedStatement, parameter, sql);
break;
case DELETE:
- dealDeleteSql(mappedStatement, parameter,sql);
+ dealDeleteSql(mappedStatement, parameter, sql);
break;
}
return invocation.proceed();
@@ -57,7 +72,46 @@
* @param mappedStatement
* @param parameter
*/
- private void dealDeleteSql(MappedStatement mappedStatement, Object parameter,String sql) {
+ private void dealDeleteSql(MappedStatement mappedStatement, Object parameter, String sql) {
+
+ String tmpTable = sql.substring(sql.indexOf("into") + 4, sql.indexOf("("));
+ String tmpWhere = sql.substring(sql.indexOf("where"));
+ //鎻掑叆鎿嶄綔鏃朵箣鍓嶇殑 娌℃湁鏁版嵁 鎵�浠� preValue 涓虹┖瀵硅薄
+ JSONArray preValues = new JSONArray();
+
+ String execSql = "select * from " + tmpTable + " " + tmpWhere;
+
+ queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl", IQueryServiceDAO.class);
+ List<Map<String, Object>> deleteDatas = queryServiceDAOImpl.executeSql(execSql, null);
+
+ if (deleteDatas != null && deleteDatas.size() > 0) {
+ for (Map<String, Object> map : deleteDatas) {
+ preValues.add(map);
+ }
+ }
+
+ JSONArray afterValues = new JSONArray();
+
+ JSONObject logText = new JSONObject();
+ logText.put("preValue", preValues);
+ logText.put("afterValue", afterValues);
+
+ OrderItemDto orderItemDto = new OrderItemDto();
+ orderItemDto.setbId("-1");
+ orderItemDto.setAction("DEL");
+ orderItemDto.setActionObj(tmpTable.trim());
+ orderItemDto.setLogText(logText.toJSONString());
+ orderItemDto.setServiceName(ApplicationContextFactory.getApplicationName());
+ orderItemDto.setoId(Java110TransactionalFactory.getOId());
+
+ String url = ServiceConstant.SERVICE_ORDER_URL + "/order/oIdApi/createOrderItem";
+ HttpHeaders httpHeaders = new HttpHeaders();
+ HttpEntity httpEntity = new HttpEntity(orderItemDto.toString(), httpHeaders);
+ ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new IllegalArgumentException("娉ㄥ唽浜嬪姟鍥炴粴鏃ュ織澶辫触" + responseEntity);
+ }
}
/**
@@ -66,7 +120,71 @@
* @param mappedStatement
* @param parameter
*/
- private void dealUpdateSql(MappedStatement mappedStatement, Object parameter,String sql) {
+ private void dealUpdateSql(MappedStatement mappedStatement, Object parameter, String sql) {
+ //RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
+
+ String tmpTable = sql.substring(sql.indexOf("update") + 6, sql.indexOf("set"));
+ String tmpWhere = sql.substring(sql.indexOf("where"));
+ String tmpKey = sql.substring(sql.indexOf("set") + 3, sql.indexOf("where"));
+ String[] tmpString = tmpKey.split(",");
+ Map tmpAfterMap = new HashMap();
+ for (String tmp : tmpString) {
+ String[] keyValues = tmp.split("=");
+ String key = "";
+ if (keyValues.length != 2) {
+ throw new IllegalArgumentException("update 璇彞鍙兘鏈夐棶棰橈紝娌℃湁 set 涓嚭閿� " + sql);
+ }
+ if (keyValues[0].contains(".")) {
+ key = keyValues[0].substring(keyValues[0].indexOf(".") + 1);
+ } else {
+ key = keyValues[0];
+ }
+ tmpAfterMap.put(key.trim(), keyValues[1].trim());
+ }
+
+
+ if (tmpString == null || tmpString.length < 1) {
+ throw new IllegalArgumentException("update 璇彞鍙兘鏈夐棶棰橈紝娌℃湁 set 鍐呭 " + sql);
+ }
+ //鎻掑叆鎿嶄綔鏃朵箣鍓嶇殑 娌℃湁鏁版嵁 鎵�浠� preValue 涓虹┖瀵硅薄
+ JSONArray preValues = new JSONArray();
+ JSONArray afterValues = new JSONArray();
+ JSONObject afterVaule = null;
+ String execSql = "select * from " + tmpTable + " " + tmpWhere;
+
+ queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl", IQueryServiceDAO.class);
+ List<Map<String, Object>> deleteDatas = queryServiceDAOImpl.executeSql(execSql, null);
+
+ if (deleteDatas != null && deleteDatas.size() > 0) {
+ for (Map<String, Object> map : deleteDatas) {
+ preValues.add(map);
+ afterVaule = new JSONObject();
+ afterVaule.putAll(map);
+ afterVaule.putAll(tmpAfterMap);
+ afterValues.add(afterVaule);
+ }
+ }
+
+ JSONObject logText = new JSONObject();
+ logText.put("preValue", preValues);
+ logText.put("afterValue", afterValues);
+
+ OrderItemDto orderItemDto = new OrderItemDto();
+ orderItemDto.setbId("-1");
+ orderItemDto.setAction("MOD");
+ orderItemDto.setActionObj(tmpTable.trim());
+ orderItemDto.setLogText(logText.toJSONString());
+ orderItemDto.setServiceName(ApplicationContextFactory.getApplicationName());
+ orderItemDto.setoId(Java110TransactionalFactory.getOId());
+
+ String url = ServiceConstant.SERVICE_ORDER_URL + "/order/oIdApi/createOrderItem";
+ HttpHeaders httpHeaders = new HttpHeaders();
+ HttpEntity httpEntity = new HttpEntity(orderItemDto.toString(), httpHeaders);
+ ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new IllegalArgumentException("娉ㄥ唽浜嬪姟鍥炴粴鏃ュ織澶辫触" + responseEntity);
+ }
}
/**
@@ -75,10 +193,53 @@
* @param mappedStatement
* @param parameter
*/
- private void dealInsertSql(MappedStatement mappedStatement, Object parameter,String sql) {
- String deleteSql = "delete from ";
+ private void dealInsertSql(MappedStatement mappedStatement, Object parameter, String sql) {
+ // RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
+ //鎻掑叆鎿嶄綔鏃朵箣鍓嶇殑 娌℃湁鏁版嵁 鎵�浠� preValue 涓虹┖瀵硅薄
+ JSONArray preValues = new JSONArray();
+
+ JSONArray afterValues = new JSONArray();
+ JSONObject afterValue = new JSONObject();
+ String tmpTable = sql.substring(sql.toLowerCase().indexOf("into") + 4, sql.indexOf("("));
+ String tmpKey = sql.substring(sql.indexOf("(") + 1, sql.indexOf(")"));
+ String tmpValue = sql.substring(sql.lastIndexOf("(") + 1, sql.lastIndexOf(")"));
+ String[] tmpKeys = tmpKey.split(",");
+ String[] tmpValues = tmpValue.split(",");
+
+ if (tmpKeys.length != tmpValues.length) {
+ throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑" + sql);
+ }
+
+ if (tmpKeys.length < 1) {
+ throw new IllegalArgumentException("sql 閿欒 鏈壘鍒発ey" + sql);
+ }
+ for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
+ afterValue.put(tmpKeys[keyIndex], tmpValues[keyIndex]);
+ }
+ afterValues.add(afterValue);
+
+ JSONObject logText = new JSONObject();
+ logText.put("preValue", preValues);
+ logText.put("afterValue", afterValues);
+
+ OrderItemDto orderItemDto = new OrderItemDto();
+ orderItemDto.setbId("-1");
+ orderItemDto.setAction("ADD");
+ orderItemDto.setActionObj(tmpTable.trim());
+ orderItemDto.setLogText(logText.toJSONString());
+ orderItemDto.setServiceName(ApplicationContextFactory.getApplicationName());
+ orderItemDto.setoId(Java110TransactionalFactory.getOId());
+
+ String url = ServiceConstant.SERVICE_ORDER_URL + "/order/oIdApi/createOrderItem";
+ HttpHeaders httpHeaders = new HttpHeaders();
+ HttpEntity httpEntity = new HttpEntity(orderItemDto.toString(), httpHeaders);
+ ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new IllegalArgumentException("娉ㄥ唽浜嬪姟鍥炴粴鏃ュ織澶辫触" + responseEntity);
+ }
}
@@ -117,7 +278,7 @@
}
}
}
- return sql;
+ return sql.toLowerCase();
}
private String getParameterValue(Object obj) {
diff --git a/java110-service/src/main/java/com/java110/service/dao/IQueryServiceDAO.java b/java110-db/src/main/java/com/java110/db/dao/IQueryServiceDAO.java
similarity index 91%
rename from java110-service/src/main/java/com/java110/service/dao/IQueryServiceDAO.java
rename to java110-db/src/main/java/com/java110/db/dao/IQueryServiceDAO.java
index 6f052d7..7750f4e 100644
--- a/java110-service/src/main/java/com/java110/service/dao/IQueryServiceDAO.java
+++ b/java110-db/src/main/java/com/java110/db/dao/IQueryServiceDAO.java
@@ -1,9 +1,8 @@
-package com.java110.service.dao;
+package com.java110.db.dao;
import com.java110.entity.order.ServiceBusiness;
import com.java110.entity.service.ServiceSql;
-import javax.validation.OverridesAttribute;
import java.util.List;
import java.util.Map;
diff --git a/java110-service/src/main/java/com/java110/service/dao/impl/QueryServiceDAOImpl.java b/java110-db/src/main/java/com/java110/db/dao/impl/QueryServiceDAOImpl.java
similarity index 98%
rename from java110-service/src/main/java/com/java110/service/dao/impl/QueryServiceDAOImpl.java
rename to java110-db/src/main/java/com/java110/db/dao/impl/QueryServiceDAOImpl.java
index f2d4b70..a31393c 100644
--- a/java110-service/src/main/java/com/java110/service/dao/impl/QueryServiceDAOImpl.java
+++ b/java110-db/src/main/java/com/java110/db/dao/impl/QueryServiceDAOImpl.java
@@ -1,10 +1,10 @@
-package com.java110.service.dao.impl;
+package com.java110.db.dao.impl;
import com.java110.utils.util.StringUtil;
import com.java110.core.base.dao.BaseServiceDao;
import com.java110.entity.order.ServiceBusiness;
import com.java110.entity.service.ServiceSql;
-import com.java110.service.dao.IQueryServiceDAO;
+import com.java110.db.dao.IQueryServiceDAO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
diff --git a/java110-db/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml b/java110-db/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml
index 43cb313..787dc4b 100644
--- a/java110-db/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml
@@ -11,7 +11,7 @@
requestTime,
`create_time` createTime,`order_type_cd` orderTypeCd, `finish_time` finishTime, `remark`
from c_orders t
- where t.status_cd = '0'
+ where 1=1
<if test="oId != null and oId != ''">
and t.o_id = #{oId}
</if>
@@ -29,7 +29,7 @@
t.finish_time finishTime,t.remark,ul.service_name serviceName,ul.log_text logText
from c_order_item t
LEFT JOIN unitem_log ul on t.b_id = ul.b_id and t.o_id = ul.o_id and ul.status_cd = '0'
- where t.status_cd = '0'
+ where 1=1
<if test="oId != null and oId != ''">
and t.o_id = #{oId}
</if>
@@ -44,7 +44,7 @@
<![CDATA[
insert into c_orders(o_id,app_id,ext_transaction_id,user_id,request_time,order_type_cd,remark,status_cd)
- values(#{oId},#{appId},#{extTransactionId},#{userId},#{requestTime},#{orderTypeCd},#{remark},#{statusCd})
+ values(#{oId},#{appId},#{extTransactionId},#{userId},#{requestTime},#{orderTypeCd},#{remark},'S')
]]>
</insert>
@@ -58,15 +58,29 @@
<!--淇濆瓨璁㈠崟淇℃伅 c_order_item 涓� -->
<insert id="saveOrderItem" parameterType="Map">
- INSERT INTO `c_order_item` (`b_id`, `o_id`, `action`, `action_obj`, `finish_time`, `remark`)
- VALUES (#{bId}, #{oId}, #{action}, #{actionObj}, #{finishTime}, #{remark})
+ INSERT INTO `c_order_item` (`b_id`, `o_id`, `action`, `action_obj`, `finish_time`, `remark`,status_cd)
+ VALUES (#{bId}, #{oId}, #{action}, #{actionObj}, #{finishTime}, #{remark},'S')
</insert>
<!--淇濆瓨璁㈠崟淇℃伅 unitem_log 涓� -->
<insert id="saveUnItemLog" parameterType="Map">
- INSERT INTO `unitem_log` (`b_id`, `o_id`, `service_name`, `log_text`)
- VALUES (#{bId}, #{oId}, #{serviceName}, #{logText})
+ INSERT INTO `unitem_log` (`b_id`, `o_id`, `service_name`, `log_text`,status_cd)
+ VALUES (#{bId}, #{oId}, #{serviceName}, #{logText},'0')
</insert>
+ <!-- 淇敼璁㈠崟椤逛俊鎭� -->
+ <update id="updateOrderItem" parameterType="Map">
+ update c_order_item t
+ set t.finish_time = #{finishTime},
+ t.status_cd = #{statusCd}
+ where t.o_id = #{oId}
+ </update>
+
+ <!-- 鍒犻櫎浜嬪姟鏃ュ織 -->
+ <update id="deleteUnItemLog" parameterType="Map">
+ delete from unitem_log where o_id = #{oId}
+ </update>
+
+
<!-- 淇濆瓨璁㈠崟椤逛俊鎭� c_business -->
<insert id="saveBusiness" parameterType="Map">
diff --git a/java110-db/src/main/resources/mapper/common/AppraiseServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/AppraiseServiceDaoImplMapper.xml
index 9a3d285..801572a 100644
--- a/java110-db/src/main/resources/mapper/common/AppraiseServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/AppraiseServiceDaoImplMapper.xml
@@ -7,10 +7,10 @@
<!-- 淇濆瓨璇勪环淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveAppraise" parameterType="Map">
INSERT INTO appraise (`appraise_id`, `appraise_score`, `appraise_type`, `context`, `parent_appraise_id`,
- `appraise_user_id`, `appraise_user_name`, `obj_type`, `obj_id`)
+ `appraise_user_id`, `appraise_user_name`, `obj_type`, `obj_id`,status_cd)
VALUES (#{appraiseId}, #{appraiseScore}, #{appraiseType}, #{context}, #{parentAppraiseId}, #{appraiseUserId},
#{appraiseUserName},
- #{objType}, #{objId});
+ #{objType}, #{objId},'0');
</insert>
</mapper>
diff --git a/java110-interface/src/main/java/com/java110/intf/community/repair/IAppraiseRepairService.java b/java110-interface/src/main/java/com/java110/intf/community/repair/IAppraiseRepairService.java
new file mode 100644
index 0000000..b2c7c58
--- /dev/null
+++ b/java110-interface/src/main/java/com/java110/intf/community/repair/IAppraiseRepairService.java
@@ -0,0 +1,24 @@
+package com.java110.intf.community.repair;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.appraise.AppraiseDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * 淇濆瓨璇勪环鎺ュ彛绫�
+ */
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/repair")
+public interface IAppraiseRepairService {
+
+ /**
+ * 淇濆瓨鎺ュ彛璇勪环
+ * @param appraiseDto
+ * @return
+ */
+ @RequestMapping(value = "/appraiseRepair", method = RequestMethod.POST)
+ public AppraiseDto appraiseRepair(@RequestBody AppraiseDto appraiseDto);
+}
diff --git a/java110-service/src/main/java/com/java110/service/api/BusinessApi.java b/java110-service/src/main/java/com/java110/service/api/BusinessApi.java
index 9a6910d..c49fc73 100644
--- a/java110-service/src/main/java/com/java110/service/api/BusinessApi.java
+++ b/java110-service/src/main/java/com/java110/service/api/BusinessApi.java
@@ -1,13 +1,13 @@
package com.java110.service.api;
+import com.java110.core.base.controller.BaseController;
+import com.java110.core.factory.DataTransactionFactory;
+import com.java110.service.context.DataQuery;
+import com.java110.service.context.DataQueryFactory;
+import com.java110.service.smo.IQueryServiceSMO;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.util.Assert;
-import com.java110.service.context.DataQueryFactory;
-import com.java110.core.factory.DataTransactionFactory;
-import com.java110.core.base.controller.BaseController;
-import com.java110.service.context.DataQuery;
-import com.java110.service.smo.IQueryServiceSMO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -166,6 +166,17 @@
}
}
+
+ @RequestMapping(path = "/businessApi/fallBack", method = RequestMethod.POST)
+ public ResponseEntity<String> fallBack(@RequestBody String fallBackInfo) {
+ try {
+ return queryServiceSMOImpl.fallBack(fallBackInfo);
+ } catch (Exception e) {
+ logger.error("璇锋眰璁㈠崟寮傚父", e);
+ return new ResponseEntity<String>("澶勭悊寮傚父", HttpStatus.BAD_REQUEST);
+ }
+ }
+
public IQueryServiceSMO getQueryServiceSMOImpl() {
return queryServiceSMOImpl;
}
diff --git a/java110-service/src/main/java/com/java110/service/context/DataQuery.java b/java110-service/src/main/java/com/java110/service/context/DataQuery.java
index f6dd53e..ad54e6e 100644
--- a/java110-service/src/main/java/com/java110/service/context/DataQuery.java
+++ b/java110-service/src/main/java/com/java110/service/context/DataQuery.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.entity.service.ServiceSql;
-import com.java110.service.dao.IQueryServiceDAO;
+import com.java110.db.dao.IQueryServiceDAO;
import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
diff --git a/java110-service/src/main/java/com/java110/service/smo/IQueryServiceSMO.java b/java110-service/src/main/java/com/java110/service/smo/IQueryServiceSMO.java
index a392d2c..2476837 100644
--- a/java110-service/src/main/java/com/java110/service/smo/IQueryServiceSMO.java
+++ b/java110-service/src/main/java/com/java110/service/smo/IQueryServiceSMO.java
@@ -2,6 +2,7 @@
import com.java110.utils.exception.BusinessException;
import com.java110.service.context.DataQuery;
+import org.springframework.http.ResponseEntity;
/**
* 鍏敤鏌ヨ澶勭悊
@@ -25,4 +26,13 @@
* @throws BusinessException
*/
public void commonDoService(DataQuery dataQuery) throws BusinessException;
+
+
+ /**
+ * c_common_sql
+ * 鍏叡鍙楃悊鏈嶅姟
+ * @return
+ * @throws BusinessException
+ */
+ public ResponseEntity<String> fallBack(String fallBackInfo) throws BusinessException;
}
diff --git a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
index a17b616..bb7df68 100644
--- a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
+++ b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
@@ -4,18 +4,18 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPath;
+import com.java110.core.factory.DataTransactionFactory;
+import com.java110.db.dao.IQueryServiceDAO;
+import com.java110.entity.service.ServiceSql;
+import com.java110.service.context.DataQuery;
+import com.java110.service.smo.IQueryServiceSMO;
import com.java110.utils.cache.ServiceSqlCache;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.BusinessException;
-import com.java110.core.factory.DataTransactionFactory;
import com.java110.utils.log.LoggerEngine;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
-import com.java110.service.context.DataQuery;
-import com.java110.entity.service.ServiceSql;
-import com.java110.service.dao.IQueryServiceDAO;
-import com.java110.service.smo.IQueryServiceSMO;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.ognl.Ognl;
import org.apache.ibatis.ognl.OgnlException;
@@ -116,6 +116,23 @@
dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_PARAM_ERROR,
e.getMessage()));
}
+
+ }
+
+ @Override
+ public ResponseEntity<String> fallBack(String fallBackInfo) throws BusinessException {
+
+ JSONArray params = JSONArray.parseArray(fallBackInfo);
+ for (int paramIndex = 0; paramIndex < params.size(); paramIndex++) {
+ JSONObject param = params.getJSONObject(paramIndex);
+ String sql = param.getString("fallBackSql");
+ if (StringUtil.isEmpty(sql)) {
+ return new ResponseEntity<String>("鏈寘鍚玸ql淇℃伅", HttpStatus.BAD_REQUEST);
+ }
+ int flag = queryServiceDAOImpl.updateSql(sql, null);
+
+ }
+ return new ResponseEntity<String>("鍥為��鎴愬姛", HttpStatus.OK);
}
@@ -344,7 +361,7 @@
String[] oSqls = oldSql.split("</if>");
for (String oSql : oSqls) {
logger.debug("澶勭悊if 鑺傜偣锛屽綋鍓嶅鐞嗙殑oSql=" + oSql + "鎬荤殑oSqls = " + oSqls);
- if(StringUtil.isNullOrNone(oSql) || !oSql.contains("<if")){
+ if (StringUtil.isNullOrNone(oSql) || !oSql.contains("<if")) {
newSql.append(oSql);
continue;
}
diff --git a/java110-utils/pom.xml b/java110-utils/pom.xml
index 075b055..dae4ec6 100644
--- a/java110-utils/pom.xml
+++ b/java110-utils/pom.xml
@@ -153,5 +153,6 @@
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
</dependency>
+
</dependencies>
</project>
diff --git a/java110-utils/src/main/java/com/java110/utils/exception/InterceptorException.java b/java110-utils/src/main/java/com/java110/utils/exception/InterceptorException.java
new file mode 100644
index 0000000..1610840
--- /dev/null
+++ b/java110-utils/src/main/java/com/java110/utils/exception/InterceptorException.java
@@ -0,0 +1,189 @@
+package com.java110.utils.exception;
+
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ * 鎷︽埅鍣ㄥ紓甯�
+ * Created by wuxw on 2018/4/14.
+ */
+public class InterceptorException extends RuntimeException {
+
+
+ private Result result;
+ private Throwable cause = this;
+
+ public InterceptorException(){}
+
+ /**
+ * 鏋勯�犳柟娉�
+ * @param result 杩斿洖鍊�
+ * @param cause 寮傚父鍫嗘爤
+ */
+ public InterceptorException(Result result, Throwable cause) {
+ super(result.getMsg(), cause);
+ this.result = result;
+ }
+
+ /**
+ * 鏋勯�犳柟娉�
+ * @param code 杩斿洖鐮�
+ * @param msg 閿欒娑堟伅
+ */
+ public InterceptorException(int code, String msg) {
+ super(msg);
+ this.result = new Result(code, msg);
+ }
+
+ public InterceptorException(String code, String msg) {
+ super(msg);
+ this.result = new Result(code, msg);
+ }
+
+ /**
+ * 鏋勯�犳柟娉�
+ * @param result 杩斿洖鍊�
+ * @param detail 鍏蜂綋鐨勮繑鍥炴秷鎭�
+ */
+ public InterceptorException(Result result, String detail) {
+ super(result.getMsg() + "," + detail);
+ this.result = new Result(result.getCode(), result.getMsg() + "," + detail);
+ }
+
+ /**
+ * 鏋勯�犳柟娉�
+ * @param result 杩斿洖鍊�
+ * @param detail 鍏蜂綋鐨勮繑鍥炴秷鎭�
+ * @param cause 寮傚父鍫嗘爤
+ */
+ public InterceptorException(Result result, String detail, Throwable cause) {
+ super(result.getMsg() + "," + detail, cause);
+ this.result = new Result(result.getCode(), result.getMsg() + "," + detail);
+ }
+
+ /**
+ * 鏋勯�犳柟娉�
+ * @param code 杩斿洖鐮�
+ * @param msg 杩斿洖娑堟伅
+ * @param cause 寮傚父鍫嗘爤
+ */
+ public InterceptorException(int code, String msg, Throwable cause) {
+ super(msg, cause);
+
+ if(cause != null) {
+ if(cause.getCause() != null) {
+ msg += " cause:" + ExceptionUtils.populateExecption(cause.getCause(), 500);
+ }
+ msg += " StackTrace:"+ExceptionUtils.populateExecption(cause, 500);
+ }
+ this.result = new Result(code, msg);
+ }
+
+ /**
+ * 鏋勯�犳柟娉�
+ * @param code 杩斿洖鐮�
+ * @param cause 寮傚父鍫嗘爤
+ */
+ public InterceptorException(int code, Throwable cause) {
+ super(cause);
+ String msg = "";
+
+ if(cause != null) {
+ if(cause.getCause() != null) {
+ msg += " cause:" + ExceptionUtils.populateExecption(cause.getCause(), 500);
+ }
+ msg += " StackTrace:"+ExceptionUtils.populateExecption(cause, 500);
+ }
+ this.result = new Result(code, msg);
+ }
+
+ /**
+ *
+ * TODO 绠�鍗曟弿杩拌鏂规硶鐨勫疄鐜板姛鑳斤紙鍙�夛級.
+ * @see Throwable#getCause()
+ */
+ public synchronized Throwable getCause() {
+ return (cause==this ? super.getCause() : cause);
+ }
+
+
+ /**
+ * 杩斿洖寮傚父娑堟伅
+ * @return 寮傚父娑堟伅
+ */
+ @Override
+ public String getMessage() {
+ return ExceptionUtils.buildMessage(super.getMessage(), getCause());
+ }
+
+ /**
+ * 寮傚父
+ * @return
+ */
+ public String toJsonString() {
+ JSONObject exceptionJson = JSONObject.parseObject("{\"exception\":{}");
+ JSONObject exceptionJsonObj = exceptionJson.getJSONObject("exception");
+
+ if (getResult() != null)
+ exceptionJsonObj.putAll(JSONObject.parseObject(result.toString()));
+
+ exceptionJsonObj.put("exceptionTrace",getMessage());
+
+ return exceptionJsonObj.toString();
+ }
+ @Override
+ public void printStackTrace(PrintStream ps) {
+ ps.print("<exception>");
+ if (getResult() != null) {
+ ps.print(result.toString());
+ }
+ ps.append("<exceptionTrace>");
+
+ Throwable cause = getCause();
+ if (cause == null) {
+ super.printStackTrace(ps);
+ } else {
+ ps.println(this);
+ ps.print("Caused by: ");
+ cause.printStackTrace(ps);
+ }
+ ps.append("</exceptionTrace>");
+ ps.println("</exception>");
+ }
+
+ @Override
+ public void printStackTrace(PrintWriter pw) {
+ pw.print("<exception>");
+ if (getResult() != null) {
+ pw.print(result.toString());
+ }
+ pw.append("<exceptionTrace>");
+
+ Throwable cause = getCause();
+ if (cause == null) {
+ super.printStackTrace(pw);
+ } else {
+ pw.println(this);
+ pw.print("Caused by: ");
+ cause.printStackTrace(pw);
+ }
+ pw.append("</exceptionTrace>");
+ pw.println("</exception>");
+ }
+
+ /**
+ * 杩斿洖寮傚父鍊�
+ * @return 寮傚父鍊煎璞�
+ */
+ public Result getResult() {
+ return result;
+ }
+
+ public void setResult(Result result) {
+ this.result = result;
+ }
+
+}
diff --git a/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java b/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
index f1be460..a3ec0a4 100644
--- a/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
+++ b/service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
@@ -1,6 +1,7 @@
package com.java110.common;
import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.RestTemplate;
import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
import com.java110.service.init.ServiceStartInit;
import org.slf4j.Logger;
@@ -15,7 +16,7 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
+
import java.nio.charset.Charset;
@@ -60,7 +61,7 @@
@LoadBalanced
public RestTemplate restTemplate() {
StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
- RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+ RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
return restTemplate;
}
@@ -70,9 +71,9 @@
* @return restTemplate
*/
@Bean
- public com.java110.core.client.RestTemplate outRestTemplate() {
+ public RestTemplate outRestTemplate() {
StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
- com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(com.java110.core.client.RestTemplate.class);
+ com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
return restTemplate;
}
diff --git a/service-common/src/main/java/com/java110/common/service/appraise/SaveAppraiseServiceImpl.java b/service-common/src/main/java/com/java110/common/service/appraise/SaveAppraiseServiceImpl.java
index 1c69424..a0248df 100644
--- a/service-common/src/main/java/com/java110/common/service/appraise/SaveAppraiseServiceImpl.java
+++ b/service-common/src/main/java/com/java110/common/service/appraise/SaveAppraiseServiceImpl.java
@@ -7,6 +7,7 @@
import com.java110.intf.common.appraise.ISaveAppraiseService;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -42,6 +43,10 @@
if (appraiseDto.getAppraiseId().startsWith("-")) {
appraiseDto.setAppraiseId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appraiseId));
}
+
+ if (StringUtil.isEmpty(appraiseDto.getParentAppraiseId())) {
+ appraiseDto.setParentAppraiseId("-1");
+ }
int saveFlag = appraiseServiceDaoImpl.saveAppraise(BeanConvertUtil.beanCovertMap(appraiseDto));
if (saveFlag > 0) {
return appraiseDto;
diff --git a/service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java b/service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java
index ff2b617..38d0c3a 100644
--- a/service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java
+++ b/service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java
@@ -1,6 +1,7 @@
package com.java110.community;
import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.client.RestTemplate;
import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
import com.java110.service.init.ServiceStartInit;
import org.slf4j.Logger;
@@ -14,7 +15,6 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
import java.nio.charset.Charset;
@@ -29,11 +29,11 @@
* @tag
*/
@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.community",
- "com.java110.core", "com.java110.config.properties.code","com.java110.db"})
+ "com.java110.core", "com.java110.config.properties.code", "com.java110.db"})
@EnableDiscoveryClient
@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
basePackages = {"com.java110.community.listener"})
-@EnableFeignClients(basePackages = {"com.java110.core.smo.user"})
+@EnableFeignClients(basePackages = {"com.java110.core.smo.user", "com.java110.intf.common"})
public class CommunityServiceApplicationStart {
private static Logger logger = LoggerFactory.getLogger(CommunityServiceApplicationStart.class);
@@ -48,7 +48,7 @@
@LoadBalanced
public RestTemplate restTemplate() {
StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
- RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+ RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
return restTemplate;
}
@@ -65,11 +65,11 @@
}
public static void main(String[] args) throws Exception {
- try{
+ try {
ApplicationContext context = SpringApplication.run(CommunityServiceApplicationStart.class, args);
ServiceStartInit.initSystemConfig(context);
- }catch (Throwable e){
- logger.error("绯荤粺鍚姩澶辫触",e);
+ } catch (Throwable e) {
+ logger.error("绯荤粺鍚姩澶辫触", e);
}
}
}
\ No newline at end of file
diff --git a/service-community/src/main/java/com/java110/community/service/repair/AppraiseRepairServiceImpl.java b/service-community/src/main/java/com/java110/community/service/repair/AppraiseRepairServiceImpl.java
new file mode 100644
index 0000000..f5f3654
--- /dev/null
+++ b/service-community/src/main/java/com/java110/community/service/repair/AppraiseRepairServiceImpl.java
@@ -0,0 +1,46 @@
+package com.java110.community.service.repair;
+
+import com.java110.community.dao.IRepairServiceDao;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.dto.appraise.AppraiseDto;
+import com.java110.dto.repair.RepairDto;
+import com.java110.intf.common.appraise.ISaveAppraiseService;
+import com.java110.intf.community.repair.IAppraiseRepairService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * 鎶ヤ慨璇勪环
+ */
+@RestController
+public class AppraiseRepairServiceImpl implements IAppraiseRepairService {
+
+ @Autowired
+ private ISaveAppraiseService saveAppraiseServiceImpl;
+ @Autowired
+ private IRepairServiceDao repairServiceDaoImpl;
+
+ @Override
+ @Java110Transactional
+ public AppraiseDto appraiseRepair(@RequestBody AppraiseDto appraiseDto) {
+
+ //灏嗗伐鍗曡〃鐨勭姸鎬佷慨鏀逛负瀹屾垚
+ Map info = new HashMap();
+ info.put("repairId", appraiseDto.getObjId());
+ info.put("statusCd", "0");
+ info.put("state", RepairDto.STATE_RETURN_VISIT);
+ repairServiceDaoImpl.updateRepairInfoInstance(info);
+
+ //璇勪环琛ㄤ腑鍔犲叆璇勪环鍐呭
+ appraiseDto.setParentAppraiseId("-1");
+ appraiseDto.setObjType(AppraiseDto.OBJ_TYPE_REPAIR);
+ appraiseDto.setAppraiseType(AppraiseDto.APPRAISE_TYPE_PUBLIC);
+ return saveAppraiseServiceImpl.saveAppraise(appraiseDto);
+
+ }
+}
diff --git a/service-order/src/main/java/com/java110/order/api/OIdApi.java b/service-order/src/main/java/com/java110/order/api/OIdApi.java
index 10d38ca..bdda8b3 100644
--- a/service-order/src/main/java/com/java110/order/api/OIdApi.java
+++ b/service-order/src/main/java/com/java110/order/api/OIdApi.java
@@ -63,4 +63,16 @@
OrderItemDto orderItemDto = BeanConvertUtil.covertBean(orderItemObj, OrderItemDto.class);
return tServiceSMOImpl.createOrderItem(orderItemDto);
}
+
+ /**
+ * 瀹屾垚浜嬪姟
+ *
+ * @return
+ */
+ @RequestMapping(path = "/finishOId", method = RequestMethod.POST)
+ public ResponseEntity<String> finishOId(@RequestBody String order) {
+ JSONObject orderObj = JSONObject.parseObject(order);
+ OrderDto orderDto = BeanConvertUtil.covertBean(orderObj, OrderDto.class);
+ return tServiceSMOImpl.finishOrder(orderDto);
+ }
}
diff --git a/service-order/src/main/java/com/java110/order/dao/ICenterServiceDAO.java b/service-order/src/main/java/com/java110/order/dao/ICenterServiceDAO.java
index 25ff4d5..3a59c50 100644
--- a/service-order/src/main/java/com/java110/order/dao/ICenterServiceDAO.java
+++ b/service-order/src/main/java/com/java110/order/dao/ICenterServiceDAO.java
@@ -37,6 +37,23 @@
public void saveOrderItem(Map orderItem) throws DAOException;
/**
+ * 瀹屾垚璁㈠崟淇℃伅
+ *
+ * @param orderItem 璁㈠崟淇℃伅
+ * @return
+ */
+ public void updateOrderItem(Map orderItem) throws DAOException;
+
+ /**
+ * 瀹屾垚璁㈠崟淇℃伅
+ *
+ * @param orderItem 璁㈠崟淇℃伅
+ * @return
+ */
+ public void deleteUnItemLog(Map orderItem) throws DAOException;
+
+
+ /**
* 淇濆瓨璁㈠崟淇℃伅
*
* @param order 璁㈠崟淇℃伅
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
index 6eb9f76..889eed2 100644
--- 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
@@ -64,6 +64,23 @@
}
+ @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));
+ }
+ }
+
+ @Override
+ public void deleteUnItemLog(Map unItemLog) throws DAOException {
+ int saveFlag = sqlSessionTemplate.delete("centerServiceDAOImpl.deleteUnItemLog", unItemLog);
+ if (saveFlag < 1) {
+ throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鍒犻櫎浜嬪姟鏃ュ織澶辫触锛�" + JSONObject.toJSONString(unItemLog));
+ }
+ }
+
+
/**
* 淇濆瓨璁㈠崟淇℃伅
*
diff --git a/service-order/src/main/java/com/java110/order/smo/IOIdServiceSMO.java b/service-order/src/main/java/com/java110/order/smo/IOIdServiceSMO.java
index c91dfba..8501dc2 100644
--- a/service-order/src/main/java/com/java110/order/smo/IOIdServiceSMO.java
+++ b/service-order/src/main/java/com/java110/order/smo/IOIdServiceSMO.java
@@ -34,4 +34,12 @@
* @return
*/
ResponseEntity<String> createOrderItem(OrderItemDto orderItemDto);
+
+
+ /**
+ * 瀹屾垚浜嬪姟
+ *
+ * @return
+ */
+ ResponseEntity<String> finishOrder(OrderDto orderDto);
}
diff --git a/service-order/src/main/java/com/java110/order/smo/impl/CenterServiceCacheSMOImpl.java b/service-order/src/main/java/com/java110/order/smo/impl/CenterServiceCacheSMOImpl.java
index a675894..cd1d999 100644
--- a/service-order/src/main/java/com/java110/order/smo/impl/CenterServiceCacheSMOImpl.java
+++ b/service-order/src/main/java/com/java110/order/smo/impl/CenterServiceCacheSMOImpl.java
@@ -17,7 +17,7 @@
import com.java110.entity.mapping.Mapping;
import com.java110.service.context.DataQuery;
import com.java110.entity.service.ServiceSql;
-import com.java110.service.dao.IQueryServiceDAO;
+import com.java110.db.dao.IQueryServiceDAO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java b/service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java
index e2fe540..6ef665d 100644
--- a/service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java
+++ b/service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java
@@ -9,6 +9,7 @@
import com.java110.order.dao.ICenterServiceDAO;
import com.java110.order.smo.IOIdServiceSMO;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
@@ -33,7 +34,7 @@
private static Logger logger = LoggerFactory.getLogger(OIdServiceSMOImpl.class);
- public static final String FALLBACK_URL = "http://SERVICE_NAME/fallBack";
+ public static final String FALLBACK_URL = "http://SERVICE_NAME/businessApi/fallBack";
public static final String SERVICE_NAME = "SERVICE_NAME";
@@ -59,6 +60,10 @@
if (StringUtil.isEmpty(orderDto.getRequestTime())) {
throw new IllegalArgumentException("鏈寘鍚姹傛椂闂�");
+ }
+
+ if (StringUtil.isEmpty(orderDto.getUserId())) {
+ throw new IllegalArgumentException("鏈寘鍚敤鎴稩D");
}
//淇濆瓨璁㈠崟淇℃伅
@@ -93,18 +98,158 @@
List<OrderItemDto> errorOrderItemDtos = new ArrayList<>();
for (OrderItemDto orderItemDto : orderItemDtos) {
try {
- httpEntity = new HttpEntity<String>(JSONObject.toJSONString(orderItemDto), header);
+ JSONArray params = generateParam(orderItemDto);
+ httpEntity = new HttpEntity<String>(params.toJSONString(), header);
restTemplate.exchange(FALLBACK_URL.replace(SERVICE_NAME, orderItemDto.getServiceName()), HttpMethod.POST, httpEntity, String.class);
} catch (Exception e) {
logger.error("鍥為��浜嬪姟澶辫触", e);
errorOrderItemDtos.add(orderItemDto);
}
}
+
+ //鏍囪涓鸿鍗曢」澶辫触
+ Map info = new HashMap();
+ info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ info.put("statusCd", "E");
+ info.put("oId", orderDto.getoId());
+ centerServiceDAOImpl.updateOrderItem(info);
+
+ //鍒犻櫎 浜嬪姟鏃ュ織
+ centerServiceDAOImpl.deleteUnItemLog(info);
+
+ //鏍囪涓鸿鍗曞け璐�
+ info = new HashMap();
+ info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ info.put("statusCd", "E");
+ info.put("oId", orderDto.getoId());
+ centerServiceDAOImpl.updateOrder(info);
+
if (errorOrderItemDtos.size() > 0) {
return new ResponseEntity<String>(JSONArray.toJSONString(errorOrderItemDtos), HttpStatus.BAD_REQUEST);
} else {
return new ResponseEntity<String>("", HttpStatus.OK);
}
+ }
+
+ /**
+ * 鐢熸垚鍥炴粴sql
+ *
+ * @param orderItemDto
+ * @return
+ */
+ private JSONArray generateParam(OrderItemDto orderItemDto) {
+ JSONArray params = null;
+ switch (orderItemDto.getAction()) {
+ case "ADD":
+ params = generateDeleteSql(orderItemDto);
+ break;
+ case "MOD":
+ params = generateUpdateSql(orderItemDto);
+ break;
+ case "DEL":
+ params = generateInsertSql(orderItemDto);
+ break;
+ }
+
+ return params;
+ }
+
+ /**
+ * 鐢熸垚insert璇彞
+ *
+ * @param orderItemDto
+ * @return
+ */
+ private JSONArray generateInsertSql(OrderItemDto orderItemDto) {
+ JSONArray params = new JSONArray();
+ JSONObject param = null;
+ String sql = "";
+ String logText = orderItemDto.getLogText();
+
+ JSONObject logTextObj = JSONObject.parseObject(logText);
+ JSONArray preValues = logTextObj.getJSONArray("preValue");
+ for (int preValueIndex = 0; preValueIndex < preValues.size(); preValueIndex++) {
+ sql = "insert into " + orderItemDto.getActionObj() + " ";
+ param = new JSONObject();
+ JSONObject keyValue = preValues.getJSONObject(preValueIndex);
+ String keySql = "( ";
+ String valueSql = " values (";
+ for (String key : keyValue.keySet()) {
+ keySql += (key + ",");
+ valueSql += (keyValue.getString(key) + ",");
+ }
+ if (keySql.endsWith(",")) {
+ keySql = keySql.substring(0, keySql.length() - 1);
+ }
+ if (valueSql.endsWith(",")) {
+ valueSql = valueSql.substring(0, valueSql.length() - 1);
+ }
+ sql = sql + keySql + ") " + valueSql + ") ";
+ param.put("fallBackSql", sql);
+ params.add(param);
+ }
+
+ return params;
+ }
+
+ private JSONArray generateUpdateSql(OrderItemDto orderItemDto) {
+ JSONArray params = new JSONArray();
+ JSONObject param = null;
+ String sql = "";
+ String logText = orderItemDto.getLogText();
+
+ JSONObject logTextObj = JSONObject.parseObject(logText);
+ JSONArray preValues = logTextObj.getJSONArray("preValue");
+ JSONArray afterValues = logTextObj.getJSONArray("afterValue");
+
+ for (int preValueIndex = 0; preValueIndex < preValues.size(); preValueIndex++) {
+ sql = "update " + orderItemDto.getActionObj() + " set ";
+ param = new JSONObject();
+ JSONObject keyValue = preValues.getJSONObject(preValueIndex);
+ JSONObject afterKeyValue = afterValues.getJSONObject(preValueIndex);
+ String whereSql = " where 1=1 ";
+ for (String key : keyValue.keySet()) {
+ sql += (key + "=" + keyValue.getString(key) + ",");
+ whereSql += (" and " + key + " = " + afterKeyValue.getString(key));
+ }
+ if (sql.endsWith(",")) {
+ sql = sql.substring(0, sql.length() - 1);
+ }
+
+ sql += whereSql;
+
+ param.put("fallBackSql", sql);
+ params.add(param);
+ }
+
+ return params;
+ }
+
+ /**
+ * 鐢熸垚鍒犻櫎璇彞
+ *
+ * @param orderItemDto
+ */
+ private JSONArray generateDeleteSql(OrderItemDto orderItemDto) {
+ JSONArray params = new JSONArray();
+ JSONObject param = null;
+ String sql = "";
+ String logText = orderItemDto.getLogText();
+
+ JSONObject logTextObj = JSONObject.parseObject(logText);
+ JSONArray preValues = logTextObj.getJSONArray("preValue");
+ for (int preValueIndex = 0; preValueIndex < preValues.size(); preValueIndex++) {
+ sql = "delete from " + orderItemDto.getActionObj() + " where 1=1 ";
+ param = new JSONObject();
+ JSONObject keyValue = preValues.getJSONObject(preValueIndex);
+ for (String key : keyValue.keySet()) {
+ sql += (" and " + key + "=" + keyValue.getString(key));
+ }
+ param.put("fallBackSql", sql);
+ params.add(param);
+ }
+
+ return params;
}
@Override
@@ -135,4 +280,36 @@
return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
}
+
+ /**
+ * 瀹屾垚浜嬪姟
+ *
+ * @param orderDto
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> finishOrder(OrderDto orderDto) {
+ if (StringUtil.isEmpty(orderDto.getoId())) {
+ return new ResponseEntity<String>("璇锋眰鎶ユ枃涓湭鍖呭惈浜嬪姟ID", HttpStatus.NOT_FOUND);
+ }
+
+ //瀹屾垚璁㈠崟椤�
+ Map info = new HashMap();
+ info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ info.put("statusCd", "C");
+ info.put("oId", orderDto.getoId());
+ centerServiceDAOImpl.updateOrderItem(info);
+
+ //鍒犻櫎 浜嬪姟鏃ュ織
+ centerServiceDAOImpl.deleteUnItemLog(info);
+
+ //瀹屾垚璁㈠崟
+ info = new HashMap();
+ info.put("finishTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ info.put("statusCd", "C");
+ info.put("oId", orderDto.getoId());
+ centerServiceDAOImpl.updateOrder(info);
+
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
+ }
}
--
Gitblit v1.8.0