From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/controller/MsiWebapiJsonController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 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
new file mode 100644
index 0000000..54c5d15
--- /dev/null
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/controller/MsiWebapiJsonController.java
@@ -0,0 +1,56 @@
+package org.jeecg.modules.msi.webapi.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import liquibase.pro.packaged.S;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.msi.utils.JsonMapper;
+import org.jeecg.modules.msi.webapi.entity.MsiWebapiJsonEntity;
+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;
+
+import java.io.IOException;
+import java.util.List;
+
+@Slf4j
+@Api(tags = "鑷姩鍖栫嚎鏁版嵁")
+@RestController
+@RequestMapping("/msi/webapi")
+public class MsiWebapiJsonController extends JeecgController<MsiWebapiJsonEntity, IMsiWebapiJsonService> {
+
+
+
+ @AutoLog(value = "鑷姩鍖栫嚎鏁版嵁鎺ユ敹")
+ @ApiOperation(value = "鑷姩鍖栫嚎鏁版嵁鎺ユ敹 ", notes = "鑷姩鍖栫嚎鏁版嵁鎺ユ敹")
+ @RequestMapping(value = "/receiveAutomation")
+ public Result<?> receiveSaveMsiWebApiJson(@RequestBody List<MachineEquipentInfo> data) {
+ MsiWebapiJsonEntity entity = new MsiWebapiJsonEntity();
+ if (StringUtils.isBlank(data.toString())) {
+ return Result.error("鏁版嵁涓虹┖","");
+ }
+ entity.setModuleType("MDC");
+ entity.setWebapiInfo(data.toString());
+ //鍚庣画杩涜鍏朵粬涓氬姟鍏宠仈
+ JsonMapper mapper = new JsonMapper();
+ try {
+ service.saveTableAutomationOne(data);
+ } 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