修改话题接口回调

liwei2917
1 parent 6581fca2
Showing 1 changed file with 15 additions and 12 deletions
src/main/java/com/cnlive/shenhe/api/TopicControllerApi.java
@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 @Controller
 @RequestMapping("/api/topic")
@@ -130,32 +132,33 @@ public class TopicControllerApi {
         //获取中转服务器消息
         String errorCode = json.getString("errorCode");
         String errorMessage=json.getString("errorMessage");
-        String date=json.getString("date");
-        //获取接收方消息
-        JSONObject dateObject = JSONObject.parseObject(date);
-        String topic_id=dateObject.getString("topic_id");
+        //获取接收方消息 
+        JSONObject dataObject = json.getJSONObject("data");
+        String topic_id=dataObject.getString("topic_id");
         //获取当前话题实体
-        ShyTopic shyTopic=new ShyTopic();
-        shyTopic.setTopic_id(topic_id);
-        ShyTopic topic = topicService.getShyTopic(shyTopic);
+        ShyTopic topic=new ShyTopic();
+        topic.setTopic_id(topic_id);
+        topic = topicService.getShyTopic(topic);
         if(errorCode.equals("0")){
-        	logger.info("cms系统已通知");
+        	logger.info("话题id为："+topic_id+",cms系统已通知");
         	if(topic!=null){
         	  topic.setShenhe_msg(topic.getShenhe_msg()+",cms系统已通知");
         	}
         }else{//中转服务器失败
-        	logger.info("中转服务器调用cms失败,失败消息："+errorMessage);
+        	logger.info("话题id为："+topic_id+",中转服务器调用cms失败,失败消息："+errorMessage);
         	topic.setShenhe_msg(topic.getShenhe_msg()+",中转服务器调用cms失败,失败消息："+errorMessage);
     		topic.setShenhe_status(CommonConst.AUDIT_INTT);
     		topic.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
         }
-        boolean rs = topicService.updateshyTopic(shyTopic);
+        boolean rs = topicService.updateshyTopic(topic);
+        Map<String,Object> ee=new HashMap<>();
+        ee.put("topic_id", topic_id);
         if(rs){
-        	return new ResponseBean(ErrorEnum.SUCCESS,new JSONObject().put("topic_id", topic_id));
+        	return new ResponseBean(ErrorEnum.SUCCESS,ee);
         }
-        return new ResponseBean(300,"话题送审回调成功，入库失败",new JSONObject().put("topic_id", topic_id));
+        return new ResponseBean(300,"话题送审回调成功，入库失败",ee);
      }