From c434ece53b249ae10f20f9fd552d03ca671c5b11 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 四月 2024 17:08:48 +0800
Subject: [PATCH] 加入电梯相机功能，支持电梯非机动车检车
---
service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
index ffc2cce..bebb3f6 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
@@ -8,9 +8,8 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.AuthenticationFactory;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.file.FileDto;
+import com.java110.doc.annotation.*;
import com.java110.dto.user.UserDto;
-import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.store.IOrgStaffRelV1InnerServiceSMO;
import com.java110.intf.store.IStoreUserV1InnerServiceSMO;
@@ -33,9 +32,42 @@
import java.util.List;
+
+@Java110CmdDoc(title = "娣诲姞鍛樺伐",
+ description = "澶栭儴绯荤粺閫氳繃娣诲姞鍛樺伐鎺ュ彛 娣诲姞鍛樺伐锛屾敞鎰忛渶瑕佺墿涓氱鐞嗗憳璐﹀彿鐧诲綍锛屽洜涓轰笉闇�瑕佷紶storeId 鏄牴鎹鐞嗗憳鐧诲綍淇℃伅鑾峰彇鐨�",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/user.staff.add",
+ resource = "userDoc",
+ author = "鍚村鏂�",
+ serviceCode = "user.staff.add",
+ seq = 3
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "orgId", length = 30, remark = "缁勭粐ID"),
+ @Java110ParamDoc(name = "orgName", length = 64, remark = "缁勭粐鍚嶇О"),
+ @Java110ParamDoc(name = "name", length = 64, remark = "鍚嶇О"),
+ @Java110ParamDoc(name = "sex", length = 64, remark = "鎬у埆 0濂� 1鐢�"),
+ @Java110ParamDoc(name = "email", length = 64, remark = "閭"),
+ @Java110ParamDoc(name = "tel", length = 11, remark = "鎵嬫満鍙�"),
+ @Java110ParamDoc(name = "address", length = 64, remark = "鍦板潃"),
+ @Java110ParamDoc(name = "relCd", length = 64, remark = "宀椾綅,鏅�氬憳宸� 1000 閮ㄩ棬缁忕悊 2000 閮ㄩ棬鍓粡鐞� 3000 閮ㄩ棬缁勯暱 4000 鍒嗗叕鍙告�荤粡鐞� 5000 鍒嗗叕鍙稿壇鎬荤粡鐞� 6000 鎬荤粡鐞嗗姪鐞� 7000 鎬诲叕鍙告�荤粡鐞� 8000 鎬诲叕鍙稿壇鎬荤粡鐞� 9000"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody="{\"orgId\":\"102022091988250052\",\"orgName\":\"婕旂ず鐗╀笟 / 浠堕儴\",\"username\":\"寮犱笁\",\"sex\":\"0\",\"email\":\"231@qq.com\",\"tel\":\"123\",\"address\":\"123\",\"relCd\":\"1000\",\"photo\":\"\",\"name\":\"寮犱笁\"}",
+ resBody="{'code':0,'msg':'鎴愬姛'}"
+)
+
@Java110Cmd(serviceCode = "user.staff.add")
public class UserStaffAddCmd extends Cmd {
-
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@@ -47,9 +79,6 @@
private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
@Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
- @Autowired
private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
@Autowired
@@ -57,7 +86,6 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-
if (!reqJson.containsKey("storeId")) {
String storeId = context.getReqHeaders().get("store-id");
reqJson.put("storeId", storeId);
@@ -68,9 +96,9 @@
UserDto userDto = new UserDto();
userDto.setTel(reqJson.getString("tel"));
userDto.setUserFlag("1");
+ userDto.setLevelCd("01"); //鍛樺伐
List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
Assert.listIsNull(users, "鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
-
}
@Override
@@ -94,22 +122,13 @@
addStaffOrg(reqJson);
int flag = 0;
if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(reqJson.getString("photo"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- reqJson.put("photoId", fileDto.getFileId());
- reqJson.put("fileSaveName", fileName);
JSONObject businessUnit = new JSONObject();
businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
businessUnit.put("relTypeCd", "12000");
businessUnit.put("saveWay", "table");
businessUnit.put("objId", userId);
- businessUnit.put("fileRealName", fileDto.getFileId());
- businessUnit.put("fileSaveName", fileName);
+ businessUnit.put("fileRealName", reqJson.getString("photo"));
+ businessUnit.put("fileSaveName", reqJson.getString("photo"));
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
if (flag < 1) {
@@ -129,10 +148,8 @@
Assert.jsonObjectHaveKey(paramObj, "name", "璇锋眰鍙傛暟涓湭鍖呭惈name 鑺傜偣锛岃纭");
//Assert.jsonObjectHaveKey(paramObj,"email","璇锋眰鍙傛暟涓湭鍖呭惈email 鑺傜偣锛岃纭");
Assert.jsonObjectHaveKey(paramObj, "tel", "璇锋眰鍙傛暟涓湭鍖呭惈tel 鑺傜偣锛岃纭");
- Assert.jsonObjectHaveKey(paramObj, "orgId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈閮ㄩ棬淇℃伅");
Assert.jsonObjectHaveKey(paramObj, "address", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍦板潃淇℃伅");
Assert.jsonObjectHaveKey(paramObj, "sex", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎬у埆淇℃伅");
- Assert.jsonObjectHaveKey(paramObj, "relCd", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍛樺伐瑙掕壊");
if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
--
Gitblit v1.8.0