From 32c691241f63b936944c6347fbf343551c30fc00 Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Thu, 15 Oct 2020 23:51:33 +0800
Subject: [PATCH] up

---
 .../service/impl/CaseCategoryServiceImpl.java | 25 ++++++++++++++++++-
 .../service/impl/CaseContentServiceImpl.java  |  1 +
 .../java/com/bsd/cases/vo/CaseCategoryVo.java | 17 +++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/bsd/cases/vo/CaseCategoryVo.java

diff --git a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java
index 4fa5dcb..d228bb1 100644
--- a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java
+++ b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java
@@ -1,13 +1,16 @@
 package com.bsd.cases.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsd.cases.constants.Constants;
 import com.bsd.cases.mapper.CaseCategoryMapper;
 import com.bsd.cases.model.CaseCategory;
+import com.bsd.cases.model.CaseContent;
 import com.bsd.cases.service.CaseCategoryService;
 import com.bsd.cases.util.AjaxRequest;
 import com.bsd.cases.util.AjaxResult;
 import com.bsd.cases.util.PageUtils;
+import com.bsd.cases.vo.CaseCategoryVo;
 import com.bsd.cases.vo.CaseSearchVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,13 +55,33 @@ public class CaseCategoryServiceImpl extends BaseServiceImpl<CaseCategoryMapper,
             findCaseCategory2.setState(Constants.STATE_VALID);
             List<CaseCategory> caseCategoryList2 = caseCategoryMapper.select(findCaseCategory2);
             findCaseCategory.setState(Constants.STATE_VALID);
-            findCaseCategory.setParentId(caseCategoryList2.get(0).getId());
+            parentId = caseCategoryList2.get(0).getId();
+            findCaseCategory.setParentId(parentId);
         }else {
             findCaseCategory.setState(Constants.STATE_VALID);
             findCaseCategory.setParentId(parentId);
         }
         List<CaseCategory> caseCategoryList = caseCategoryMapper.select(findCaseCategory);
         JSONObject pageJson = PageUtils.page(caseCategoryList,pageNum,pageSize);
+        JSONArray jsonArray = pageJson.getJSONArray("list");
+        caseCategoryList = JSONObject.parseArray(JSONObject.toJSONString(jsonArray), CaseCategory.class);
+        List<CaseCategoryVo> newCaseCategoryVoList = new ArrayList<>();
+        for (CaseCategory caseCategory:caseCategoryList){
+            CaseCategoryVo caseCategoryVo = new CaseCategoryVo();
+            caseCategoryVo.setName(caseCategory.getName());
+            caseCategoryVo.setLevel(caseCategory.getLevel());
+            caseCategoryVo.setParentId(parentId);
+            caseCategoryVo.setUrl(caseCategory.getUrl());
+            String parenName = caseCategoryMapper.selectByPrimaryKey(parentId).getName();
+            caseCategoryVo.setParentName(parenName);
+            newCaseCategoryVoList.add(caseCategoryVo);
+        }
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("list",newCaseCategoryVoList);
+        jsonObject.put("total",pageJson.getInteger("total"));
+        jsonObject.put("pageNum",pageNum);
+        jsonObject.put("pages",(int) Math.ceil(Double.valueOf(pageJson.getInteger("total")) / Double.valueOf(pageSize)));
+        jsonObject.put("pageSize",pageSize);
         return pageJson;
     }
 
diff --git a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
index 4150581..6921fe2 100644
--- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
+++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
@@ -57,6 +57,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
         jsonObject.put("total",pageJson.getInteger("total"));
         jsonObject.put("pageNum",pageNum);
         jsonObject.put("pageSize",pageSize);
+        jsonObject.put("pages",(int) Math.ceil(Double.valueOf(pageJson.getInteger("total")) / Double.valueOf(pageSize)));
         return jsonObject;
     }
 }
diff --git a/src/main/java/com/bsd/cases/vo/CaseCategoryVo.java b/src/main/java/com/bsd/cases/vo/CaseCategoryVo.java
new file mode 100644
index 0000000..9b58306
--- /dev/null
+++ b/src/main/java/com/bsd/cases/vo/CaseCategoryVo.java
@@ -0,0 +1,17 @@
+package com.bsd.cases.vo;
+
+import lombok.Data;
+
+@Data
+public class CaseCategoryVo {
+    private String name;
+
+    private Integer level;
+
+    private Long parentId;
+
+    private String url;
+
+    private String parentName;
+
+}