Your Name пре 3 година
родитељ
комит
66a5a93153

+ 15 - 1
service-community/src/main/java/com/java110/community/smo/impl/VisitV1InnerServiceSMOImpl.java

@@ -28,6 +28,7 @@ import com.java110.dto.machine.CarBlackWhiteDto;
 import com.java110.dto.machine.MachineDto;
 import com.java110.dto.visit.VisitDto;
 import com.java110.dto.visitSetting.VisitSettingDto;
+import com.java110.intf.common.IAccessControlWhiteAuthV1InnerServiceSMO;
 import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.common.IMachineInnerServiceSMO;
@@ -36,6 +37,7 @@ import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
 import com.java110.intf.community.IVisitV1InnerServiceSMO;
 import com.java110.intf.user.ICarBlackWhiteV1InnerServiceSMO;
 import com.java110.po.accessControlWhite.AccessControlWhitePo;
+import com.java110.po.accessControlWhiteAuth.AccessControlWhiteAuthPo;
 import com.java110.po.car.CarBlackWhitePo;
 import com.java110.po.owner.VisitPo;
 import com.java110.utils.exception.CmdException;
@@ -78,6 +80,9 @@ public class VisitV1InnerServiceSMOImpl extends BaseServiceSMO implements IVisit
     @Autowired
     private IAccessControlWhiteV1InnerServiceSMO accessControlWhiteV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IAccessControlWhiteAuthV1InnerServiceSMO accessControlWhiteAuthV1InnerServiceSMOImpl;
+
     @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
 
@@ -185,7 +190,7 @@ public class VisitV1InnerServiceSMOImpl extends BaseServiceSMO implements IVisit
                 accessControlWhitePo.setCommunityId(visitDto.getCommunityId());
                 accessControlWhitePo.setEndTime(visitDto.getDepartureTime());
                 accessControlWhitePo.setIdCard("");
-                accessControlWhitePo.setMachineId(tmpMachineDto.getMachineId());
+                accessControlWhitePo.setMachineId("-1");
                 accessControlWhitePo.setPersonName(visitDto.getvName());
                 accessControlWhitePo.setPersonType(AccessControlWhiteDto.PERSON_TYPE_VISIT);
                 accessControlWhitePo.setStartTime(visitDto.getVisitTime());
@@ -195,6 +200,15 @@ public class VisitV1InnerServiceSMOImpl extends BaseServiceSMO implements IVisit
                 if (flag < 1) {
                     throw new CmdException("同步门禁白名单失败");
                 }
+                AccessControlWhiteAuthPo accessControlWhiteAuthPo = new AccessControlWhiteAuthPo();
+                accessControlWhiteAuthPo.setAcwaId(GenerateCodeFactory.getGeneratorId("10"));
+                accessControlWhiteAuthPo.setAcwId(accessControlWhitePo.getAcwId());
+                accessControlWhiteAuthPo.setCommunityId(accessControlWhitePo.getCommunityId());
+                accessControlWhiteAuthPo.setMachineId(tmpMachineDto.getMachineId());
+                flag = accessControlWhiteAuthV1InnerServiceSMOImpl.saveAccessControlWhiteAuth(accessControlWhiteAuthPo);
+                if (flag < 1) {
+                    throw new CmdException("同步门禁白名单失败");
+                }
             } else {
                 accessControlWhitePo.setAcwId(accessControlWhiteDtos.get(0).getAcwId());
                 accessControlWhitePo.setStartTime(visitDto.getVisitTime());