Browse Source

bug 修改

wanghui 8 years ago
parent
commit
3ab5337a69

+ 3 - 3
src/main/java/com/goafanti/admin/controller/AdminMessageController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSONObject;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
@@ -24,7 +25,6 @@ import com.goafanti.message.enums.ConsumerType;
 import com.goafanti.message.enums.RecommendType;
 import com.goafanti.message.enums.SubjectType;
 import com.goafanti.message.service.MessageService;
-import com.google.gson.JsonObject;
 
 /**
  *  消息推送
@@ -43,8 +43,8 @@ public class AdminMessageController extends CertifyApiController{
 	@RequestMapping(value = "/toCreateSystemMessage", method = RequestMethod.GET)
 	public Result toCreateSystemMessage(){
 		Result res = new Result();
-		JsonObject jsonObject = new JsonObject();
-		jsonObject.addProperty("createTime", DateUtils.formatDate(new Date(), AFTConstants.YYYYMMDDHHMMSS));
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("createTime", DateUtils.formatDate(new Date(), AFTConstants.YYYYMMDDHHMMSS));
 		res.setData(jsonObject);
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml

@@ -487,7 +487,7 @@
    	 	#{sql,jdbcType=VARCHAR}
    </select>
    
-   <select id="listSystemMessageByPage"  resultMap="com.goafanti.message.bo.MessageListBo">
+   <select id="listSystemMessageByPage"  resultType="com.goafanti.message.bo.MessageListBo">
 		select
 			a.id as messageId,
 			date_format(a.create_time,'%Y-%m-%d %H:%I:%S') as createTime,