#巡检任务派发定时任务

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindAreaDutyVo.java

@@ -16,6 +16,10 @@ public class WindAreaDutyVo {
 	@ApiModelProperty(value = "机构Id")
 	private Long deptId;
 
+	@ApiModelProperty(value = "机构名称")
+	private String deptName;
+
+
 	@ApiModelProperty(value = "开始时间")
 	private String start;
 

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindKpiAppVo.java

@@ -13,6 +13,15 @@ import lombok.Data;
 @ApiModel(value = "风电站点app指标数据")
 public class WindKpiAppVo {
 
+	@ApiModelProperty(value = "机构Id")
+	private Long deptId;
+
+	@ApiModelProperty(value = "机构名称")
+	private String deptName;
+
+	@ApiModelProperty(value = "机构类型")
+	private Integer type;
+
 	@ApiModelProperty(value = "风电站数量")
 	private Integer count;
 

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindScoreVo.java

@@ -30,6 +30,10 @@ public class WindScoreVo {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double generateMon;
 
+	@ApiModelProperty(value = "月计划发电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Double planMon;
+
 	@ApiModelProperty(value = "年计划发电量")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double planYear;
@@ -46,13 +50,13 @@ public class WindScoreVo {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double speedRate;
 
-	@ApiModelProperty(value = "短期准确率")
+	@ApiModelProperty(value = "月利用小时")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private Double accuracy;
+	private Double availableMon;
 
-	@ApiModelProperty(value = "超短期准确率")
+	@ApiModelProperty(value = "月发电量完成率")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private Double ultraShortAccuracyRate;
+	private Double completeMonRate;
 
 	@ApiModelProperty(value = "近年发电量集合")
 	private List<PowerYearVo> powerYearVoList;

hzims-service-api/inspect-api/pom.xml

@@ -64,6 +64,12 @@
             <artifactId>common-api</artifactId>
             <version>4.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>safeproduct-api</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.ToString;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.ToString;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity;
 import com.hnac.hzinfo.inspect.utils.QueryField;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import com.hnac.hzinfo.inspect.ai.entity.UserFaceDataEntity;
 import lombok.Data;

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java

@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectMapper.java

@@ -2,11 +2,7 @@ package com.hnac.hzims.scheduled.mapper.inspect;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity;
-import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * @author ysj

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java

@@ -1,12 +1,8 @@
 package com.hnac.hzims.scheduled.service.inspect;
 
 import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity;
-import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO;
-import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO;
 import org.springblade.core.mp.base.BaseService;
 
-import java.util.List;
-
 /**
  * @author ysj
  */

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java

@@ -8,7 +8,6 @@ import com.hnac.hzinfo.core.push.model.PushInfo;
 import com.hnac.hzinfo.core.push.model.PushPlatform;
 import com.hnac.hzinfo.inspect.task.TaskContants;
 import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
-import com.hnac.hzinfo.inspect.task.job.HzThreadPool;
 import com.xxl.job.core.log.XxlJobLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.sms.model.SmsResponse;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java

@@ -1,6 +1,6 @@
 package com.hnac.hzims.scheduled.service.inspect;
 
-import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO;
+import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO;
 import com.hnac.hzinfo.inspect.plan.PlanContants;
 import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
 import org.springframework.beans.factory.annotation.Autowired;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java

@@ -1,24 +1,14 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.ContentMapper;
 import com.hnac.hzims.scheduled.service.inspect.ContentService;
 import com.hnac.hzinfo.inspect.obj.entity.ContentEntity;
-import com.hnac.hzinfo.inspect.obj.mapper.ContentMapper;
-import com.hnac.hzinfo.inspect.obj.services.DatabaseCopyHandler;
-import com.hnac.hzinfo.inspect.obj.utils.CodeUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.tool.utils.CollectionUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * @author ysj
  */

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.ObjectUserMapper;
 import com.hnac.hzims.scheduled.service.inspect.ObjectUserService;
 import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity;
-import com.hnac.hzinfo.inspect.obj.mapper.ObjectUserMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.PlanObjectTemplateMapper;
 import com.hnac.hzims.scheduled.service.inspect.PlanObjectTemplateService;
 import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity;
-import com.hnac.hzinfo.inspect.plan.mapper.PlanObjectTemplateMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java

@@ -1,8 +1,8 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
+import com.hnac.hzims.scheduled.mapper.inspect.PlanOrgMapper;
 import com.hnac.hzims.scheduled.service.inspect.PlanOrgService;
 import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity;
-import com.hnac.hzinfo.inspect.plan.mapper.PlanOrgMapper;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.PlanPositionMapper;
+import com.hnac.hzims.scheduled.service.inspect.PlanPositionService;
 import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity;
-import com.hnac.hzinfo.inspect.plan.mapper.PlanPositionMapper;
-import com.hnac.hzinfo.inspect.plan.service.IPlanPositionService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -17,6 +17,6 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @AllArgsConstructor
 @DS("inspect")
-public class PlanPositionServiceImpl extends BaseServiceImpl<PlanPositionMapper, PlanPositionEntity> implements IPlanPositionService {
+public class PlanPositionServiceImpl extends BaseServiceImpl<PlanPositionMapper, PlanPositionEntity> implements PlanPositionService {
 
 }

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.PlanUserMapper;
 import com.hnac.hzims.scheduled.service.inspect.PlanUserService;
 import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity;
-import com.hnac.hzinfo.inspect.plan.mapper.PlanUserMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java

@@ -1,10 +1,9 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.ProjectContentMapper;
 import com.hnac.hzims.scheduled.service.inspect.ProjectContentService;
 import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity;
-import com.hnac.hzinfo.inspect.obj.mapper.ProjectContentMapper;
-import com.hnac.hzinfo.inspect.obj.services.DatabaseCopyHandler;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.ProjectMapper;
 import com.hnac.hzims.scheduled.service.inspect.ProjectService;
 import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity;
-import com.hnac.hzinfo.inspect.obj.mapper.ProjectMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java

@@ -1,16 +1,14 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectContentMapper;
 import com.hnac.hzims.scheduled.service.inspect.TaskObjectProjectContentService;
 import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity;
-import com.hnac.hzinfo.inspect.task.mapper.TaskObjectProjectContentMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @author ysj
  */

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java

@@ -1,17 +1,14 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectMapper;
 import com.hnac.hzims.scheduled.service.inspect.TaskObjectProjectService;
 import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity;
-import com.hnac.hzinfo.inspect.task.mapper.TaskObjectProjectMapper;
-import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @author ysj
  */

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java

@@ -1,18 +1,14 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectMapper;
 import com.hnac.hzims.scheduled.service.inspect.TaskObjectService;
 import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity;
-import com.hnac.hzinfo.inspect.task.mapper.TaskObjectMapper;
-import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO;
-import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @author ysj
  */

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskResultMapper;
 import com.hnac.hzims.scheduled.service.inspect.TaskResultService;
 import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity;
-import com.hnac.hzinfo.inspect.task.mapper.TaskResultMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java

@@ -18,8 +18,6 @@ import com.hnac.hzinfo.inspect.plan.PlanContants;
 import com.hnac.hzinfo.inspect.plan.entity.*;
 import com.hnac.hzinfo.inspect.task.TaskContants;
 import com.hnac.hzinfo.inspect.task.entity.*;
-import com.hnac.hzinfo.inspect.task.job.service.TaskRemindManager;
-import com.hnac.hzinfo.inspect.task.job.service.TaskVideoManager;
 import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO;
 import com.xxl.job.core.log.XxlJobLogger;
 import lombok.AllArgsConstructor;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskUserMapper;
 import com.hnac.hzims.scheduled.service.inspect.TaskUserService;
 import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity;
-import com.hnac.hzinfo.inspect.task.mapper.TaskUserMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java

@@ -1,26 +1,13 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hnac.hzims.scheduled.mapper.inspect.TemplateProjectMapper;
 import com.hnac.hzims.scheduled.service.inspect.TemplateProjectService;
-import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity;
-import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity;
 import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity;
-import com.hnac.hzinfo.inspect.obj.mapper.TemplateProjectMapper;
-import com.hnac.hzinfo.inspect.obj.services.DatabaseCopyHandler;
-import com.hnac.hzinfo.inspect.obj.services.TemplateService;
-import com.hnac.hzinfo.inspect.obj.services.impl.ProjectContentServiceImpl;
-import com.hnac.hzinfo.inspect.obj.utils.CodeUtils;
-import com.hnac.hzinfo.inspect.obj.vo.ProjectContentDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author ysj

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TemplateMapper;
 import com.hnac.hzims.scheduled.service.inspect.TemplateService;
 import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity;
-import com.hnac.hzinfo.inspect.obj.mapper.TemplateMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java

@@ -2,15 +2,13 @@ package com.hnac.hzinfo.inspect.ai.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hnac.hzinfo.inspect.ai.AIContants;
-import com.hnac.hzinfo.inspect.ai.dto.AIData;
+import com.hnac.hzinfo.inspect.ai.vo.AIData;
-import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO;
+import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO;
 import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity;
 import com.hnac.hzinfo.inspect.ai.service.IClockService;
 import com.hnac.hzinfo.inspect.ai.service.IRobotTaskIdentifyService;
-import com.hnac.hzinfo.inspect.ai.util.BigDecimalUtil;
 import com.hnac.hzinfo.inspect.ai.util.CommonUtil;
 import com.hnac.hzinfo.inspect.ai.util.EndianUtil;
 import com.hnac.hzinfo.inspect.ai.vo.RobotTaskVO;
@@ -52,7 +50,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  *  服务实现类

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/UserFaceDataServiceImpl.java

@@ -4,7 +4,7 @@ package com.hnac.hzinfo.inspect.ai.service.impl;
 import com.google.common.base.Functions;
 import com.google.common.collect.Lists;
 import com.hnac.hzinfo.inspect.ai.config.FaceConfig;
-import com.hnac.hzinfo.inspect.ai.dto.FaceResponse;
+import com.hnac.hzinfo.inspect.ai.vo.FaceResponse;
 import com.hnac.hzinfo.inspect.ai.entity.UserFaceDataEntity;
 import com.hnac.hzinfo.inspect.ai.mapper.UserFaceDataMapper;
 import com.hnac.hzinfo.inspect.ai.service.IUserFaceDataService;

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/VideoTaskAiMqttConsumer.java

@@ -1,6 +1,6 @@
 package com.hnac.hzinfo.inspect.ai.service.impl;
 
-import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO;
+import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO;
 import com.hnac.hzinfo.inspect.task.job.service.TaskVideoManager;
 import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.jackson.JsonUtil;

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskVideoManager.java

@@ -1,6 +1,6 @@
 package com.hnac.hzinfo.inspect.task.job.service;
 
-import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO;
+import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO;
 import com.hnac.hzinfo.inspect.plan.PlanContants;
 import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
 import org.springframework.beans.factory.annotation.Autowired;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java

@@ -34,7 +34,6 @@ import com.hnac.hzims.ticket.workTicket.feign.ITicketInfoClient;
 import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO;
 import com.hnac.hzinfo.inspect.task.feign.IInspectTaskReportClient;
 import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
@@ -142,12 +141,16 @@ public class WindHomeServiceImpl implements WindHomeService {
         }
         // 月发电量
         score.setGenerateMon(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getPower).sum());
+        // 月计划发电量
+        score.setPlanMon(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getPlan).sum());
+        // 月发电量完成率
+        if(Math.abs(score.getGenerateMon()) > 0 && Math.abs(score.getPlanMon()) > 0){
+            score.setCompleteMonRate(BigDecimal.valueOf(score.getGenerateMon() / score.getPlanMon() * 100).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+        }
         // 月平均风速
         score.setSpeedRate(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getSpeed).average().getAsDouble());
-        // 月短期准确率
+        // 月利用小时
-        score.setAccuracy(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getAccuracy).average().getAsDouble());
+        score.setAvailableMon(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getAvailable).sum());
-        // 月超短期准确率
-        score.setUltraShortAccuracyRate(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getUltraShortAccuracy).average().getAsDouble());
         // 日发电量
         score.setGenerateDay(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),DateUtil.PATTERN_DATE))).mapToDouble(WindEntity::getPower).sum());
         // 近年发电量
@@ -306,6 +309,8 @@ public class WindHomeServiceImpl implements WindHomeService {
         WindKpiAppVo kpi = new WindKpiAppVo();
         // 站点数量
         kpi.setCount(stations.size());
+        // 机构名称
+        this.subordinateDept(kpi);
         // 风电数据
         List<WindEntity> winds = windService.list(new LambdaQueryWrapper<WindEntity>() {{
             in(WindEntity::getStationCode,stations.stream().map(StationEntity::getCode).collect(Collectors.toList()))
@@ -331,6 +336,24 @@ public class WindHomeServiceImpl implements WindHomeService {
     }
 
     /**
+     * 设置省子公司名称
+     * @param kpi
+     */
+    private void subordinateDept(WindKpiAppVo kpi) {
+        R<List<Dept>> result = sysClient.getDeptByCurrentUser();
+        if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){
+            return;
+        }
+        Optional<Dept> optional;
+        optional = result.getData().stream().min(Comparator.comparing(Dept::getDeptCategory));
+        optional.ifPresent(dept -> {
+            kpi.setDeptId(dept.getId());
+            kpi.setDeptName(dept.getDeptName());
+            kpi.setType(dept.getDeptCategory());
+        });
+    }
+
+    /**
      * 风电app区域数据
      * @param deptId
      * @return
@@ -401,6 +424,10 @@ public class WindHomeServiceImpl implements WindHomeService {
     public WindAreaDutyVo app_area_duty(Long deptId) {
         WindAreaDutyVo areaDuty = new WindAreaDutyVo();
         areaDuty.setDeptId(deptId);
+        R<Dept> result = sysClient.getDept(deptId);
+        if(result.isSuccess() && ObjectUtil.isNotEmpty(result.getData())){
+            areaDuty.setDeptName(result.getData().getDeptName());
+        }
         // 风电统计数据
         this.windFill(areaDuty,deptId);