海南版本提交

2024-03-18 15:21:28 +08:00
parent 5b7763b265
commit 5fff26c276
27 changed files with 1647 additions and 274 deletions
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityController.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityController.java
@@ -1,40 +1,35 @@
 package com.njcn.advance.controller.carrycapacity;

-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
-import com.alibaba.nacos.shaded.com.google.common.collect.Maps;
-import com.njcn.advance.pojo.carrycapacity.excel.CarryCapcityDataIEexcel;
-import com.njcn.advance.pojo.carrycapacity.excel.CarryCapcityDataPEexcel;
-import com.njcn.advance.pojo.carrycapacity.excel.CarryCapcityDataQEexcel;
-import com.njcn.advance.pojo.carrycapacity.excel.CarryCapcityDataVEexcel;
+import com.alibaba.excel.EasyExcel;
+import com.njcn.advance.pojo.carrycapacity.excel.CarryCapcityDataEexcel;
 import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityCalParam;
 import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityEvaluateParam;
 import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityQueryDataParam;
 import com.njcn.advance.pojo.carrycapacity.param.ExcelDataParam;
-import com.njcn.advance.pojo.carrycapacity.vo.*;
+import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDResultVO;
+import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDataIVO;
+import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDataQVO;
+import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDataVO;
 import com.njcn.advance.service.carrycapacity.CarryCapcityService;
+import com.njcn.advance.utils.EasyExcelUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pq.pojo.vo.TerminalTree;
-import com.njcn.poi.util.PoiUtil;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.compress.utils.Lists;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;


 /**
@@ -113,49 +108,19 @@ public class CarryCapacityController extends BaseController {
    @ResponseBody
    @ApiOperation("导出数据集模板")
    @GetMapping(value = "getExcelTemplate")
-    public HttpResult<String> getExcelTemplate(HttpServletResponse response) {
-        final List<Map<String, Object>> sheetsList = Lists.newArrayList();
-        Map<String, Object> exportMap = Maps.newHashMap();
-        final ExportParams exportParams = new ExportParams(null, "电流幅值", ExcelType.HSSF);
-        // 以下3个参数为API中写死的参数名 分别是sheet配置/导出类（注解定义）/数据集
-        exportMap.put("title", exportParams);
-        exportMap.put("entity", CarryCapcityDataIEexcel.class);
-        exportMap.put("data", new ArrayList<>());
-        // 加入多sheet配置列表
-        sheetsList.add(exportMap);
-
-        Map<String, Object> exportMap2 = Maps.newHashMap();
-        final ExportParams exportParams2 = new ExportParams(null, "电压", ExcelType.XSSF);
-        // 以下3个参数为API中写死的参数名 分别是sheet配置/导出类（注解定义）/数据集
-        exportMap2.put("title", exportParams2);
-        exportMap2.put("entity", CarryCapcityDataVEexcel.class);
-        exportMap2.put("data", new ArrayList<>());
-        // 加入多sheet配置列表
-        sheetsList.add(exportMap2);
-
-        Map<String, Object> exportMap3 = Maps.newHashMap();
-        final ExportParams exportParams3 = new ExportParams(null, "有功功率", ExcelType.XSSF);
-        // 以下3个参数为API中写死的参数名 分别是sheet配置/导出类（注解定义）/数据集
-        exportMap3.put("title", exportParams3);
-        exportMap3.put("entity", CarryCapcityDataPEexcel.class);
-        exportMap3.put("data", new ArrayList<>());
-        // 加入多sheet配置列表
-        sheetsList.add(exportMap3);
-
-        Map<String, Object> exportMap4 = Maps.newHashMap();
-        final ExportParams exportParams4 = new ExportParams(null, "无功功率", ExcelType.XSSF);
-        // 以下3个参数为API中写死的参数名 分别是sheet配置/导出类（注解定义）/数据集
-        exportMap4.put("title", exportParams4);
-        exportMap4.put("entity", CarryCapcityDataQEexcel.class);
-        exportMap4.put("data", new ArrayList<>());
-        // 加入多sheet配置列表
-        sheetsList.add(exportMap4);
-        Workbook workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF);
+    public HttpResult<String> getExcelTemplate(HttpServletResponse response) throws IOException {


-        String fileName = "数据集.xlsx";
-        ExportParams exportExcel = new ExportParams("数据集", "数据集");
-        PoiUtil.exportFileByWorkbook(workbook, fileName, response);
+
+        String sheetName = "数据集模版.xlsx";
+        List<CarryCapcityDataEexcel> excels = new ArrayList<>();
+        CarryCapcityDataEexcel exportHeadersExcel = new CarryCapcityDataEexcel();
+        excels.add(exportHeadersExcel);
+        EasyExcel.write(response.getOutputStream(), CarryCapcityDataEexcel.class)
+                .sheet(sheetName)
+                .doWrite(excels);
+        EasyExcelUtil.writeWithSheetsWeb(response,  "数据集模版");
+



--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityResultController.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityResultController.java
@@ -2,6 +2,7 @@ package com.njcn.advance.controller.carrycapacity;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityResultParam;
+import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityResultPO;
 import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDResultVO;
 import com.njcn.advance.service.carrycapacity.CarryCapacityResultPOService;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -15,10 +16,9 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;


 /**
@@ -45,7 +45,14 @@ public class CarryCapacityResultController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
    }

-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/remove")
+    @ApiOperation("承载能力评估用户批量删除")
+    public HttpResult<Boolean> remove(@RequestParam("ids") List<String> ids) {
+        String methodDescribe = getMethodDescribe("remove");
+        Boolean flag = carryCapacityResultPOService.lambdaUpdate().in(CarryCapacityResultPO::getId, ids).set(CarryCapacityResultPO::getStatus, 0).update();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }


 }
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityStrategyController.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityStrategyController.java
@@ -1,7 +1,9 @@
 package com.njcn.advance.controller.carrycapacity;

 import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityStrategyParam;
+import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityStrategyDhlVO;
 import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityStrategyVO;
+import com.njcn.advance.service.carrycapacity.CarryCapacityStrategyDhlPOService;
 import com.njcn.advance.service.carrycapacity.CarryCapacityStrategyPOService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -36,10 +38,12 @@ public class CarryCapacityStrategyController extends BaseController {


    private final CarryCapacityStrategyPOService carryCapacityStrategyPOService;
+    private final CarryCapacityStrategyDhlPOService carryCapacityStrategyDhlPOService;
+

    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/add")
-    @ApiOperation("用户新增承载能力评估策略")
+    @ApiOperation("用户新增承载能力评估策略（光伏）")
    @ApiImplicitParam(name = "carryCapacityStrategyParam", value = "新增参数", required = true)
    public HttpResult<Boolean> add(@RequestBody @Validated CarryCapacityStrategyParam carryCapacityStrategyParam) {
        String methodDescribe = getMethodDescribe("add");
@@ -47,8 +51,17 @@ public class CarryCapacityStrategyController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
    }
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addList")
+    @ApiOperation("用户新增承载能力评估策略组（光伏）")
+    @ApiImplicitParam(name = "carryCapacityStrategyParamList", value = "新增参数", required = true)
+    public HttpResult<Boolean> addList(@RequestBody @Validated List<CarryCapacityStrategyParam> carryCapacityStrategyParamList) {
+        String methodDescribe = getMethodDescribe("addList");
+        Boolean flag = carryCapacityStrategyPOService.addList(carryCapacityStrategyParamList);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/queyDetail")
-    @ApiOperation("承载能力评估策略初始化查询")
+    @ApiOperation("承载能力评估策略初始化查询（光伏）")
    public HttpResult<List<CarryCapacityStrategyVO>> queyDetail() {
        String methodDescribe = getMethodDescribe("queyDetail");
        List<CarryCapacityStrategyVO> carryCapacityStrategyVOList = carryCapacityStrategyPOService.queyDetail();
@@ -64,4 +77,23 @@ public class CarryCapacityStrategyController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/adddhl")
+    @ApiOperation("用户新增承载能力评估策略（电弧炉）")
+    @ApiImplicitParam(name = "capacityStrategyDhlVO", value = "新增参数", required = true)
+    public HttpResult<Boolean> adddhl(@RequestBody @Validated CarryCapacityStrategyDhlVO capacityStrategyDhlVO) {
+        String methodDescribe = getMethodDescribe("adddhl");
+        Boolean flag = carryCapacityStrategyDhlPOService.adddhl(capacityStrategyDhlVO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queyDetailDhl")
+    @ApiOperation("承载能力评估策略初始化查询（电弧炉）")
+    public HttpResult<List<CarryCapacityStrategyDhlVO>> queyDetailDhl() {
+        String methodDescribe = getMethodDescribe("queyDetailDhl");
+        List<CarryCapacityStrategyDhlVO> car = carryCapacityStrategyDhlPOService.queyDetailDhl();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, car, methodDescribe);
+    }
+
 }