海南版本提交

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-api/src/main/java/com/njcn/advance/pojo/carrycapacity/excel/CarryCapcityDataEexcel.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/excel/CarryCapcityDataEexcel.java
@@ -0,0 +1,286 @@
+package com.njcn.advance.pojo.carrycapacity.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.converters.localdatetime.LocalDateTimeStringConverter;
+import com.njcn.advance.utils.EasyExcelUtil;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2022/5/12 9:13
+ */
+@Data
+public class CarryCapcityDataEexcel {
+
+    @ExcelProperty(index = 0,value = "时间",converter = LocalDateTimeStringConverter.class)
+    private LocalDateTime time;
+
+    @ExcelProperty(index =1,value = {"电压","A"})
+    private Double u_a;
+
+    @ExcelProperty(index =2,value = {"电压","B"})
+    private Double u_b;
+
+    @ExcelProperty(index =3,value = {"电压","C"})
+    private Double u_c;
+
+
+    @ExcelProperty(index =4,value = {"有功功率","A"})
+    private Double p_a;
+
+    @ExcelProperty(index =5,value = {"有功功率","B"})
+    private Double p_b;
+
+    @ExcelProperty(index =6,value = {"有功功率","C"})
+    private Double p_c;
+
+    @ExcelProperty(index =7,value = {"无功功率","A"})
+    private Double q_a;
+
+    @ExcelProperty(index =8,value = {"无功功率","B"})
+    private Double q_b;
+
+    @ExcelProperty(index =9,value = {"无功功率","C"})
+    private Double q_c;
+
+    @ExcelProperty(index =10,value = {"电流","2次","A"})
+    private Double i2_a;
+
+    @ExcelProperty(index =11,value = {"电流","2次","B"})
+    private Double i2_b;
+
+    @ExcelProperty(index =12,value = {"电流","2次","C"})
+    private Double i2_c;
+
+    @ExcelProperty(index =13,value = {"电流","3次","A"})
+    private Double i3_a;
+
+    @ExcelProperty(index =14,value = {"电流","3次","B"})
+    private Double i3_b;
+
+    @ExcelProperty(index =15,value = {"电流","3次","C"})
+    private Double i3_c;
+
+    @ExcelProperty(index =16,value = {"电流","4次","A"})
+    private Double i4_a;
+
+    @ExcelProperty(index =17,value = {"电流","4次","B"})
+    private Double i4_b;
+
+    @ExcelProperty(index =18,value = {"电流","4次","C"})
+    private Double i4_c;
+
+    @ExcelProperty(index =19,value = {"电流","5次","A"})
+    private Double i5_a;
+
+    @ExcelProperty(index =20,value = {"电流","5次","B"})
+    private Double i5_b;
+
+    @ExcelProperty(index =21,value = {"电流","5次","C"})
+    private Double i5_c;
+
+    @ExcelProperty(index =22,value = {"电流","6次","A"})
+    private Double i6_a;
+
+    @ExcelProperty(index =23,value = {"电流","6次","B"})
+    private Double i6_b;
+
+    @ExcelProperty(index =24,value = {"电流","6次","C"})
+    private Double i6_c;
+
+    @ExcelProperty(index =25,value = {"电流","7次","A"})
+    private Double i7_a;
+
+    @ExcelProperty(index =26,value = {"电流","7次","B"})
+    private Double i7_b;
+
+    @ExcelProperty(index =27,value = {"电流","7次","C"})
+    private Double i7_c;
+
+    @ExcelProperty(index =28,value = {"电流","8次","A"})
+    private Double i8_a;
+
+    @ExcelProperty(index =29,value = {"电流","8次","B"})
+    private Double i8_b;
+
+    @ExcelProperty(index =30,value = {"电流","8次","C"})
+    private Double i8_c;
+
+    @ExcelProperty(index =31,value = {"电流","9次","A"})
+    private Double i9_a;
+
+    @ExcelProperty(index =32,value = {"电流","9次","B"})
+    private Double i9_b;
+
+    @ExcelProperty(index =33,value = {"电流","9次","C"})
+    private Double i9_c;
+
+    @ExcelProperty(index =34,value = {"电流","10次","A"})
+    private Double i10_a;
+
+    @ExcelProperty(index =35,value = {"电流","10次","B"})
+    private Double i10_b;
+
+    @ExcelProperty(index =36,value = {"电流","10次","C"})
+    private Double i10_c;
+
+    @ExcelProperty(index =37,value = {"电流","11次","A"})
+    private Double i11_a;
+
+    @ExcelProperty(index =38,value = {"电流","11次","B"})
+    private Double i11_b;
+
+    @ExcelProperty(index =39,value = {"电流","11次","C"})
+    private Double i11_c;
+
+    @ExcelProperty(index =40,value = {"电流","12次","A"})
+    private Double i12_a;
+
+    @ExcelProperty(index =41,value = {"电流","12次","B"})
+    private Double i12_b;
+
+    @ExcelProperty(index =42,value = {"电流","12次","C"})
+    private Double i12_c;
+
+    @ExcelProperty(index =43,value = {"电流","13次","A"})
+    private Double i13_a;
+
+    @ExcelProperty(index =44,value = {"电流","13次","B"})
+    private Double i13_b;
+
+    @ExcelProperty(index =45,value = {"电流","13次","C"})
+    private Double i13_c;
+
+    @ExcelProperty(index =46,value = {"电流","14次","A"})
+    private Double i14_a;
+
+    @ExcelProperty(index =47,value = {"电流","14次","B"})
+    private Double i14_b;
+
+    @ExcelProperty(index =48,value = {"电流","14次","C"})
+    private Double i14_c;
+
+    @ExcelProperty(index =49,value = {"电流","15次","A"})
+    private Double i15_a;
+
+    @ExcelProperty(index =50,value = {"电流","15次","B"})
+    private Double i15_b;
+
+    @ExcelProperty(index =51,value = {"电流","15次","C"})
+    private Double i15_c;
+
+    @ExcelProperty(index =52,value = {"电流","16次","A"})
+    private Double i16_a;
+
+    @ExcelProperty(index =53,value = {"电流","16次","B"})
+    private Double i16_b;
+
+    @ExcelProperty(index =54,value = {"电流","16次","C"})
+    private Double i16_c;
+
+    @ExcelProperty(index =55,value = {"电流","17次","A"})
+    private Double i17_a;
+
+    @ExcelProperty(index =56,value = {"电流","17次","B"})
+    private Double i17_b;
+
+    @ExcelProperty(index =57,value = {"电流","17次","C"})
+    private Double i17_c;
+
+    @ExcelProperty(index =58,value = {"电流","18次","A"})
+    private Double i18_a;
+
+    @ExcelProperty(index =59,value = {"电流","18次","B"})
+    private Double i18_b;
+
+    @ExcelProperty(index =60,value = {"电流","18次","C"})
+    private Double i18_c;
+
+    @ExcelProperty(index =61,value = {"电流","19次","A"})
+    private Double i19_a;
+
+    @ExcelProperty(index =62,value = {"电流","19次","B"})
+    private Double i19_b;
+
+    @ExcelProperty(index =63,value = {"电流","19次","C"})
+    private Double i19_c;
+
+    @ExcelProperty(index =64,value = {"电流","20次","A"})
+    private Double i20_a;
+
+    @ExcelProperty(index =65,value = {"电流","20次","B"})
+    private Double i20_b;
+
+    @ExcelProperty(index =66,value = {"电流","20次","C"})
+    private Double i20_c;
+
+    @ExcelProperty(index =67,value = {"电流","21次","A"})
+    private Double i21_a;
+
+    @ExcelProperty(index =68,value = {"电流","21次","B"})
+    private Double i21_b;
+
+    @ExcelProperty(index =69,value = {"电流","21次","C"})
+    private Double i21_c;
+
+    @ExcelProperty(index =70,value = {"电流","22次","A"})
+    private Double i22_a;
+
+    @ExcelProperty(index =71,value = {"电流","22次","B"})
+    private Double i22_b;
+
+    @ExcelProperty(index =72,value = {"电流","22次","C"})
+    private Double i22_c;
+
+    @ExcelProperty(index =73,value = {"电流","23次","A"})
+    private Double i23_a;
+
+    @ExcelProperty(index =74,value = {"电流","23次","B"})
+    private Double i23_b;
+
+    @ExcelProperty(index =75,value = {"电流","23次","C"})
+    private Double i23_c;
+
+    @ExcelProperty(index =76,value = {"电流","24次","A"})
+    private Double i24_a;
+
+    @ExcelProperty(index =77,value = {"电流","24次","B"})
+    private Double i24_b;
+
+    @ExcelProperty(index =78,value = {"电流","24次","C"})
+    private Double i24_c;
+
+    @ExcelProperty(index =79,value = {"电流","25次","A"})
+    private Double i25_a;
+
+    @ExcelProperty(index =80,value = {"电流","25次","B"})
+    private Double i25_b;
+
+    @ExcelProperty(index =81,value = {"电流","25次","C"})
+    private Double i25_c;
+
+    public static void main(String[] args) {
+        List<CarryCapcityDataEexcel> objects = EasyExcelUtil.syncReadModel("C:\\Users\\无名\\Desktop\\11.xlsx", CarryCapcityDataEexcel.class, 0,3);
+        System.out.println(objects);
+
+//        String sheetName = "sheetName";
+//        List<CarryCapcityDataEexcel> excels = new ArrayList<>();
+//        CarryCapcityDataEexcel exportHeadersExcel = new CarryCapcityDataEexcel();
+//        excels.add(exportHeadersExcel);
+//
+//        EasyExcel.write("C:\\\\Users\\\\无名\\\\Desktop\\\\22.xlsx", CarryCapcityDataEexcel.class)
+//                .sheet(sheetName)
+//                .doWrite(excels);
+
+    }
+
+
+
+
+}
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityEvaluateParam.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityEvaluateParam.java
@@ -6,6 +6,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;

 /**
@@ -21,17 +23,21 @@ import java.util.List;
@AllArgsConstructor
 public class CarryCapacityEvaluateParam {
    @ApiModelProperty(value = "接线类型不可为空\"星型接法_0\", \"三角型接法_1\", \"开口三角型接法_2\"")
+    @NotBlank(message = "接线类型不能为空")
    private String ptType;
    @ApiModelProperty(value = "变压器连接方式")
    private String connectionMode;
    @ApiModelProperty(value = "功率因数（0.95-1之间）")
+    @NotNull(message = "功率因数不能为空")
    private Double k;

    @ApiModelProperty(value = "专变用户,公变用户")
+    @NotBlank(message = "用户类型不能为空")
    private String userMode;


    @ApiModelProperty(name = "scale",value = "电压等级")
+    @NotBlank(message = "电压等级不能为空")
    private String scale;

    @ApiModelProperty(name = "shortCapacity",value = "短路容量")
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityStrategyParam.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityStrategyParam.java
@@ -19,6 +19,8 @@ import javax.validation.constraints.NotNull;
@AllArgsConstructor
@NoArgsConstructor
 public class CarryCapacityStrategyParam {
+
+    private  String id;
    /**
     * 总承载能力评估结果（1-安全，2-III级预警，3-II级预警，4-I 级预警）
     */
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityUserParam.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityUserParam.java
@@ -89,7 +89,7 @@ public class CarryCapacityUserParam {
        @NotNull(message="显示条数不能为空！")
        @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
        private Integer pageSize;
-
+        private String voltage;
        @ApiModelProperty(value="起始时间")
        private String startTime;

--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityResultPO.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityResultPO.java
@@ -78,7 +78,7 @@ public class CarryCapacityResultPO extends BaseEntity {
    private Integer iLevel;

    /**
-     * 总结果等级（1-安全，2-III级预警，3-II级预警，4-I 级预警）
+     * 总结果等级（1-安全，2-III级预警，3-II级预警，4-I 级预警,5-禁止接入，6-允许接入）
     */
    @TableField(value = "reslut_level")
    private Integer reslutLevel;
@@ -100,9 +100,30 @@ public class CarryCapacityResultPO extends BaseEntity {


    @TableField(value = "first_result")
-    private Double firstResult;
+    private double firstResult;

    @TableField(value = "i_result_list")
    private String iResultList;

+    @TableField(value = "pt_type")
+    private String ptType;
+    @TableField(value = "connection_mode")
+    private String connectionMode;
+    @TableField(value = "k")
+    private Double k;
+
+    @TableField(value = "user_mode")
+    private String userMode;
+
+
+    @TableField(value = "scale")
+    private String scale;
+
+    @TableField(value = "short_capacity")
+    private Float shortCapacity;
+
+
+    @TableField(value = "device_capacity")
+    private Float deviceCapacity;
+
 }
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyDhlPO.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyDhlPO.java
@@ -0,0 +1,98 @@
+package com.njcn.advance.pojo.carrycapacity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/3/15  10:45【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "carry_capacity_strategy_dhl")
+public class CarryCapacityStrategyDhlPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 充电桩，电弧炉，电气化铁路
+     */
+    @TableField(value = "`type`")
+    private String type;
+
+    /**
+     * 一级评估比较符
+     */
+    @TableField(value = "comparison_operators_1")
+    private String comparisonOperators1;
+
+    /**
+     * 一级评估数量
+     */
+    @TableField(value = "count_1")
+    private Integer count1;
+
+    /**
+     * 二级级评估（2~20次谐波合格个数）比较符
+     */
+    @TableField(value = "comparison_operators_2")
+    private String comparisonOperators2;
+
+    /**
+     * 二级评估（2~20次谐波合格）个数数量
+     */
+    @TableField(value = "count_2")
+    private Integer count2;
+
+    /**
+     * 二级级评估（奇数谐波合格个数）比较符
+     */
+    @TableField(value = "comparison_operators_3")
+    private String comparisonOperators3;
+
+    /**
+     * 二级评估（奇数次谐波合格）个数数量
+     */
+    @TableField(value = "count_3")
+    private Integer count3;
+
+    /**
+     * 初始配置1，客户配置2
+     */
+    @TableField(value = "proto_flag")
+    private Integer protoFlag;
+
+    /**
+     * 二级级评估（偶数谐波合格个数）比较符
+     */
+    @TableField(value = "comparison_operators_4")
+    private String comparisonOperators4;
+
+    /**
+     * 二级评估（偶数次谐波合格）个数数量
+     */
+    @TableField(value = "count_4")
+    private Integer count4;
+
+    /**
+     * 启用配置1，不启用配置2
+     */
+    @TableField(value = "user_flag")
+    private Integer userFlag;
+
+
+}
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyPO.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/po/CarryCapacityStrategyPO.java
@@ -55,4 +55,7 @@ public class CarryCapacityStrategyPO  extends BaseEntity {
    @TableField(value = "user_flag")
    private Integer userFlag;

+    @TableField(value = "id")
+    private String id;
+
 }
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/vo/CarryCapacityDResultVO.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/vo/CarryCapacityDResultVO.java
@@ -1,5 +1,6 @@
 package com.njcn.advance.pojo.carrycapacity.vo;

+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

@@ -79,6 +80,21 @@ public class CarryCapacityDResultVO {
    private List<CarryCapacityDResultVO.CarryCapacityIResult> iResultList;


+    @TableField(value = "pt_type")
+    private String connectionMode;
+    private Double k;
+
+    private String userMode;
+
+
+    private String scale;
+
+    private Float shortCapacity;
+
+
+    private Float deviceCapacity;
+
+
    @Data
    public static class CarryCapacityIResult {

--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/vo/CarryCapacityStrategyDhlVO.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/vo/CarryCapacityStrategyDhlVO.java
@@ -0,0 +1,76 @@
+package com.njcn.advance.pojo.carrycapacity.vo;
+
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/3/15  10:45【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CarryCapacityStrategyDhlVO {
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 充电桩，电弧炉，电气化铁路
+     */
+    private String type;
+
+    /**
+     * 一级评估比较符
+     */
+    private String comparisonOperators1;
+
+    /**
+     * 一级评估数量
+     */
+    private Integer count1;
+
+    /**
+     * 二级级评估（2~20次谐波合格个数）比较符
+     */
+    private String comparisonOperators2;
+
+    /**
+     * 二级评估（2~20次谐波合格）个数数量
+     */
+    private Integer count2;
+
+    /**
+     * 二级级评估（奇数谐波合格个数）比较符
+     */
+    private String comparisonOperators3;
+
+    /**
+     * 二级评估（奇数次谐波合格）个数数量
+     */
+    private Integer count3;
+
+    /**
+     * 初始配置1，客户配置2
+     */
+    private Integer protoFlag;
+
+    /**
+     * 二级级评估（偶数谐波合格个数）比较符
+     */
+    private String comparisonOperators4;
+
+    /**
+     * 二级评估（偶数次谐波合格）个数数量
+     */
+    private Integer count4;
+
+    /**
+     * 启用配置1，不启用配置2
+     */
+    private Integer userFlag;
+
+
+}
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/vo/CarryCapacityStrategyVO.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/vo/CarryCapacityStrategyVO.java
@@ -3,6 +3,8 @@ package com.njcn.advance.pojo.carrycapacity.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.util.List;
+
 /**
 * Description:
 * Date: 2024/3/5  10:47【需求编号】
@@ -12,29 +14,46 @@ import lombok.Data;
 */
@Data
 public class CarryCapacityStrategyVO {
+
    /**
     * 总承载能力评估结果（1-安全，2-III级预警，3-II级预警，4-I 级预警）
     */
+
    @ApiModelProperty(value = "总承载能力评估结果（1-安全，2-III级预警，3-II级预警，4-I 级预警）")
    private Integer result;

-    /**
-     * 指标评估结果（1-安全，2-III级预警，3-II级预警，4-I 级预警）
-     */
-    @ApiModelProperty(value = "指标评估结果（1-安全，2-III级预警，3-II级预警，4-I 级预警）")
-    private Integer indexResult;
-
-    /**
-     * 比较符
-     */
-    @ApiModelProperty(value = "比较符")
-    private String comparisonOperators;
-
-    /**
-     * 数量
-     */
-    @ApiModelProperty(value = "数量")
-    private Integer count;


+    private List<CarryCapacityStrategysingleVO> capacityStrategysingleVOList;
+    @Data
+    public static class CarryCapacityStrategysingleVO  {
+
+        private  String id;
+        private List<CarryCapacityStrategyIndexVO> carryCapacityStrategyIndexVOList;
+        @Data
+        public static class CarryCapacityStrategyIndexVO  {
+
+            /**
+             * 指标评估结果（1-安全，2-III级预警，3-II级预警，4-I 级预警）
+             */
+            @ApiModelProperty(value = "指标评估结果（1-安全，2-III级预警，3-II级预警，4-I 级预警）")
+            private Integer indexResult;
+
+            /**
+             * 比较符
+             */
+            @ApiModelProperty(value = "比较符")
+            private String comparisonOperators;
+
+            /**
+             * 数量
+             */
+            @ApiModelProperty(value = "数量")
+            private Integer count;
+
+        }
+
+
+
+    }
 }