server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -64,7 +64,7 @@ * 每分钟拉取一次今日的访客预约数据 * @throws Exception */ @Scheduled(fixedDelay= 60*1000) @Scheduled(fixedDelay= 30*1000) public void syncVistAppointData() throws Exception { if(Constants.DEALING_FROM_HK_VISIT){ return ; server/dmvisit_admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@ # application: # name: doumeemes profiles: active: dev active: devYL # JSON返回配置 jackson: server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
@@ -38,11 +38,11 @@ public CountDataResponse countData(BaseRequest param){ MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.select("count(1) as applyTotalNum"); queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status not in(1,4,9)) as applyPassNum"); queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status=8) as visitInNum"); queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status=6) as visitOutNum"); queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status not in(5,6,8)) as applyPassNum"); queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status in (5)) as visitInNum"); queryWrapper.select("(select count(1) from visits where TO_DAYS(create_date)=TO_DAYS(now()) and status in (6,8)) as visitOutNum"); queryWrapper.select("(select count(1) from car_event where TO_DAYS(create_date)=TO_DAYS(now()) and inout_type=0 and event_type="+ HKConstants.EventTypes.PARK_PASS_IN.getKey() +") as carInNum"); queryWrapper.select("(select count(1) from car_event where TO_DAYS(create_date)=TO_DAYS(now()) and inout_type=1 and event_type="+ HKConstants.EventTypes.PARK_PASS_OUT.getKey() +") as carOutNum"); queryWrapper.select("(select count(1) from car_event where TO_DAYS(create_date)=TO_DAYS(now()) and (inout_type !=0 ) and event_type="+ HKConstants.EventTypes.PARK_PASS_OUT.getKey() +") as carOutNum"); queryWrapper.eq(Visits::getIsdeleted, Constants.ZERO ); queryWrapper.apply("TO_DAYS(create_date)=TO_DAYS(now())" ); queryWrapper.last("limit 1"); @@ -84,7 +84,7 @@ model.setCreateDate(event.getCreateDate()); model.setCompanyName(event.getCompanyName()); model.setMemberName(event.getMemberName()); model.setType(event.getMemberType()); model.setType(Constants.formatIntegerNum(event.getMemberType()) !=2?1:2); model.setVisitCompanyName(event.getVisitCompanyName()); list.add(model); } @@ -98,7 +98,6 @@ MPJLambdaWrapper<VisitEvent> wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(VisitEvent.class) ; wrapper.apply("TO_DAYS(create_date)=TO_DAYS(now())" ); wrapper.in(CarEvent::getEventType, Arrays.asList(new Integer[]{HKConstants.EventTypes.PARK_PASS_IN.getKey(),HKConstants.EventTypes.PARK_PASS_OUT.getKey()})); wrapper.last("limit 50"); wrapper.orderByDesc(VisitEvent::getCreateDate); List<VisitEvent> result =visitEventMapper.selectList( wrapper); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.doumee.config.DataSyncConfig; import com.doumee.config.SpringContextUtil; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsInfoRequest; @@ -55,6 +56,8 @@ private DeviceEventMapper deviceEventMapper; @Autowired private MemberMapper memberMapper; @Autowired private DataSyncConfig dataSyncConfig; @Autowired private CarEventMapper carEventMapper; @Autowired @@ -317,6 +320,10 @@ if(visits !=null){ //如果人员信息存在，则删除之前的所有进场数据（无论此次推送是进厂还是出场推送事件） delRetentionLis.add(visits.getMemberId()); if(dataSyncConfig.getOrgUserDataOrigin() == DataSyncConfig.origin.hk){ //如果是伊利大屏项目，不做处理 return; } Visits updateVistis = new Visits(); updateVistis.setId(visits.getId()); if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){ server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
@@ -101,7 +101,7 @@ curPage++; } if(allHkList .size() == 0){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未同步到任何组织信息！"); throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未同步到任何信息！"); } //清空原有当天的数据 visitsMapper.delete(new UpdateWrapper<Visits>().lambda() server/dmvisit_service/src/main/resources/application-dev.yml
@@ -6,7 +6,12 @@ password: rtjgfEr@&0c0m driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 连接池中的最小空闲连接 jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss server/dmvisit_service/src/main/resources/application-devYL.yml
@@ -6,7 +6,12 @@ password: rtjgfEr@&0c0m driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 连接池中的最小空闲连接 jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss server/dmvisit_service/src/main/resources/application-pro.yml
@@ -7,7 +7,12 @@ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 连接池中的最小空闲连接 knife4j: enable: true basic: server/dmvisit_service/src/main/resources/application-test.yml
@@ -10,7 +10,12 @@ jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 连接池中的最小空闲连接 #rocketmq: # namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080 # groupId: GID-wakatest server/dmvisit_service/src/main/resources/application-testYL.yml
@@ -6,7 +6,12 @@ password: rtjgfEr@&0c0m driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 连接池中的最小空闲连接 jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss
