修复bug

jiangping

2024-07-30 b65171017a7b83620669cf9226397269c249a351

修复bug

 admin/src/views/business/cars.vue

@@ -86,9 +86,11 @@
  methods: {
    // 同步信息
    async syncCars () {
      const message = await sync({})
      this.$message.success(message)
      this.search()
      sync({}).then(res =>{
        this.$message.success('导入成功')
        this.search()
      })

    }
  }
}

 admin/vue.config.js

@@ -22,7 +22,7 @@
        // target: 'http://218.23.218.228:8018/admin_interface',
        // http://218.23.218.228:9912/admin_interface
        // http://facepay.huasunsolar.com/admin_interface
        target: 'http://localhost/admin_interface ',
        target: 'http://localhost/admin_interface',
        changeOrigin: true,
        pathRewrite: {
          [`^${[process.env.VUE_APP_API_PREFIX]}`]: ''

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -773,11 +773,18 @@
        if(StringUtils.isNotBlank(event.getPlateNos())){
            ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
                    .eq(ParkBook::getCarCode,event.getPlateNos())
                    .eq(ParkBook::getParkHkId,event.getParkIndex())
                            .eq(ParkBook::getIsdeleted,Constants.ZERO )
                    .last("limit 1" ));
            if(cars!=null){
                event.setMemberId(cars.getMemberId());
            Cars c = carsMapper.selectOne(new QueryWrapper<Cars>().lambda()
                    .eq(Cars::getCode,event.getPlateNos())
                    .eq(Cars::getIsdeleted,Constants.ZERO)
                    .last("limit 1" ));
            if(cars!=null || c!=null){
                //优先查询内部车辆信息
                event.setMemberId(cars!=null?cars.getMemberId():c.getMemberId());
            }else{
                //去访客信息中查询
                Visits visits =  visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
                        .eq(Visits::getCarNos,event.getPlateNos())
                        .eq(Visits::getIsdeleted,Constants.ZERO )

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java

@@ -154,7 +154,6 @@
    }

    private void dealUpdateByList(List<VehicleTimeRangeInfoResponse> list) {
        List<Cars> newList = new ArrayList<>();
        if(list == null || list.size()==0){
            return   ;
        }
@@ -177,17 +176,21 @@
                c.setEditDate(DateUtil.getISO8601DateByStr(model.getUpdateTime()));
                if(StringUtils.isNotBlank(model.getPersonId())){
                    //被访问人
                    Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,model.getPersonId()).last("limit 1"));
                    Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                            .eq(Member::getHkId,model.getPersonId())
                            .last("limit 1"));
                    c.setMemberId(member!=null?member.getId():null);
                    if(member!=null){
                        carEventMapper.update(null,new UpdateWrapper<CarEvent>().lambda()
                                .set(CarEvent::getMemberId,member.getId())
                                .eq(CarEvent::getPlateNos,c.getCode())
                                .apply("member_id is null or member_id=''")
                                .apply("(member_id is null or member_id='')")
                        );
                    }
                }
                Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda().eq(Cars::getHkId,model.getVehicleId()).last("limit 1"));
                Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda()
                        .eq(Cars::getHkId,model.getVehicleId())
                        .last("limit 1"));
                if(cars!=null){
                    //更新
                    c.setId(cars.getId());
@@ -196,7 +199,6 @@
                    //新增
                    carsMapper.insert(c);
                }

            }

        }
@@ -220,13 +222,15 @@
            c.setEditDate(DateUtil.getISO8601DateByStr(model.getUpdateTime()));
            if(StringUtils.isNotBlank(model.getPersonId())){
                //被访问人
                Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,model.getPersonId()).last("limit 1"));
                Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                        .eq(Member::getHkId,model.getPersonId())
                        .last("limit 1"));
                c.setMemberId(member!=null?member.getId():null);
                if(member!=null){
                    carEventMapper.update(null,new UpdateWrapper<CarEvent>().lambda()
                            .set(CarEvent::getMemberId,member.getId())
                            .eq(CarEvent::getPlateNos,c.getCode())
                            .apply("member_id is null or member_id=''")
                            .apply("(member_id is null or member_id='')")
                    );
                }
            }