From 7bf93b3c8ab4d79ccd0a0f0976a6f4b49e24be77 Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Fri, 29 Mar 2019 17:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=9E=B6=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zzjee/api/TokenController.java   | 37 +++++++++++++++++++
 .../md/controller/MdGoodsController.java      |  2 +
 2 files changed, 39 insertions(+)

diff --git a/src/main/java/com/zzjee/api/TokenController.java b/src/main/java/com/zzjee/api/TokenController.java
index a1408f97..9e625573 100644
--- a/src/main/java/com/zzjee/api/TokenController.java
+++ b/src/main/java/com/zzjee/api/TokenController.java
@@ -122,7 +122,44 @@ public class TokenController {
 		return new ResponseEntity(D0, HttpStatus.OK);
 	}
 
+	@RequestMapping(value = "/postkey", method = RequestMethod.POST)
+	@ResponseBody
+	public ResponseEntity<?> postkeys(@RequestParam String devEui, @RequestParam String keyValue) {
+		logger.info("获取TOKEN[{}]" + devEui);
+		ResultDO D0 = new  ResultDO();
 
+			D0.setObj("");
+			D0.setOK(true);
+
+		// 生成一个token，保存用户登录状态
+		return new ResponseEntity(D0, HttpStatus.OK);
+	}
+
+	@RequestMapping(value = "/controlcallback", method = RequestMethod.POST)
+	@ResponseBody
+	public ResponseEntity<?> controlcallback(@RequestParam String devEui, @RequestParam String ctlDisplayStatus) {
+		logger.info("获取TOKEN[{}]" + devEui);
+		ResultDO D0 = new  ResultDO();
+
+		D0.setObj("");
+		D0.setOK(true);
+
+		// 生成一个token，保存用户登录状态
+		return new ResponseEntity(D0, HttpStatus.OK);
+	}
+
+	@RequestMapping(value = "/lighrcallback", method = RequestMethod.POST)
+	@ResponseBody
+	public ResponseEntity<?> lighrcallback(@RequestParam String devEui, @RequestParam String ctlLedStatus ) {
+		logger.info("获取TOKEN[{}]" + devEui);
+		ResultDO D0 = new  ResultDO();
+
+		D0.setObj("");
+		D0.setOK(true);
+
+		// 生成一个token，保存用户登录状态
+		return new ResponseEntity(D0, HttpStatus.OK);
+	}
 	// 文件上传
 	@RequestMapping(value = "/saveImage", method = RequestMethod.PUT)
 	@ResponseBody
diff --git a/src/main/java/com/zzjee/md/controller/MdGoodsController.java b/src/main/java/com/zzjee/md/controller/MdGoodsController.java
index 327ca7e1..822ea7bc 100644
--- a/src/main/java/com/zzjee/md/controller/MdGoodsController.java
+++ b/src/main/java/com/zzjee/md/controller/MdGoodsController.java
@@ -577,6 +577,8 @@ public class MdGoodsController extends BaseController {
 		ResultDO D0 = new  ResultDO();
 		MdGoodsEntity mdGoods  = (MdGoodsEntity)JSONHelper.json2Object(mdGoodsstr,MdGoodsEntity.class);
 		// 保存
+		org.jeecgframework.core.util.LogUtil
+				.info("===================下单成功===================");
 		try {
 			MdGoodsEntity t = systemService.get(MdGoodsEntity.class,mdGoods.getId());