From e40889177c25035496c526dbc12a9665d5b61ceb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 20 三月 2025 12:00:53 +0800
Subject: [PATCH] 优化小区房屋和小区业主 支持按小区查询数据
---
service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java
index 8be83ad..aa248c9 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java
@@ -2,11 +2,13 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.Environment;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.AuthenticationFactory;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
import com.java110.dto.store.StoreDto;
import com.java110.dto.store.StoreUserDto;
import com.java110.dto.user.UserDto;
@@ -18,14 +20,43 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import java.util.List;
+
+@Java110CmdDoc(title = "閲嶇疆瀵嗙爜",
+ description = "澶栭儴绯荤粺閫氳繃閲嶇疆鍛樺伐鎺ュ彛 閲嶇疆鍛樺伐瀵嗙爜锛屾敞鎰忛渶瑕佺墿涓氱鐞嗗憳璐﹀彿鐧诲綍锛屽洜涓轰笉闇�瑕佷紶storeId 鏄牴鎹鐞嗗憳鐧诲綍淇℃伅鑾峰彇鐨�",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/user.resetStaffPwd",
+ resource = "userDoc",
+ author = "鍚村鏂�",
+ serviceCode = "user.resetStaffPwd",
+ seq = 15
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "staffId", length = 30, remark = "鍛樺伐ID"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ @Java110ParamDoc(name = "pwd", type = "String", length = 250, remark = "瀵嗙爜"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody="{staffId: \"302022081831710053\"}",
+ resBody="{\"msg\":\"鎴愬姛\",\"code\":0,\"pwd\":\"004117\"}"
+)
+
@Java110Cmd(serviceCode = "user.resetStaffPwd")
-public class ResetStaffPwdCmd extends AbstractServiceCmdListener {
+public class ResetStaffPwdCmd extends Cmd {
@Autowired
private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
@@ -42,16 +73,31 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+ Environment.isDevEnv();
+
+ if(reqJson.containsKey("storeId") && StoreDto.STORE_ADMIN.equals(reqJson.getString("storeId"))){
+ return ;
+ }
+
if (!reqJson.containsKey("staffId")) {
reqJson.put("staffId", reqJson.getString("userId"));
}
Assert.jsonObjectHaveKey(reqJson, "staffId", "璇锋眰鍙傛暟涓湭鍖呭惈staffId 鑺傜偣锛岃纭");
+ StoreUserDto storeUserDt = new StoreUserDto();
+ storeUserDt.setUserId(reqJson.getString("userId"));
+ List<StoreUserDto> storeUserDts = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDt);
+ Assert.listOnlyOne(storeUserDts, "鏌ヨ鍛樺伐鍟嗘埛閿欒锛�");
+
//棣栧厛鍒ゆ柇鏄惁涓� 杩愯惀鎴栬�呭紑鍙�
//鏌ヨstore 淇℃伅
StoreDto storeDto = new StoreDto();
- storeDto.setStoreId(reqJson.getString("storeId"));
+ if (!reqJson.containsKey("storeId")) {
+ storeDto.setStoreId(storeUserDts.get(0).getStoreId());
+ } else {
+ storeDto.setStoreId(reqJson.getString("storeId"));
+ }
List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
@@ -62,7 +108,7 @@
//鏍￠獙 staff 鍜� store 涔嬮棿鏄惁鏈� 鍏崇郴 闃叉 鏀诲嚮
StoreUserDto storeUserDto = new StoreUserDto();
- storeUserDto.setUserId(reqJson.getString("staffId"));
+ storeUserDto.setUserId(reqJson.getString("userId"));
storeUserDto.setStoreId(reqJson.getString("storeId"));
List<StoreUserDto> storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);
@@ -74,6 +120,8 @@
modifyStaff(reqJson, cmdDataFlowContext);
JSONObject paramOut = new JSONObject();
paramOut.put("pwd", reqJson.getString("pwd"));
+ paramOut.put("code",0);
+ paramOut.put("msg","鎴愬姛");
ResponseEntity<String> responseEntity = new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
@@ -86,14 +134,14 @@
UserDto userDto = new UserDto();
userDto.setStatusCd("0");
- userDto.setUserId(paramObj.getString("userId"));
+ userDto.setUserId(paramObj.getString("staffId"));
List<UserDto> userDtos = userInnerServiceSMOImpl.getUserHasPwd(userDto);
Assert.listOnlyOne(userDtos, "鏁版嵁閿欒鏌ヨ鍒板鏉＄敤鎴蜂俊鎭垨鍗曟潯");
JSONObject userInfo = JSONObject.parseObject(JSONObject.toJSONString(userDtos.get(0)));
String pwd = GenerateCodeFactory.getRandomCode(6);
- userInfo.putAll(paramObj);
+ //userInfo.putAll(paramObj);
userInfo.put("password", AuthenticationFactory.passwdMd5(pwd));
paramObj.put("pwd", pwd);
--
Gitblit v1.8.0