From 567096dae7f467d04883f11b17f667b6cef5f536 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 28 十一月 2025 10:35:18 +0800
Subject: [PATCH] feat(dry): 新增干燥配方上传功能
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java
index 3d9e86f..c420bd1 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java
@@ -12,9 +12,11 @@
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.config.TenantContext;
import org.jeecg.common.constant.MqttConstant;
import org.jeecg.common.util.IpUtils;
import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.modules.dry.Bo.HerbFormulaBo;
import org.jeecg.modules.dry.entity.*;
import org.jeecg.modules.dry.mqtt.MqttConfig;
import org.jeecg.modules.dry.mqtt.MqttUtil;
@@ -209,6 +211,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);
@@ -277,6 +280,38 @@
}
+
+ /**
+ * drying formula upload
+ * @param formulaBo
+ * @return
+ */
+
+ @ApiOperation(value = "骞茬嚗閰嶆柟涓婁紶", notes = "骞茬嚗閰嶆柟鏂板鎴栨洿鏂�")
+ @PostMapping(value = "/saveFormula")
+ public Result<?> saveFormula(@RequestBody HerbFormulaBo formulaBo) {
+ TenantContext.setTenant(formulaBo.getTenantId()+"");
+ //鑾峰彇request
+ HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+ // 鑾峰彇璇锋眰涓绘満鐨処P鍦板潃
+ String ip = IpUtils.getIpAddr(request);
+ DryEquipment dryEquipment = dryEquipmentService.selectByTenantIdEquipmentId(formulaBo.getTenantId() + "", formulaBo.getEqpCode());
+ if (dryEquipment != null) {
+ if (dryEquipment.getIp().equals(ip)) {
+ } else {
+ return Result.error("璁惧IP鍦板潃鏈厤缃細" + ip);
+ }
+ } else {
+ return Result.error("璁惧涓嶅瓨鍦�");
+ }
+ formulaBo.setEqpType(dryEquipment.getType());
+ dryHerbFormulaService.saveOrUpdateFormula(formulaBo);
+ return Result.ok("淇濆瓨鎴愬姛");
+ }
+
+
+
+
@ApiOperation(value = "骞茬嚗閰嶆柟涓婃姤", notes = "骞茬嚗閰嶆柟璁板綍涓婃姤")
@PostMapping(value = "/sendFormulaHistory")
public Result<?> sendFormulaHistory(DryHerbFormulaHisVo hisVo) {
--
Gitblit v1.9.3