From 693908cc4ff25fa49fa376a147ddc08e4a385e7d Mon Sep 17 00:00:00 2001 From: huguanghan Date: Fri, 8 Nov 2024 14:56:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E4=BF=97=E5=8A=9F=E7=8E=87=E6=9B=B2?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TheoreticalPowerCurveController.java | 37 +++++++++++++------ .../service/TheoreticalPowerCurveService.java | 6 ++- .../TheoreticalPowerCurveServiceImpl.java | 14 ++++++- 3 files changed, 44 insertions(+), 13 deletions(-) diff --git a/das/src/main/java/com/das/modules/curve/controller/TheoreticalPowerCurveController.java b/das/src/main/java/com/das/modules/curve/controller/TheoreticalPowerCurveController.java index 25abca86..cab347ec 100644 --- a/das/src/main/java/com/das/modules/curve/controller/TheoreticalPowerCurveController.java +++ b/das/src/main/java/com/das/modules/curve/controller/TheoreticalPowerCurveController.java @@ -3,12 +3,12 @@ package com.das.modules.curve.controller; import cn.dev33.satoken.stp.StpUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.read.builder.ExcelReaderBuilder; -import com.alibaba.excel.read.metadata.ReadSheet; import com.das.common.constant.SysAuthorityIds; import com.das.common.result.R; import com.das.common.utils.PageDataInfo; import com.das.common.utils.PageQuery; import com.das.modules.curve.domain.dto.TheoreticalPowerCurveDto; +import com.das.modules.curve.domain.entity.CurveItemEntity; import com.das.modules.curve.domain.entity.TheoreticalPowerCurveEntity; import com.das.modules.curve.domain.excel.CurveItemExcel; import com.das.modules.curve.listener.CurveItemListener; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.text.ParseException; +import java.util.List; /** * 风速功率曲线controller @@ -66,8 +66,7 @@ public class TheoreticalPowerCurveController { } /** - * 删除设备类型 - * @return 所有的设备类型 + * 阐述制造商 */ @PostMapping("/delete") public R deleteTheoreticalPowerCurve(@RequestBody TheoreticalPowerCurveDto theoreticalPowerCurveDto) { @@ -80,31 +79,37 @@ public class TheoreticalPowerCurveController { return R.success(); } + /** + * 查询制造商信息 + * @param id 制造商id + * @return 制造商信息 + */ @GetMapping("/queryById") public R queryTheoreticalPowerCurveById(String id) { return R.success(theoreticalPowerCurveService.queryTheoreticalPowerCurveById(id)); } /** - * 查询设备类型列表 - * @return 所有的设备类型 + * 查询所有制造商 + * @return 所有制造商 */ @PostMapping("/query") public PageDataInfo queryAllCurve(@RequestBody PageQuery pageQuery) { return theoreticalPowerCurveService.getAllCurves(pageQuery); } - - - - /** 设备导出 */ + /** + * 速度功率曲线导出 + */ @PostMapping("/export") public void exportTheoreticalPowerCurve(@RequestBody TheoreticalPowerCurveDto theoreticalPowerCurveDto, HttpServletRequest request, HttpServletResponse response) { theoreticalPowerCurveService.exportTheoreticalPowerCurve(theoreticalPowerCurveDto,request, response); } - /** 设备导入 */ + /** + * 速度功率曲线导入 + */ @PostMapping("/import") public R importSysIotModel(String id, @RequestParam("file") MultipartFile file) throws IOException { curveItemListener.setParent(Long.valueOf(id)); @@ -112,4 +117,14 @@ public class TheoreticalPowerCurveController { read.sheet().doRead(); return R.success("导入成功"); } + + /** + * 根据制造商id查询速度功率曲线 + * @return 速度功率曲线 + */ + @GetMapping("/queryItemByParent") + public R> queryAllCurve(String id) { + List curveItemEntityList = theoreticalPowerCurveService.queryCurveItemByParent(id); + return R.success(curveItemEntityList); + } } diff --git a/das/src/main/java/com/das/modules/curve/service/TheoreticalPowerCurveService.java b/das/src/main/java/com/das/modules/curve/service/TheoreticalPowerCurveService.java index 1a5e8789..bea33046 100644 --- a/das/src/main/java/com/das/modules/curve/service/TheoreticalPowerCurveService.java +++ b/das/src/main/java/com/das/modules/curve/service/TheoreticalPowerCurveService.java @@ -3,10 +3,12 @@ package com.das.modules.curve.service; import com.das.common.utils.PageDataInfo; import com.das.common.utils.PageQuery; import com.das.modules.curve.domain.dto.TheoreticalPowerCurveDto; +import com.das.modules.curve.domain.entity.CurveItemEntity; import com.das.modules.curve.domain.entity.TheoreticalPowerCurveEntity; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; public interface TheoreticalPowerCurveService { PageDataInfo getAllCurves(PageQuery pageQuery); @@ -21,5 +23,7 @@ public interface TheoreticalPowerCurveService { void exportTheoreticalPowerCurve(TheoreticalPowerCurveDto theoreticalPowerCurveDto, HttpServletRequest request, HttpServletResponse response); + List queryCurveItemByParent(String id); + } diff --git a/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java b/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java index 96ddc565..8293511e 100644 --- a/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java +++ b/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java @@ -91,7 +91,11 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe if (theoreticalPowerCurveDto.getId() == null){ throw new ServiceException("参数缺失"); } + //删除关联曲线数据 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("PARENT",theoreticalPowerCurveDto.getId()); + curveItemMapper.delete(queryWrapper); //删除制造商数据 theoreticalPowerCurveMapper.deleteById(theoreticalPowerCurveDto.getId()); @@ -121,6 +125,15 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe HuExcelUtils.exportExcel(response, exportList, theoreticalPowerCurve.getMadeinfactory()+theoreticalPowerCurve.getModel()+"理论功率"); } + @Override + public List queryCurveItemByParent(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("PARENT",Long.valueOf(id)); + queryWrapper.orderByAsc("SPEED"); + List curveItemEntityList = curveItemMapper.selectList(queryWrapper); + return curveItemEntityList; + } + public void batchProcessing(List curveItemList, Long parent){ //先删除制造商数据 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -137,6 +150,5 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe item.setRevision(1); curveItemMapper.insert(item); } - } }