From ac70082e183ae551ccdcda57304c7a669e28d5ee Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期四, 24 五月 2018 01:45:22 +0800
Subject: [PATCH] 同步过程测试完成，异步过程未测试
---
UserService/src/main/java/com/java110/user/rest/UserServiceRest.java | 259 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 237 insertions(+), 22 deletions(-)
diff --git a/UserService/src/main/java/com/java110/user/rest/UserServiceRest.java b/UserService/src/main/java/com/java110/user/rest/UserServiceRest.java
index 370b94e..6954188 100644
--- a/UserService/src/main/java/com/java110/user/rest/UserServiceRest.java
+++ b/UserService/src/main/java/com/java110/user/rest/UserServiceRest.java
@@ -3,8 +3,11 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.common.log.LoggerEngine;
+import com.java110.common.util.Assert;
import com.java110.common.util.ProtocolUtil;
import com.java110.core.base.controller.BaseController;
+import com.java110.entity.user.Cust;
+import com.java110.feign.user.IUserService;
import com.java110.user.smo.IUserServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,8 +18,8 @@
* 鐢ㄦ埛鏈嶅姟鎻愪緵绫�
* Created by wuxw on 2017/4/5.
*/
-@RestController
-public class UserServiceRest extends BaseController {
+//@RestController
+public class UserServiceRest extends BaseController implements IUserService {
@Autowired
IUserServiceSMO iUserServiceSMO;
@@ -24,12 +27,90 @@
/**
* 閫氳繃User瀵硅薄涓暟鎹煡璇㈢敤鎴蜂俊鎭�
* 濡�,鐢ㄦ埛ID锛屽悕绉�
- * @param userJson
+ * @param data
* @return
*/
@RequestMapping("/userService/queryUserInfo")
- public String queryUserInfo(@RequestParam("userJson") String userJson){
- return null;
+ public String queryUserInfo(@RequestParam("data") String data){
+ LoggerEngine.debug("queryUserInfo鍏ュ弬锛�" + data);
+
+
+ String resultUserInfo = null;
+
+ JSONObject reqUserJSON = null;
+ try {
+ reqUserJSON = this.simpleValidateJSON(data);
+ Cust oldCust = new Cust();
+ oldCust.setCustId(reqUserJSON.getString("custId"));
+ resultUserInfo = iUserServiceSMO.queryCust(oldCust);
+
+ } catch (Exception e) {
+ LoggerEngine.error("鏈嶅姟澶勭悊鍑虹幇寮傚父锛�", e);
+ resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_ERROR,"鏈嶅姟澶勭悊鍑虹幇寮傚父"+e,null);
+ } finally {
+ LoggerEngine.debug("鐢ㄦ埛鏈嶅姟鎿嶄綔瀹㈡埛鍑哄弬锛�" + resultUserInfo);
+ return resultUserInfo;
+ }
+ }
+
+ /**
+ * 鏍规嵁璐墿杞︿俊鎭煡璇�
+ *
+ * 杩欓噷杩斿洖data淇℃伅
+ * @param busiOrder
+ * @return
+ */
+ @Override
+ @RequestMapping("/userService/queryCustInfoByOlId")
+ public String queryCustInfoByOlId(@RequestParam("busiOrder") String busiOrder) {
+
+
+ LoggerEngine.debug("queryUserInfo鍏ュ弬锛�" + busiOrder);
+
+
+ String resultUserInfo = null;
+
+ try {
+ this.simpleValidateJSON(busiOrder);
+ resultUserInfo = iUserServiceSMO.queryCustInfoByOlId(busiOrder);
+
+ } catch (Exception e) {
+ LoggerEngine.error("鏈嶅姟澶勭悊鍑虹幇寮傚父锛�", e);
+ resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_ERROR,"鏈嶅姟澶勭悊鍑虹幇寮傚父"+e,null);
+ } finally {
+ LoggerEngine.debug("鐢ㄦ埛鏈嶅姟鎿嶄綔瀹㈡埛鍑哄弬锛�" + resultUserInfo);
+ return resultUserInfo;
+ }
+ }
+
+ /**
+ * 鏍规嵁璐墿杞︿俊鎭煡璇� 闇�瑕佷綔搴熺殑鍙戣捣鐨勬姤鏂�
+ *
+ * 杩欓噷杩斿洖data淇℃伅
+ * @param busiOrder
+ * @return
+ */
+ @Override
+ @RequestMapping("/userService/queryNeedDeleteCustInfoByOlId")
+ public String queryNeedDeleteCustInfoByOlId(@RequestParam("busiOrder") String busiOrder) {
+
+
+ LoggerEngine.debug("queryUserInfo鍏ュ弬锛�" + busiOrder);
+
+
+ String resultUserInfo = null;
+
+ try {
+ this.simpleValidateJSON(busiOrder);
+ resultUserInfo = iUserServiceSMO.queryNeedDeleteCustInfoByOlId(busiOrder);
+
+ } catch (Exception e) {
+ LoggerEngine.error("鏈嶅姟澶勭悊鍑虹幇寮傚父锛�", e);
+ resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_ERROR,"鏈嶅姟澶勭悊鍑虹幇寮傚父"+e,null);
+ } finally {
+ LoggerEngine.debug("鐢ㄦ埛鏈嶅姟鎿嶄綔瀹㈡埛鍑哄弬锛�" + resultUserInfo);
+ return resultUserInfo;
+ }
}
@@ -55,26 +136,108 @@
reqUserJSON = this.simpleValidateJSON(data);
//1.0瑙勫垯鏍￠獙锛屾姤鏂囨槸鍚﹀悎娉�
- // 瀹㈡埛淇℃伅澶勭悊
- if(reqUserJSON.containsKey("boCust")){
- JSONArray boCusts = reqUserJSON.getJSONArray("boCust");
- JSONObject boCustObj = new JSONObject();
- boCustObj.put("boCust",boCusts);
- iUserServiceSMO.soBoCust(boCustObj.toJSONString());
- }
+ //2.0 鍙楃悊瀹㈡埛淇℃伅
+ resultUserInfo = iUserServiceSMO.soUserService(reqUserJSON);
- //瀹㈡埛灞炴�т俊鎭鐞�
- if(reqUserJSON.containsKey("boCustAttr")){
+ } catch (Exception e) {
+ LoggerEngine.error("鏈嶅姟澶勭悊鍑虹幇寮傚父锛�", e);
+ resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_ERROR,"鏈嶅姟澶勭悊鍑虹幇寮傚父"+e,null);
+ } finally {
+ LoggerEngine.debug("鐢ㄦ埛鏈嶅姟鎿嶄綔瀹㈡埛鍑哄弬锛�" + resultUserInfo);
+ return resultUserInfo;
+ }
+ }
- JSONArray boCustAttrs = reqUserJSON.getJSONArray("boCustAttr");
- JSONObject boCustAttrObj = new JSONObject();
- boCustAttrObj.put("boCustAttr",boCustAttrs);
- iUserServiceSMO.soBoCustAttr(boCustAttrObj.toJSONString());
- }
- resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_SUCCESS,"鍙楃悊鎴愬姛",null);
+ /**
+ * 杩欎釜鎺ュ彛涓撻棬鐢ㄤ簬璁㈠崟鏈嶅姟鍙楃悊鐢紝鍏ュ弬涓� JSONObject
+ *
+ * 鏀寔 澶氫釜 瀹㈡埛淇℃伅 鍙楃悊
+ *
+ * 璇锋眰鍗忚锛�
+ *
+ * {
+ "data": [
+ {
+ "actionTypeCd": "C1",
+ "boCust": [
+ {
+ "custId": "-1",
+ "name": "S",
+ "email": "-52",
+ "cellphone": "17797173942",
+ "realName": "wuxw",
+ "sex": "1",
+ "password": "123456",
+ "lanId": "863010",
+ "custAdress": "闈掓捣鐪佽タ瀹佸競鍩庝腑鍖烘牸鍏板皬闀�",
+ "custType": "1",
+ "openId": "",
+ "state": "ADD"
+ },
+ {
+ "custId": "123",
+ "name": "S",
+ "email": "-52",
+ "cellphone": "17797173942",
+ "realName": "wuxw",
+ "sex": "1",
+ "password": "123456",
+ "lanId": "863010",
+ "custAdress": "闈掓捣鐪佽タ瀹佸競鍩庝腑鍖烘牸鍏板皬闀�",
+ "custType": "1",
+ "openId": "",
+ "state": "DEL"
+ }
+ ],
+ "boCustAttr": [
+ {
+ "custId": "123",
+ "prodId": "-1",
+ "attrCd": "123344",
+ "value": "1",
+ "state": "ADD"
+ },
+ {
+ "custId": "123",
+ "prodId": "-1",
+ "attrCd": "123345",
+ "value": "1",
+ "state": "DEL"
+ }
+ ]
+ }
+ ]
+ }
- //2.0
+ *
+ * 杩斿洖鍗忚锛�
+ *
+ * {
+ 'RESULT_CODE': '0000',
+ 'RESULT_MSG': '鎴愬姛',
+ 'RESULT_INFO': {}
+ }
+ * @param data
+ * @return
+ */
+ @Override
+ @RequestMapping("/userService/soUserServiceForOrderService")
+ public String soUserServiceForOrderService(@RequestParam("data") String data) {
+ LoggerEngine.debug("soUserService鍏ュ弬锛�" + data);
+
+ String resultUserInfo = null;
+
+ JSONObject reqUserJSON = null;
+ try {
+ reqUserJSON = this.simpleValidateJSON(data);
+ //1.0瑙勫垯鏍￠獙锛屾姤鏂囨槸鍚﹀悎娉�
+
+
+ //2.0 鍙楃悊瀹㈡埛淇℃伅
+ resultUserInfo = iUserServiceSMO.soUserServiceForOrderService(reqUserJSON);
+
+
} catch (Exception e) {
LoggerEngine.error("鏈嶅姟澶勭悊鍑虹幇寮傚父锛�", e);
resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_ERROR,"鏈嶅姟澶勭悊鍑虹幇寮傚父"+e,null);
@@ -107,7 +270,7 @@
resultUserInfo = iUserServiceSMO.soBoCust(data);
}catch (Exception e){
LoggerEngine.error("鏈嶅姟澶勭悊鍑虹幇寮傚父锛�", e);
- resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_ERROR,"鏈嶅姟澶勭悊鍑虹幇寮傚父"+e,null);
+ resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_ERROR,"鏈嶅姟澶勭悊鍑虹幇寮傚父:"+e,null);
} finally {
LoggerEngine.debug("鐢ㄦ埛鏈嶅姟鎿嶄綔瀹㈡埛鍑哄弬锛�" + resultUserInfo);
return resultUserInfo;
@@ -144,6 +307,58 @@
}
+ /**
+ * 浣滃簾璁㈠崟锛屾牴鎹産oId浣滃簾璁㈠崟
+ *
+ * 鎺ュ彛鍗忚锛�
+ *
+ * { 'data': [
+
+ {
+ 'olId': '123456',
+ 'boId': '222222',
+ 'actionTypeCd': 'C1'
+ },
+ {
+ 'olId': '123456',
+ 'boId': '222222',
+ 'actionTypeCd': 'C1'
+ },
+ {
+ 'olId': '123456',
+ 'boId': '222222',
+ 'actionTypeCd': 'C1'
+ }
+ ] }
+ * @param data
+ * @return
+ */
+ @RequestMapping("/userService/soDeleteCustService")
+ public String soDeleteCustService(@RequestParam("data") String data){
+
+ LoggerEngine.debug("浣滃簾璁㈠崟鍏ュ弬锛�"+data);
+
+ String resultUserInfo = null;
+
+ JSONObject reqParam = null;
+
+ try{
+ reqParam = this.simpleValidateJSON(data);
+
+ Assert.isNotNull(reqParam,"data","浼犲叆鎶ユ枃閿欒锛屾病鏈夊寘鍚玠ata鑺傜偣"+reqParam);
+
+ resultUserInfo = iUserServiceSMO.soDeleteCustInfo(reqParam.getJSONArray("data"));
+
+ }catch (Exception e){
+ LoggerEngine.error("鏈嶅姟澶勭悊鍑虹幇寮傚父锛�", e);
+ resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_ERROR,"鏈嶅姟澶勭悊鍑虹幇寮傚父"+e+data,null);
+ }finally {
+ LoggerEngine.debug("浣滃簾璁㈠崟鍑哄弬锛�" + resultUserInfo);
+ return resultUserInfo;
+ }
+ }
+
+
public IUserServiceSMO getiUserServiceSMO() {
return iUserServiceSMO;
}
--
Gitblit v1.8.0