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/communityLocation/ListCommunityLocationCmd.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/communityLocation/ListCommunityLocationCmd.java b/service-community/src/main/java/com/java110/community/cmd/communityLocation/ListCommunityLocationCmd.java
index 321deda..2706679 100644
--- a/service-community/src/main/java/com/java110/community/cmd/communityLocation/ListCommunityLocationCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/communityLocation/ListCommunityLocationCmd.java
@@ -17,26 +17,27 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.FloorDto;
+import com.java110.dto.UnitDto;
import com.java110.dto.community.CommunityLocationDto;
-import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
-import com.java110.intf.community.ICommunityLocationV1InnerServiceSMO;
+import com.java110.intf.community.*;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
+
import java.util.List;
import java.util.ArrayList;
+
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* 绫昏〃杩帮細鏌ヨ
@@ -51,12 +52,16 @@
@Java110Cmd(serviceCode = "communityLocation.listCommunityLocations")
public class ListCommunityLocationCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(ListCommunityLocationCmd.class);
- @Autowired
- private ICommunityLocationV1InnerServiceSMO communityLocationV1InnerServiceSMOImpl;
+ private static Logger logger = LoggerFactory.getLogger(ListCommunityLocationCmd.class);
@Autowired
private ICommunityLocationInnerServiceSMO communityLocationInnerServiceSMOImpl;
+
+ @Autowired
+ private IUnitInnerServiceSMO unitInnerServiceSMOImpl;
+
+ @Autowired
+ private IFloorInnerServiceSMO floorInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -67,15 +72,39 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-
CommunityLocationDto communityLocationDto = BeanConvertUtil.covertBean(reqJson, CommunityLocationDto.class);
int count = communityLocationInnerServiceSMOImpl.queryCommunityLocationsCount(communityLocationDto);
- List<CommunityLocationDto> communityLocationDtos = null;
+ List<CommunityLocationDto> communityLocationDtos = new ArrayList<>();
if (count > 0) {
- communityLocationDtos = communityLocationInnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
+ List<CommunityLocationDto> communityLocations = communityLocationInnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
+ for (CommunityLocationDto communityLocation : communityLocations) {
+ if (!StringUtil.isEmpty(communityLocation.getLocationType()) && communityLocation.getLocationType().equals("2000")
+ && !StringUtil.isEmpty(communityLocation.getLocationObjId()) && !communityLocation.getLocationObjId().equals("-1")) { //鍗曞厓
+ UnitDto unitDto = new UnitDto();
+ unitDto.setUnitId(communityLocation.getLocationObjId());
+ List<UnitDto> unitDtos = unitInnerServiceSMOImpl.queryUnits(unitDto);
+ Assert.listOnlyOne(unitDtos, "鏌ヨ鍗曞厓閿欒");
+ communityLocation.setFloorId(unitDtos.get(0).getFloorId());
+ communityLocation.setUnitId(unitDtos.get(0).getUnitId());
+ FloorDto floorDto = new FloorDto();
+ floorDto.setFloorId(unitDtos.get(0).getFloorId());
+ List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
+ Assert.listOnlyOne(floorDtos, "鏌ヨ妤兼爧閿欒");
+ } else if (!StringUtil.isEmpty(communityLocation.getLocationType()) && communityLocation.getLocationType().equals("6000")
+ && !StringUtil.isEmpty(communityLocation.getLocationObjId()) && !communityLocation.getLocationObjId().equals("-1")) { //妤兼爧
+ communityLocation.setFloorId(communityLocation.getLocationObjId());
+ } else if (!StringUtil.isEmpty(communityLocation.getLocationType()) && communityLocation.getLocationType().equals("7000")
+ && !StringUtil.isEmpty(communityLocation.getLocationObjId()) && !communityLocation.getLocationObjId().equals("-1")) { //鍋滆溅鍦�
+ communityLocation.setPaId(communityLocation.getLocationObjId());
+ } else if (!StringUtil.isEmpty(communityLocation.getLocationType()) && communityLocation.getLocationType().equals("4000")
+ && !StringUtil.isEmpty(communityLocation.getLocationObjId()) && !communityLocation.getLocationObjId().equals("-1")) { //宀椾涵
+ communityLocation.setBoxId(communityLocation.getLocationObjId());
+ }
+ communityLocationDtos.add(communityLocation);
+ }
} else {
communityLocationDtos = new ArrayList<>();
}
--
Gitblit v1.8.0