From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index 37627fa..377c814 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -1,31 +1,25 @@
package com.doumee.service.business.impl;
-import cn.emay.sdk.util.StringUtil;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.DeviceMapper;
-import com.doumee.dao.business.PlatformDeviceMapper;
-import com.doumee.dao.business.PlatformJobMapper;
-import com.doumee.dao.business.PlatformMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.join.PlatformJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.openapi.response.PlatformNumByStatusResponse;
import com.doumee.dao.openapi.response.PlatformStatusListResponse;
-import com.doumee.service.business.PlatformDeviceService;
import com.doumee.service.business.PlatformService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -46,6 +40,8 @@
@Autowired
private PlatformMapper platformMapper;
+ @Autowired
+ private PlatformGroupMapper platformGroupMapper;
@Autowired
private PlatformJoinMapper platformJoinMapper;
@Autowired
@@ -79,6 +75,7 @@
platformDevice.setType(Constants.ZERO);
platformDevice.setDeviceId(ledId.toString());
platformDevice.setHkId(device.getHkId());
+ platformDevice.setHkNo(device.getNo());
platformDevice.setName(device.getName());
platformDeviceList.add(platformDevice);
}
@@ -100,6 +97,7 @@
platformDevice.setType(Constants.TWO);
platformDevice.setDeviceId(broadcastId.toString());
platformDevice.setHkId(device.getHkId());
+ platformDevice.setHkNo(device.getNo());
platformDevice.setName(device.getName());
platformDeviceList.add(platformDevice);
}
@@ -133,6 +131,32 @@
public void updateById(Platform platform) {
platform.setEditor(platform.getLoginUserInfo().getId());
platform.setEditDate(new Date());
+ Platform model = platformMapper.selectById(platform.getId());
+ if(Objects.isNull(platform.getSortnum())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(model.getGroupId()!= null && platform.getGroupId()!=null && !Constants.equalsInteger(platform.getGroupId(),model.getGroupId())){
+ PlatformGroup group = platformGroupMapper.selectById(platform.getGroupId());
+ if(group ==null || Constants.equalsInteger(group.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鏈堝彴缁勪俊鎭笉姝ｇ‘锛�");
+ }
+ //濡傛灉鏈堝彴鍒嗙粍鍙戠敓鍙樺寲
+ Long count = platformJobJoinMapper.selectCount( new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getPlatformId,model.getId())
+ .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.WART_SIGN_IN.getKey()
+ ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()
+ ,Constants.PlatformJobStatus.DONE.getKey()
+ ,Constants.PlatformJobStatus.LEAVED.getKey()
+ ,Constants.PlatformJobStatus.CANCEL.getKey()
+ ));
+ if(count!=null && count>0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠鏈堝彴鏈夋鍦ㄤ綔涓氱殑浠诲姟锛屼笉鑳借繘琛屾湀鍙扮粍鍒囨崲鎿嶄綔锛�");
+ }
+ }
//鍒犻櫎LED/骞挎挱鏁版嵁
platformDeviceMapper.delete(new QueryWrapper<PlatformDevice>().lambda()
.eq(PlatformDevice::getPlatformId,platform.getId())
@@ -154,6 +178,7 @@
platformDevice.setType(Constants.ZERO);
platformDevice.setDeviceId(ledId.toString());
platformDevice.setHkId(device.getHkId());
+ platformDevice.setHkNo(device.getNo());
platformDevice.setName(device.getName());
platformDeviceList.add(platformDevice);
}
@@ -177,6 +202,7 @@
platformDevice.setType(Constants.TWO);
platformDevice.setDeviceId(broadcastId.toString());
platformDevice.setHkId(device.getHkId());
+ platformDevice.setHkNo(device.getNo());
platformDevice.setName(device.getName());
platformDeviceList.add(platformDevice);
}
@@ -267,7 +293,10 @@
.eq(pageWrap.getModel().getYpos() != null, Platform::getYpos, pageWrap.getModel().getYpos())
.eq(pageWrap.getModel().getWidth() != null, Platform::getWidth, pageWrap.getModel().getWidth())
.eq(pageWrap.getModel().getHeight() != null, Platform::getHeight, pageWrap.getModel().getHeight())
- .eq(pageWrap.getModel().getAngle() != null, Platform::getAngle, pageWrap.getModel().getAngle());
+ .eq(pageWrap.getModel().getAngle() != null, Platform::getAngle, pageWrap.getModel().getAngle())
+ .eq(pageWrap.getModel().getType() != null, Platform::getType, pageWrap.getModel().getType())
+ .orderByAsc(Platform::getSortnum)
+ ;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -316,9 +345,12 @@
.selectAs(PlatformGroup::getName,Platform::getGroupName)
.select(" (select ifnull(TIMESTAMPDIFF(HOUR, '2023-01-01 '||pg.start_time||':00', '2023-01-01 '||pg.end_time||':00' ),0) from platform_group pg " +
" where t.group_id = pg.id ) as openTime ")
- .select(" ( select ROUND( ifnull(SUM(pl.PARAM3),0) / 3600 , 2 ) from platform_log pl where pl.OBJ_ID = t.id and pl.remark = t.id " +
- " and pl.CREATE_DATE > '"+Utils.Date.getStart(platform.getQueryDateStart())+"' " +
- "and pl.CREATE_DATE <= '"+Utils.Date.getEnd(platform.getQueryDateEnd())+"' ) as workCountTime ")
+ .select(" ( select ROUND( ifnull(SUM(pl.PARAM3),0) / 3600 , 2 ) from platform_log pl where pl.remark = t.id " +
+ " and pl.CREATE_DATE > '"+DateUtil.getFomartDate(platform.getQueryDateStart(),"yyyy-MM-dd")+" 00:00:00' " +
+ "and pl.CREATE_DATE <= '"+DateUtil.getFomartDate(platform.getQueryDateEnd(),"yyyy-MM-dd")+" 23:59:59' ) as workCountTime ")
+ .select(" ( select count(1) from platform_log pl where pl.remark = t.id " +
+ " and pl.CREATE_DATE > '"+DateUtil.getFomartDate(platform.getQueryDateStart(),"yyyy-MM-dd")+" 00:00:00' " +
+ "and pl.CREATE_DATE <= '"+DateUtil.getFomartDate(platform.getQueryDateEnd(),"yyyy-MM-dd")+" 23:59:59' and pl.OBJ_TYPE = 5 ) as stopCount ")
.leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId);
queryWrapper
.eq(platform.getGroupId() != null, Platform::getGroupId, platform.getGroupId())
@@ -345,8 +377,6 @@
//鏌ヨ2鏃ユ湡鐩稿樊澶╂暟
Integer sumDays = DateUtil.daysBetweenDates(platform.getQueryDateEnd(),platform.getQueryDateStart())+1;
for (Platform bean:platformList) {
- List<PlatformJob> beanJobList = platformJobList.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),bean.getId())).collect(Collectors.toList());
- bean.setStopCount(beanJobList.size());
if(Objects.isNull(bean.getOpenTime())||bean.getOpenTime().compareTo(BigDecimal.ZERO)<=0){
bean.setUseRata(BigDecimal.ZERO);
continue;
@@ -355,6 +385,7 @@
bean.setUseRata(
bean.getWorkCountTime().multiply(new BigDecimal(100)).divide(sumTime,BigDecimal.ROUND_HALF_DOWN,2)
);
+ bean.setUseRata(Constants.formatBigdecimal2Float(bean.getUseRata()));//寮哄埗淇濈暀涓や綅灏忔暟
}
}
return platformList;
@@ -412,6 +443,7 @@
if(Constants.equalsInteger(platform.getPlatformStatus(),Constants.ONE)){
response.setCarCode(platform.getWorkCarCode());
}
+ platformStatusListResponses.add(response);
}
}
return platformStatusListResponses;
--
Gitblit v1.9.3