Forráskód Böngészése

待办任务,队列数

shiyue 2 hónapja
szülő
commit
feb0b773db

+ 0 - 23
energy-manage-common/src/main/java/com/energy/manage/common/po/windfield/WindFieldPO.java

@@ -94,28 +94,5 @@ public class WindFieldPO extends NewBaseDomain {
     private Integer dataSource;
 
 
-    /**
-     *分钟级阈值
-     */
-    private Integer minuteThresholdValue;
-
-    /**
-     *分钟级初始化时间
-     */
-    private Date minuteInitDate;
-
-    /**
-     *秒钟级阈值
-     */
-    private Integer secondThresholdValue;
-
-    /**
-     *秒钟初始化时间
-     */
-    private Date secondInitDate;
-
-
-
-
 }
 

+ 0 - 14
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldDto.java

@@ -113,20 +113,6 @@ public class WindFieldDto {
     private Integer createBy;
 
 
-    /**
-     *分钟级阈值
-     */
-    @ApiModelProperty(value = "分钟级阈值")
-    private Integer minuteThresholdValue;
-
-    /**
-     *秒钟级阈值
-     */
-    @ApiModelProperty(value = "秒钟级阈值")
-    private Integer secondThresholdValue;
-
-
-
     @Setter
     @Getter
     @ApiModel

+ 1 - 12
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldUpdateDto.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 @Getter
@@ -95,18 +96,6 @@ public class WindFieldUpdateDto {
     private String powerContractUrl;
 
     /**
-     *分钟级阈值
-     */
-    @ApiModelProperty(value = "分钟级阈值")
-    private Integer minuteThresholdValue;
-
-    /**
-     *秒钟级阈值
-     */
-    @ApiModelProperty(value = "秒钟级阈值")
-    private Integer secondThresholdValue;
-
-    /**
      * 测风塔
      */
     @ApiModelProperty("测风塔")

+ 22 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindSysDateDto.java

@@ -0,0 +1,22 @@
+package com.energy.manage.service.domain.dto.windfield;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel("亮亮调用接口修改系统采集时间-废弃")
+public class WindSysDateDto {
+
+
+    @ApiModelProperty("风场编号")
+    private String windFarmCode;
+
+    @ApiModelProperty("数据采集开始时间")
+    private String startTime;
+
+
+}

+ 0 - 1
energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/WindFieldService.java

@@ -118,5 +118,4 @@ public interface WindFieldService {
 
 
 
-
 }

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldServiceImpl.java

@@ -46,6 +46,7 @@ import com.energy.manage.service.service.system.SysPermissionService;
 import com.energy.manage.service.service.windfield.WindFieldResourceService;
 import com.energy.manage.service.service.windfield.WindFieldService;
 import com.energy.manage.service.service.windrelation.WindRelationService;
+import com.energy.manage.service.util.DateUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
@@ -395,6 +396,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
 
         WindFieldPO windFieldPO = new WindFieldPO();
         BeanUtil.copyProperties(windFieldUpdateDto, windFieldPO);
+
         Example queryExample = new Example(WindFieldPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldCode", windFieldPO.getFieldCode());