From 983acc56b667c90804dbf5f46dae8f0161876380 Mon Sep 17 00:00:00 2001
From: 曾成 <121184950@qq.com>
Date: 星期六, 28 三月 2020 19:36:36 +0800
Subject: [PATCH] Merge branch 'back' of https://github.com/java110/MicroCommunity into back
---
Api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java b/Api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java
index ca6b9dc..d2dd1e8 100644
--- a/Api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java
+++ b/Api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java
@@ -78,6 +78,53 @@
@Override
protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+ if(reqJson.containsKey("relationship")){
+ queryRelationship(event,context,reqJson);
+ }else{
+ queryCommon(event,context,reqJson);
+ }
+
+ }
+
+ /**
+ * 鍏崇郴鏌ヨ
+ * @param event
+ * @param context
+ * @param reqJson
+ */
+ private void queryRelationship(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+ InspectionDto inspectionPointDto = BeanConvertUtil.covertBean(reqJson, InspectionDto.class);
+
+ int count = inspectionPointInnerServiceSMOImpl.queryInspectionsRelationShipCount(inspectionPointDto);
+
+ List<ApiInspectionPointDataVo> inspectionPoints = null;
+
+ if (count > 0) {
+ inspectionPoints = BeanConvertUtil.covertBeanList(inspectionPointInnerServiceSMOImpl.getInspectionRelationShip(inspectionPointDto), ApiInspectionPointDataVo.class);
+ // 鍒锋柊 浣嶇疆淇℃伅
+ refreshMachines(inspectionPoints);
+ } else {
+ inspectionPoints = new ArrayList<>();
+ }
+
+ ApiInspectionPointVo apiInspectionPointVo = new ApiInspectionPointVo();
+
+ apiInspectionPointVo.setTotal(count);
+ apiInspectionPointVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
+ apiInspectionPointVo.setInspectionPoints(inspectionPoints);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPointVo), HttpStatus.OK);
+
+ context.setResponseEntity(responseEntity);
+ }
+
+ /**
+ * 鏅�氭煡璇�
+ * @param event
+ * @param context
+ * @param reqJson
+ */
+ private void queryCommon(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
InspectionDto inspectionPointDto = BeanConvertUtil.covertBean(reqJson, InspectionDto.class);
int count = inspectionPointInnerServiceSMOImpl.queryInspectionsCount(inspectionPointDto);
@@ -101,7 +148,6 @@
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPointVo), HttpStatus.OK);
context.setResponseEntity(responseEntity);
-
}
@@ -187,7 +233,6 @@
/**
* 鑾峰彇鎵归噺鍗曞厓
- *
*/
private void refreshRooms(List<ApiInspectionPointDataVo> inspectionPoints) {
List<String> roomIds = new ArrayList<String>();
@@ -210,7 +255,7 @@
//鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
- for (ApiInspectionPointDataVo inspectionPointDataVo: tmpInspectionPoint) {
+ for (ApiInspectionPointDataVo inspectionPointDataVo : tmpInspectionPoint) {
for (RoomDto tmpRoomDto : roomDtos) {
if (inspectionPointDataVo.getLocationObjId().equals(tmpRoomDto.getRoomId())) {
inspectionPointDataVo.setLocationObjName(tmpRoomDto.getFloorNum() + "鏍�" + tmpRoomDto.getUnitNum() + "鍗曞厓" + tmpRoomDto.getRoomNum() + "瀹�");
--
Gitblit v1.8.0