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

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

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

@@ -10,6 +10,7 @@
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.LocksMapper;
import com.doumee.dao.business.SitesMapper;
import com.doumee.dao.business.model.Locks;
@@ -30,6 +31,7 @@
import org.springframework.util.CollectionUtils;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -51,6 +53,7 @@

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;


    @Override
    public String create(Sites sites) {
@@ -102,7 +105,15 @@
    @Override
    public void updateById(Sites sites) {
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        QueryWrapper<Sites> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Sites::getCode,sites.getCode());
        Sites count = sitesMapper.selectOne(wrapper);
        if (Objects.nonNull(count) && !count.getId().equals(sites.getId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"站点编号已存在");
        }
        Sites update = new Sites();
        update.setId(sites.getId());
        update.setCreateDate(new Date());
        update.setEditor(principal.getId());
        update.setName(sites.getName());
@@ -227,7 +238,37 @@
    }

    @Override
    public void siteReservesNotice(String siteId) throws Exception {
    public void siteReservesNotice()  throws Exception{
        QueryWrapper<Sites> queryWrapper = new QueryWrapper<>();
        queryWrapper.select(" *, " +
                " (select count(r.id) from locks r where r.site_id = sites.id) as all_lock_num ," +
                "(select count(l.bike_code) from locks l where l.site_id = sites.id and l.bike_code IS NOT NULL and l.bike_code !='' ) as bikeCount");
        queryWrapper.lambda().eq(Sites::getStatus,Constants.ZERO);
        queryWrapper.lambda().eq(Sites::getIsdeleted,Constants.ZERO);
        queryWrapper.lambda().orderByAsc(Sites::getCode);
        List<Sites> sitesList = sitesMapper.selectList(queryWrapper);
        if (!CollectionUtils.isEmpty(sitesList)){
                for (Sites s:sitesList) {
                    if(Constants.formatIntegerNum(s.getAllLockNum())<=Constants.ZERO){
                        continue;
                    }
                    BigDecimal warnMin = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.WARN_MIN).getCode());
                    BigDecimal warnMax = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.WARN_MAX).getCode());
                    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(StringUtils.isBlank(s.getName())?s.getId() + " - 未知" :s.getId() + " - " + s.getName(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode(),Constants.ZERO,warnMax);
                    }else if(rata.compareTo(warnMin)<Constants.ZERO){
                        //发送钉钉通知
                        DingDingNotice.reservesNotice(StringUtils.isBlank(s.getName())?s.getId() + " - 未知" :s.getId() + " - " + s.getName(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
                                systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode(),Constants.ONE,warnMin);
                    }
                }
        }


    }
}