From 9c5cc5bbc7a882fd5bb466621ea10bd5f73b2fd1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 19 十月 2024 20:19:44 +0800
Subject: [PATCH] 增加首页卡片的布局设置字段layoutConfig;lincense去掉原版文字

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java
index 1cc6c57..9c385b1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationDpController.java
@@ -62,9 +62,6 @@
     @GetResource({"/listDatapointsByWorkstationId"})
     @ApiOperation("鏍规嵁宸ヤ綅id鑾峰彇鏁版嵁鐐�")
     public R<WorkstationDatapointsVO> listDatapointsByWorkstationId(@RequestParam Long workstationId) {
-    	WorkstationDatapointsVO v = new WorkstationDatapointsVO();
-    	v.setDpHead("myhead");
-    	//return R.data(v);
         return R.data(workstationDatapointsService.getDatapoints(workstationId));
     }
     
@@ -72,10 +69,12 @@
     @ApiOperation("淇濆瓨宸ヤ綅鏁版嵁鐐归厤缃�")
     public R<Boolean> saveDatapoints(@RequestBody WorkstationDatapointsSubmitVO datapoints) {
     	//return R.data(true);
+    	
     	try {
     		workstationDatapointsService.submit(datapoints);
     	}catch(Exception e) {
-    		return R.data(false);
+    		//R.fail(null).
+    		return R.fail(e.getMessage());
     	}
         return R.data(true);
     }

--
Gitblit v1.9.3