待办任务，队列数

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

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Table;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 风场信息
@@ -93,5 +94,28 @@ public class WindFieldPO extends NewBaseDomain {
     private Integer dataSource;
 
 
+    /**
+     *分钟级阈值
+     */
+    private Integer minuteThresholdValue;
+
+    /**
+     *分钟级初始化时间
+     */
+    private Date minuteInitDate;
+
+    /**
+     *秒钟级阈值
+     */
+    private Integer secondThresholdValue;
+
+    /**
+     *秒钟初始化时间
+     */
+    private Date secondInitDate;
+
+
+
+
 }
 

energy-manage-service/src/main/java/com/energy/manage/service/controller/units/UnitDictController.java

@@ -175,6 +175,15 @@ public class UnitDictController extends BaseServiceController {
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
+
+    @UserLoginToken
+    @PostMapping(value = "/updateUnitDictBrandModelParameter")
+    @ApiOperation(value = "更新部件品牌型号-参数")
+    public ResultResp updateUnitDictBrandModelParameter(@RequestBody @Valid UnitDictBrandModelParameterUpdateDto unitDictBrandModelParameterUpdateDto) {
+        boolean flg = unitDictConstantsService.updateUnitDictBrandParameterModel(unitDictBrandModelParameterUpdateDto);
+        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    }
+
     @UserLoginToken
     @PostMapping(value = "/delUnitDictBrandModel")
     @ApiOperation(value = "删除部件品牌型号-品牌型号")

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/units/UnitDictBrandModelParameterUpdateDto.java

@@ -0,0 +1,41 @@
+package com.energy.manage.service.domain.dto.units;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@ApiModel("更新风机部件品牌算法参数")
+public class UnitDictBrandModelParameterUpdateDto {
+
+
+    @ApiModelProperty("主键")
+    @NotNull(message = "主键不能为空")
+    private Integer id;
+
+    // 部件类型
+    @ApiModelProperty("部件类型")
+    @NotNull(message = "部件类型不能为空")
+    private String unitType;
+
+    // 滚动数量
+    @ApiModelProperty("滚动数量")
+    private BigDecimal rollsNumbe;
+
+    // 滚动直径
+    @ApiModelProperty("滚动直径")
+    private BigDecimal rollsDiameter;
+
+    // 圆直径
+    @ApiModelProperty("描圆直径述")
+    private BigDecimal circleDiameter;
+
+    // 接触角
+    @ApiModelProperty("接触角")
+    private BigDecimal thetaDeg;
+}

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

@@ -9,6 +9,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -112,6 +113,20 @@ public class WindFieldDto {
     private Integer createBy;
 
 
+    /**
+     *分钟级阈值
+     */
+    @ApiModelProperty(value = "分钟级阈值")
+    private Integer minuteThresholdValue;
+
+    /**
+     *秒钟级阈值
+     */
+    @ApiModelProperty(value = "秒钟级阈值")
+    private Integer secondThresholdValue;
+
+
+
     @Setter
     @Getter
     @ApiModel

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

@@ -95,6 +95,18 @@ public class WindFieldUpdateDto {
     private String powerContractUrl;
 
     /**
+     *分钟级阈值
+     */
+    @ApiModelProperty(value = "分钟级阈值")
+    private Integer minuteThresholdValue;
+
+    /**
+     *秒钟级阈值
+     */
+    @ApiModelProperty(value = "秒钟级阈值")
+    private Integer secondThresholdValue;
+
+    /**
      * 测风塔
      */
     @ApiModelProperty("测风塔")

energy-manage-service/src/main/java/com/energy/manage/service/service/units/UnitDictConstantsService.java

@@ -107,6 +107,14 @@ public interface UnitDictConstantsService  {
     boolean updateUnitDictBrandModel(UnitDictBrandModelUpdateDto unitDictBrandModelUpdateDto);
 
     /**
+     * 更新部件品牌型号参数
+     * @param unitDictBrandModelParameterUpdateDto
+     * @return
+     */
+    boolean updateUnitDictBrandParameterModel(UnitDictBrandModelParameterUpdateDto unitDictBrandModelParameterUpdateDto);
+
+
+    /**
      * 删除部件品牌型号
      * @param unitDictBrandModelIdDto
      * @return

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitDictConstantsServiceImpl.java

@@ -250,8 +250,6 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         BeanUtil.copyProperties(unitDictBrandModelDto, po);
         po.setCreateTime(new Date());
 
-        // redis删除
-        delBrandRedisKey(unitDictBrandModelDto.getManufacture());
         return unitDictBrandModelMapper.insertUseGeneratedKeys(po) > 0;
     }
 
@@ -265,8 +263,20 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("id", unitDictBrandModelUpdateDto.getId());
 
-        // redis删除
-        delBrandRedisKey(unitDictBrandModelUpdateDto.getManufacture());
+        return unitDictBrandModelMapper.updateByExampleSelective(po, queryExample) > 0;
+    }
+
+    @Override
+    public boolean updateUnitDictBrandParameterModel(UnitDictBrandModelParameterUpdateDto unitDictBrandModelParameterUpdateDto) {
+        UnitDictBrandModelPO po = new UnitDictBrandModelPO();
+        po.setRollsNumber(unitDictBrandModelParameterUpdateDto.getRollsNumbe());
+        po.setRollsDiameter(unitDictBrandModelParameterUpdateDto.getRollsDiameter());
+        po.setCircleDiameter(unitDictBrandModelParameterUpdateDto.getCircleDiameter());
+        po.setThetaDeg(unitDictBrandModelParameterUpdateDto.getThetaDeg());
+        Example queryExample = new Example(UnitDictBrandModelPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("id", unitDictBrandModelParameterUpdateDto.getId());
+
         return unitDictBrandModelMapper.updateByExampleSelective(po, queryExample) > 0;
     }
 
@@ -306,15 +316,15 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         return dictConstantsMapper.selectCountByExample(queryExample) > 0 ? true : false;
     }
 
-    /**
-     * 删除品牌对应型号
-     *
-     * @param brandKey
-     * @return
-     */
-    private void delBrandRedisKey(String brandKey) {
-        String brandlistKey = ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPB_KEY, brandKey);
-        cacheService.delete(brandlistKey);
-    }
+//    /**
+//     * 删除品牌对应型号
+//     *
+//     * @param brandKey
+//     * @return
+//     */
+//    private void delBrandRedisKey(String brandKey) {
+//        String brandlistKey = ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPB_KEY, brandKey);
+//        cacheService.delete(brandlistKey);
+//    }
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitServiceImpl.java

@@ -83,19 +83,20 @@ public class UnitServiceImpl implements UnitService {
 
     @Override
     public List<String> getBrandModelNameOrModelNumber(UnitDictBrandModelDto unitDictBrandModelDto) {
-        if (StringUtils.isEmpty(unitDictBrandModelDto.getManufacture())) {
-            return unitDictConstantsService.getUnitDictBrandModelList(unitDictBrandModelDto);
-        }
-        String brandlistKey = ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPB_KEY, unitDictBrandModelDto.getManufacture());
-        String val = cacheService.get(brandlistKey);
-        if (StringUtils.isEmpty(val)) {
-            List<String> valueString = unitDictConstantsService.getUnitDictBrandModelList(unitDictBrandModelDto);
-            log.info("品牌对应型号 ===> " + JSON.toJSONString(valueString));
-            cacheService.add(brandlistKey, JSON.toJSONString(valueString));
-            return valueString;
-        }
-        List<String> modelList = JSONArray.parseArray(val, String.class);
-        return modelList;
+//        if (StringUtils.isEmpty(unitDictBrandModelDto.getManufacture())) {
+//            return unitDictConstantsService.getUnitDictBrandModelList(unitDictBrandModelDto);
+//        }
+        return unitDictConstantsService.getUnitDictBrandModelList(unitDictBrandModelDto);
+//        String brandlistKey = ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPB_KEY, unitDictBrandModelDto.getManufacture());
+//        String val = cacheService.get(brandlistKey);
+//        if (StringUtils.isEmpty(val)) {
+//            List<String> valueString = unitDictConstantsService.getUnitDictBrandModelList(unitDictBrandModelDto);
+//            log.info("品牌对应型号 ===> " + JSON.toJSONString(valueString));
+//            cacheService.add(brandlistKey, JSON.toJSONString(valueString));
+//            return valueString;
+//        }
+//        List<String> modelList = JSONArray.parseArray(val, String.class);
+//        return modelList;
     }
 
     @Override