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 | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 6aed1e4..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
@@ -66,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(),"绔欑偣缂栧彿宸插瓨鍦�");
}
@@ -80,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());
@@ -123,6 +126,7 @@
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);
@@ -171,6 +175,7 @@
return ;
}
sites.setIsdeleted(Constants.ZERO);
+ sites.setType(Constants.ZERO);
sites.setStatus(Constants.ZERO);
QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
wrapper.lambda().orderByDesc(Sites::getLastLinkDate);
@@ -179,7 +184,8 @@
for(Sites site : siteList){
//鏃堕棿鏌ヨ繃閫氫俊寮傚父闃堝��
if(Constants.formatIntegerNum(site.getNeedNotice()) == Constants.ZERO
- && System.currentTimeMillis()-site.getLastLinkDate().getTime() > second*1000){
+ &&(site.getLastLinkDate() == null
+ || System.currentTimeMillis()-site.getLastLinkDate().getTime() > second*1000)){
errorList.add(site);
}
}
@@ -240,6 +246,9 @@
}
if (pageWrap.getModel().getClientVersion() != null) {
queryWrapper.lambda().eq(Sites::getClientVersion, pageWrap.getModel().getClientVersion());
+ }
+ 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)) {
@@ -340,7 +349,14 @@
}
}
}
-
-
}
+
+ @Override
+ 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