From 8c05d8c9715a26e1b7a01db431d1262730d8c408 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 17 四月 2024 15:55:26 +0800
Subject: [PATCH] add AMES设备结果回传
---
jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java | 1
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java | 2 +
jcdm-main/src/main/java/com/jcdm/main/demo/vo/FeedBackVO.java | 14 +++++++
jcdm-main/src/main/java/com/jcdm/main/demo/vo/FeedBackDataVO.java | 13 ++++++
jcdm-main/src/main/java/com/jcdm/main/demo/controller/SendDemo.java | 34 +++++++++++++++++
5 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
index 1517545..7cabfb5 100644
--- a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
+++ b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
@@ -115,6 +115,7 @@
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+ .antMatchers("/sendDemo/push").permitAll()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
.anyRequest().authenticated()
.and()
diff --git a/jcdm-main/src/main/java/com/jcdm/main/demo/controller/SendDemo.java b/jcdm-main/src/main/java/com/jcdm/main/demo/controller/SendDemo.java
new file mode 100644
index 0000000..a490ade
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/demo/controller/SendDemo.java
@@ -0,0 +1,34 @@
+package com.jcdm.main.demo.controller;
+
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONPObject;
+import com.jcdm.main.demo.vo.FeedBackDataVO;
+import com.jcdm.main.demo.vo.FeedBackVO;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/sendDemo")
+public class SendDemo {
+
+ @PostMapping("/push")
+ public JSONObject push(@RequestBody JSONObject param){
+
+ FeedBackVO vo = new FeedBackVO();
+ FeedBackDataVO dataVO = new FeedBackDataVO();
+ dataVO.setProductNum("1111");
+ dataVO.setResultCode("S");
+ dataVO.setResultText("閲囬泦瀹屾垚");
+ vo.setCode("success");
+ vo.setMessage("API璋冪敤鎴愬姛");
+ vo.setData(dataVO);
+ JSONObject from = JSONObject.from(vo);
+
+ String jsonString = JSONObject.toJSONString(vo);
+ System.out.println(jsonString);
+ return from;
+ }
+
+
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/demo/vo/FeedBackDataVO.java b/jcdm-main/src/main/java/com/jcdm/main/demo/vo/FeedBackDataVO.java
new file mode 100644
index 0000000..b1f9c9f
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/demo/vo/FeedBackDataVO.java
@@ -0,0 +1,13 @@
+package com.jcdm.main.demo.vo;
+
+import lombok.Data;
+
+@Data
+public class FeedBackDataVO {
+
+ private String productNum;
+
+ private String resultCode;
+
+ private String resultText;
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/demo/vo/FeedBackVO.java b/jcdm-main/src/main/java/com/jcdm/main/demo/vo/FeedBackVO.java
new file mode 100644
index 0000000..e4b5e6b
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/demo/vo/FeedBackVO.java
@@ -0,0 +1,14 @@
+package com.jcdm.main.demo.vo;
+
+import lombok.Data;
+
+@Data
+public class FeedBackVO {
+
+ private String code;
+
+ private String message;
+
+ private FeedBackDataVO data;
+
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java
index 4df37a9..454ac28 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java
@@ -61,6 +61,8 @@
resultMap.put("planItemsProject", planTaskIdList);
resultMap.put("planTask",byId);
+ }else {
+ throw new ServiceException("鏈幏鍙栧埌璁″垝鏁版嵁!");
}
return AjaxResult.success(resultMap);
}
--
Gitblit v1.9.3