From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java |  152 ++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 108 insertions(+), 44 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index a936760..fc9aea5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -128,6 +128,8 @@
     @Autowired
     private InoutDayCountMapper inoutDayCountMapper;
     @Autowired
+    private InoutRecordMapper inoutRecordMapper;
+    @Autowired
     private CarEventMapper carEventMapper;
 
     @Autowired
@@ -302,8 +304,7 @@
             WxPlatNotice wxPlatNotice = new WxPlatNotice();
             wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
                     wxNoticeConfigMapper,visits,
-                    Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload,
-                    systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+                    Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload, 
                     Arrays.asList(visits.getOpenid().split(","))
             );
         }
@@ -312,7 +313,6 @@
 
         return visits.getId();
     }
-
 
     @Override
     @Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -341,7 +341,6 @@
                 wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
                         wxNoticeConfigMapper,visits,
                         Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload,
-                        systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                         Arrays.asList(systemUser.getOpenid().split(","))
                 );
             }
@@ -1324,6 +1323,9 @@
         queryWrapper.isNull(Visits::getParentId);
         queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Visits::getMemberId,pageWrap.getModel().getMemberId());
         queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getReceptMemberId()),Visits::getReceptMemberId,pageWrap.getModel().getReceptMemberId());
+        queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()),Visits::getStarttime,Utils.Date.getStart(pageWrap.getModel().getQueryStarttime()));
+        queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),Visits::getStarttime,Utils.Date.getEnd(pageWrap.getModel().getQueryEndtime()));
+
 
         if(Objects.nonNull(pageWrap.getModel().getBusinessStatus())){
             if(Constants.equalsInteger(pageWrap.getModel().getBusinessStatus(),Constants.TWO)){
@@ -1530,8 +1532,24 @@
 
 
     @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public  void  visitLevelForCarOut(Visits visits){
+        visits.setRemark("璺熼殢璁垮杞﹁締绂诲洯鑷姩绛剧");
+        visitLevelBiz(visits);
+    }
+    @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
     public void  visitLevel(Integer visitId){
         Visits visits = visitsMapper.selectById(visitId);
+        visits.setRemark("骞冲彴绠$悊鍛樻墜鍔ㄧ绂绘垚鍔�");
+        visitLevelBiz(visits);
+        //浜у嚭鍦ㄥ満浜哄憳淇℃伅
+        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+                .eq(Retention::getType,Constants.memberType.visitor)
+                .eq(Retention::getMemberId,visits.getMemberId()));
+    }
+
+    private void visitLevelBiz(Visits visits) {
         if(Objects.isNull(visits)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
@@ -1542,14 +1560,16 @@
         request.setOrderId(visits.getHkId());
         //璋冪敤娴峰悍寮哄埗绛剧
         BaseResponse response =  HKService.iccmSignoff(request);
-//        BaseResponse response =  HKService.outVisitAppiontment(request);
-        visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.signout)
-                .eq(Visits::getId,visitId));
-        //浜у嚭鍦ㄥ満浜哄憳淇℃伅
-        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
-                .eq(Retention::getType,Constants.memberType.visitor)
-                .eq(Retention::getMemberId,visits.getMemberId()));
+        if(response!=null &&StringUtils.isNotBlank(response.getCode()) && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
+            visitsMapper.update(null,new UpdateWrapper<Visits>().lambda()
+                    .set(Visits::getStatus,Constants.VisitStatus.signout)
+                    .set(Visits::getRemark,visits.getRemark())
+                    .eq(Visits::getId,visits.getId()));
+        }else{
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮绛剧澶辫触锛岃鍒锋柊閲嶈瘯");
+        }
     }
+
     @Override
     public void  visitCancel(Integer visitId){
         Visits visits = visitsMapper.selectById(visitId);
@@ -1686,7 +1706,8 @@
                             .eq(Notices::getStatus,Constants.ZERO)
                             .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞�
                             .eq(Notices::getObjId,visits.getId())
-                            .eq(Notices::getObjType,Constants.equalsInteger(visits.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
+                            .eq(Notices::getObjType,!Constants.equalsInteger(visits.getType(),Constants.TWO)?
+                                    Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
             );
 
             Approve approve = new Approve();
@@ -1790,7 +1811,7 @@
                     .apply(" DATE(TIME_INFO) = CURDATE()  ")
                     .last(" limit 1 ")
             );
-
+ 
             //浠婃棩鍦ㄥ洯浜烘暟
             pcWorkPlatformDataVO.setTodayInParkUserNum(
                     retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
@@ -1801,8 +1822,7 @@
 
             //鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�
             pcWorkPlatformDataVO.setInParkLwUserNum(
-                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)
-                            && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
+                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FOUR)).count()
             );
             pcWorkPlatformDataVO.setLwUserInNum(Constants.ZERO);
             pcWorkPlatformDataVO.setLwUserOutNum(Constants.ZERO);
@@ -1814,6 +1834,10 @@
             );
             pcWorkPlatformDataVO.setVisitUserNum(Constants.ZERO);
             pcWorkPlatformDataVO.setSignLevelNum(Constants.ZERO);
+
+            //鍦ㄥ洯璐ц繍杞﹁締鍙告満
+            pcWorkPlatformDataVO.setInParkDriverUserNum(
+                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FIVE)&&Objects.isNull(i.getCompanyType())).count());
 
             //鍦ㄥ洯杞﹁締
             pcWorkPlatformDataVO.setTodayInParkCarNum(
@@ -1841,24 +1865,37 @@
             List<InterestedListVO> weekVisitList = new ArrayList<>();
             List<InterestedListVO> weekCarList = new ArrayList<>();
             List<InterestedListVO> lwList = new ArrayList<>();
+            List<InterestedListVO> internalList = new ArrayList<>();
             //鏌ヨ涓冨ぉ鍓嶇殑璁垮璁板綍鏁伴噺
-            List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
-                    Constants.VisitStatus.signin,Constants.VisitStatus.signout)
-                    .apply(" STARTTIME >   CURDATE() - INTERVAL 7 DAY " )
+//            List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
+//                    Constants.VisitStatus.signin,Constants.VisitStatus.signout)
+//                    .apply(" STARTTIME >   CURDATE() - INTERVAL 7 DAY " )
+//            );
+
+            List<InoutRecord> inoutRecordList = inoutRecordMapper.selectList(new QueryWrapper<InoutRecord>().lambda()
+                    .eq(InoutRecord::getInOrOut,Constants.ZERO).eq(InoutRecord::getIsdeleted,Constants.ZERO)
+                    .apply(" TIME_INFO >   CURDATE() - INTERVAL 7 DAY " )
             );
 
-            List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
-                    .in(CarEvent::getEventType,"771760131","771760130")
-                    .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY  " )
-            );
+//            List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
+//                    .in(CarEvent::getEventType,"771760131","771760130")
+//                    .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY  " )
+//            );
 
             for (String days:weekDays) {
                 InterestedListVO visitVO = new InterestedListVO();
                 visitVO.setName(days);
-                if(CollectionUtils.isNotEmpty(visitsList)){
+                if(CollectionUtils.isNotEmpty(inoutRecordList)){
                     //澶勭悊璁垮浜哄憳鏁伴噺
-                    List<Visits> daysList = visitsList.stream().filter(i->Objects.nonNull(i.getStarttime())&&DateUtil.dateToString(i.getStarttime(),"yyyy-MM-dd").equals(days)).collect(Collectors.toList());
-                    List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());
+//                    List<Visits> daysList = visitsList.stream().filter(i->Objects.nonNull(i.getStarttime())&&DateUtil.dateToString(i.getStarttime(),"yyyy-MM-dd").equals(days)).collect(Collectors.toList());
+//                    List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());
+
+                    List<String> memberIds  = inoutRecordList.stream().filter(i->
+                                    Objects.isNull(i.getCarCode())&&
+                                    Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
+                            )
+                            .map(i->i.getMemberPhone())
+                            .collect(Collectors.toList());
                     if(CollectionUtils.isNotEmpty(memberIds)){
                         visitVO.setNum(new HashSet<String>(memberIds).size());
                     }
@@ -1872,11 +1909,16 @@
                 InterestedListVO carVO = new InterestedListVO();
                 carVO.setName(days);
 
-
-                if(CollectionUtils.isNotEmpty(carEventList)){
+                if(CollectionUtils.isNotEmpty(inoutRecordList)){
                     //澶勭悊璁垮浜哄憳鏁伴噺
-                    List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
-                    List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
+//                    List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
+//                    List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
+                    List<String> carCodeList  = inoutRecordList.stream().filter(i->
+                                    Objects.isNull(i.getCarCode())&&
+                                            Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
+                            )
+                            .map(i->i.getMemberPhone())
+                            .collect(Collectors.toList());
                     if(CollectionUtils.isNotEmpty(carCodeList)){
                         carVO.setNum(new HashSet<String>(carCodeList).size());
                     }
@@ -1896,24 +1938,46 @@
             );
 
             if(CollectionUtils.isNotEmpty(companyList)){
-                List<Integer> companyIds = companyList.stream().map(i->i.getId()).collect(Collectors.toList());
-                List<Retention> retentionList = retentionMapper.selectList(
-                        new QueryWrapper<Retention>().lambda()
-                                .eq(Retention::getType,Constants.TWO)
-                                .in(Retention::getCompanyId,companyIds)
-                );
-                for (Company company:companyList) {
-                    Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size();
-                    if(count>0){
-                        InterestedListVO lw = new InterestedListVO();
-                        lw.setNum(count);
-                        lw.setName(company.getName());
-                        lwList.add(lw);
+                List<Company>  lwCompanyList  = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
+                if(CollectionUtils.isNotEmpty(lwCompanyList)){
+                    List<Integer> lwCompanyIds = lwCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
+                    List<Retention> retentionList = retentionMapper.selectList(
+                            new QueryWrapper<Retention>().lambda()
+                                    .eq(Retention::getType,Constants.FOUR)
+                                    .in(Retention::getCompanyId,lwCompanyIds)
+                    );
+                    for (Company company:lwCompanyList) {
+                        Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size();
+                        if(count>0){
+                            InterestedListVO lw = new InterestedListVO();
+                            lw.setNum(count);
+                            lw.setName(company.getName());
+                            lwList.add(lw);
+                        }
+                    }
+                }
+
+                List<Company>  internalCompanyList  = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).collect(Collectors.toList());
+                if(CollectionUtils.isNotEmpty(internalCompanyList)){
+                    List<Integer> internalCompanyIds = internalCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
+                    List<Retention> retentionList = retentionMapper.selectList(
+                            new QueryWrapper<Retention>().lambda()
+                                    .eq(Retention::getType,Constants.TWO)
+                                    .in(Retention::getCompanyId,internalCompanyIds)
+                    );
+                    for (Company company:internalCompanyList) {
+                        Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size();
+                        if(count>0){
+                            InterestedListVO lw = new InterestedListVO();
+                            lw.setNum(count);
+                            lw.setName(company.getName());
+                            internalList.add(lw);
+                        }
                     }
                 }
             }
-
-            pcWorkPlatformDataVO.setLwList(lwList   );
+            pcWorkPlatformDataVO.setInternalList(internalList);
+            pcWorkPlatformDataVO.setLwList(lwList);
         }else if(Constants.equalsInteger(queryType,Constants.THREE)) {
             if (Objects.isNull(loginUserInfo.getMemberId())) {
                 pcWorkPlatformDataVO.setNoticesList(new ArrayList<>());

--
Gitblit v1.9.3