From 1cbbb341d22e3c46b15af65b6f97d738bae7ca95 Mon Sep 17 00:00:00 2001
From: yangbin <yangbin>
Date: 星期二, 20 五月 2025 10:46:57 +0800
Subject: [PATCH] 自动化
---
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/controller/MsiWebapiJsonController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/controller/MsiWebapiJsonController.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/controller/MsiWebapiJsonController.java
index 0a5734b..c8459f1 100644
--- a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/controller/MsiWebapiJsonController.java
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/controller/MsiWebapiJsonController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.msi.webapi.controller;
+import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.type.TypeReference;
import io.swagger.annotations.Api;
@@ -15,6 +16,7 @@
import org.jeecg.modules.msi.webapi.service.IMsiWebapiJsonService;
import org.jeecg.modules.msi.webapi.vo.MachineEquipentInfo;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -27,31 +29,31 @@
@RequestMapping("/msi/webapi")
public class MsiWebapiJsonController extends JeecgController<MsiWebapiJsonEntity, IMsiWebapiJsonService> {
+
+
@AutoLog(value = "鑷姩鍖栫嚎鏁版嵁鎺ユ敹")
@ApiOperation(value = "鑷姩鍖栫嚎鏁版嵁鎺ユ敹 ", notes = "鑷姩鍖栫嚎鏁版嵁鎺ユ敹")
- @PostMapping(value = "/receiveAutomation")
- public Result<?> receiveSaveMsiWebApiJson(String data) {
+ @RequestMapping(value = "/receiveAutomation")
+ public Result<?> receiveSaveMsiWebApiJson(@RequestBody List<MachineEquipentInfo> data) {
MsiWebapiJsonEntity entity = new MsiWebapiJsonEntity();
- if (StringUtils.isBlank(data)) {
+ if (StringUtils.isBlank(data.toString())) {
return Result.error("鏁版嵁涓虹┖","");
}
entity.setModuleType("MDC");
- entity.setWebapiInfo(data);
+ entity.setWebapiInfo(data.toString());
//鍚庣画杩涜鍏朵粬涓氬姟鍏宠仈
JsonMapper mapper = new JsonMapper();
try {
- List<MachineEquipentInfo> machineInfoList = mapper.fromJson(data, new TypeReference<List<MachineEquipentInfo>>(){});
- for (MachineEquipentInfo machineInfo : machineInfoList) {
-
+ //List<MachineEquipentInfo> machineInfoList = mapper.fromJson(data, new TypeReference<List<MachineEquipentInfo>>(){});
+ for (MachineEquipentInfo machineInfo : data) {
System.out.println(machineInfo);
- // Add additional processing logic here for each item
+ //瑙ｆ瀽鏁版嵁
+ service.saveTableAutomationOne(data);
}
- } catch (IOException e) {
+ } catch (Exception e) {
log.error("JSON parsing error: {}", e.getMessage());
return Result.error("鏁版嵁寮傚父", e.getMessage());
-
}
-
service.save(entity);
return Result.OK("鎺ユ敹鎴愬姛");
}
--
Gitblit v1.9.3