From ac9d7e2b74713e436dc0d7c08fd05a75f57fdbcb Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 25 三月 2023 00:00:03 +0800
Subject: [PATCH] 支持厂拍门禁
---
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 24 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
index 32c3738..8da47f0 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
@@ -3,14 +3,18 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
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.doc.annotation.*;
import com.java110.dto.RoomDto;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.user.bmo.owner.IQueryOwnerStatisticsBMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -25,8 +29,69 @@
import java.util.List;
import java.util.Map;
+@Java110CmdDoc(title = "鏌ヨ涓氫富",
+ description = "绗笁鏂圭郴缁燂紝姣斿鎷涘晢绯荤粺鏌ヨ涓氫富淇℃伅",
+ httpMethod = "get",
+ url = "http://{ip}:{port}/app/owner.queryOwners",
+ resource = "userDoc",
+ author = "鍚村鏂�",
+ serviceCode = "owner.queryOwners",
+ seq = 12
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "page", type = "int",length = 11, remark = "椤垫暟"),
+ @Java110ParamDoc(name = "row", type = "int",length = 11, remark = "琛屾暟"),
+ @Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
+ @Java110ParamDoc(name = "name", length = 64, remark = "涓氫富鍚嶇О"),
+ @Java110ParamDoc(name = "link", length = 11, remark = "涓氫富鎵嬫満鍙�"),
+ @Java110ParamDoc(name = "idCard", length = 30, remark = "涓氫富韬唤璇佸彿"),
+ @Java110ParamDoc(name = "ownerTypeCd", length = 12, remark = "涓氫富绫诲瀷 1001 涓氫富 2002 瀹跺涵鎴愬憳 瀹跺涵鎴愬憳 闇�瑕佷紶涓氫富鐨刼wnerId"),
+ @Java110ParamDoc(name = "ownerId", length = 30, remark = "涓氫富ID锛屽搴垚鍛樹笟涓籌D"),
+ @Java110ParamDoc(name = "memberId", length = 30, remark = "涓氫富ID锛屼富閿甀D"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ @Java110ParamDoc(name = "owners", type = "Array", length = -1, defaultValue = "鎴愬姛", remark = "鏁版嵁"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "communityId", length = 30, remark = "灏忓尯ID"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "name", length = 64, remark = "涓氫富鍚嶇О"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "link", length = 11, remark = "涓氫富鎵嬫満鍙�"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "idCard", length = 30, remark = "涓氫富韬唤璇佸彿"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "address", length = 512, remark = "鍦板潃"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "sex", length = 12, remark = "鎬у埆 鐢� 1 濂� 0"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "ownerTypeCd", length = 12, remark = "涓氫富绫诲瀷 1001 涓氫富 2002 瀹跺涵鎴愬憳 瀹跺涵鎴愬憳 闇�瑕佷紶涓氫富鐨刼wnerId"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "remark", length = 512, remark = "澶囨敞"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "memberId", length = 30, remark = "涓氫富ID"),
+ @Java110ParamDoc(parentNodeName = "owners",name = "ownerPhoto", length = -1, remark = "涓氫富浜鸿劯 鐢ㄤ簬鍚屾闂ㄧ 浜鸿劯寮�闂�"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody="http://ip:port/app/owner.queryOwners?ownerTypeCd=1001&page=1&row=10&communityId=2022121921870161",
+ resBody="{\n" +
+ "\t\"owners\": [{\n" +
+ "\t\t\"address\": \"寮犱笁\",\n" +
+ "\t\t\"idCard\": \"\",\n" +
+ "\t\t\"link\": \"18909718888\",\n" +
+ "\t\t\"memberId\": \"772023012589770046\",\n" +
+ "\t\t\"name\": \"鐜嬬帇\",\n" +
+ "\t\t\"ownerId\": \"772023012589770046\",\n" +
+ "\t\t\"ownerTypeCd\": \"1001\",\n" +
+ "\t\t\"remark\": \"\",\n" +
+ "\t\t\"sex\": \"0\",\n" +
+ "\t\t\"userName\": \"浜哄拰鐗╀笟\"\n" +
+ "\t}],\n" +
+ "\t\"page\": 0,\n" +
+ "\t\"records\": 1,\n" +
+ "\t\"rows\": 0,\n" +
+ "\t\"total\": 1\n" +
+ "}"
+)
@Java110Cmd(serviceCode = "owner.queryOwners")
-public class QueryOwnersCmd extends AbstractServiceCmdListener {
+public class QueryOwnersCmd extends Cmd {
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
@@ -36,6 +101,12 @@
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IQueryOwnerStatisticsBMO queryOwnerStatisticsBMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -49,27 +120,36 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-//鏍规嵁鎴垮眿鏌ヨ鏃� 鍏堢敤 鎴垮眿淇℃伅鏌ヨ 涓氫富ID
+ //鏍规嵁鎴垮眿鏌ヨ鏃� 鍏堢敤 鎴垮眿淇℃伅鏌ヨ 涓氫富ID
freshRoomId(reqJson);
-
-
if (reqJson.containsKey("name") && !StringUtil.isEmpty(reqJson.getString("name"))) {
queryByCondition(reqJson, cmdDataFlowContext);
return;
}
-
int row = reqJson.getInteger("row");
-
ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
-
//鏌ヨ鎬昏褰曟暟
int total = ownerInnerServiceSMOImpl.queryOwnersCount(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
apiOwnerVo.setTotal(total);
List<OwnerDto> ownerDtos = new ArrayList<>();
if (total > 0) {
List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwners(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
+ // 鏌ヨ缁熻鏁版嵁
+ ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", reqJson.getString("userId"));
for (OwnerDto ownerDto : ownerDtoList) {
+ //鏌ヨ鐓х墖
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(ownerDto.getMemberId());
+ fileRelDto.setRelTypeCd("10000"); //涓氫富鐓х墖
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ if (fileRelDtos != null && fileRelDtos.size() > 0) {
+ List<String> urls = new ArrayList<>();
+ for (FileRelDto fileRel : fileRelDtos) {
+ urls.add(fileRel.getFileRealName());
+ }
+ ownerDto.setUrls(urls);
+ }
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
String idCard = ownerDto.getIdCard();
if (mark.size() == 0 && idCard != null && !idCard.equals("") && idCard.length() > 16) {
@@ -86,58 +166,47 @@
}
apiOwnerVo.setOwners(BeanConvertUtil.covertBeanList(ownerDtos, ApiOwnerDataVo.class));
}
-
apiOwnerVo.setRecords((int) Math.ceil((double) total / (double) row));
-
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOwnerVo), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
private void freshRoomId(JSONObject reqJson) {
-
if (!reqJson.containsKey("roomName")) {
return;
}
-
String roomName = reqJson.getString("roomName");
if (StringUtil.isEmpty(roomName)) {
return;
}
-
if (!roomName.contains("-")) {
throw new IllegalArgumentException("鎴垮眿鏍煎紡閿欒,璇峰啓鍏ュ 妤兼爧-鍗曞厓-鎴垮眿 鏍煎紡");
}
-
- String[] params = roomName.split("-");
+ String[] params = roomName.split("-", 3);
if (params.length != 3) {
throw new IllegalArgumentException("鎴垮眿鏍煎紡閿欒,璇峰啓鍏ュ 妤兼爧-鍗曞厓-鎴垮眿 鏍煎紡");
}
-
RoomDto roomDto = new RoomDto();
roomDto.setFloorNum(params[0]);
roomDto.setUnitNum(params[1]);
roomDto.setRoomNum(params[2]);
roomDto.setCommunityId(reqJson.getString("communityId"));
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
-
Assert.listOnlyOne(roomDtos, "鏈煡璇㈠埌鎴垮眿涓嬩笟涓讳俊鎭�");
-
reqJson.put("roomId", roomDtos.get(0).getRoomId());
-
}
/**
* 鏍规嵁鏉′欢鏌ヨ
*
- * @param reqJson 鏌ヨ淇℃伅
+ * @param reqJson 鏌ヨ淇℃伅
* @param cmdDataFlowContext 涓婁笅鏂�
*/
private void queryByCondition(JSONObject reqJson, ICmdDataFlowContext cmdDataFlowContext) {
//鑾峰彇褰撳墠鐢ㄦ埛id
String ownerTypeCd = reqJson.getString("ownerTypeCd");
OwnerDto tmpOwnerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
- if(!StringUtil.isEmpty(ownerTypeCd) && ownerTypeCd.contains(",")){
+ if (!StringUtil.isEmpty(ownerTypeCd) && ownerTypeCd.contains(",")) {
tmpOwnerDto.setOwnerTypeCd("");
tmpOwnerDto.setOwnerTypeCds(ownerTypeCd.split(","));
}
@@ -149,6 +218,9 @@
List<OwnerDto> ownerDtos = new ArrayList<>();
if (total > 0) {
List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnersByCondition(tmpOwnerDto);
+ // 鏌ヨ缁熻鏁版嵁
+ ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
+
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
for (OwnerDto ownerDto : ownerDtoList) {
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
@@ -167,9 +239,7 @@
}
apiOwnerVo.setOwners(BeanConvertUtil.covertBeanList(ownerDtos, ApiOwnerDataVo.class));
}
-
apiOwnerVo.setRecords((int) Math.ceil((double) total / (double) row));
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOwnerVo), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
--
Gitblit v1.8.0