Merge branch 'ww' into test
This commit is contained in:
@@ -178,12 +178,9 @@ public class CommonController {
|
||||
/**
|
||||
* 交班
|
||||
*/
|
||||
@GetMapping("common/handoverData")
|
||||
public Result handoverData(String shopId) {
|
||||
JSONObject jsonObject1 = new JSONObject();
|
||||
jsonObject1.put("type", "handover");
|
||||
PushToClientChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(),shopId);
|
||||
|
||||
@PostMapping("common/handoverData")
|
||||
public Result handoverData(@RequestBody Map<String, String> map) throws Exception{
|
||||
PushToClientChannelHandlerAdapter.getInstance().AppSendInfo(JSONObject.toJSONString(map),map.get("shopId"));
|
||||
return Result.success(CodeEnum.SUCCESS);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user