Merge remote-tracking branch 'remotes/origin/dev_heart' into dev

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -38,7 +39,7 @@ public class MqPointCallbackController {
 	 * @return
 	 */
 	@RequestMapping("activeSendPoint")
-	public String activeSendPoint(ReceiveMqMsg mqMsg) {
+	public String activeSendPoint(@RequestBody ReceiveMqMsg mqMsg) {
 		log.debug("activeSendPoint receive mqMsg:{}", JSON.toJSONString(mqMsg));
 		if (mqMsg == null || StringUtils.isBlank(mqMsg.getMsg())) {
 			log.warn("activeSendPoint mqMsg is empty");
@@ -62,7 +63,7 @@ public class MqPointCallbackController {
 	 * @return
 	 */
 	@RequestMapping("registervolunteer")
-	public String registerVolunteer(ReceiveMqMsg mqMsg) {
+	public String registerVolunteer(@RequestBody ReceiveMqMsg mqMsg) {
 		log.debug("registerVolunteer receive mqMsg:{}", JSON.toJSONString(mqMsg));
 		if (mqMsg == null || StringUtils.isBlank(mqMsg.getMsg())) {
 			log.warn("registerVolunteer mqMsg is empty");
@@ -86,7 +87,7 @@ public class MqPointCallbackController {
 	 * @return
 	 */
 	@RequestMapping("pubactivelive")
-	public String pubActiveLive(ReceiveMqMsg mqMsg) {
+	public String pubActiveLive(@RequestBody ReceiveMqMsg mqMsg) {
 		log.debug("pubActiveLive receive mqMsg:{}", JSON.toJSONString(mqMsg));
 		if (mqMsg == null || StringUtils.isBlank(mqMsg.getMsg())) {
 			log.warn("pubActiveLive mqMsg is empty");