feats

src/main/java/com/yunzhi/demo/controller/TaPostController.java

@@ -134,8 +134,8 @@ public class TaPostController extends BaseController {
      */
     @RequestMapping(value="/admin/post/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taPostUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaPost taPost) throws Exception{
+    public ResponseBean taPostUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                     @ApiParam("更新内容") @RequestBody TaPost taPost) throws Exception{
 
         TdPostType postType = iTdPostTypeService.getById(taPost.getTypeId());
         if (null != postType) {
@@ -158,8 +158,6 @@ public class TaPostController extends BaseController {
     public ResponseBean taPostGet(@ApiParam(value = "客户端", allowableValues = "admin,ma") @PathVariable String client,
                                   @ApiParam("文章ID") @PathVariable String id) throws Exception{
 
-        Map<String, Object> result = new HashMap<>();
-
         // 获取文章信息
         TaPost taPost = iTaPostService.getById(id);
         if (null == taPost || Constants.STATUS_DELETED.equals(taPost.getStatus())) {
@@ -168,6 +166,7 @@ public class TaPostController extends BaseController {
 
         // 获取统计信息
         TaPostData taPostData = iTaPostDataService.getById(id);
+        taPost.setPostData(taPostData);
 
 
         // 获取试题
@@ -178,7 +177,7 @@ public class TaPostController extends BaseController {
             // 当前人员是否收藏过
             TaPerson taPerson = getCurrentPerson();
             boolean saved = iTaPostSaveService.checkSaved(taPerson.getPersonId(), id);
-            result.put("saved", saved);
+            taPost.setIsSaved(saved);
 
             // 埋点数据
             iTaPostDataService.recordBy(id, taPerson);
@@ -192,11 +191,8 @@ public class TaPostController extends BaseController {
                 }
             }
         }
+        taPost.setPostTestList(postTestList);
 
-        result.put("post", taPost);
-        result.put("postData", taPostData);
-        result.put("postTest", postTestList);
-
-        return ResponseBean.success(result);
+        return ResponseBean.success(taPost);
     }
 }

src/main/java/com/yunzhi/demo/controller/TaPostTestController.java

@@ -117,7 +117,7 @@ public class TaPostTestController extends BaseController {
      * @param taPostTest 实体对象
      * @return
      */
-    @RequestMapping(value="/taPostTest",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/post-test",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taPostTestAdd(@ApiParam("保存内容") @RequestBody TaPostTest taPostTest) throws Exception{
 

src/main/java/com/yunzhi/demo/entity/TaPost.java

@@ -91,4 +91,15 @@ public class TaPost implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateDate;
 
+    @ApiModelProperty(value = "统计数据")
+    @TableField(exist = false)
+    private TaPostData postData;
+
+    @ApiModelProperty(value = "题库")
+    @TableField(exist = false)
+    private List<TaPostTest> postTestList;
+
+    @ApiModelProperty(value = "是否被收藏")
+    @TableField(exist = false)
+    private Boolean isSaved;
 }

src/main/java/com/yunzhi/demo/entity/TaPostTest.java

@@ -34,6 +34,9 @@ public class TaPostTest implements Serializable {
     @ApiModelProperty(value = "关联文章")
     private String postId;
 
+    @ApiModelProperty(value = "标题")
+    private String title;
+
     @ApiModelProperty(value = "试题")
     private String question;