1.删除@Table注解 2.新增创建批次名称

energy-manage-common/src/main/java/com/energy/manage/common/constant/redis/ManagerRedisKeyConstant.java

@@ -15,7 +15,9 @@ public class ManagerRedisKeyConstant {
 
     public static String DICT_CONSTANTS_KEY = "energy:dict:constants";
 
-    //id 工具缓存
+    /**
+     * id 工具缓存
+     */
     public static String IDGENERATOR_CONSTANTS_KEY = "energy:Idgenerator:{id}";
 
 

energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisOptionRecords.java → energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisOptionRecordsPo.java

@@ -11,12 +11,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.persistence.Table;
 import java.util.Date;
 
-
+@Table(name = "analysis_option_records")
 @Data
 @Accessors(chain = true)
-public class AnalysisOptionRecords {
+public class AnalysisOptionRecordsPo {
 
     private Long id;
 

energy-manage-common/src/main/java/com/energy/manage/common/reponse/ConstVar.java

@@ -88,6 +88,8 @@ public enum ConstVar {
 
   ANALYSISING(910001, "当前有批次正在进行分析,请稍后重试"),
 
+  EXSIT_BATCH_NAME(1010001, "当前批次名称已存在，请重新编辑"),
+
   //测评小程序
   PAPER_USER_UNBELONG_TO(3000,"哎呀，该测评已经被其他用户绑定过了，您无法进行查看~"),
   PAPER_ANSWER_SIZE_ERROR(3001,"试题未答完,请检查试题");

energy-manage-common/src/main/java/com/energy/manage/common/util/IdGeneratorUtil.java

@@ -28,7 +28,4 @@ public class IdGeneratorUtil {
         return String.format("%0" + digit + "d", number);
     }
 
-
-
-
 }

energy-manage-service/pom.xml

@@ -42,6 +42,13 @@
             <version>8.0.3</version>
         </dependency>
 
+        <!--拼音-->
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+            <version>2.5.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>

energy-manage-service/src/main/java/com/energy/manage/service/controller/windfieldbatch/WindFieldBatchController.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.controller.windfieldbatch;
 
 import com.energy.manage.common.base.Page;
+import com.energy.manage.common.reponse.ConstVar;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
 import com.energy.manage.service.controller.base.BaseServiceController;
@@ -43,7 +44,11 @@ public class WindFieldBatchController extends BaseServiceController {
         Integer loginUserId = getUserId();
         windFieldBatchDto.setCreateBy(loginUserId);
         windFieldBatchDto.setUpdateBy(loginUserId);
-        return success(windFieldBatchService.addWindFieldBatch(windFieldBatchDto));
+        int result = windFieldBatchService.addWindFieldBatch(windFieldBatchDto);
+        if (result == -1) {
+            return ResultResp.FAIL(ConstVar.EXSIT_BATCH_NAME);
+        }
+        return result == -1 ? ResultResp.FAIL(ConstVar.EXSIT_BATCH_NAME) : success(result);
     }
 
     @UserLoginToken
@@ -70,5 +75,11 @@ public class WindFieldBatchController extends BaseServiceController {
         return success(windFieldBatchService.deleteWindFieldBatch(windFieldBatchDto));
     }
 
+    @UserLoginToken
+    @ApiOperation(value = "生成批次名称")
+    @PostMapping("/createBatchName")
+    public ResultResp createBatchName(@RequestParam String fieldName){
+        return success(windFieldBatchService.createBatchName(fieldName));
+    }
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AnalysisCommentTypeRelationDto.java

@@ -13,7 +13,6 @@ import java.util.Date;
  * @date 2024/5/23 12:53
  * @desc
  */
-@Table(name = "analysis_comment_type_relation")
 @Data
 @Accessors(chain = true)
 public class AnalysisCommentTypeRelationDto {

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AnalysisDiagramRelationDto.java

@@ -12,7 +12,6 @@ import java.util.Date;
  * @date 2024/5/23 12:52
  * @desc
  */
-@Table(name = "analysis_diagram_relation")
 @Data
 public class AnalysisDiagramRelationDto {
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AnalysisDto.java

@@ -64,22 +64,22 @@ public class AnalysisDto {
     /**
      * 风速值最大最小
      */
-    private List<Integer> valueWindSpeed;
+    private List<Double> valueWindSpeed;
 
     /**
      * 桨距角最大最小
      */
-    private List<Integer> valuePitchAngle;
+    private List<Double> valuePitchAngle;
 
     /**
      * 有功功率
      */
-    private List<Integer> valueActivePower;
+    private List<Double> valueActivePower;
 
     /**
      * 发电机转速
      */
-    private List<Integer> valueGeneratorSpeed;
+    private List<Double> valueGeneratorSpeed;
 
     /*分析类型 configAnalysis*/
     /**
@@ -91,41 +91,41 @@ public class AnalysisDto {
     /**
      * 直驱发电机转速轴系
      */
-    private List<Integer> dGeneratorSpeed;
+    private List<Double> dGeneratorSpeed;
 
     /**
      * 非直驱发电机转速轴系设置
      */
-    private List<Integer> iGeneratorSpeed;
+    private List<Double> iGeneratorSpeed;
 
     /**
      * 直驱发电机转矩轴系
      */
-    private List<Integer> dGeneratorTorque;
+    private List<Double> dGeneratorTorque;
 
     /**
      * 非直驱发电机转矩轴系
      */
-    private List<Integer> iGeneratorTorque;
+    private List<Double> iGeneratorTorque;
 
     /**
      *风能利用系数轴系
      */
-    private List<Integer> cp;
+    private List<Double> cp;
 
     /**
      * 叶尖速比轴系
      */
-    private List<Integer> tsr;
+    private List<Double> tsr;
 
     /**
      * 桨距角轴系
      */
-    private List<Integer> pitchAngle;
+    private List<Double> pitchAngle;
 
     /**
      * 有功功率轴系
      */
-    private List<Integer> activePower;
+    private List<Double> activePower;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AnalysisGeneralFileDto.java

@@ -12,7 +12,6 @@ import java.util.Date;
  * @date 2024/5/23 12:55
  * @desc
  */
-@Table(name = "analysis_general_file")
 @Data
 public class AnalysisGeneralFileDto {
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AnalysisOptionRecordsDto.java

@@ -1,6 +1,6 @@
 package com.energy.manage.service.domain.dto.analysis;
 
-import com.energy.manage.common.po.analysis.AnalysisOptionRecords;
+import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -11,5 +11,5 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class AnalysisOptionRecordsDto extends AnalysisOptionRecords {
+public class AnalysisOptionRecordsDto extends AnalysisOptionRecordsPo {
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AnalysisResultDto.java

@@ -13,7 +13,6 @@ import java.util.Date;
  * @date 2024/5/23 12:50
  * @desc
  */
-@Table(name = "analysis_result")
 @Data
 public class AnalysisResultDto extends BaseDto {
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AnalysisTypeDto.java

@@ -11,7 +11,6 @@ import java.util.Date;
  * @date 2024/5/23 12:51
  * @desc
  */
-@Table(name = "analysis_type")
 @Data
 public class AnalysisTypeDto {
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfieldbatch/WindFieldBatchDto.java

@@ -38,7 +38,7 @@ public class WindFieldBatchDto {
     private String batchCode;
 
     /**
-     * 批次状态 0：启用 1：停用
+     * 批次状态 1：启用 0：停用
      */
     private Integer batchState;
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisCommentTypeRelationVo.java

@@ -10,7 +10,6 @@ import javax.persistence.Table;
  * @date 2024/5/23 12:53
  * @desc
  */
-@Table(name = "analysis_comment_type_relation")
 @Data
 public class AnalysisCommentTypeRelationVo {
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisDiagramRelationVo.java

@@ -12,7 +12,6 @@ import java.util.Date;
  * @date 2024/5/23 12:52
  * @desc
  */
-@Table(name = "analysis_diagram_relation")
 @Data
 public class AnalysisDiagramRelationVo {
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisGeneralFileVo.java

@@ -12,7 +12,6 @@ import java.util.Date;
  * @date 2024/5/23 12:55
  * @desc
  */
-@Table(name = "analysis_general_file")
 @Data
 public class AnalysisGeneralFileVo {
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisOptionRecordsVo.java

@@ -1,6 +1,6 @@
 package com.energy.manage.service.domain.vo.analysis;
 
-import com.energy.manage.common.po.analysis.AnalysisOptionRecords;
+import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -11,5 +11,5 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class AnalysisOptionRecordsVo extends AnalysisOptionRecords {
+public class AnalysisOptionRecordsVo extends AnalysisOptionRecordsPo {
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisResultVo.java

@@ -13,7 +13,6 @@ import java.util.Date;
  * @date 2024/5/23 12:50
  * @desc
  */
-@Table(name = "analysis_result")
 @Data
 public class AnalysisResultVo {
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisTypeVo.java

@@ -10,7 +10,6 @@ import javax.persistence.Table;
  * @date 2024/5/23 12:51
  * @desc
  */
-@Table(name = "analysis_type")
 @Data
 public class AnalysisTypeVo {
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windfieldbatch/WindFieldBatchVo.java

@@ -14,7 +14,7 @@ import java.util.Date;
 public class WindFieldBatchVo {
 
     /**
-     * 批次编号
+     * 批次编号 1：启用 0：停用
      */
     private String batchCode;
 

energy-manage-service/src/main/java/com/energy/manage/service/mappers/analysis/AnalysisOptionRecordsMapper.java

@@ -1,7 +1,7 @@
 package com.energy.manage.service.mappers.analysis;
 
 import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.analysis.AnalysisOptionRecords;
+import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -14,7 +14,7 @@ import java.util.List;
  * @desc
  */
 @Repository
-public interface AnalysisOptionRecordsMapper extends MyMapper<AnalysisOptionRecords> {
+public interface AnalysisOptionRecordsMapper extends MyMapper<AnalysisOptionRecordsPo> {
 
 
     List<AnalysisOptionRecordsVo> selectAllByTimeDesc(@Param("fieldCodes") List<String> fieldCodes);

energy-manage-service/src/main/java/com/energy/manage/service/mappers/windfieldbatch/WindFieldBatchMapper.java

@@ -43,4 +43,11 @@ public interface WindFieldBatchMapper extends MyMapper<WindFieldBatchPo>{
      */
     WindFieldBatchVo selectByBatchCode(String batchNo);
 
+    /**
+     * 根据名称查询
+     * @param batchName
+     * @return
+     */
+    WindFieldBatchVo selectByBatchName(String batchName);
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -1,6 +1,6 @@
 package com.energy.manage.service.service.analysis.impl;
 
-import com.energy.manage.common.po.analysis.AnalysisOptionRecords;
+import com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo;
 import com.energy.manage.common.reponse.ConstVar;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.common.util.HttpUtils;
@@ -464,7 +464,7 @@ public class AnalysisServiceImpl implements AnalysisService {
                 WindFieldBatchVo windFieldBatchVo = windFieldBatchMapper.selectByBatchCode(batchCode);
                 fieldCode = windFieldBatchVo.getFieldCode();
             }
-            AnalysisOptionRecords optionRecordsPo = new AnalysisOptionRecords();
+            AnalysisOptionRecordsPo optionRecordsPo = new AnalysisOptionRecordsPo();
             LoginUser user = LoginUserContextHolder.get();
             optionRecordsPo.setOptionBy(user.getUserId());
             optionRecordsPo.setOptionByName(user.getUserName());

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiserr/impl/AnalysisErrServiceImpl.java

@@ -2,7 +2,6 @@ package com.energy.manage.service.service.analysiserr.impl;
 
 import com.energy.manage.common.reponse.ConstVar;
 import com.energy.manage.common.reponse.ResultResp;
-import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
 import com.energy.manage.service.domain.dto.windexceptioncount.WindExceptionCountDto;
 import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
 import com.energy.manage.service.mappers.windexceptioncount.WindExceptionCountMapper;

energy-manage-service/src/main/java/com/energy/manage/service/service/windfieldbatch/WindFieldBatchService.java

@@ -45,4 +45,11 @@ public interface WindFieldBatchService {
      */
     List<WindFieldBatchVo> queryWindFieldBatch(WindFileBatchPageDto windFieldBatchDto);
 
+    /**
+     * 生成风场名称
+     * @param fieldName
+     * @return
+     */
+    String createBatchName(String fieldName);
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/windfieldbatch/impl/WindFieldBatchServiceImpl.java

@@ -14,6 +14,7 @@ import com.energy.manage.service.mappers.windfield.WindFieldMapper;
 import com.energy.manage.service.mappers.windfieldbatch.WindFieldBatchMapper;
 import com.energy.manage.service.service.cache.CacheService;
 import com.energy.manage.service.service.windfieldbatch.WindFieldBatchService;
+import com.energy.manage.service.util.PinYinUtils;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +49,10 @@ public class WindFieldBatchServiceImpl implements WindFieldBatchService {
      */
     @Override
     public int addWindFieldBatch(WindFieldBatchDto windEgineBatchDto) {
+        WindFieldBatchVo exsitBatchVo = windFieldBatchMapper.selectByBatchName(windEgineBatchDto.getBatchName());
+        if(exsitBatchVo != null){
+            return -1;
+        }
         windEgineBatchDto.setBatchCode(createWindFieldBatchCode(windEgineBatchDto.getFieldCode()));
         WindFieldVo windFieldVo = windFieldMapper.selectByCodeNumber(windEgineBatchDto.getFieldCode());
         windEgineBatchDto.setFieldName(windFieldVo.getFieldName());
@@ -97,12 +102,23 @@ public class WindFieldBatchServiceImpl implements WindFieldBatchService {
     }
 
     /**
+     * 生成批次名称
+     * @param fieldName
+     * @return
+     */
+    @Override
+    public String createBatchName(String fieldName){
+        String fieldPYHeader = PinYinUtils.getPinYinHeadChar(fieldName);
+        return fieldPYHeader.concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, fieldPYHeader)),6));
+    }
+
+    /**
      * 生成风场批次号
      * @param fieldCode
      * @return
      */
     public String createWindFieldBatchCode(String fieldCode){
-        String sequece = IdPrefixEnum.WIND_ENGINE_BATCH_NUMBER.getCode().concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_ENGINE_BATCH_NUMBER.getCode()))));
+        String sequece = IdPrefixEnum.WIND_ENGINE_BATCH_NUMBER.getCode().concat(IdGeneratorUtil.zeroFillUtil(cacheService.incr(ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_CONSTANTS_KEY, IdPrefixEnum.WIND_FIELD_NUMBER.getCode(),IdPrefixEnum.WIND_ENGINE_BATCH_NUMBER.getCode())),6));
         return fieldCode + SEPARATOR + sequece;
     }
 }

energy-manage-service/src/main/java/com/energy/manage/service/test/TestJson.java

@@ -122,7 +122,7 @@ public class TestJson {
         dto.setBeginTime("1234-12-12 00:00:12");
         dto.setExcludingMonths(Arrays.asList("1","2","3"));
         dto.setTurbines(Arrays.asList("456","789"));
-        dto.setValueActivePower(Arrays.asList(1,2));
+        dto.setValueActivePower(Arrays.asList(1.2,2.3));
         dto.setConfigAnalysis(Arrays.asList("algorithm.powerOscillationAnalyst|PowerOscillationAnalyst|executeAnalysis|minute","algorithm.pitchTSRCpAnalyst|PitchTSRCpAnalyst|executeAnalysis|second"));
         setValue(dto,rootNode);
         for (JsonNode node : rootNode) {

energy-manage-service/src/main/java/com/energy/manage/service/util/PinYinUtils.java

@@ -0,0 +1,35 @@
+package com.energy.manage.service.util;
+
+import net.sourceforge.pinyin4j.PinyinHelper;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author chy
+ * @date 2024/7/4 11:19
+ * @desc
+ */
+public class PinYinUtils {
+
+    /**
+     * 获取汉字首字母
+     * @param sourceStr
+     * @return
+     */
+    public static String getPinYinHeadChar(String sourceStr) {
+        if (StringUtils.isBlank(sourceStr)) {
+            return "";
+        }
+        String convert = "";
+        for (char word : sourceStr.toCharArray()) {
+            // 提取字符的首字母
+            String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(word);
+            convert += pinyinArray != null ? pinyinArray[0].charAt(0) : word;
+        }
+        return convert.toUpperCase();
+    }
+
+    public static void main(String[] args) {
+        String a = "招远风电场";
+        System.out.println(getPinYinHeadChar(a));
+    }
+}

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisOptionRecordsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.energy.manage.service.mappers.analysis.AnalysisOptionRecordsMapper">
-    <resultMap id="BaseResultMap" type="com.energy.manage.common.po.analysis.AnalysisOptionRecords">
+    <resultMap id="BaseResultMap" type="com.energy.manage.common.po.analysis.AnalysisOptionRecordsPo">
         <id column="id" property="id" jdbcType="BIGINT"/>
         <result column="option_content" property="optionContent" jdbcType="VARCHAR"/>
         <result column="option_by" property="optionBy" jdbcType="INTEGER"/>

energy-manage-service/src/main/resources/mybatis/windenginebatch/WindFieldBatchMapper.xml

@@ -128,4 +128,16 @@
         where batch_code = #{batchCode}
     </select>
 
+    <select id="selectByBatchName" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo">
+        select batch.batch_code,
+               batch.batch_name,
+               batch.field_name,
+               batch.field_code,
+               batch.batch_state,
+               batch.is_delete,
+               batch.create_time
+        from wind_field_batch batch
+        where batch_name = #{batchName}
+    </select>
+
 </mapper>