From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java
index c7d0c1b..4ddb8dc 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java
@@ -1,11 +1,12 @@
package com.java110.web.smo.impl;
import com.alibaba.fastjson.JSONObject;
+import com.java110.entity.component.ComponentValidateResult;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.StringUtil;
import com.java110.core.context.IPageData;
-import com.java110.web.core.BaseComponentSMO;
+import com.java110.core.component.BaseComponentSMO;
+import com.java110.utils.util.StringUtil;
import com.java110.web.smo.IStaffServiceSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,13 +37,18 @@
@Override
public ResponseEntity<String> saveStaff(IPageData pd) {
logger.debug("淇濆瓨鍛樺伐淇℃伅鍏ュ弬锛歿}", pd.toString());
- Assert.jsonObjectHaveKey(pd.getReqData(), "username", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鐢ㄦ埛鍚嶄俊鎭�");
- Assert.jsonObjectHaveKey(pd.getReqData(), "email", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈閭淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(), "tel", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎵嬫満淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(), "sex", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎬у埆淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(), "address", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍦板潃淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(), "orgId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈閮ㄩ棬淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(), "relCd", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍛樺伐瑙掕壊");
+ JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+ Assert.hasKeyAndValue(reqJson, "username", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鐢ㄦ埛鍚嶄俊鎭�");
+ //Assert.hasKeyAndValue(reqJson, "email", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈閭淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "tel", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎵嬫満淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "sex", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎬у埆淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "address", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍦板潃淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "orgId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈閮ㄩ棬淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "relCd", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍛樺伐瑙掕壊");
+
+ if (reqJson.containsKey("email") && !StringUtil.isEmpty(reqJson.getString("email"))) {
+ Assert.isEmail(reqJson, "email", "涓嶆槸鏈夋晥鐨勯偖绠辨牸寮�");
+ }
ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
@@ -50,11 +56,11 @@
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
- Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeIdQueryStaffServiceListener", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
- JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+ // JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("name", reqJson.getString("username"));
reqJson.put("storeId", storeId);
reqJson.put("storeTypeCd", storeTypeCd);
@@ -73,18 +79,18 @@
Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "rows", "璇锋眰鎶ユ枃涓湭鍖呭惈rows鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈rows鑺傜偣");
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.isInteger(paramIn.getString("page"), "page涓嶆槸鏁板瓧");
- Assert.isInteger(paramIn.getString("rows"), "rows涓嶆槸鏁板瓧");
+ Assert.isInteger(paramIn.getString("row"), "rows涓嶆槸鏁板瓧");
int page = Integer.parseInt(paramIn.getString("page"));
- int rows = Integer.parseInt(paramIn.getString("rows"));
+ int rows = Integer.parseInt(paramIn.getString("row"));
String staffName = paramIn.getString("staffName");
if (rows > 50) {
return new ResponseEntity<String>("rows 鏁伴噺涓嶈兘澶т簬50", HttpStatus.BAD_REQUEST);
}
- page = (page - 1) * rows;
+ // page = (page - 1) * rows;
ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
@@ -92,15 +98,15 @@
Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
- paramIn.put("page", page);
+ //paramIn.put("page", page);
paramIn.put("storeId", storeId);
- if (StringUtil.isEmpty(staffName)) {
- responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/query.staff.infos" + super.mapToUrlParam(paramIn), HttpMethod.GET);
- } else {
+ //if (StringUtil.isEmpty(staffName)) {
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/query.staff.infos" + super.mapToUrlParam(paramIn), HttpMethod.GET);
+ /* } else {
responseEntity = this.callCenterService(restTemplate, pd, "",
ServiceConstant.SERVICE_API_URL + "/api/query.staff.byName?rows=" + rows + "&page=" + page + "&storeId=" + storeId + "&name=" + staffName, HttpMethod.GET);
- }
+ }*/
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
@@ -141,11 +147,12 @@
public ResponseEntity<String> delete(IPageData pd) {
ResponseEntity<String> responseEntity = null;
Assert.jsonObjectHaveKey(pd.getReqData(), "userId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鐢ㄦ埛ID淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(), "storeId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍟嗘埛ID淇℃伅");
+ //Assert.jsonObjectHaveKey(pd.getReqData(), "storeId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍟嗘埛ID淇℃伅");
+ ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
JSONObject newParam = new JSONObject();
newParam.put("userId", paramIn.getString("userId"));
- newParam.put("storeId", paramIn.getString("storeId"));
+ newParam.put("storeId", result.getStoreId());
//淇敼鐢ㄦ埛淇℃伅
responseEntity = this.callCenterService(restTemplate, pd, newParam.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/user.staff.delete", HttpMethod.POST);
@@ -227,7 +234,7 @@
public ResponseEntity<String> addStaffPrivilegeOrPrivilegeGroup(IPageData pd) {
ResponseEntity<String> responseEntity = null;
Assert.jsonObjectHaveKey(pd.getReqData(), "userId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鐢ㄦ埛ID淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(), "pId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鏉冮檺ID淇℃伅");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "pIds", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鏉冮檺ID淇℃伅");
Assert.jsonObjectHaveKey(pd.getReqData(), "pFlag", "璇锋眰鎶ユ枃鏍煎紡閿欒");
JSONObject _paramObj = JSONObject.parseObject(pd.getReqData());
responseEntity = super.getStoreInfo(pd, restTemplate);
@@ -283,10 +290,14 @@
private void modifyStaffValidate(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "userId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鐢ㄦ埛ID淇℃伅");
Assert.jsonObjectHaveKey(pd.getReqData(), "username", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鐢ㄦ埛鍚嶄俊鎭�");
- Assert.jsonObjectHaveKey(pd.getReqData(), "email", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈閭淇℃伅");
+ //Assert.jsonObjectHaveKey(pd.getReqData(), "email", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈閭淇℃伅");
Assert.jsonObjectHaveKey(pd.getReqData(), "tel", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎵嬫満淇℃伅");
Assert.jsonObjectHaveKey(pd.getReqData(), "sex", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎬у埆淇℃伅");
Assert.jsonObjectHaveKey(pd.getReqData(), "address", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍦板潃淇℃伅");
+ JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+ if (reqJson.containsKey("email") && !StringUtil.isEmpty(reqJson.getString("email"))) {
+ Assert.isEmail(reqJson, "email", "涓嶆槸鏈夋晥鐨勯偖绠辨牸寮�");
+ }
}
--
Gitblit v1.8.0