Commit 180b4039 authored by zuoadmin's avatar zuoadmin

Merge branch 'bug' into 'master'

1,群推加入日志

See merge request !29
parents a9ed2de4 6ff56128
package com.weface.controller; package com.weface.controller;
import com.alibaba.fastjson.JSONObject;
import com.weface.code.CommonResult; import com.weface.code.CommonResult;
import com.weface.common.utils.Constant; import com.weface.common.utils.Constant;
import com.weface.common.validator.ValidatorParam; import com.weface.common.validator.ValidatorParam;
...@@ -10,6 +11,7 @@ import com.weface.dto.InformForm; ...@@ -10,6 +11,7 @@ import com.weface.dto.InformForm;
import com.weface.dto.MsgDTO; import com.weface.dto.MsgDTO;
import com.weface.dto.PushDTO; import com.weface.dto.PushDTO;
import com.weface.service.PushService; import com.weface.service.PushService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
/** /**
* @author Administrator * @author Administrator
*/ */
@Slf4j
@RestController @RestController
@RequestMapping("push") @RequestMapping("push")
public class PushController { public class PushController {
...@@ -42,6 +45,7 @@ public class PushController { ...@@ -42,6 +45,7 @@ public class PushController {
@PostMapping("/all") @PostMapping("/all")
public CommonResult pushAll(InformForm informForm) { public CommonResult pushAll(InformForm informForm) {
log.error("群推内容:{}", JSONObject.toJSONString(informForm));
ValidatorUtils.validateEntity(informForm, InformForm.PushValid.class); ValidatorUtils.validateEntity(informForm, InformForm.PushValid.class);
if(informForm.getEquipmentType().equals("kksh")) if(informForm.getEquipmentType().equals("kksh"))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment