jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java
@@ -46,12 +46,12 @@ logger.error("IPUtils ERROR ", e); } // //使用代理，则获取第一个IP地址 // if(StringUtils.isEmpty(ip) && ip.length() > 15) { // if(ip.indexOf(",") > 0) { // ip = ip.substring(0, ip.indexOf(",")); // } // } //使用代理，则获取第一个IP地址 if(StringUtils.isEmpty(ip) && ip.length() > 15) { if(ip.indexOf(",") > 0) { ip = ip.substring(0, ip.indexOf(",")); } } return ip; } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java
@@ -125,5 +125,6 @@ public DryEquipment(RealTimeDataVo realTimeDataVo) { this.code = realTimeDataVo.getMachineid(); this.tenantId = realTimeDataVo.getTenantid(); this.enable = "Y"; } } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java
@@ -36,13 +36,13 @@ @ApiModelProperty(value = "id") private String id; /**配方编号*/ @Excel(name = "配方编号", width = 15) @ApiModelProperty(value = "配方编号") private String code; /**药材id*/ @Excel(name = "药材id", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id") @Excel(name = "药材", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_herb_info", dicText = "name", dicCode = "id") @ApiModelProperty(value = "药材id") @ApiModelProperty(value = "药材") private String herbId; /**配方名称*/ @Excel(name = "配方名称", width = 15) @@ -53,7 +53,7 @@ @ApiModelProperty(value = "缩写") private String abbr; /**药材拼音*/ @Excel(name = "药材拼音", width = 15) @ApiModelProperty(value = "药材拼音") private String pinyin; /**设备类型*/ @@ -70,7 +70,7 @@ @ApiModelProperty(value = "轻质物料") private String light; /**配方分类*/ @Excel(name = "配方分类", width = 15) // @Excel(name = "配方分类", width = 15) @ApiModelProperty(value = "配方分类") private String category; /**初始含水率*/ @@ -98,11 +98,11 @@ @ApiModelProperty(value = "初始风机频率") private Integer fanSpeed; /**环境温度*/ @Excel(name = "环境温度", width = 15) @ApiModelProperty(value = "环境温度") private Double envTemp; /**环境湿度*/ @Excel(name = "环境湿度", width = 15) @ApiModelProperty(value = "环境湿度") private Double envHum; /**翻料策略*/ @@ -110,15 +110,15 @@ @ApiModelProperty(value = "翻料策略") private String strategy; /**荡料延时ms*/ @Excel(name = "荡料延时ms", width = 15) @ApiModelProperty(value = "荡料延时ms") private Integer delay; /**翻料次数*/ @Excel(name = "翻料次数", width = 15) @ApiModelProperty(value = "翻料次数") private Integer turn; /**含水率补偿*/ @Excel(name = "含水率补偿", width = 15) // @Excel(name = "含水率补偿", width = 15) @ApiModelProperty(value = "含水率补偿") private Double moisOffset; @@ -126,8 +126,14 @@ @Excel(name = "冷风时长", width = 15) @ApiModelProperty(value = "冷风时长") private Integer coolingDuration; /**是否启用*/ @Excel(name = "是否启用", width = 15) @ApiModelProperty(value = "是否启用") private String enabled; /**租户id*/ @Excel(name = "租户id", width = 15) @ApiModelProperty(value = "租户id") private Integer tenantId; /**创建人*/ jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/HerbFormulaVo.java
@@ -33,4 +33,6 @@ private String strategy; @ApiModelProperty(value = "冷风时长") private Integer coolingDuration; @ApiModelProperty(value = "启用标志") private String enabled; } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java
@@ -209,6 +209,7 @@ } LambdaQueryWrapper<DryHerbFormula> queryWrapper = new LambdaQueryWrapper<DryHerbFormula>(); queryWrapper.eq(DryHerbFormula::getEqpType, dryEquipment.getType()) .eq(DryHerbFormula::getEnabled, "true") .eq(DryHerbFormula::getTenantId, tenantId); List<DryHerbFormula> list = dryHerbFormulaService.list(queryWrapper);
@@ -407,6 +407,8 @@ log.error("新增设备失败：数据库保存异常！equipment={}", addEqu); return null; } redisUtil.del(CommonCacheConstant.DRY_CACHE_TENANT_EQUS_LIST); redisUtil.del(CommonCacheConstant.DRY_CACHE_TENANT_EQUS); } catch (Exception e) { e.printStackTrace(); } finally { @@ -520,15 +522,15 @@ queryWrapper.last("LIMIT 1"); DryHerbFormula one = dryHerbFormulaService.getOne(queryWrapper); if (one == null) { one = new DryHerbFormula(realTimeDataVo); DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid()); if (dryEquipment != null && dryEquipment.getType() != null) { one.setEqpType(dryEquipment.getType()); } dryHerbFormulaService.save(one); } // if (one == null) { // one = new DryHerbFormula(realTimeDataVo); // DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid()); // if (dryEquipment != null && dryEquipment.getType() != null) { // one.setEqpType(dryEquipment.getType()); // } // // dryHerbFormulaService.save(one); // } return one; } @@ -668,9 +670,9 @@ if (order != null) { orderVo.setEnvHum(order.getEnvHum()); orderVo.setEnvTemp(order.getEnvTemp()); double watt = order.getWatt() - order.getDetailList().get(0).getWatt(); double watt = order.getWatt() - (order.getDetailList().size() > 0 ?order.getDetailList().get(0).getWatt():0); orderVo.setWatt(orderVo.getWatt() == null ? watt : orderVo.getWatt() + watt); double steam = order.getSteam() - order.getDetailList().get(0).getSteam(); double steam = order.getSteam() - ( order.getDetailList().size() > 0 ?order.getDetailList().get(0).getSteam():0); orderVo.setSteam(orderVo.getSteam() == null ? steam : orderVo.getSteam() + steam); orderVo.setOriginWeight(orderVo.getOriginWeight() == null ? order.getOriginWeight() : orderVo.getOriginWeight() + order.getOriginWeight());
