海南版本提交

2024-03-13 18:24:38 +08:00
parent 1192b87083
commit 6288e6902c
37 changed files with 1918 additions and 473 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
@@ -9,11 +9,10 @@ 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.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.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.pojo.carrycapacity.param.ExcelDataParam;
+import com.njcn.advance.pojo.carrycapacity.vo.*;
 import com.njcn.advance.service.carrycapacity.CarryCapcityService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -62,6 +61,16 @@ public class CarryCapacityController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapacityDataVO, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/modelTraining")
+    @ApiOperation("承载能力评估模型训练")
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    public HttpResult<CarryCapacityDataVO> modelTraining(@RequestBody @Validated CarryCapacityQueryDataParam queryParam) {
+        String methodDescribe = getMethodDescribe("modelTraining");
+        CarryCapacityDataVO carryCapacityDataVO = carryCapcityService.modelTraining(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapacityDataVO, methodDescribe);
+    }
+
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/queryCarryCapacityQData")
    @ApiOperation("承载能力评估数据查询-无功功率")
@@ -102,7 +111,7 @@ public class CarryCapacityController extends BaseController {
    }

    @ResponseBody
-    @ApiOperation("导出设备模板")
+    @ApiOperation("导出数据集模板")
    @GetMapping(value = "getExcelTemplate")
    public HttpResult<String> getExcelTemplate(HttpServletResponse response) {
        final List<Map<String, Object>> sheetsList = Lists.newArrayList();
@@ -116,7 +125,7 @@ public class CarryCapacityController extends BaseController {
        sheetsList.add(exportMap);

        Map<String, Object> exportMap2 = Maps.newHashMap();
-        final ExportParams exportParams2 = new ExportParams(null, "电压", ExcelType.HSSF);
+        final ExportParams exportParams2 = new ExportParams(null, "电压", ExcelType.XSSF);
        // 以下3个参数为API中写死的参数名 分别是sheet配置/导出类（注解定义）/数据集
        exportMap2.put("title", exportParams2);
        exportMap2.put("entity", CarryCapcityDataVEexcel.class);
@@ -125,7 +134,7 @@ public class CarryCapacityController extends BaseController {
        sheetsList.add(exportMap2);

        Map<String, Object> exportMap3 = Maps.newHashMap();
-        final ExportParams exportParams3 = new ExportParams(null, "有功功率", ExcelType.HSSF);
+        final ExportParams exportParams3 = new ExportParams(null, "有功功率", ExcelType.XSSF);
        // 以下3个参数为API中写死的参数名 分别是sheet配置/导出类（注解定义）/数据集
        exportMap3.put("title", exportParams3);
        exportMap3.put("entity", CarryCapcityDataPEexcel.class);
@@ -134,17 +143,17 @@ public class CarryCapacityController extends BaseController {
        sheetsList.add(exportMap3);

        Map<String, Object> exportMap4 = Maps.newHashMap();
-        final ExportParams exportParams4 = new ExportParams(null, "无功功率", ExcelType.HSSF);
+        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.HSSF);
+        Workbook workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF);


-        String fileName = "数据集.xls";
+        String fileName = "数据集.xlsx";
        ExportParams exportExcel = new ExportParams("数据集", "数据集");
        PoiUtil.exportFileByWorkbook(workbook, fileName, response);

@@ -153,5 +162,25 @@ public class CarryCapacityController extends BaseController {
        return null;
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/uploadExcel")
+    @ApiOperation("上传数据集")
+    public HttpResult<Boolean> uploadExcel(@Validated ExcelDataParam excelDataParam) throws Exception {
+        String methodDescribe = getMethodDescribe("uploadExcel");
+
+        boolean flag = carryCapcityService.uploadExcel(excelDataParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/carryCapacityEvaluate")
+    @ApiOperation("承载能力评估_充电站、电加热负荷、电气化铁路承载能力评估")
+    @ApiImplicitParam(name = "calParam", value = "计算参数", required = true)
+    public HttpResult<CarryCapacityDResultVO> carryCapacityEvaluate(@RequestBody @Validated CarryCapacityEvaluateParam calParam) {
+        String methodDescribe = getMethodDescribe("carryCapacityEvaluate");
+        CarryCapacityDResultVO vo = carryCapcityService.carryCapacityEvaluate(calParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
+    }
+

 }
--- 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
@@ -0,0 +1,51 @@
+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.vo.CarryCapacityDResultVO;
+import com.njcn.advance.service.carrycapacity.CarryCapacityResultPOService;
+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.web.controller.BaseController;
+import io.swagger.annotations.Api;
+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;
+
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2023年07月21日 10:06
+ */
+@RestController
+@RequestMapping("result")
+@Api(tags = "承载能力评估结果")
+@RequiredArgsConstructor
+public class CarryCapacityResultController extends BaseController {
+
+
+    private final CarryCapacityResultPOService carryCapacityResultPOService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryResultList")
+    @ApiOperation("承载能力评估列表查询")
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    public HttpResult<IPage<CarryCapacityDResultVO>> queryResultList(@RequestBody @Validated CarryCapacityResultParam.CarryCapacityResultPageParam queryParam) {
+        String methodDescribe = getMethodDescribe("queryResultList");
+        IPage<CarryCapacityDResultVO> vo = carryCapacityResultPOService.queryResultList(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
+    }
+
+
+
+
+}
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityUserController.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityUserController.java
@@ -74,6 +74,15 @@ public class CarryCapacityUserController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queyDetailUserById")
+    @ApiOperation("承载能力评估用户查询")
+    public HttpResult<CarryCapacityUserPO> queyDetailUserById(@RequestParam("userId") String userId) {
+        String methodDescribe = getMethodDescribe("queyDetailUserById");
+        CarryCapacityUserPO po = carryCapacityUserPOService.queyDetailUserById(userId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
+    }
+