From 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 23:07:46 +0800
Subject: [PATCH] 合并远程分支，并处理冲突
---
service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java
index 2a0d66b..ab7b4bc 100755
--- a/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java
@@ -17,11 +17,18 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
+import com.java110.dto.machine.MachineTranslateDto;
+import com.java110.dto.owner.OwnerAttrDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
import com.java110.intf.job.IDataBusInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 璁惧寮�闂ㄥ姛鑳�
@@ -34,6 +41,11 @@
@Autowired
IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
+ @Autowired
+ private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;
/**
* 寮�闂ㄥ姛鑳�
@@ -43,10 +55,57 @@
*/
@Override
public ResponseEntity<String> openDoor(JSONObject reqJson) {
+ //濡傛灉鏄笟涓� 闄愬埗寮�闂ㄦ鏁�
+ if ("owner".equals(reqJson.getString("userRole"))) {
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setMemberId(reqJson.getString("userId"));
+ ownerDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+ if (ownerDtos == null || ownerDtos.size() < 1) {
+ return ResultVo.error("娌℃湁鏉冮檺寮�闂�");
+ }
+
+ if (!hasOpenDoorPri(ownerDtos.get(0), reqJson.getString("machineCode"))) {
+ return ResultVo.error("浠婃棩寮�闂ㄦ鏁板凡鐢ㄥ畬锛岃鑱旂郴鐗╀笟瀹㈡湇浜哄憳");
+ }
+ }
ResultVo resultVo = dataBusInnerServiceSMOImpl.openDoor(reqJson);
return ResultVo.createResponseEntity(resultVo);
}
+ private boolean hasOpenDoorPri(OwnerDto ownerDto, String machineCode) {
+
+ List<OwnerAttrDto> ownerAttrDtos = ownerDto.getOwnerAttrDtos();
+
+ if (ownerAttrDtos == null || ownerAttrDtos.size() < 1) {
+ return true;
+ }
+ long openDoorCount = -1;
+ for (OwnerAttrDto ownerAttrDto : ownerAttrDtos) {
+ if (OwnerAttrDto.SPEC_CD_MACHINE_OPEN_COUNT.equals(ownerAttrDto.getSpecCd())) {
+ openDoorCount = Long.parseLong(ownerAttrDto.getValue());
+ }
+ }
+
+ if (openDoorCount == -1) { //璇存槑娌℃湁閰嶇疆 涓嶉檺鍒�
+ return true;
+ }
+
+ MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+ machineTranslateDto.setCommunityId(ownerDto.getCommunityId());
+ machineTranslateDto.setMachineCode(machineCode);
+ machineTranslateDto.setObjBId(ownerDto.getMemberId());
+ machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_OPEN_DOOR);
+ machineTranslateDto.setIsNow("Y");
+ long count = machineTranslateInnerServiceSMOImpl.queryMachineTranslatesCount(machineTranslateDto);
+
+ if (openDoorCount > count) {
+ return true;
+ }
+
+ return false;
+ }
+
/**
* 閲嶅惎璁惧
*
--
Gitblit v1.8.0