修改

jiangping

2023-10-12 be54460bd13123eff51034e2cde2b3dafd000111

修改

 server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java

@@ -14,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
@@ -28,6 +29,7 @@
@Slf4j
public class DeviceSubscribeServiceImpl implements DeviceSubcribeService {
    @Autowired
    @Lazy
    MemberRidesService memberRidesService;
    @Autowired
    private MqttLogMapper mqttLogMapper;

 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java

@@ -415,13 +415,12 @@
        //状态，0闭合, 1打开，2运行中, 3异常
        if(model.getStatus() == Constants.LockStatus.open){
            //如果是开锁业务，判断是否有开锁中的信息
            if(StringUtils.isNotBlank(locks.getBikeCode())){

            }
            MemberRides memberRides = new MemberRides();
            memberRides.setBikeCode(model.getBikeCode());


            memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
            memberRides.setRentLockId(model.getId());
            memberRides.setIsdeleted(Constants.ZERO);
            //（更新请求开锁中的锁头关联的骑行记录）
            memberRidesMapper.update(null,new UpdateWrapper<>(memberRides));
        }
        return 0;
    }
@@ -434,11 +433,10 @@
        if(bikes != null ) {
            if (  StringUtils.equals(model.getBikeCode(), bikes.getCode())){
                //如果绑定车辆信息发生编号，更换绑定关系
                bikes.setCode(model.getBikeCode());
                bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
                UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
                updateWrapper.lambda().set(Bikes::getId, bikes.getId());

                updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
                updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
                //更新自行站点锁头绑定自行车信息
                bikesMapper.updateById(bikes);
            }
@@ -466,7 +464,6 @@
        Locks model =   locksMapper.selectById(locks.getId());
        Date date =new Date();
        //检查站点信息，不存在则新增
//        boolean newSite =false;
        Sites sites = sitesMapper.selectById(locks.getSiteId());
        if(sites == null){
            sites = new Sites();
@@ -478,7 +475,6 @@
            sites.setLockNum(1);
            //新增锁头
            sitesMapper.insert(sites);
//            newSite =true;
        }

        if(model == null){
@@ -493,28 +489,7 @@
            model.setCreateDate(date);
            model.setStatus(locks.getStatus());
            locksMapper.insert(model);
         /*   UpdateWrapper<Sites> wrapper = new UpdateWrapper();
            wrapper.eq("id",sites.getId());
            wrapper.lambda().setSql("lock_num = COALESCE(lock_num,0)  + 1");
            wrapper.lambda().set(Sites::getEditDate,date);
            sitesMapper.update(null,wrapper);//累计锁头数量*/
        }else{
          /*  if(!StringUtils.equals(model.getId(),locks.getId())){
                //如果站点发生变化，原来的站点锁头数量-1
                UpdateWrapper<Sites> wrapper = new UpdateWrapper();
                wrapper.eq("id",model.getId());
                wrapper.lambda().setSql("lock_num = COALESCE(lock_num,0)  - 1");
                wrapper.lambda().set(Sites::getEditDate,date);
                sitesMapper.update(null,wrapper);//累计锁头数量
            }
            if(!newSite){
                //如果站点未发生变化， 并且不是新站点，站点锁头+1
                UpdateWrapper<Sites> wrapper = new UpdateWrapper();
                wrapper.eq("id",model.getId());
                wrapper.lambda().setSql("lock_num = COALESCE(lock_num,0)  - 1");
                wrapper.lambda().set(Sites::getEditDate,date);
                sitesMapper.update(null,wrapper);//累计锁头数量
            }*/
            model.setSiteId(locks.getSiteId());
            model.setIsdeleted(Constants.ZERO);
            model.setCode(locks.getCode());