Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2025-02-20 8b65a5c9e392f46eeea7cfda9647d59aee4ec81a

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

@@ -10,8 +10,11 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.dao.business.BikesMapper;
import com.doumee.dao.business.LocksMapper;
import com.doumee.dao.business.SitesMapper;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.Sites;
import com.doumee.dao.business.web.request.SitesMonitorBikeDTO;
@@ -27,6 +30,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.math.BigDecimal;
@@ -49,9 +53,12 @@

    @Autowired
    private LocksMapper locksMapper;
    @Autowired
    private BikesMapper bikesMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;


    @Override
    public String create(Sites sites) {
@@ -59,8 +66,9 @@

        QueryWrapper<Sites> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Sites::getCode,sites.getCode());
        Integer count = sitesMapper.selectCount(wrapper);
                .eq(Sites::getCode,sites.getCode())
                .eq(Sites::getIsdeleted,Constants.ZERO);
        Long count = sitesMapper.selectCount(wrapper);
        if (count > 0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"站点编号已存在");
        }
@@ -73,7 +81,9 @@
        insert.setIsdeleted(Constants.ZERO);
        insert.setInfo(sites.getInfo());
        insert.setName(sites.getName());
        insert.setType(sites.getType());
        insert.setCode(sites.getCode());
        insert.setElectronicFence(sites.getElectronicFence());
        insert.setStatus(Constants.ZERO);
        insert.setLockNum(sites.getLockNum());
        insert.setIp(sites.getIp());
@@ -116,8 +126,14 @@
        update.setEditor(principal.getId());
        update.setName(sites.getName());
        update.setLockNum(sites.getLockNum());
        update.setElectronicFence(sites.getElectronicFence());
        update.setIp(sites.getIp());
        update.setNeedNotice(sites.getNeedNotice());
        sitesMapper.updateById(update);
    }
    @Override
    public void updateByMqtt(Sites sites) {
        sitesMapper.updateById(sites);
    }

    @Override
@@ -145,6 +161,42 @@
    public List<Sites> findList(Sites sites) {
        QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
        return sitesMapper.selectList(wrapper);
    }
    @Override
    public void  noticeNoLinkList(Sites sites) {
        //发送钉钉通知
        int second  =0;
        try {
            second = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.NOTICE_SITE_LINK_LIMIT).getCode());
        }catch (Exception e){

        }
        if(second <=0){
            return ;
        }
        sites.setIsdeleted(Constants.ZERO);
        sites.setStatus(Constants.ZERO);
        QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
        wrapper.lambda().orderByDesc(Sites::getLastLinkDate);
        List<Sites> siteList =sitesMapper.selectList(wrapper);
        List<Sites> errorList = new ArrayList<>();
        for(Sites site : siteList){
            //时间查过通信异常阈值
            if(Constants.formatIntegerNum(site.getNeedNotice()) == Constants.ZERO
                    && System.currentTimeMillis()-site.getLastLinkDate().getTime() > second*1000){
                errorList.add(site);
            }
        }
        if(errorList.size()>0){
            try {
                DingDingNotice.siteNoLink(errorList, systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode(),
                        systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode(),
                        systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode());
            } catch (Exception e) {
                e.printStackTrace();
            }
        }

    }

    @Override
@@ -193,13 +245,17 @@
        if (pageWrap.getModel().getClientVersion() != null) {
            queryWrapper.lambda().eq(Sites::getClientVersion, pageWrap.getModel().getClientVersion());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
        if (pageWrap.getModel().getType() != null) {
            queryWrapper.lambda().eq(Sites::getType, pageWrap.getModel().getType());
        }
         /*for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        }*/
        queryWrapper.lambda().orderByAsc(Sites::getCode);
        return PageData.from(sitesMapper.selectPage(page, queryWrapper));
    }

@@ -207,6 +263,27 @@
    public long count(Sites sites) {
        QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
        return sitesMapper.selectCount(wrapper);
    }
    @Override
    @Transactional
    public void dealSiteLocks(Sites sites) {
        if(StringUtils.isBlank(sites.getId()) || StringUtils.isBlank(sites.getClientVersion())){
            return;
        }
        sites.setEditDate(new Date());
        sitesMapper.updateById(sites);
        String[] lockCods = new String[sites.getLockNum()];
        if(Constants.formatIntegerNum(sites.getLockNum())>0){
            for (int i = 1; i < sites.getLockNum()+1; i++) {
                lockCods[i-1] = i+"";
            }
        }
        locksMapper.delete(new UpdateWrapper<Locks>().lambda()
                .eq(Locks::getSiteId,sites.getId())
                .notIn(lockCods.length>0,Locks::getCode,lockCods));
        bikesMapper.delete(new UpdateWrapper<Bikes>().lambda()
                .eq(Bikes::getSiteId,sites.getId())
                .notIn(lockCods.length>0,Bikes::getLockId,lockCods));
    }

    @Override
@@ -255,14 +332,18 @@
                    BigDecimal rata = new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100L));
                    if(rata.compareTo(warnMax)>Constants.ZERO){
                        //发送钉钉通知
                        DingDingNotice.reservesNotice(s.getName(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode(),Constants.ZERO,warnMax);
                        DingDingNotice.reservesNotice(StringUtils.isBlank(s.getName())?s.getId() + " - 未知" :s.getId() + " - " + s.getName(),
                                Constants.ZERO,warnMax,
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode());
                    }else if(rata.compareTo(warnMin)<Constants.ZERO){
                        //发送钉钉通知
                        DingDingNotice.reservesNotice(s.getName(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode(),Constants.ONE,warnMin);
                        DingDingNotice.reservesNotice(StringUtils.isBlank(s.getName())?s.getId() + " - 未知" :s.getId() + " - " + s.getName()
                               ,Constants.ONE,warnMin,
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode());
                    }
                }
        }