新增:分析信息查询接口

energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisResultPo.java

@@ -129,5 +129,5 @@ public class AnalysisResultPo {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date analysisFinishTime;
-
+    
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/analysis/AnalysisController.java

@@ -66,6 +66,7 @@ public class AnalysisController extends BaseServiceController {
     {
         //设置为手动分析
         analysisto.setAutoOrManual(AnalysisConstants.MANUAL_ANALYSIS);
+        analysisto.setUpdateBy(getLoginUser().getUserId());
         return analysisService.analysis(analysisto);
     }
 

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

@@ -129,4 +129,9 @@ public class AnalysisDto {
      */
     private List<Double> activePower;
 
+    /**
+     * 分析人
+     */
+    private Integer updateBy;
+
 }

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

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
-import java.util.List;
+import java.util.Set;
 
 /**
  * @author chy
@@ -20,12 +20,12 @@ public class AnalysisRelateInfoVo {
     /**
      * 已分析的批次信息
      */
-    private List<AnalysisTypeShortVo> analysisTypes;
+    private Set<AnalysisTypeShortVo> analysisTypes;
 
     /**
      * 已分析的风机列表
      */
-    private List<WindEngineGroupShortVo> windEngineGroups;
+    private Set<WindEngineGroupShortVo> windEngineGroups;
 
     /**
      * 分析操作人

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

@@ -1,11 +1,9 @@
 package com.energy.manage.service.domain.vo.analysis;
 
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -19,7 +17,7 @@ import java.util.Map;
 public class AnalysisResultShowVo {
 
     /**
-     * 分析类型（树形结构）
+     * 分析类型
      */
     private List<Map<String,Object>> analysisTypeList;
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windfield/WindFieldDescriptVo.java

@@ -4,7 +4,7 @@ import com.energy.manage.common.po.windfield.WindFieldPO;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.List;
+import java.util.Set;
 
 /**
  * @author chy
@@ -28,6 +28,6 @@ public class WindFieldDescriptVo extends WindFieldPO {
     /**
      * 风机类型
      */
-    private List<String> engineMillTypes;
+    private Set<String> engineMillTypes;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/AnalysisService.java

@@ -54,7 +54,7 @@ public interface AnalysisService {
     AnalysisResultShowVo analysisEditQuery(String batchCode);
 
     /**
-     * 查询已经分析的分析类型和风机信息
+     * 查询已经分析的分析类型
      * @param batchCode
      * @return
      */

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

@@ -19,6 +19,7 @@ import com.energy.manage.service.domain.dto.analysis.AnalysisResultDto;
 import com.energy.manage.service.domain.vo.analysis.*;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldAndBatchTreeVo;
 import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
+import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupShortVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldDescriptVo;
@@ -28,6 +29,7 @@ import com.energy.manage.service.filter.LoginUser;
 import com.energy.manage.service.filter.LoginUserContextHolder;
 import com.energy.manage.service.mappers.analysis.*;
 import com.energy.manage.service.mappers.system.SysOrganizationAuthMapper;
+import com.energy.manage.service.mappers.system.SysUserInfoMapper;
 import com.energy.manage.service.mappers.windenginegroup.WindEngineGroupMapper;
 import com.energy.manage.service.mappers.windfield.WindFieldMapper;
 import com.energy.manage.service.mappers.windfieldbatch.WindFieldBatchMapper;
@@ -48,6 +50,7 @@ import io.minio.messages.Item;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -106,6 +109,9 @@ public class AnalysisServiceImpl implements AnalysisService {
     private WindEngineGroupMapper windEngineGroupMapper;
 
     @Autowired
+    private SysUserInfoMapper sysUserInfoMapper;
+
+    @Autowired
     private AnalysisResultReportMapper resultReportMapper;
 
     @Autowired
@@ -255,7 +261,7 @@ public class AnalysisServiceImpl implements AnalysisService {
     }
 
     /**
-     * 查询已经分析的分析类型和风机信息
+     * 查询已经分析的分析类型
      * @param batchCode
      * @return
      */
@@ -421,11 +427,15 @@ public class AnalysisServiceImpl implements AnalysisService {
      * @return
      */
     private WindFieldDescriptVo getWindFieldDescriptVo(String fieldCode){
-//        WindFieldDescriptVo fieldInfoVo = windFieldMapper.selectByCodeNumber(fieldCode);
-//        fieldInfoVo.setFieldCode(fieldCode)
-//                .setFieldName(fieldMapper.selectByCode(fieldCode).getFieldName());
-//        return fieldInfoVo;
-        return null;
+        WindFieldVo windFieldVo = windFieldMapper.selectByCodeNumber(fieldCode);
+        WindFieldDescriptVo windFieldDescriptVo = new WindFieldDescriptVo();
+        BeanUtils.copyProperties(windFieldVo,windFieldDescriptVo);
+        List<WindEngineGroupPageVo> windEngineGroupPageVos = windEngineGroupMapper.selectWindEngineGroupListByFieldCode(fieldCode);
+        //设置风机数量
+        windFieldDescriptVo.setEngineCount(windEngineGroupPageVos.size());
+        //设置机型集合
+        windFieldDescriptVo.setEngineMillTypes(windEngineGroupPageVos.stream().map(WindEngineGroupPageVo::getMachineTypeCode).collect(Collectors.toSet()));
+        return windFieldDescriptVo;
     }
 
     /**
@@ -434,8 +444,17 @@ public class AnalysisServiceImpl implements AnalysisService {
      * @return
      */
     private AnalysisRelateInfoVo getAnalysisCodeInfo(String batchCode){
-        return null;
+        AnalysisRelateInfoVo returnVo = new AnalysisRelateInfoVo();
+        AnalysisResultPo analysisResultPo = analysisResultMapper.selectByBatchCode(batchCode);
+        returnVo.setDataStartTime(analysisResultPo.getDataStartTime())
+                .setDataEndTime(analysisResultPo.getDataEndTime())
+                .setAnalysisFinishTime(analysisResultPo.getAnalysisFinishTime())
+                .setUpdateByName(sysUserInfoMapper.getUserInfoByUserId(analysisResultPo.getCreateBy()).getUserName())
+                .setAnalysisTypes(queryAnalysisedType(batchCode))
+                .setWindEngineGroups(queryAnalysisedEngine(batchCode,null));
+        return returnVo;
     }
+
     /**
      * 全部文件下载查询接口
      * @param fieldCode

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

@@ -51,7 +51,13 @@
         from analysis_diagram_relation relations
         left join wind_engine_group engine
         on relations.field_engine_code = engine.engine_code
-        where relations.batch_code = #{batchCode,jdbcType=VARCHAR}
-        and relations.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
+        <where>
+            <if test="batchCode != null and batchCode != ''">
+                relations.batch_code = #{batchCode,jdbcType=VARCHAR}
+            </if>
+            <if test="analysisTypeCode != null and analysisTypeCode != ''">
+                and relations.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
+            </if>
+        </where>
     </select>
 </mapper>

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

@@ -126,7 +126,8 @@
             data_end_time = #{endTime,jdbcType=VARCHAR},
             data_type_code = #{scada,jdbcType=VARCHAR},
             analysis_start_time = now(),
-            update_time = now()
+            update_time = now(),
+            update_by = #{updateBy,jdbcType=INTEGER}
         where batch_code = #{dataBatchNum,jdbcType=VARCHAR}
     </update>
 </mapper>

energy-manage-service/src/main/resources/mybatis/system/UserMapper.xml

@@ -56,7 +56,7 @@
         u.id AS userId,
         u.user_name AS userName,
         u.user_phone AS userPhone,
-        u u.login_name as loginName,
+        u.login_name as loginName,
         r.id AS roleId,
         r.role_description AS roleName
         FROM

energy-manage-service/src/main/resources/mybatis/windfield/WindFieldMapper.xml

@@ -88,6 +88,9 @@
             field.province_name as provinceName,
             field.city_name as cityName,
             field.elevation_height as elevationHeight,
+            field.latitude,
+            field.longitude,
+            field.rated_capacity_number,
             field.create_time as createTime
         from wind_field field
         left join wind_company company