From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 144 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 132 insertions(+), 12 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 893331c..8dc8961 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,33 +1,32 @@ 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.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.service.business.PlatformDeviceService; +import com.doumee.dao.openapi.response.PlatformStatusListResponse; 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; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -42,11 +41,15 @@ @Autowired private PlatformMapper platformMapper; @Autowired + private PlatformGroupMapper platformGroupMapper; + @Autowired private PlatformJoinMapper platformJoinMapper; @Autowired private PlatformDeviceMapper platformDeviceMapper; @Autowired private DeviceMapper deviceMapper; + @Autowired + private PlatformJobJoinMapper platformJobJoinMapper; @@ -72,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); } @@ -93,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); } @@ -126,6 +131,31 @@ 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(),"瀵逛笉璧凤紝鏈堝彴缁勪俊鎭笉姝g‘锛�"); + } + //濡傛灉鏈堝彴鍒嗙粍鍙戠敓鍙樺寲 + Long count = platformJobJoinMapper.selectCount( new QueryWrapper<PlatformJob>().lambda() + .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .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()) @@ -147,6 +177,7 @@ platformDevice.setType(Constants.ZERO); platformDevice.setDeviceId(ledId.toString()); platformDevice.setHkId(device.getHkId()); + platformDevice.setHkNo(device.getNo()); platformDevice.setName(device.getName()); platformDeviceList.add(platformDevice); } @@ -170,6 +201,7 @@ platformDevice.setType(Constants.TWO); platformDevice.setDeviceId(broadcastId.toString()); platformDevice.setHkId(device.getHkId()); + platformDevice.setHkNo(device.getNo()); platformDevice.setName(device.getName()); platformDeviceList.add(platformDevice); } @@ -260,7 +292,9 @@ .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()) + .orderByAsc(Platform::getSortnum) + ; for(PageWrap.SortData sortData: pageWrap.getSorts()) { if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { queryWrapper.orderByDesc(sortData.getProperty()); @@ -293,10 +327,66 @@ ); } } - } - return platformPageData; + } + + @Override + public List<Platform> platformWorkReportList(Platform platform) { + if(Objects.isNull(platform) + || Objects.isNull(platform.getQueryDateStart()) + || Objects.isNull(platform.getQueryDateEnd())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍙傛暟閿欒"); + } + MPJLambdaWrapper<Platform> queryWrapper = new MPJLambdaWrapper<>(); + queryWrapper.selectAll(Platform.class) + .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.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()) + .eq( Platform::getIsdeleted, Constants.ZERO) + .like(platform.getName() != null, Platform::getName, platform.getName()) + .orderByDesc(Platform::getId); + List<Platform> platformList = platformJoinMapper.selectList(queryWrapper); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformList)){ + //鏌ヨ鎵�鏈夋湀鍙版暟鎹笅鐨� 浠诲姟鏁版嵁 浠诲姟鏁版嵁涓� + List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class, + new MPJLambdaWrapper<PlatformJob>() + .selectAll(PlatformJob.class) + .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey(), + Constants.PlatformJobStatus.DONE.getKey(), + Constants.PlatformJobStatus.TRANSFERING.getKey(), + Constants.PlatformJobStatus.EXCEPTION.getKey(), + Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(), + Constants.PlatformJobStatus.LEAVED.getKey() + ) + .in(PlatformJob::getPlatformId,platformList.stream().map(i->i.getId()).collect(Collectors.toList())) + .ge(platform.getQueryDateStart() != null, PlatformJob::getStartDate, Utils.Date.getStart(platform.getQueryDateStart())) + .le(platform.getQueryDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(platform.getQueryDateEnd())) + ); + //鏌ヨ2鏃ユ湡鐩稿樊澶╂暟 + Integer sumDays = DateUtil.daysBetweenDates(platform.getQueryDateEnd(),platform.getQueryDateStart())+1; + for (Platform bean:platformList) { + if(Objects.isNull(bean.getOpenTime())||bean.getOpenTime().compareTo(BigDecimal.ZERO)<=0){ + bean.setUseRata(BigDecimal.ZERO); + continue; + } + BigDecimal sumTime = BigDecimal.valueOf(sumDays).multiply(bean.getOpenTime()); + bean.setUseRata( + bean.getWorkCountTime().multiply(new BigDecimal(100)).divide(sumTime,BigDecimal.ROUND_HALF_DOWN,2) + ); + bean.setUseRata(Constants.formatBigdecimal2Float(bean.getUseRata()));//寮哄埗淇濈暀涓や綅灏忔暟 + } + } + return platformList; } @Override @@ -333,6 +423,36 @@ + @Override + public List<PlatformStatusListResponse> getPlatformStatusList(){ + List<Platform> platformList = platformJoinMapper.selectJoinList(Platform.class,new MPJLambdaWrapper<Platform>() + .selectAll(Platform.class) + .select(" ( select count(1) from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" ) as workStatus ") + .select(" ( select pj.CAR_CODE_FRONT from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" limit 1 ) as workCarCode ") + .eq(Platform::getIsdeleted,Constants.ZERO) + ); + List<PlatformStatusListResponse> platformStatusListResponses = new ArrayList<>(); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformList)){ + for (Platform platform:platformList) { + PlatformStatusListResponse response = new PlatformStatusListResponse(); + response.setPlatformHkId(platform.getHkId()); + response.setPlatformName(platform.getName()); + response.setStatus(platform.getPlatformStatus()); + if(Constants.equalsInteger(platform.getPlatformStatus(),Constants.ONE)){ + response.setCarCode(platform.getWorkCarCode()); + } + platformStatusListResponses.add(response); + } + } + return platformStatusListResponses; + } + + + + + + + } -- Gitblit v1.9.3