From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 146 insertions(+), 27 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index b1ac1b2..a27bae7 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/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,9 +30,11 @@
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;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -48,9 +53,12 @@
@Autowired
private LocksMapper locksMapper;
+ @Autowired
+ private BikesMapper bikesMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
@Override
public String create(Sites sites) {
@@ -58,12 +66,14 @@
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(),"绔欑偣缂栧彿宸插瓨鍦�");
}
Sites insert = new Sites();
+ insert.setId(sites.getCode());
insert.setCreateDate(new Date());
insert.setCreator(principal.getId());
insert.setEditDate(new Date());
@@ -71,11 +81,13 @@
insert.setIsdeleted(Constants.ZERO);
insert.setInfo(sites.getInfo());
insert.setName(sites.getName());
+ insert.setType(sites.getType());
insert.setCode(sites.getCode());
- insert.setStatus(sites.getStatus());
+ insert.setElectronicFence(sites.getElectronicFence());
+ insert.setStatus(Constants.ZERO);
insert.setLockNum(sites.getLockNum());
insert.setIp(sites.getIp());
- sitesMapper.insert(sites);
+ sitesMapper.insert(insert);
return sites.getId();
}
@@ -101,13 +113,27 @@
@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());
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
@@ -128,13 +154,51 @@
@Override
public Sites findOne(Sites sites) {
QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
- return sitesMapper.selectOne(wrapper);
+ return sitesMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
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.setType(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
+ &&(site.getLastLinkDate() == null
+ || 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
@@ -166,10 +230,10 @@
queryWrapper.lambda().eq(Sites::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Sites::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Sites::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Sites::getCode, pageWrap.getModel().getCode());
+ queryWrapper.lambda().like(Sites::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Sites::getStatus, pageWrap.getModel().getStatus());
@@ -183,13 +247,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));
}
@@ -198,25 +266,48 @@
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
public PageData<Sites> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap) {
-
// IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
IPage<Sites> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Sites> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.select("*,(select count(r.id) from locks r where r.site_id = sites.id) as localCount" +
- ",(select count(r.bike_code) from locks r where r.site_id = sites.id and r.bike_code is null and r.bike_code !='' ) as bikeCount");
+ 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");
// Page<SitesMonitorDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorDTO(page, pageWrap.getModel().getCode(), pageWrap.getModel().getName());
queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Sites::getCode,pageWrap.getModel().getCode());
- queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Sites::getCode,pageWrap.getModel().getName());
+ queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Sites::getName,pageWrap.getModel().getName());
queryWrapper.lambda().orderByAsc(Sites::getCode);
IPage<Sites> sitesMonitorDTO = sitesMapper.selectPage(page, queryWrapper);
-
if (!CollectionUtils.isEmpty(sitesMonitorDTO.getRecords())){
sitesMonitorDTO.getRecords().forEach(s->{
- s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getLocalCount()).setScale(2)));
+ if(Constants.formatIntegerNum(s.getAllLockNum()) >0){
+ s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),2,BigDecimal.ROUND_HALF_UP));
+ }else{
+ s.setRate(new BigDecimal(0.0));
+ }
});
}
@@ -224,20 +315,48 @@
}
@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(),
+ 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(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());
+ }
+ }
+ }
}
@Override
- public PageData<SitesMonitorBikeDTO> getSitesMonitorBikeDTO(PageWrap<SitesMonitorDTO> pageWrap) {
- IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- Page<SitesMonitorBikeDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorBikeDTO(page,
- pageWrap.getModel().getCode(),
- pageWrap.getModel().getName(),
- pageWrap.getModel().getLockCode(),
- pageWrap.getModel().getHasBike());
-
-
- return PageData.from(sitesMonitorDTO);
+ public List<Sites> getSiteList(Integer type){
+ return sitesMapper.selectList(new QueryWrapper<Sites>().lambda()
+ .eq(Sites::getIsdeleted,Constants.ZERO)
+ .eq(Sites::getStatus,Constants.ZERO)
+ .eq(Objects.nonNull(type),Sites::getType,type));
}
+
}
--
Gitblit v1.9.3