From aa337f20f7f95ca9eaa32d1aaf1a78cdb61691fe Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Fri, 10 Aug 2018 17:38:30 +0800
Subject: [PATCH] fix bug

---
 .../modules/tiku/service/ICourseService.java  |  4 +++
 .../tiku/service/impl/CourseServiceImpl.java  | 35 +++++++++++++++++++
 .../modules/tiku/web/CourseController.java    |  7 ++++
 3 files changed, 46 insertions(+)

diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java
index 36d530a..ddb3e49 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java
@@ -1,5 +1,6 @@
 package com.tamguo.modules.tiku.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.tamguo.modules.tiku.model.CourseEntity;
@@ -23,4 +24,7 @@ public interface ICourseService extends IService<CourseEntity>{
 
 	/** 停用科目*/
 	void disabled(String uid);
+
+	/** 科目树*/
+	JSONArray treeData();
 }
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java
index 7896dad..840baed 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java
@@ -1,18 +1,25 @@
 package com.tamguo.modules.tiku.service.impl;
 
 import java.util.Arrays;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.tamguo.modules.tiku.dao.CourseMapper;
 import com.tamguo.modules.tiku.dao.SubjectMapper;
 import com.tamguo.modules.tiku.model.CourseEntity;
+import com.tamguo.modules.tiku.model.SubjectEntity;
 import com.tamguo.modules.tiku.model.condition.CourseCondition;
 import com.tamguo.modules.tiku.model.enums.CourseStatusEnum;
+import com.tamguo.modules.tiku.model.enums.SubjectStatusEnum;
 import com.tamguo.modules.tiku.service.ICourseService;
 
 @Service
@@ -86,5 +93,33 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, CourseEntity> i
 		entity.setStatus(CourseStatusEnum.DISABLED);
 		courseMapper.updateById(entity);
 	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public JSONArray treeData() {
+		List<SubjectEntity> subjectList = subjectMapper.selectList(Condition.create().eq("status", SubjectStatusEnum.NORMAL.getValue()));
+		List<CourseEntity> courseList = courseMapper.selectList(Condition.create().eq("status", CourseStatusEnum.NORMAL.getValue()));
+		return transform(subjectList, courseList);
+	}
+	
+	private JSONArray transform(List<SubjectEntity> subjectList , List<CourseEntity> courseList) {
+		JSONArray entitys = new JSONArray();
+		for(int i=0 ; i<subjectList.size() ; i++) {
+			JSONObject entity = new JSONObject();
+			entity.put("id", subjectList.get(i).getId());
+			entity.put("name", subjectList.get(i).getName());
+			entity.put("pId", "0");
+			entitys.add(entity);
+		}
+		for(int i=0 ; i<courseList.size() ; i++) {
+			JSONObject entity = new JSONObject();
+			entity.put("id", courseList.get(i).getId());
+			entity.put("name", courseList.get(i).getName());
+			entity.put("pId", courseList.get(i).getSubjectId());
+			entitys.add(entity);
+		}
+		return entitys;
+	}
+
 
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java
index 411a5e0..cb3da28 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.tamguo.common.utils.ExceptionSupport;
@@ -119,4 +120,10 @@ public class CourseController {
 		}
 	}
 	
+	@RequestMapping(path="treeData",method=RequestMethod.GET)
+	@ResponseBody
+	public JSONArray treeData() {
+		return iCourseService.treeData();
+	}
+	
 }