From ce0fef1c976ede5d77dfba1c285bbd0436d02d04 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 08 八月 2024 14:00:21 +0800 Subject: [PATCH] 优云录像可用接口调通 --- ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 143 ++++++++++++++++++++++++++++++----------------- 1 files changed, 90 insertions(+), 53 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java index 40f9093..354b073 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java @@ -1,42 +1,46 @@ package com.ycl.platform.service.impl; +import com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.dataListener.CurrencyDataListener; import com.ycl.platform.base.BaseSelect; -import com.ycl.platform.domain.entity.Region; import com.ycl.platform.domain.entity.YwPeople; import com.ycl.platform.domain.entity.YwPoint; import com.ycl.platform.domain.entity.YwUnit; import com.ycl.platform.domain.form.BatchEditPointForm; -import com.ycl.platform.mapper.RegionMapper; +import com.ycl.platform.domain.form.YwPointForm; +import com.ycl.platform.domain.query.YwPointQuery; +import com.ycl.platform.domain.vo.YwPointVO; +import com.ycl.platform.domain.excel.PointExport; +import com.ycl.platform.domain.excel.PointSelectHandler; import com.ycl.platform.mapper.YwPeopleMapper; import com.ycl.platform.mapper.YwPointMapper; -import com.ycl.platform.mapper.YwUnitMapper; import com.ycl.platform.service.YwPointService; import com.ycl.platform.service.YwUnitService; import com.ycl.system.Result; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.platform.domain.form.YwPointForm; -import com.ycl.platform.domain.vo.YwPointVO; -import com.ycl.platform.domain.query.YwPointQuery; -import java.util.List; - -import com.ycl.system.entity.SysUser; -import com.ycl.system.service.ISysDeptService; - -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ycl.system.mapper.SysDeptMapper; import com.ycl.system.page.PageUtil; +import com.ycl.utils.DateUtils; import com.ycl.utils.SecurityUtils; -import enumeration.general.RegionLevelEnum; -import org.springframework.stereotype.Service; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; -import java.util.ArrayList; -import java.util.Objects; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import lombok.RequiredArgsConstructor; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import java.util.function.Consumer; +import java.util.stream.Collectors; /** * 杩愮淮鐐逛綅 鏈嶅姟瀹炵幇绫� @@ -48,11 +52,8 @@ @RequiredArgsConstructor public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService { - private final YwPointMapper ywPointMapper; - private final ISysDeptService deptService; + private final SysDeptMapper sysDeptMapper; private final YwUnitService unitService; - private final YwUnitMapper ywUnitMapper; - private final RegionMapper regionMapper; private final YwPeopleMapper ywPeopleMapper; /** @@ -88,8 +89,6 @@ new LambdaUpdateChainWrapper<>(baseMapper) .in(YwPoint::getId, form.getIds()) .set(YwPoint::getUnitId, form.getUnitId()) - .set(YwPoint::getStartTime, form.getStartTime()) - .set(YwPoint::getEndTime, form.getEndTime()) .update(); } else { new LambdaUpdateChainWrapper<>(baseMapper) @@ -109,16 +108,11 @@ */ @Override public Result update(YwPointForm form) { - YwPoint entity = baseMapper.selectById(form.getId()); - - // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊 Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); BeanUtils.copyProperties(form, entity); - if (baseMapper.updateById(entity) > 0) { - return Result.ok("淇敼鎴愬姛"); - } - return Result.error("淇敼澶辫触"); + baseMapper.updateById(entity); + return Result.ok("淇敼鎴愬姛"); } /** @@ -154,21 +148,9 @@ */ @Override public Result page(YwPointQuery query) { - - IPage<YwPoint> page = new LambdaQueryChainWrapper<>(baseMapper) - .like(StringUtils.hasText(query.getPointName()), YwPoint::getPointName, query.getPointName()) - .orderByDesc(YwPoint::getCreateTime) - .page(PageUtil.getPage(query, YwPoint.class)); - - List<YwPointVO> vos = page.getRecords().stream() - .map( - entity -> YwPointVO.getVoByEntity(entity, null) - .setDeptName(deptService.selectDeptById(entity.getDeptId()).getDeptName()) - .setUnitName(unitService.getById(entity.getUnitId()).getUnitName()) - ) - .collect(Collectors.toList()); - - return Result.ok().data(vos).total(page.getTotal()); + IPage<YwPointVO> page = PageUtil.getPage(query, YwPointVO.class); + baseMapper.page(page, query); + return Result.ok().data(page.getRecords()).total(page.getTotal()); } /** @@ -178,10 +160,12 @@ */ @Override public Result detail(String id) { - YwPoint entity = baseMapper.selectById(id); Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); YwPointVO vo = YwPointVO.getVoByEntity(entity, null); + if (Objects.nonNull(entity.getDeptId())) { + vo.setDeptIds(sysDeptMapper.selectParents(entity.getDeptId())); + } return Result.ok().data(vo); } @@ -212,16 +196,69 @@ unitId = people.getBelongUnit(); } - List<Region> list = new LambdaQueryChainWrapper<>(regionMapper) - .eq(Region::getRegionLevel, RegionLevelEnum.STREET) - .like(Region::getFullName, keyword) + List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper) + .eq(YwPoint::getUnitId, unitId) + .like(YwPoint::getPointName, keyword) .list(); List<BaseSelect> data = list.stream().map(item -> { BaseSelect baseSelect = new BaseSelect(); baseSelect.setId(item.getId()); - baseSelect.setValue(item.getFullName()); + baseSelect.setValue(item.getPointName()); return baseSelect; }).collect(Collectors.toList()); return Result.ok().data(data); } + + @Override + public boolean updateRecovery(List<String> serialNumberList, int recovery) { + return new LambdaUpdateChainWrapper<>(baseMapper) + .in(YwPoint::getSerialNumber, serialNumberList) + .set(YwPoint::getRecovery, recovery) + .set(recovery == 0, YwPoint::getRecoveryTime, DateUtils.getNowDate()) + .update(); + } + + @Override + public List<YwPoint> home() { + return baseMapper.home(); + } + + @Override + public void export(YwPointQuery query, HttpServletResponse response) throws IOException { + // 瀵煎嚭鏁版嵁 + List<PointExport> exportData = baseMapper.export(query); + + EasyExcel.write(response.getOutputStream(), PointExport.class) + .sheet("鐐逛綅鏇存崲杩愮淮鍗曚綅") + .doWrite(exportData); + } + + @Override + public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException { + Consumer<List<PointExport>> consumer = (dataList) -> { + this.updatePoint(dataList, unitId, startTime, endTime); + }; + EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll(); + return Result.ok(); + } + + /** + * 淇敼鐐逛綅鐨勮繍缁村崟浣� + * + * @param dataList + * @param unitId + */ + private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime) { + if (CollectionUtils.isEmpty(dataList)) { + throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖"); + } + List<String> pointList = dataList.stream().map(PointExport::getSerialNumber).collect(Collectors.toList()); + new LambdaUpdateChainWrapper<>(baseMapper) + .in(YwPoint::getSerialNumber, pointList) + .set(YwPoint::getUnitId, unitId) + .set(YwPoint::getStartTime, startTime) + .set(YwPoint::getEndTime, endTime) + .update(); + } + } -- Gitblit v1.8.0