From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/unit/QueryUnitsCmd.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/unit/QueryUnitsCmd.java b/service-community/src/main/java/com/java110/community/cmd/unit/QueryUnitsCmd.java
index d7882e4..1e5e4ad 100644
--- a/service-community/src/main/java/com/java110/community/cmd/unit/QueryUnitsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/unit/QueryUnitsCmd.java
@@ -3,10 +3,12 @@
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.dto.FloorDto;
+import com.java110.doc.annotation.*;
import com.java110.dto.UnitDto;
+import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto;
+import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO;
import com.java110.intf.community.IFloorInnerServiceSMO;
import com.java110.intf.community.IUnitInnerServiceSMO;
import com.java110.utils.exception.CmdException;
@@ -19,29 +21,73 @@
import java.util.List;
+
+@Java110CmdDoc(title = "鏌ヨ鍗曞厓",
+ description = "鐢ㄤ簬澶栫郴缁熸煡璇㈠崟鍏冧俊鎭姛鑳�",
+ httpMethod = "get",
+ url = "http://{ip}:{port}/app/unit.queryUnits",
+ resource = "communityDoc",
+ author = "鍚村鏂�",
+ serviceCode = "unit.queryUnits",
+ seq = 12
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
+ @Java110ParamDoc(name = "floorId", length = 30, remark = "妤兼爧ID"),
+ @Java110ParamDoc(name = "page", type = "int",length = 11, remark = "椤垫暟"),
+ @Java110ParamDoc(name = "row", type = "int",length = 11, remark = "琛屾暟"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "unitId", type = "String", length = 30, remark = "鍗曞厓ID"),
+ @Java110ParamDoc(name = "unitNum", type = "String", length = 250, remark = "鍗曞厓缂栧彿"),
+ @Java110ParamDoc(name = "seq", type = "int", length = 11, remark = "鎺掑簭"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody="http://{ip}:{port}/app/unit.queryUnits?page=1&row=10&communityId=123123&floorId=123",
+ resBody="{'unitId':'123123','unitNum':'123123','seq':1}"
+)
+
@Java110Cmd(serviceCode = "unit.queryUnits")
-public class QueryUnitsCmd extends AbstractServiceCmdListener {
+public class QueryUnitsCmd extends Cmd {
@Autowired
private IUnitInnerServiceSMO unitInnerServiceSMOImpl;
@Autowired
private IFloorInnerServiceSMO floorInnerServiceSMOImpl;
+ @Autowired
+ private IDataPrivilegeUnitV1InnerServiceSMO dataPrivilegeUnitV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
//Assert.jsonObjectHaveKey(reqJson, "floorId", "璇锋眰涓湭鍖呭惈floorId淇℃伅");
//鏍￠獙灏忓尯妤糏D鍜屽皬鍖烘槸鍚︽湁瀵瑰簲鍏崇郴
- int total = floorInnerServiceSMOImpl.queryFloorsCount(BeanConvertUtil.covertBean(reqJson, FloorDto.class));
-
- if (total < 1) {
- throw new IllegalArgumentException("浼犲叆灏忓尯妤糏D涓嶆槸璇ュ皬鍖虹殑妤�");
- }
+// int total = floorInnerServiceSMOImpl.queryFloorsCount(BeanConvertUtil.covertBean(reqJson, FloorDto.class));
+//
+// if (total < 1) {
+// throw new IllegalArgumentException("浼犲叆灏忓尯妤糏D涓嶆槸璇ュ皬鍖虹殑妤�");
+// }
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
UnitDto unitDto = BeanConvertUtil.covertBean(reqJson, UnitDto.class);
+ unitDto.setUserId("");
+
+ String staffId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ DataPrivilegeStaffDto dataPrivilegeStaffDto = new DataPrivilegeStaffDto();
+ dataPrivilegeStaffDto.setStaffId(staffId);
+ String[] unitIds = dataPrivilegeUnitV1InnerServiceSMOImpl.queryDataPrivilegeUnitsByStaff(dataPrivilegeStaffDto);
+
+ if(unitIds != null && unitIds.length>0){
+ unitDto.setUnitIds(unitIds);
+ }
List<UnitDto> unitDtoList = unitInnerServiceSMOImpl.queryUnits(unitDto);
--
Gitblit v1.8.0