zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
yeys 2019-03-29 17:50:12 +08:00
parent bd0e17323a 7bf93b3c8a
commit 32e1e2a9e9
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/zzjee/api/TokenController.java
View File

@ -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

2
src/main/java/com/zzjee/md/controller/MdGoodsController.java
View File

@ -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());