完成污区图算法编写

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java

@@ -237,7 +237,7 @@ public class ExecutionCenter extends BaseController {
     @PostMapping("/orgPointExecutor")
     @Async("asyncExecutor")
     public void orgPointExecutor(@RequestBody BaseParam baseParam) {
-        String methodDescribe = getMethodDescribe("OrgPointExecutor");
+        String methodDescribe = getMethodDescribe("orgPointExecutor");
         //手动判断参数是否合法,
         CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = judgeExecuteParam(baseParam);
         // 测点索引

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java

@@ -3,7 +3,8 @@ package com.njcn.algorithm.serviceimpl.line;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
 import com.njcn.algorithm.service.line.IPollutionService;
 import com.njcn.dataProcess.api.*;
@@ -57,7 +58,7 @@ public class PollutionServiceImpl implements IPollutionService {
     public void handleDay(CalculatedParam<String> calculatedParam) {
         List<DataPollutionD> pollutionList;
         List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.POLLUTION_STATIS.getCode()).getData();
-        Map<String, DictData> dictData = dictDataList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+        Map<String, DictData> dictData = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity()));
         LocalDate local = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate());
         String beginDay = LocalDateTimeUtil.format(LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATETIME_PATTERN);
         String endDay = LocalDateTimeUtil.format(LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATETIME_PATTERN);
@@ -129,19 +130,18 @@ public class PollutionServiceImpl implements IPollutionService {
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfMonth(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfMonth(calculatedParam.getDataDate()));
-        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
+        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
-        for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) {
+        for (DeptGetChildrenMoreDTO dto : calculatedParam.getIdList()) {
-            Collection<LineDevGetDTO> union = CollectionUtils.union
+            if (ObjectUtil.isNotNull(dto.getUnitId())) {
-                    (Optional.ofNullable(deptGetChildrenMoreDTO.getLineBaseList()).orElse(new ArrayList<>()),
+                lineParam.setLineId(Arrays.asList(dto.getUnitId()));
-                            Optional.ofNullable(deptGetChildrenMoreDTO.getPwMonitorIds()).orElse(new ArrayList<>()));
-            List<String> lineIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
-            if (CollUtil.isNotEmpty(lineIds)) {
-                lineParam.setLineId(lineIds);
                 List<DataPollutionOrgD> data = dataPollutionFeignClient.getRawDataOrgD(lineParam).getData();
+                if (CollUtil.isNotEmpty(data)) {
+                    System.out.println(data);
+                }
                 Map<String, List<DataPollutionOrgD>> pollutionMap = data.stream().collect(Collectors.groupingBy(DataPollutionOrgD::getPollutionType));
                 pollutionMap.forEach((key, value) -> {
                     DataPollutionOrgM orgD = new DataPollutionOrgM();
-                    orgD.setOrgId(deptGetChildrenMoreDTO.getUnitId());
+                    orgD.setOrgId(dto.getUnitId());
                     orgD.setDataDate(localDate);
                     orgD.setPollutionType(key);
                     orgD.setValue(value.stream().max(Comparator.comparing(DataPollutionOrgD::getValue)).get().getValue());
@@ -161,19 +161,15 @@ public class PollutionServiceImpl implements IPollutionService {
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfQuarter(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfQuarter(calculatedParam.getDataDate()));
-        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
+        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
-        for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) {
+        for (DeptGetChildrenMoreDTO dto : calculatedParam.getIdList()) {
-            Collection<LineDevGetDTO> union = CollectionUtils.union
+            if (ObjectUtil.isNotNull(dto.getUnitId())) {
-                    (Optional.ofNullable(deptGetChildrenMoreDTO.getLineBaseList()).orElse(new ArrayList<>()),
+                lineParam.setLineId(Arrays.asList(dto.getUnitId()));
-                            Optional.ofNullable(deptGetChildrenMoreDTO.getPwMonitorIds()).orElse(new ArrayList<>()));
-            List<String> lineIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
-            if (CollUtil.isNotEmpty(lineIds)) {
-                lineParam.setLineId(lineIds);
                 List<DataPollutionOrgM> data = dataPollutionFeignClient.getRawDataOrgM(lineParam).getData();
                 Map<String, List<DataPollutionOrgM>> pollutionMap = data.stream().collect(Collectors.groupingBy(DataPollutionOrgM::getPollutionType));
                 pollutionMap.forEach((key, value) -> {
                     DataPollutionOrgQ orgD = new DataPollutionOrgQ();
-                    orgD.setOrgId(deptGetChildrenMoreDTO.getUnitId());
+                    orgD.setOrgId(dto.getUnitId());
                     orgD.setDataDate(localDate);
                     orgD.setPollutionType(key);
                     orgD.setValue(value.stream().max(Comparator.comparing(DataPollutionOrgM::getValue)).get().getValue());
@@ -193,19 +189,15 @@ public class PollutionServiceImpl implements IPollutionService {
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfYear(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfYear(calculatedParam.getDataDate()));
-        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
+        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
-        for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) {
+        for (DeptGetChildrenMoreDTO dto : calculatedParam.getIdList()) {
-            Collection<LineDevGetDTO> union = CollectionUtils.union
+            if (ObjectUtil.isNotNull(dto.getUnitId())) {
-                    (Optional.ofNullable(deptGetChildrenMoreDTO.getLineBaseList()).orElse(new ArrayList<>()),
+                lineParam.setLineId(Arrays.asList(dto.getUnitId()));
-                            Optional.ofNullable(deptGetChildrenMoreDTO.getPwMonitorIds()).orElse(new ArrayList<>()));
-            List<String> lineIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
-            if (CollUtil.isNotEmpty(lineIds)) {
-                lineParam.setLineId(lineIds);
                 List<DataPollutionOrgQ> data = dataPollutionFeignClient.getRawDataOrgQ(lineParam).getData();
                 Map<String, List<DataPollutionOrgQ>> pollutionMap = data.stream().collect(Collectors.groupingBy(DataPollutionOrgQ::getPollutionType));
                 pollutionMap.forEach((key, value) -> {
                     DataPollutionOrgY orgD = new DataPollutionOrgY();
-                    orgD.setOrgId(deptGetChildrenMoreDTO.getUnitId());
+                    orgD.setOrgId(dto.getUnitId());
                     orgD.setDataDate(localDate);
                     orgD.setPollutionType(key);
                     orgD.setValue(value.stream().max(Comparator.comparing(DataPollutionOrgQ::getValue)).get().getValue());
@@ -257,14 +249,10 @@ public class PollutionServiceImpl implements IPollutionService {
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfMonth(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfMonth(calculatedParam.getDataDate()));
-        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
+        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
         for (String substationId : calculatedParam.getIdList()) {
-            LineDevGetBandDTO data = commTerminalGeneralClient.substationGetLine(substationId).getData();
+            if (StrUtil.isNotBlank(substationId)) {
-            Collection<LineDevGetDTO> union = CollectionUtils.union(Optional.ofNullable(data.getPwList()).orElse(new ArrayList<>()),
+                lineParam.setLineId(Arrays.asList(substationId));
-                    Optional.ofNullable(data.getZwList()).orElse(new ArrayList<>()));
-            List<String> lindIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
-            if (CollUtil.isNotEmpty(lindIds)) {
-                lineParam.setLineId(lindIds);
                 List<DataPollutionSubstationD> pollutionDS = dataPollutionFeignClient.getRawDataSubstationD(lineParam).getData();
                 Map<String, List<DataPollutionSubstationD>> pollutionMap = pollutionDS.stream().collect(Collectors.groupingBy(DataPollutionSubstationD::getPollutionType));
                 pollutionMap.forEach((key, value) -> {
@@ -289,14 +277,10 @@ public class PollutionServiceImpl implements IPollutionService {
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfQuarter(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfQuarter(calculatedParam.getDataDate()));
-        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
+        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
         for (String substationId : calculatedParam.getIdList()) {
-            LineDevGetBandDTO data = commTerminalGeneralClient.substationGetLine(substationId).getData();
+            if (StrUtil.isNotBlank(substationId)) {
-            Collection<LineDevGetDTO> union = CollectionUtils.union(Optional.ofNullable(data.getPwList()).orElse(new ArrayList<>()),
+                lineParam.setLineId(Arrays.asList(substationId));
-                    Optional.ofNullable(data.getZwList()).orElse(new ArrayList<>()));
-            List<String> lindIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
-            if (CollUtil.isNotEmpty(lindIds)) {
-                lineParam.setLineId(lindIds);
                 List<DataPollutionSubstationM> pollutionDS = dataPollutionFeignClient.getRawDataSubstationM(lineParam).getData();
                 Map<String, List<DataPollutionSubstationM>> pollutionMap = pollutionDS.stream().collect(Collectors.groupingBy(DataPollutionSubstationM::getPollutionType));
                 pollutionMap.forEach((key, value) -> {
@@ -321,14 +305,10 @@ public class PollutionServiceImpl implements IPollutionService {
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfYear(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfYear(calculatedParam.getDataDate()));
-        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
+        LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
         for (String substationId : calculatedParam.getIdList()) {
-            LineDevGetBandDTO data = commTerminalGeneralClient.substationGetLine(substationId).getData();
+            if (StrUtil.isNotBlank(substationId)) {
-            Collection<LineDevGetDTO> union = CollectionUtils.union(Optional.ofNullable(data.getPwList()).orElse(new ArrayList<>()),
+                lineParam.setLineId(Arrays.asList(substationId));
-                    Optional.ofNullable(data.getZwList()).orElse(new ArrayList<>()));
-            List<String> lindIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
-            if (CollUtil.isNotEmpty(lindIds)) {
-                lineParam.setLineId(lindIds);
                 List<DataPollutionSubstationQ> pollutionDS = dataPollutionFeignClient.getRawDataSubstationQ(lineParam).getData();
                 Map<String, List<DataPollutionSubstationQ>> pollutionMap = pollutionDS.stream().collect(Collectors.groupingBy(DataPollutionSubstationQ::getPollutionType));
                 pollutionMap.forEach((key, value) -> {

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RMpPollutionD.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,24 +21,27 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @TableName(value = "r_mp_pollution_d")
 public class RMpPollutionD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
     /**
      * 单位id
      */
-    @TableField(value = "line_id")
+    @MppMultiId(value = "line_id")
     @ApiModelProperty(value = "监测点")
     private String lineId;
 
     /**
      * 时间
      */
-    @TableField(value = "data_date")
+    @MppMultiId(value = "data_date")
     @ApiModelProperty(value = "时间")
     private LocalDate dataDate;
 
     /**
      * 污区图统计类型
      */
-    @TableField(value = "pollution_type")
+    @MppMultiId(value = "pollution_type")
     @ApiModelProperty(value = "污区图统计类型")
     private String pollutionType;
 
@@ -48,5 +52,5 @@ public class RMpPollutionD implements Serializable {
     @ApiModelProperty(value = "统计值")
     private Double value;
 
-    private static final long serialVersionUID = 1L;
+
 }

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatPollutionOrgD.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -24,21 +25,21 @@ public class RStatPollutionOrgD implements Serializable {
     /**
      * 单位id
      */
-    @TableField(value = "org_id")
+    @MppMultiId(value = "org_id")
     @ApiModelProperty(value="单位id")
     private String orgId;
 
     /**
      * 时间
      */
-    @TableField(value = "data_date")
+    @MppMultiId(value = "data_date")
     @ApiModelProperty(value="时间")
     private LocalDate dataDate;
 
     /**
      * 污区图统计类型
      */
-    @TableField(value = "pollution_type")
+    @MppMultiId(value = "pollution_type")
     @ApiModelProperty(value="污区图统计类型")
     private String pollutionType;
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatPollutionOrgM.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,21 +24,21 @@ public class RStatPollutionOrgM implements Serializable {
     /**
      * 单位id
      */
-    @TableField(value = "org_id")
+    @MppMultiId(value = "org_id")
     @ApiModelProperty(value="单位id")
     private String orgId;
 
     /**
      * 时间
      */
-    @TableField(value = "data_date")
+    @MppMultiId(value = "data_date")
     @ApiModelProperty(value="时间")
     private LocalDate dataDate;
 
     /**
      * 污区图统计类型
      */
-    @TableField(value = "pollution_type")
+    @MppMultiId(value = "pollution_type")
     @ApiModelProperty(value="污区图统计类型")
     private String pollutionType;
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatPollutionOrgQ.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,21 +24,21 @@ public class RStatPollutionOrgQ implements Serializable {
     /**
      * 单位id
      */
-    @TableField(value = "org_id")
+    @MppMultiId(value = "org_id")
     @ApiModelProperty(value="单位id")
     private String orgId;
 
     /**
      * 时间
      */
-    @TableField(value = "data_date")
+    @MppMultiId(value = "data_date")
     @ApiModelProperty(value="时间")
     private LocalDate dataDate;
 
     /**
      * 污区图统计类型
      */
-    @TableField(value = "pollution_type")
+    @MppMultiId(value = "pollution_type")
     @ApiModelProperty(value="污区图统计类型")
     private String pollutionType;
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatPollutionOrgY.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,21 +24,21 @@ public class RStatPollutionOrgY implements Serializable {
     /**
      * 单位id
      */
-    @TableField(value = "org_id")
+    @MppMultiId(value = "org_id")
     @ApiModelProperty(value="单位id")
     private String orgId;
 
     /**
      * 时间
      */
-    @TableField(value = "data_date")
+    @MppMultiId(value = "data_date")
     @ApiModelProperty(value="时间")
     private LocalDate dataDate;
 
     /**
      * 污区图统计类型
      */
-    @TableField(value = "pollution_type")
+    @MppMultiId(value = "pollution_type")
     @ApiModelProperty(value="污区图统计类型")
     private String pollutionType;
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatPollutionSubstationD.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,21 +24,21 @@ public class RStatPollutionSubstationD implements Serializable {
     /**
      * 变电站id
      */
-    @TableField(value = "substation_id")
+    @MppMultiId(value = "substation_id")
     @ApiModelProperty(value = "变电站id")
     private String substationId;
 
     /**
      * 时间
      */
-    @TableField(value = "data_date")
+    @MppMultiId(value = "data_date")
     @ApiModelProperty(value = "时间")
     private LocalDate dataDate;
 
     /**
      * 污区图统计类型
      */
-    @TableField(value = "pollution_type")
+    @MppMultiId(value = "pollution_type")
     @ApiModelProperty(value = "污区图统计类型")
     private String pollutionType;
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatPollutionSubstationM.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,21 +24,21 @@ public class RStatPollutionSubstationM implements Serializable {
     /**
      * 变电站id
      */
-    @TableField(value = "substation_id")
+    @MppMultiId(value = "substation_id")
     @ApiModelProperty(value = "变电站id")
     private String substationId;
 
     /**
      * 时间
      */
-    @TableField(value = "data_date")
+    @MppMultiId(value = "data_date")
     @ApiModelProperty(value = "时间")
     private LocalDate dataDate;
 
     /**
      * 污区图统计类型
      */
-    @TableField(value = "pollution_type")
+    @MppMultiId(value = "pollution_type")
     @ApiModelProperty(value = "污区图统计类型")
     private String pollutionType;
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatPollutionSubstationQ.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,21 +24,21 @@ public class RStatPollutionSubstationQ implements Serializable {
     /**
      * 变电站id
      */
-    @TableField(value = "substation_id")
+    @MppMultiId(value = "substation_id")
     @ApiModelProperty(value="变电站id")
     private String substationId;
 
     /**
      * 时间
      */
-    @TableField(value = "data_date")
+    @MppMultiId(value = "data_date")
     @ApiModelProperty(value="时间")
     private LocalDate dataDate;
 
     /**
      * 污区图统计类型
      */
-    @TableField(value = "pollution_type")
+    @MppMultiId(value = "pollution_type")
     @ApiModelProperty(value="污区图统计类型")
     private String pollutionType;
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatPollutionSubstationY.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,21 +24,21 @@ public class RStatPollutionSubstationY implements Serializable {
     /**
      * 变电站id
      */
-    @TableField(value = "substation_id")
+    @MppMultiId(value = "substation_id")
     @ApiModelProperty(value="变电站id")
     private String substationId;
 
     /**
      * 时间
      */
-    @TableField(value = "data_date")
+    @MppMultiId(value = "data_date")
     @ApiModelProperty(value="时间")
     private LocalDate dataDate;
 
     /**
      * 污区图统计类型
      */
-    @TableField(value = "pollution_type")
+    @MppMultiId(value = "pollution_type")
     @ApiModelProperty(value="污区图统计类型")
     private String pollutionType;