ids) {
+ CourseExample example = new CourseExample();
+ CourseExample.Criteria criteria = example.createCriteria();
+ criteria.andSpecialtyIdIn(ids);
+ return courseMapper.selectByExample(example);
+ }
+
}
diff --git a/src/cn/edu/hit/education/service/ICourseService.java b/src/cn/edu/hit/education/service/ICourseService.java
index ffbfafb42db69188fef21263bda3576837f26fa1..07e936b6d3e5db082f2cb1e28409fd09dadac3b3 100644
--- a/src/cn/edu/hit/education/service/ICourseService.java
+++ b/src/cn/edu/hit/education/service/ICourseService.java
@@ -1,18 +1,18 @@
/**
-* title ICouserService.java
-* package cn.edu.hit.education.service
-* description TODO
-* copyright ҵѧ(C) 2019
-* company ҵѧAS&MT
-* author ѩ jinxuesong@163.com
-* date 2021421 3:00:15
-* version v1.0
+* title �� ICouserService.java
+* package �� cn.edu.hit.education.service
+* description ��TODO
+* copyright �� ��������ҵ��ѧ(C) 2019
+* company �� ��������ҵ��ѧAS&MT
+* author �� ��ѩ�� jinxuesong@163.com
+* date �� 2021��4��21�� ����3:00:15
+* version �� v1.0
*
* Modification History:
* Date Author Version Discription
* -----------------------------------------------------------------------------------
-* 2021421 ѩ 1.0 1.0
-* Why & What is modified: <ԭ>
+* 2021��4��21�� ��ѩ�� 1.0 1.0
+* Why & What is modified: <��ԭ������>
*/
package cn.edu.hit.education.service;
@@ -22,10 +22,10 @@ import java.util.Set;
import cn.edu.hit.education.pojo.Course;
/**
- * classname ICouserService
- * description TODO
- * author ѩ jinxuesong@163.com
- * date 2021421 3:00:15
+ * classname �� ICouserService
+ * description ��TODO
+ * author �� ��ѩ�� jinxuesong@163.com
+ * date �� 2021��4��21�� ����3:00:15
*/
public interface ICourseService {
@@ -44,4 +44,7 @@ public interface ICourseService {
List queryCoursesBySpecialtyPropertyId(int specialtyId, int propertyId);
List queryCoursesByIds(Set ids);
+
+ List queryAllCourseBySpecityId(List ids);
+
}
diff --git a/src/cn/edu/hit/education/service/IProcessService.java b/src/cn/edu/hit/education/service/IProcessService.java
index c3883aefbc66b99602af7ed6cb5ef5bd360871f9..6b5a11e02b66778040a3fc951c447373c25b711a 100644
--- a/src/cn/edu/hit/education/service/IProcessService.java
+++ b/src/cn/edu/hit/education/service/IProcessService.java
@@ -1,29 +1,24 @@
/**
-* title IProcessService.java
-* package cn.edu.hit.education.service
-* description TODO
-* copyright ҵѧ(C) 2019
-* company ҵѧAS&MT
-* author ѩ jinxuesong@163.com
-* date 2021421 4:22:02
-* version v1.0
+* title �� IProcessService.java
+* package �� cn.edu.hit.education.service
+* description ��TODO
+* copyright �� ��������ҵ��ѧ(C) 2019
+* company �� ��������ҵ��ѧAS&MT
+* author �� ��ѩ�� jinxuesong@163.com
+* date �� 2021��4��21�� ����4:22:02
+* version �� v1.0
*
* Modification History:
* Date Author Version Discription
* -----------------------------------------------------------------------------------
-* 2021421 ѩ 1.0 1.0
-* Why & What is modified: <ԭ>
+* 2021��4��21�� ��ѩ�� 1.0 1.0
+* Why & What is modified: <��ԭ������>
*/
package cn.edu.hit.education.service;
import java.util.List;
import cn.edu.hit.education.pojo.Process;
-/**
- * classname IProcessService
- * description TODO
- * author ѩ jinxuesong@163.com
- * date 2021421 4:22:02
- */
+
public interface IProcessService {
int insert(Process process);
@@ -32,6 +27,8 @@ public interface IProcessService {
int update(Process process);
+ Process queryProcessByPrimaryKey(int id);
+
List queryAllProcess();
List queryProcessesByProcessName(String name);
diff --git a/src/cn/edu/hit/education/service/IPropertyService.java b/src/cn/edu/hit/education/service/IPropertyService.java
index 9fc0696cc4ef4b400834c81d630a0dc1532f313d..2ec88015a6c1ee865dedb631beb99482baa13e7f 100644
--- a/src/cn/edu/hit/education/service/IPropertyService.java
+++ b/src/cn/edu/hit/education/service/IPropertyService.java
@@ -1,31 +1,10 @@
-/**
-* title IPropertyService.java
-* package cn.edu.hit.education.service
-* description TODO
-* copyright ҵѧ(C) 2019
-* company ҵѧAS&MT
-* author ѩ jinxuesong@163.com
-* date 2021421 4:22:14
-* version v1.0
-*
-* Modification History:
-* Date Author Version Discription
-* -----------------------------------------------------------------------------------
-* 2021421 ѩ 1.0 1.0
-* Why & What is modified: <ԭ>
-*/
+
package cn.edu.hit.education.service;
import java.util.List;
import cn.edu.hit.education.pojo.Property;
-/**
- * classname IPropertyService
- * description TODO
- * author ѩ jinxuesong@163.com
- * date 2021421 4:22:14
- */
public interface IPropertyService {
int insert(Property property);
@@ -34,6 +13,8 @@ public interface IPropertyService {
int update(Property property);
+ Property queryPropertyByPrimaryKey(int id);
+
Property queryPropertyById(int id);
List queryAllProperty();
@@ -41,4 +22,7 @@ public interface IPropertyService {
List queryPropertiesByProcessId(int processId);
void clearPropertyNum();
+
+ Property queryPropertyByName(String name);
+
}
diff --git a/src/cn/edu/hit/education/service/ProcessServiceImpl.java b/src/cn/edu/hit/education/service/ProcessServiceImpl.java
index 17868d6dd0683a573e06749b23e1034a64e24373..a0460082ce06219ebc07f8253167f31f31b56f6f 100644
--- a/src/cn/edu/hit/education/service/ProcessServiceImpl.java
+++ b/src/cn/edu/hit/education/service/ProcessServiceImpl.java
@@ -1,18 +1,18 @@
/**
-* title ProcessServiceImpl.java
-* package cn.edu.hit.education.service
-* description TODO
-* copyright ҵѧ(C) 2019
-* company ҵѧAS&MT
-* author ѩ jinxuesong@163.com
-* date 2021421 4:38:37
-* version v1.0
+* title �� ProcessServiceImpl.java
+* package �� cn.edu.hit.education.service
+* description ��TODO
+* copyright �� ��������ҵ��ѧ(C) 2019
+* company �� ��������ҵ��ѧAS&MT
+* author �� ��ѩ�� jinxuesong@163.com
+* date �� 2021��4��21�� ����4:38:37
+* version �� v1.0
*
* Modification History:
* Date Author Version Discription
* -----------------------------------------------------------------------------------
-* 2021421 ѩ 1.0 1.0
-* Why & What is modified: <ԭ>
+* 2021��4��21�� ��ѩ�� 1.0 1.0
+* Why & What is modified: <��ԭ������>
*/
package cn.edu.hit.education.service;
@@ -25,12 +25,6 @@ import cn.edu.hit.education.dao.ProcessMapper;
import cn.edu.hit.education.pojo.Process;
import cn.edu.hit.education.pojo.ProcessExample;
-/**
- * classname ProcessServiceImpl
- * description TODO
- * author ѩ jinxuesong@163.com
- * date 2021421 4:38:37
- */
@Service
public class ProcessServiceImpl implements IProcessService {
@@ -39,25 +33,21 @@ public class ProcessServiceImpl implements IProcessService {
@Override
public int insert(Process process) {
- // TODO Զɵķ
return processMapper.insert(process);
}
@Override
public int deleteByPrimaryKey(int id) {
- // TODO Զɵķ
return processMapper.deleteByPrimaryKey(id);
}
@Override
public int update(Process process) {
- // TODO Զɵķ
return processMapper.updateByPrimaryKey(process);
}
@Override
public List queryAllProcess() {
- // TODO Զɵķ
ProcessExample example = new ProcessExample();
ProcessExample.Criteria criteria = example.createCriteria();
criteria.andIdGreaterThan(0);
@@ -67,7 +57,6 @@ public class ProcessServiceImpl implements IProcessService {
@Override
public List queryProcessesByProcessName(String name) {
- // TODO Զɵķ
ProcessExample example = new ProcessExample();
ProcessExample.Criteria criteria = example.createCriteria();
criteria.andNameEqualTo(name.trim());
@@ -75,4 +64,10 @@ public class ProcessServiceImpl implements IProcessService {
return processMapper.selectByExample(example);
}
+ @Override
+ public Process queryProcessByPrimaryKey(int id) {
+ // TODO 自动生成的方法存根
+ return processMapper.selectByPrimaryKey(id);
+ }
+
}
diff --git a/src/cn/edu/hit/education/service/PropertyServiceImpl.java b/src/cn/edu/hit/education/service/PropertyServiceImpl.java
index 1b5ae0da98602b077601a6a8181bae5a1ea83a37..a0bbe5e9d2ea67efef8f0ab92c88ffe50d514d1f 100644
--- a/src/cn/edu/hit/education/service/PropertyServiceImpl.java
+++ b/src/cn/edu/hit/education/service/PropertyServiceImpl.java
@@ -1,19 +1,4 @@
-/**
-* title PropertyServiceImpl.java
-* package cn.edu.hit.education.service
-* description TODO
-* copyright ҵѧ(C) 2019
-* company ҵѧAS&MT
-* author ѩ jinxuesong@163.com
-* date 2021421 4:39:13
-* version v1.0
-*
-* Modification History:
-* Date Author Version Discription
-* -----------------------------------------------------------------------------------
-* 2021421 ѩ 1.0 1.0
-* Why & What is modified: <ԭ>
-*/
+
package cn.edu.hit.education.service;
import java.util.List;
@@ -24,13 +9,8 @@ import org.springframework.stereotype.Service;
import cn.edu.hit.education.dao.PropertyMapper;
import cn.edu.hit.education.pojo.Property;
import cn.edu.hit.education.pojo.PropertyExample;
+import cn.edu.hit.education.pojo.PropertyExample.Criteria;
-/**
- * classname PropertyServiceImpl
- * description TODO
- * author ѩ jinxuesong@163.com
- * date 2021421 4:39:13
- */
@Service
public class PropertyServiceImpl implements IPropertyService {
@@ -39,25 +19,21 @@ public class PropertyServiceImpl implements IPropertyService {
@Override
public int insert(Property property) {
- // TODO Զɵķ
return propertyMapper.insert(property);
}
@Override
public int deleteByPrimaryKey(int id) {
- // TODO Զɵķ
return propertyMapper.deleteByPrimaryKey(id);
}
@Override
public int update(Property property) {
- // TODO Զɵķ
return propertyMapper.updateByPrimaryKey(property);
}
@Override
public List queryAllProperty() {
- // TODO Զɵķ
PropertyExample example = new PropertyExample();
PropertyExample.Criteria criteria = example.createCriteria();
criteria.andIdGreaterThan(0);
@@ -67,7 +43,6 @@ public class PropertyServiceImpl implements IPropertyService {
@Override
public List queryPropertiesByProcessId(int processId) {
- // TODO Զɵķ
PropertyExample example = new PropertyExample();
PropertyExample.Criteria criteria = example.createCriteria();
criteria.andProcessIdEqualTo(processId);
@@ -77,7 +52,6 @@ public class PropertyServiceImpl implements IPropertyService {
@Override
public void clearPropertyNum() {
- // TODO Զɵķ
List properties = queryAllProperty();
if(properties != null && properties.size() > 0){
for (Property property : properties) {
@@ -90,8 +64,19 @@ public class PropertyServiceImpl implements IPropertyService {
@Override
public Property queryPropertyById(int id) {
- // TODO Զɵķ
return propertyMapper.selectByPrimaryKey(id);
}
+ @Override
+ public Property queryPropertyByPrimaryKey(int id) {
+ // TODO 自动生成的方法存根
+ return propertyMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public Property queryPropertyByName(String name) {
+
+ return propertyMapper.queryPropertyByName(name);
+ }
+
}
diff --git a/src/cn/edu/hit/education/utils/ExcelUtil.java b/src/cn/edu/hit/education/utils/ExcelUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..c0a50cfb2b2e5062fe546d4a1bd3d5171ac1d437
--- /dev/null
+++ b/src/cn/edu/hit/education/utils/ExcelUtil.java
@@ -0,0 +1,312 @@
+package cn.edu.hit.education.utils;
+
+
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.xssf.usermodel.*;
+
+import java.io.*;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @program: Demo
+ * @Date: 2019/2/19 10:50
+ * @Author: LiJc
+ * @Description:
+ */
+public class ExcelUtil {
+
+ public boolean writeExcel(List> list, String path) throws Exception {
+ String postfix = path.substring(path.lastIndexOf(".") + 1, path.length());
+ if (postfix.equals("xls")) {
+ writeXls(list, path);
+ } else if (postfix.equals("xlsx")) {
+ writeXlsx(list, path);
+ }else {
+ System.out.println("文件后缀名不正确！");
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * read the Excel file
+ *
+ * @param path
+ * the path of the Excel file
+ * @return
+ * @throws IOException
+ */
+ public List> readExcel(String path) throws IOException {
+ String postfix = path.substring(path.lastIndexOf(".") + 1, path.length());
+ if (postfix.equals("xls")) {
+ return readXls(path);
+ } else if (postfix.equals("xlsx")) {
+ return readXlsx(path);
+ }
+ return null;
+ }
+
+ /**
+ * Read the Excel 2010
+ *
+ * @param path
+ * the path of the excel file
+ * @return
+ * @throws IOException
+ */
+ public List> readXlsx(String path) throws IOException {
+
+ InputStream is = new FileInputStream(path);
+ XSSFWorkbook xssfWorkbook = new XSSFWorkbook(is);
+ List> list = new ArrayList>();
+ // Read the Sheet
+ for (int numSheet = 0; numSheet < xssfWorkbook.getNumberOfSheets(); numSheet++) {
+ XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(numSheet);
+ if (xssfSheet == null) {
+ continue;
+ }
+ // Read the Row
+ for (int rowNum = 1; rowNum <= xssfSheet.getLastRowNum(); rowNum++) {
+ XSSFRow xssfRow = xssfSheet.getRow(rowNum);
+ if (xssfRow != null) {
+ Map map = new HashMap<>();
+ for (int cellNum = 0; cellNum <= xssfRow.getLastCellNum(); cellNum++) {
+ if(xssfSheet.getRow(0).getCell(cellNum)==null||xssfRow.getCell(cellNum)==null)
+ continue;
+ map.put(xssfSheet.getRow(0).getCell(cellNum) + "", getValue(xssfRow.getCell(cellNum)));
+ }
+ list.add(map);
+ }
+ }
+ }
+ xssfWorkbook.close();
+ is.close();
+ return list;
+ }
+
+ /**
+ * Read the Excel 2003-2007
+ *
+ * @param path
+ * the path of the Excel
+ * @return
+ * @throws IOException
+ */
+ public List> readXls(String path) throws IOException {
+ InputStream is = new FileInputStream(path);
+ HSSFWorkbook hssfWorkbook = new HSSFWorkbook(is);
+ List> list = new ArrayList>();
+ // Read the Sheet
+ for (int numSheet = 0; numSheet < hssfWorkbook.getNumberOfSheets(); numSheet++) {
+ HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(numSheet);
+ if (hssfSheet == null) {
+ continue;
+ }
+ // Read the Row
+ for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
+ HSSFRow hssfRow = hssfSheet.getRow(rowNum);
+ if (hssfRow != null) {
+ Map map = new HashMap<>();
+ for (int cellNum = 0; cellNum <= hssfRow.getLastCellNum(); cellNum++) {
+ if(hssfSheet.getRow(0).getCell(cellNum)==null)
+ continue;
+ map.put(hssfSheet.getRow(0).getCell(cellNum) + "", getValue(hssfRow.getCell(cellNum)));
+ }
+ list.add(map);
+ }
+ }
+ }
+ hssfWorkbook.close();
+ is.close();
+ return list;
+ }
+
+
+ @SuppressWarnings({ "static-access", "deprecation" })
+ private String getValue(XSSFCell xssfRow) {
+ if (xssfRow == null) {
+ return "";
+ } else if (xssfRow.getCellType() == CellType.BOOLEAN) {
+ return String.valueOf(xssfRow.getBooleanCellValue()).trim();
+ } else if (xssfRow.getCellType() == CellType.NUMERIC) {
+ HSSFDataFormatter dataFormatter = new HSSFDataFormatter();
+ return String.valueOf(dataFormatter.formatCellValue(xssfRow)).trim();
+ // return String.valueOf(xssfRow.getNumericCellValue()).trim();
+ } else {
+ return String.valueOf(xssfRow.getStringCellValue()).trim();
+ }
+ }
+
+ @SuppressWarnings({ "static-access", "deprecation" })
+ private String getValue(HSSFCell hssfCell) {
+ if (hssfCell == null) {
+ return "";
+ } else if (hssfCell.getCellType() == CellType.BOOLEAN) {
+ return String.valueOf(hssfCell.getBooleanCellValue()).trim();
+ } else if (hssfCell.getCellType() == CellType.NUMERIC) {
+ HSSFDataFormatter dataFormatter = new HSSFDataFormatter();
+ return String.valueOf(dataFormatter.formatCellValue(hssfCell)).trim();
+ // return String.valueOf(hssfCell.getNumericCellValue()).trim();
+ } else {
+ return String.valueOf(hssfCell.getStringCellValue()).trim();
+ }
+ }
+
+ public void writeXls(List> list, String path) throws Exception {
+ if (list == null) {
+ return;
+ }
+ int countColumnNum = list.size();
+ HSSFWorkbook book = new HSSFWorkbook();
+ // 设置样式start
+ HSSFCellStyle cellStyle = setStyleXls(book);
+ // 设置样式end
+ HSSFSheet sheet = book.createSheet("sheet");
+ // option at first row.
+ HSSFRow firstRow = sheet.createRow(0);
+
+ // Set-->数组
+ String[] options = new String[list.get(0).keySet().size()];
+ list.get(0).keySet().toArray(options);
+
+ for (int j = 0; j < options.length; j++) {
+ HSSFCell cell = firstRow.createCell(j);
+ cell.setCellStyle(cellStyle);
+ cell.setCellValue(new HSSFRichTextString(options[j]));
+ }
+
+ for (int i = 0; i < countColumnNum; i++) {
+ HSSFRow row = sheet.createRow(i + 1);
+ Map map = list.get(i);
+ for (int column = 0; column < options.length; column++) {
+ HSSFCell cell = row.createCell(column);
+ cell.setCellStyle(cellStyle);
+ cell.setCellValue((map.get(options[column])==null?"":map.get(options[column])) + "");
+ }
+ }
+ File file = new File(path);
+ FileUtils.forceMkdir(file.getParentFile());
+ OutputStream os = new FileOutputStream(file);
+ book.write(os);
+ os.close();
+ }
+
+ public void writeXlsx(List> list, String path) throws Exception {
+ if (list == null) {
+ return;
+ }
+ // XSSFWorkbook
+ int countColumnNum = list.size();
+ XSSFWorkbook book = new XSSFWorkbook();
+ XSSFCellStyle cellStyle = setStyleXlsx(book);
+ XSSFSheet sheet = book.createSheet("studentSheet");
+
+ // option at first row.
+ XSSFRow firstRow = sheet.createRow(0);
+ // Set-->数组
+ String[] options = new String[list.get(0).keySet().size()];
+ list.get(0).keySet().toArray(options);
+ for (int j = 0; j < options.length; j++) {
+ XSSFCell cell = firstRow.createCell(j);
+ cell.setCellStyle(cellStyle);
+ cell.setCellValue(new XSSFRichTextString(options[j]));
+ }
+ for (int i = 0; i < countColumnNum; i++) {
+ XSSFRow row = sheet.createRow(i + 1);
+ Map map = list.get(i);
+ for (int column = 0; column < options.length; column++) {
+ XSSFCell cell = row.createCell(column);
+ cell.setCellStyle(cellStyle);
+ cell.setCellValue((map.get(options[column])==null?"":map.get(options[column])) + "");
+ }
+ }
+ File file = new File(path);
+ FileUtils.forceMkdir(file.getParentFile());
+ OutputStream os = new FileOutputStream(file);
+ book.write(os);
+ os.close();
+ }
+
+ /**
+ * 设置样式
+ * @param book
+ * @return
+ */
+ public HSSFCellStyle setStyleXls(HSSFWorkbook book){
+ HSSFCellStyle cellStyle = book.createCellStyle();
+ cellStyle.setAlignment(HorizontalAlignment.CENTER);// 居中
+ cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直
+ cellStyle.setBorderBottom(BorderStyle.THIN);//下边框
+ cellStyle.setBorderLeft(BorderStyle.THIN);//左边框
+ cellStyle.setBorderTop(BorderStyle.THIN);//上边框
+ cellStyle.setBorderRight(BorderStyle.THIN);//右边框
+ return cellStyle;
+ }
+
+ /**
+ * 设置样式
+ * @param book
+ * @return
+ */
+ public XSSFCellStyle setStyleXlsx(XSSFWorkbook book){
+ XSSFCellStyle cellStyle = book.createCellStyle();
+ cellStyle.setAlignment(HorizontalAlignment.CENTER);// 居中
+ cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直
+ cellStyle.setBorderBottom(BorderStyle.THIN);//下边框
+ cellStyle.setBorderLeft(BorderStyle.THIN);//左边框
+ cellStyle.setBorderTop(BorderStyle.THIN);//上边框
+ cellStyle.setBorderRight(BorderStyle.THIN);//右边框
+ return cellStyle;
+ }
+
+ /**
+ * 返回文件绝对路径
+ *
+ * @param subPath
+ * @param fileName
+ * @return
+ */
+ public String getSavePath(String subPath, String fileName) {
+
+ // 处理子路径
+ if (!StringUtils.isBlank(subPath)) {
+ subPath += "/";
+ } else {
+ subPath = "";
+ }
+
+ // 处理日期路径
+ Date date = new Date();
+ SimpleDateFormat yyyyFt = new SimpleDateFormat("yyyy");
+ SimpleDateFormat MMFt = new SimpleDateFormat("MM");
+ SimpleDateFormat ddFt = new SimpleDateFormat("dd");
+ SimpleDateFormat HHFt = new SimpleDateFormat("HH");
+ String datePath = MessageFormat.format("{0}/{1}/{2}/{3}/", yyyyFt.format(date), MMFt.format(date), ddFt.format(date),
+ HHFt.format(date));
+
+ return "/" + subPath + datePath + getNewFileName(fileName);
+ }
+
+ /**
+ * 构建新文件名称
+ *
+ * @param fileName
+ * @return
+ */
+ public String getNewFileName(String fileName) {
+ String[] names = fileName.split("[\\.]");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmSS");
+ String dateString = sdf.format(new Date());
+ return names[0] + "-" + dateString + "." + names[1];
+ }
+}
+
diff --git a/src/cn/edu/hit/education/view/CourseExploreView.java b/src/cn/edu/hit/education/view/CourseExploreView.java
index 8fdbc507b05e8015fc2c494881d537ba04eb4133..d4a6baac9619bea129f0ae176a0717343540c78e 100644
--- a/src/cn/edu/hit/education/view/CourseExploreView.java
+++ b/src/cn/edu/hit/education/view/CourseExploreView.java
@@ -21,72 +21,56 @@ import org.eclipse.ui.part.ViewPart;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import cn.edu.hit.education.action.AddCollegeAction;
-import cn.edu.hit.education.action.AddSpecialtyAction;
-import cn.edu.hit.education.action.AddUniversityAction;
+import cn.edu.hit.education.action.AddCourseAction;
+import cn.edu.hit.education.action.AddProcessAction;
+import cn.edu.hit.education.action.AddPropertyAction;
+import cn.edu.hit.education.action.UpdateCourseAction;
+import cn.edu.hit.education.action.UpdateProcessAction;
+import cn.edu.hit.education.action.UpdatePropertyAction;
import cn.edu.hit.education.contentprovider.CourseContentProvider;
import cn.edu.hit.education.labelprovider.CourseLabelProvider;
-import cn.edu.hit.education.listener.MyDragSourceListener;
-import cn.edu.hit.education.model.CollegeNode;
+import cn.edu.hit.education.listener.CourseDragSourceListener;
import cn.edu.hit.education.model.CourseNode;
import cn.edu.hit.education.model.CourseRootNode;
import cn.edu.hit.education.model.Node;
-import cn.edu.hit.education.model.OrganizationNode;
-import cn.edu.hit.education.model.UniversityNode;
-import cn.edu.hit.education.pojo.Semester;
-import cn.edu.hit.education.pojo.Specialty;
+import cn.edu.hit.education.model.ProcessNode;
+import cn.edu.hit.education.model.PropertyNode;
+import cn.edu.hit.education.model.ResourceNode;
+import cn.edu.hit.education.pojo.Course;
+import cn.edu.hit.education.pojo.Process;
+import cn.edu.hit.education.pojo.Property;
import cn.edu.hit.education.service.ICourseService;
+import cn.edu.hit.education.service.IProcessService;
import cn.edu.hit.education.service.IScheduleService;
import cn.edu.hit.education.service.ISemesterService;
-import cn.edu.hit.education.service.ISpecialtyService;
-import cn.edu.hit.education.service.IUniversityService;
-/**
-*@Title: CourseExploreView
-*@Description:课程View
-*@author:李朝辉
-*@data:2021年4月29日午夜11:54
-*
-*
-*/
-
@Component
public class CourseExploreView extends ViewPart {
@Autowired
- IUniversityService universityService;
+ IProcessService processService;
@Autowired
ICourseService courseService;
@Autowired
IScheduleService scheduleService;
@Autowired
ISemesterService semesterService;
- @Autowired
- ISpecialtyService specialtyService;
-
-
public static final String ID = "cn.edu.hit.education.view.CourseExploreView";
final Transfer[] transfer=new Transfer[]{LocalSelectionTransfer.getTransfer()};
final Transfer[] transfer2=new Transfer[] {TextTransfer.getInstance()};
private TreeViewer treeViewer;
private Tree tree;
- private Semester semester;
- private Specialty specialty;
- private CourseNode courseNode ;
-
-
-
-
+ private Node currentNode;
+
public CourseExploreView() {
-
}
public void createPartControl(Composite parent) {
treeViewer = new TreeViewer(parent, SWT.BORDER);
tree = treeViewer.getTree();
- treeViewer.addDragSupport(DND.DROP_MOVE, transfer2, new MyDragSourceListener(treeViewer));
+ treeViewer.addDragSupport(DND.DROP_MOVE, transfer2, new CourseDragSourceListener(treeViewer));
treeViewer.setContentProvider(new CourseContentProvider());
treeViewer.setLabelProvider(new CourseLabelProvider());
@@ -98,8 +82,7 @@ public class CourseExploreView extends ViewPart {
TreeItem selections = (TreeItem)e.item;
Node node = (Node)selections.getData();
if(node instanceof CourseNode){
- courseNode = (CourseNode)node;
- System.out.println("所选课程ID： "+courseNode.getId());
+ currentNode = (CourseNode)node;
}
}
});
@@ -135,15 +118,86 @@ public class CourseExploreView extends ViewPart {
}
});*/
- //createContextMenu(parent);
-
-
+ makeContextMenu();
}
+ private void makeContextMenu() {
+ MenuManager menuMgr = new MenuManager();
+
+ Menu menu = menuMgr.createContextMenu(treeViewer.getControl());
+ menuMgr.addMenuListener(new IMenuListener() {
+ @Override
+ public void menuAboutToShow(IMenuManager manager) {
+ if (treeViewer.getSelection().isEmpty()) {
+ return;
+ }
+
+ if (treeViewer.getSelection() instanceof IStructuredSelection) {
+ IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+ currentNode = (Node)selection.getFirstElement();
+
+ if(currentNode instanceof ResourceNode){
+ menuMgr.add(new AddProcessAction(CourseExploreView.this));
+ }else if(currentNode instanceof ProcessNode){
+ menuMgr.add(new AddPropertyAction(CourseExploreView.this,currentNode.getId()));
+ menuMgr.add(new UpdateProcessAction(CourseExploreView.this,currentNode.getId()));
+ }else if(currentNode instanceof PropertyNode){
+ menuMgr.add(new AddCourseAction(CourseExploreView.this,currentNode.getId()));
+ menuMgr.add(new UpdatePropertyAction(CourseExploreView.this,currentNode.getId()));
+ }else{
+ menuMgr.add(new UpdateCourseAction(CourseExploreView.this,currentNode.getId()));
+ }
+ }
+ }
+ });
+ menuMgr.setRemoveAllWhenShown(true);
+ treeViewer.getControl().setMenu(menu);
+
+ }
+
/**
* Passing the focus request to the viewer's control.
*/
public void setFocus() {
treeViewer.getControl().setFocus();
}
+
+ public void refreshNewData(Object obj){
+ if(obj instanceof Process){
+ Process process = (Process)obj;
+ ProcessNode processNode = new ProcessNode(process.getId(),process.getName());
+ currentNode.addChild(processNode);
+ }else if(obj instanceof Property){
+ Property property = (Property)obj;
+ PropertyNode propertyNode = new PropertyNode(property.getId(),property.getName());
+ currentNode.addChild(propertyNode);
+ }else if(obj instanceof Course){
+ Course course = (Course)obj;
+ CourseNode courseNode = new CourseNode(course.getId(),course.getName());
+ currentNode.addChild(courseNode);
+ }else{
+
+ }
+
+ treeViewer.refresh(currentNode,true);
+ treeViewer.setExpandedState(currentNode, true);
+ }
+
+ public void refreshUpdateData(Object obj){
+ if(obj instanceof Process){
+ Process process = (Process)obj;
+ currentNode.setName(process.getName());
+ }else if(obj instanceof Property){
+ Property property = (Property)obj;
+ currentNode.setName(property.getName());
+ }else if(obj instanceof Course){
+ Course course = (Course)obj;
+ currentNode.setName(course.getName());
+ }else{
+
+ }
+
+ treeViewer.refresh(currentNode,true);
+ treeViewer.setExpandedState(currentNode, true);
+ }
}
diff --git a/src/cn/edu/hit/education/view/CourseScheduleView.java b/src/cn/edu/hit/education/view/CourseScheduleView.java
index 96e563c6e7b34e5f83bcdfd25af2003a21ac892f..0d6e14b7ff025b31282e44bba42b6672e65c8e46 100644
--- a/src/cn/edu/hit/education/view/CourseScheduleView.java
+++ b/src/cn/edu/hit/education/view/CourseScheduleView.java
@@ -42,7 +42,7 @@ import org.springframework.stereotype.Component;
import cn.edu.hit.education.contentprovider.CourseScheduleContentProvider;
import cn.edu.hit.education.labelprovider.CourseScheduleLabelProvider;
-import cn.edu.hit.education.listener.MyDropTargetListener;
+import cn.edu.hit.education.listener.CourseDropTargetListener;
import cn.edu.hit.education.pojo.Course;
import cn.edu.hit.education.pojo.ExCourse;
import cn.edu.hit.education.pojo.Schedule;
@@ -148,7 +148,7 @@ public class CourseScheduleView extends ViewPart implements ISelectionProvider{
tblclmnNewColumn.setWidth(100);
tblclmnNewColumn.setText("\u5B9E\u9A8C\u5B66\u65F6");
tableViewer.addDropSupport(DND.DROP_MOVE, transfer2,
- new MyDropTargetListener(tableViewer, this));
+ new CourseDropTargetListener(tableViewer, this));
Menu contextMenu = new Menu(table);
table.setMenu(contextMenu);
diff --git a/src/educationschedule/Perspective.java b/src/educationschedule/Perspective.java
index db5635d0aefba69130eb3eac401352c18664304a..4f8dfb4854566c66cb438d0928901e7529173227 100644
--- a/src/educationschedule/Perspective.java
+++ b/src/educationschedule/Perspective.java
@@ -24,7 +24,7 @@ public class Perspective implements IPerspectiveFactory {
IFolderLayout mainArea = layout.createFolder("mainArea", IPageLayout.LEFT, 0.8f, editorArea);
mainArea.addView(CourseScheduleView.ID);
mainArea.addView(CourseInformationView.ID);
- mainArea.addView(MovingBoxView.ID);
+ //mainArea.addView(MovingBoxView.ID);
}
}