Merge branch 'energy-manage-chy2'

energy-manage-common/src/main/java/com/energy/manage/common/po/datatransfer/DataTransferPo.java

@@ -2,6 +2,7 @@ package com.energy.manage.common.po.datatransfer;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import javax.persistence.Table;
 import java.math.BigDecimal;
@@ -15,6 +16,7 @@ import java.util.Date;
  */
 @Table(name = "date_tansfer")
 @Data
+@Accessors(chain = true)
 public class DataTransferPo {
 
     /**

energy-manage-common/src/main/java/com/energy/manage/common/po/windexceptioncount/WindExceptionCountPo.java

@@ -67,4 +67,9 @@ public class WindExceptionCountPo {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime ;
+
+    /**
+     * 异常描述
+     */
+    private String errDesc;
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysiserr/AnalysisErrController.java

@@ -51,7 +51,7 @@ public class AnalysisErrController extends BaseServiceController {
     public ResultResp analysisErrEdit(@RequestBody WindExceptionCountDto windExceptionCountDto)
     {
         windExceptionCountDto.setUpdateBy(getUserId());
-        return analysisErrService.analysisErrEdit(windExceptionCountDto);
+        return success(analysisErrService.analysisErrEdit(windExceptionCountDto));
     }
 
     @UserLoginToken
@@ -60,6 +60,15 @@ public class AnalysisErrController extends BaseServiceController {
     public ResultResp analysisErrDel(@RequestBody WindExceptionCountDto windExceptionCountDto)
     {
         windExceptionCountDto.setUpdateBy(getUserId());
-        return analysisErrService.analysisErrDel(windExceptionCountDto);
+        return success(analysisErrService.analysisErrDel(windExceptionCountDto));
+    }
+
+    @UserLoginToken
+    @ApiOperation(value = "查询风机异常信息")
+    @GetMapping("/queryErrDescByEngine")
+    public ResultResp queryErrDescByEngine(@RequestParam(name = "batchCode") String batchCode,
+                                           @RequestParam(name = "engineCode") String engineCode)
+    {
+        return success(analysisErrService.queryErrDescByEngine(batchCode,engineCode));
     }
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/datatransfer/DataTransferController.java

@@ -47,7 +47,7 @@ public class DataTransferController extends BaseServiceController {
 
 
     @UserLoginToken
-    @ApiOperation("新增数据转换数据")
+    @ApiOperation("新增数据转换")
     @PostMapping("/addDataTransferList")
     public ResultResp addDataTransferList(@RequestBody DataTransferDto dataTransferDto){
         dataTransferDto.setRoleId(getRoleId());

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windexceptioncount/WindExceptionCountDto.java

@@ -55,4 +55,9 @@ public class WindExceptionCountDto extends BaseDto {
      * 更新人
      */
     private Integer updateBy;
+
+    /**
+     * 异常描述
+     */
+    private String errDesc;
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/datatransfer/DataTransferQueryAndAddVo.java

@@ -1,6 +1,5 @@
 package com.energy.manage.service.domain.vo.datatransfer;
 
-import com.energy.manage.common.po.datatransfer.DataTransferTypePo;
 import com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo;
 import lombok.Data;
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windexceptioncount/WindExceptionCountVo.java

@@ -74,4 +74,9 @@ public class WindExceptionCountVo {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
+
+    /**
+     * 异常描述
+     */
+    private String errDesc;
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windexceptioncount/WindExceptionDescVo.java

@@ -0,0 +1,33 @@
+package com.energy.manage.service.domain.vo.windexceptioncount;
+
+import lombok.Data;
+
+/**
+ * 风机异常信息
+ * @author chy
+ * @date 2024/7/5 14:25
+ * @desc
+ */
+@Data
+public class WindExceptionDescVo {
+
+    /**
+     * 批次编号
+     */
+    private String batchCode;
+
+    /**
+     * 风机编号
+     */
+    private String engineCode;
+
+    /**
+     * 分析类型名称
+     */
+    private String analysisTypeName;
+
+    /**
+     * 异常描述信息
+     */
+    private String errDesc;
+}

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/AnalysisCommentDescriptionMapper.java

@@ -19,14 +19,16 @@ public interface AnalysisCommentDescriptionMapper extends MyMapper<AnalysisComme
 
     /**
      * 根据条件查询评论数（批次 + 分析类型 + 文本类型编号）
+     * @param batchCode
+     * @param analysisTypeCode
      * @param commentTypeCode
      * @return
      */
-   int selectCountByCommentTypeCode(String commentTypeCode);
+   int selectCountByAllCode(@Param("batchCode") String batchCode,@Param("analysisTypeCode") String analysisTypeCode,@Param("commentTypeCode") String commentTypeCode);
 
 
     /**
-     * 根据条件查询评论数（批次 + 分析类型 + 文本类型编号）
+     * 根据条件查询评论数（批次 + 分析类型）
      * @param batchCode
      * @param analysisTypeCode
      * @return

energy-manage-service/src/main/java/com/energy/manage/service/mappers/windexceptioncount/WindExceptionCountMapper.java

@@ -5,6 +5,7 @@ import com.energy.manage.common.po.windexceptioncount.WindExceptionCountPo;
 import com.energy.manage.service.domain.dto.windexceptioncount.WindExceptionCountDto;
 import com.energy.manage.service.domain.vo.analysis.AnalysisErrorCodeVo;
 import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
+import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionDescVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -56,4 +57,12 @@ public interface WindExceptionCountMapper extends MyMapper<WindExceptionCountPo>
      */
     List<AnalysisErrorCodeVo> selectExceptionCountBybatchCode(@Param("batchCode") String batchCode);
 
+    /**
+     * 查询风机异常信息
+     * @param batchCode
+     * @param engineCode
+     * @return
+     */
+    List<WindExceptionDescVo> selectByBatchAndEngine(@Param("batchCode") String batchCode, @Param("engineCode") String engineCode);
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiscomment/impl/AnalysisCommentServiceImpl.java

@@ -101,7 +101,7 @@ public class AnalysisCommentServiceImpl implements AnalysisCommentService {
     @Override
     public int analysisCommentEdit(AnalysisCommentDescriptionDto dto) {
         AtomicInteger count = new AtomicInteger(0);
-        dto.getCommentList().parallelStream().forEach(item -> count.addAndGet(saveCommentDescription(dto, item)));
+        dto.getCommentList().parallelStream().forEach(item -> count.getAndAdd(saveCommentDescription(dto, item)));
         AnalysisServiceImpl.addOptionRecords(null, dto.getBatchCode(),OPTION_CONTENT);
         return count.get();
     }
@@ -124,17 +124,27 @@ public class AnalysisCommentServiceImpl implements AnalysisCommentService {
      * @param commentDescriptionDto
      */
     private int saveCommentDescription(AnalysisCommentDescriptionDto commentDescriptionDto, CommentDto commentDto){
+        //批次编号
+        String batchCode = commentDescriptionDto.getBatchCode();
+        //分析类型编号
+        String analysisTypeCode = commentDescriptionDto.getAnalysisTypeCode();
+        //评论类型编号
+        String commentTypeCode = commentDto.getCommentTypeCode();
         AnalysisCommentDescriptionPo commentDescriptionPo = new AnalysisCommentDescriptionPo();
         //拷贝批次编号 分析类型编号
-        commentDescriptionPo.setBatchCode(commentDescriptionDto.getBatchCode())
-                            .setAnalysisTypeCode(commentDescriptionDto.getAnalysisTypeCode())
-                            .setCommentTypeCode(commentDto.getCommentTypeCode())
+        commentDescriptionPo.setBatchCode(batchCode)
+                            .setAnalysisTypeCode(analysisTypeCode)
+                            .setCommentTypeCode(commentTypeCode)
                             .setComment(commentDto.getComment())
                             .setCreateBy(commentDescriptionDto.getCreateBy())
                             .setUpdateBy(commentDescriptionDto.getUpdateBy());
-        int count =  commentDescriptionMapper.selectCountByCommentTypeCode(commentDto.getCommentTypeCode());
+        int count =  commentDescriptionMapper.selectCountByAllCode(batchCode,analysisTypeCode,commentTypeCode);
         //空则添加 非空则编辑
         if(count == 0){
+            //如果评论内容为空则不添加
+            if(StringUtils.isBlank(commentDto.getComment())){
+                return 0;
+            }
            return commentDescriptionMapper.insertPoSelective(commentDescriptionPo);
         }else{
            return commentDescriptionMapper.updatePoSelective(commentDescriptionPo);

energy-manage-service/src/main/java/com/energy/manage/service/service/analysiserr/AnalysisErrService.java

@@ -5,6 +5,7 @@ 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.analysis.AnalysisErrorCodeVo;
 import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
+import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionDescVo;
 
 import java.util.List;
 
@@ -36,7 +37,7 @@ public interface AnalysisErrService {
      * @param windExceptionCountDto
      * @return
      */
-    ResultResp analysisErrEdit(WindExceptionCountDto windExceptionCountDto);
+    int analysisErrEdit(WindExceptionCountDto windExceptionCountDto);
 
 
     /**
@@ -44,7 +45,7 @@ public interface AnalysisErrService {
      * @param windExceptionCountDto
      * @return
      */
-    ResultResp analysisErrDel(WindExceptionCountDto windExceptionCountDto);
+    int analysisErrDel(WindExceptionCountDto windExceptionCountDto);
 
     /**
      *通过批次查询有异常的风机信息
@@ -54,4 +55,13 @@ public interface AnalysisErrService {
     List<AnalysisErrorCodeVo> AnalysisErrorCodeQuery(String batchCode);
 
 
+    /**
+     * 查询风机异常信息
+     * @param batchCode
+     * @param engineCode
+     * @return
+     */
+    List<WindExceptionDescVo> queryErrDescByEngine(String batchCode, String engineCode);
+
+
 }

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

@@ -5,6 +5,7 @@ import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.windexceptioncount.WindExceptionCountDto;
 import com.energy.manage.service.domain.vo.analysis.AnalysisErrorCodeVo;
 import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
+import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionDescVo;
 import com.energy.manage.service.mappers.windexceptioncount.WindExceptionCountMapper;
 import com.energy.manage.service.service.analysiserr.AnalysisErrService;
 import com.github.pagehelper.PageHelper;
@@ -51,7 +52,7 @@ public class AnalysisErrServiceImpl implements AnalysisErrService {
             return ResultResp.FAIL(ConstVar.SAME_WIND_ENGINE_ERR_INFO);
         }
         int count = windExceptionCountMapper.insertPoSelective(windExceptionCountDto);
-        return  count > 0 ? ResultResp.SUCCESS() : ResultResp.FAIL();
+        return  count > 0 ? ResultResp.SUCCESS(count) : ResultResp.FAIL();
     }
 
     /**
@@ -60,25 +61,34 @@ public class AnalysisErrServiceImpl implements AnalysisErrService {
      * @return
      */
     @Override
-    public ResultResp analysisErrEdit(WindExceptionCountDto analysisResultDto) {
-        return ResultResp.SUCCESS(windExceptionCountMapper.updatePoSelecttive(analysisResultDto));
+    public int analysisErrEdit(WindExceptionCountDto analysisResultDto) {
+        return windExceptionCountMapper.updatePoSelecttive(analysisResultDto);
     }
 
     /**
      * 删除异常描述
-     *
      * @param windExceptionCountDto
      * @return
      */
     @Override
-    public ResultResp analysisErrDel(WindExceptionCountDto windExceptionCountDto) {
+    public int analysisErrDel(WindExceptionCountDto windExceptionCountDto) {
         windExceptionCountDto.setIsDelete(1);
-        return ResultResp.SUCCESS(windExceptionCountMapper.updatePoSelecttive(windExceptionCountDto));
+        return windExceptionCountMapper.updatePoSelecttive(windExceptionCountDto);
     }
 
     @Override
     public List<AnalysisErrorCodeVo> AnalysisErrorCodeQuery(String batchCode) {
-        List<AnalysisErrorCodeVo> list = windExceptionCountMapper.selectExceptionCountBybatchCode(batchCode);
-        return list;
+        return windExceptionCountMapper.selectExceptionCountBybatchCode(batchCode);
+    }
+
+    /**
+     * 查询风机异常信息
+     * @param batchCode
+     * @param engineCode
+     * @return
+     */
+    @Override
+    public List<WindExceptionDescVo> queryErrDescByEngine(String batchCode, String engineCode){
+        return windExceptionCountMapper.selectByBatchAndEngine(batchCode,engineCode);
     }
 }

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

@@ -4,7 +4,6 @@ import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
 import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.po.analysis.AnalysisResultPo;
 import com.energy.manage.common.util.IdGeneratorUtil;
-import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
 import com.energy.manage.service.domain.dto.windfieldbatch.WindFieldBatchDto;
 import com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;

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

@@ -3,6 +3,8 @@ package com.energy.manage.service.util;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Locale;
+
 /**
  * @author chy
  * @date 2024/7/4 11:19
@@ -19,17 +21,17 @@ public class PinYinUtils {
         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();
+        StringBuffer headChar = new StringBuffer();
+        sourceStr.chars().mapToObj(c -> (char)c).forEach(item ->{
+            String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(item);
+            headChar.append(pinyinArray != null ? pinyinArray[0].charAt(0) : item);
+        });
+        return headChar.toString().toUpperCase();
     }
 
     public static void main(String[] args) {
-        String a = "招远风电场";
-        System.out.println(getPinYinHeadChar(a));
+        String a = "aaaa";
+        a.toUpperCase();
+        System.out.println(a);
     }
 }

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

@@ -14,10 +14,13 @@
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
     </resultMap>
 
-    <select id="selectCountByCommentTypeCode" parameterType="java.lang.String" resultType="int">
+    <select id="selectCountByAllCode" parameterType="java.lang.String" resultType="int">
         select count(*)
         from analysis_comment_description
-        where comment_type_code = #{commentTypeCode,jdbcType=VARCHAR}
+        where
+              batch_code = #{batchCode,jdbcType=VARCHAR}
+        and   analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
+        and   comment_type_code = #{commentTypeCode,jdbcType=VARCHAR}
     </select>
 
     <select id="selecByBatchCodeAndAnalysisTypeCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisCommentDescriptionVo">
@@ -88,6 +91,8 @@
                 update_by = #{updateBy,jdbcType=INTEGER}
             </if>
         </set>
-        where comment_type_code = #{commentTypeCode,jdbcType=VARCHAR}
+        where batch_code = #{batchCode,jdbcType=VARCHAR}
+        and   analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
+        and   comment_type_code = #{commentTypeCode,jdbcType=VARCHAR}
     </update>
 </mapper>

energy-manage-service/src/main/resources/mybatis/windexceptioncount/WindExceptionCountMapper.xml

@@ -13,6 +13,7 @@
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="update_by" property="updateBy" jdbcType="INTEGER"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="err_desc" property="errDesc" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="selectByCondition" parameterType="com.energy.manage.service.domain.dto.windexceptioncount.WindExceptionCountDto" resultType="com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo">
@@ -28,7 +29,8 @@
             count.create_by,
             count.create_time,
             count.update_by,
-            count.update_time
+            count.update_time,
+            count.err_desc
         from
             wind_exception_count count
         left join analysis_type type
@@ -58,8 +60,8 @@
         on batch.batch_code = count.batch_code
         left join wind_engine_group engine
         on engine.engine_code = count.engine_code
-        where
-            batch.batch_code in (
+        where count.is_delete = 0
+        and batch.batch_code in (
                 select distinct
                     batch_code
                 from
@@ -94,7 +96,10 @@
                 create_by,
             </if>
             <if test="updateBy != null">
-                update_by
+                update_by,
+            </if>
+            <if test="errDesc != null and errDesc != ''">
+                err_desc
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -117,7 +122,10 @@
                 #{createBy,jdbcType=INTEGER},
             </if>
             <if test="updateBy != null">
-                #{updateBy,jdbcType=INTEGER}
+                #{updateBy,jdbcType=INTEGER},
+            </if>
+            <if test="errDesc != null and errDesc != ''">
+                #{errDesc,jdbcType=VARCHAR}
             </if>
         </trim>
     </insert>
@@ -135,7 +143,10 @@
                 is_delete = #{isDelete,jdbcType=INTEGER},
             </if>
             <if test="updateBy != null">
-                update_by = #{updateBy,jdbcType=INTEGER}
+                update_by = #{updateBy,jdbcType=INTEGER},
+            </if>
+            <if test="errDesc != null and errDesc != ''">
+                err_desc = #{errDesc,jdbcType=VARCHAR}
             </if>
         </set>
         where id = #{id,jdbcType=BIGINT}
@@ -157,4 +168,18 @@
         group by engine_code
    </select>
 
+    <select id="selectByBatchAndEngine" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionDescVo">
+        select count.batch_code,
+               count.engine_code,
+               type.type_name as analysis_type_name,
+               count.err_desc
+        from wind_exception_count count
+        left join analysis_type type
+        on count.analysis_type_code = type.type_code
+        where count.is_delete = 0
+        and  count.batch_code = #{batchCode}
+        and  count.engine_code = #{engineCode}
+
+    </select>
+
 </mapper>