Commit 21a1ca21 authored by wangxl's avatar wangxl

1

parent 6aa876b1
...@@ -4,7 +4,6 @@ import com.yiboshi.arch.base.ResponseDataModel; ...@@ -4,7 +4,6 @@ import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination; import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.annotation.Anonymous; import com.yiboshi.science.config.annotation.Anonymous;
import com.yiboshi.science.config.annotation.Logs; import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.entity.SelectCodeListItem;
import com.yiboshi.science.entity.SelectListItem; import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.entity.SystemParameter; import com.yiboshi.science.entity.SystemParameter;
import com.yiboshi.science.enumeration.CommonEnum; import com.yiboshi.science.enumeration.CommonEnum;
...@@ -165,8 +164,8 @@ public class SystemParameterController extends BaseController<SystemParameterSer ...@@ -165,8 +164,8 @@ public class SystemParameterController extends BaseController<SystemParameterSer
@ApiOperation(value = "获取学科代码树列表", httpMethod = "GET", notes = "获取学科代码树列表") @ApiOperation(value = "获取学科代码树列表", httpMethod = "GET", notes = "获取学科代码树列表")
@GetMapping @GetMapping
@RequestMapping("/getKnowledgeInfoList2") @RequestMapping("/getKnowledgeInfoList2")
public ResponseDataModel<List<SelectCodeListItem>> getKnowledgeInfoList2() { public ResponseDataModel<List<SelectListItem>> getKnowledgeInfoList2() {
List<SelectCodeListItem> list = systemParameterService.getKnowledgeInfoList2(); List<SelectListItem> list = systemParameterService.getKnowledgeInfoList2();
return ResponseDataModel.ok(list); return ResponseDataModel.ok(list);
} }
......
package com.yiboshi.science.service; package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService; import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.SelectCodeListItem;
import com.yiboshi.science.entity.SelectListItem; import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.entity.SystemParameter; import com.yiboshi.science.entity.SystemParameter;
import com.yiboshi.science.param.dto.SpecDTO; import com.yiboshi.science.param.dto.SpecDTO;
...@@ -109,7 +108,7 @@ public interface SystemParameterService extends BaseService<SystemParameterQuery ...@@ -109,7 +108,7 @@ public interface SystemParameterService extends BaseService<SystemParameterQuery
* 获取学科代码树列表1 * 获取学科代码树列表1
* @return * @return
*/ */
List<SelectCodeListItem> getKnowledgeInfoList2(); List<SelectListItem> getKnowledgeInfoList2();
/** /**
* 专业数组代码列表 * 专业数组代码列表
......
...@@ -6,7 +6,6 @@ import com.yiboshi.arch.exception.BusinessException; ...@@ -6,7 +6,6 @@ import com.yiboshi.arch.exception.BusinessException;
import com.yiboshi.science.base.BaseServiceImpl; import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.base.Pagination; import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.dao.SystemParameterDAO; import com.yiboshi.science.dao.SystemParameterDAO;
import com.yiboshi.science.entity.SelectCodeListItem;
import com.yiboshi.science.entity.SelectListItem; import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.entity.SystemParameter; import com.yiboshi.science.entity.SystemParameter;
import com.yiboshi.science.entity.SystemParameterType; import com.yiboshi.science.entity.SystemParameterType;
...@@ -351,11 +350,11 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD ...@@ -351,11 +350,11 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
return list; return list;
} }
public List<SelectCodeListItem> getKnowledgeInfoList2() { public List<SelectListItem> getKnowledgeInfoList2() {
List<SelectCodeListItem> list = null; List<SelectListItem> list = null;
Object obj = redisUtils.get(RedisKey.KnowledgeCodeList2); Object obj = redisUtils.get(RedisKey.KnowledgeCodeList2);
if (null != obj) if (null != obj)
list = (List<SelectCodeListItem>) redisUtils.get(RedisKey.KnowledgeCodeList2); list = (List<SelectListItem>) redisUtils.get(RedisKey.KnowledgeCodeList2);
if (null == list || list.size() == 0) { if (null == list || list.size() == 0) {
list = getKnowledgeParameterTreeList2(); list = getKnowledgeParameterTreeList2();
redisUtils.set(RedisKey.KnowledgeCodeList2, list, 7, TimeUnit.DAYS); redisUtils.set(RedisKey.KnowledgeCodeList2, list, 7, TimeUnit.DAYS);
...@@ -385,31 +384,22 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD ...@@ -385,31 +384,22 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
return list; return list;
} }
private List<SelectListItem> AddChildList(List<SystemParameter> parentList, SelectListItem s, int CodeLenght) {
List<SelectListItem> SelectList = new ArrayList<>();
List<SystemParameter> itemList = parentList.stream().filter(f -> f.getSystemCode().contains(s.getDescription()) && f.getSystemCode().length() == CodeLenght).collect(Collectors.toList());
itemList.forEach(e -> {
SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
SelectList.add(treeListItem);
});
return SelectList;
}
private List<SelectCodeListItem> getKnowledgeParameterTreeList2() { private List<SelectListItem> getKnowledgeParameterTreeList2() {
List<SystemParameter> parentList = this.getListByType(68); List<SystemParameter> parentList = this.getListByType(68);
List<SelectCodeListItem> list = new ArrayList<>(); List<SelectListItem> list = new ArrayList<>();
List<SystemParameter> FirstList = parentList.stream().filter(e -> e.getSystemCode().equals("C") || e.getSystemCode().equals("G") || e.getSystemCode().equals("H") || e.getSystemCode().equals("F")).collect(Collectors.toList()); List<SystemParameter> FirstList = parentList.stream().filter(e -> e.getSystemCode().equals("C") || e.getSystemCode().equals("G") || e.getSystemCode().equals("H") || e.getSystemCode().equals("F")).collect(Collectors.toList());
FirstList.forEach(e -> { FirstList.forEach(e -> {
SelectCodeListItem treeListItem = new SelectCodeListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>()); SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
list.add(treeListItem); list.add(treeListItem);
}); });
list.forEach(e -> { list.forEach(e -> {
List<SelectCodeListItem> SecondList = AddChildList(parentList, e, 3); List<SelectListItem> SecondList = AddChildList(parentList, e, 3);
e.setChildren(SecondList); e.setChildren(SecondList);
SecondList.forEach(f -> { SecondList.forEach(f -> {
List<SelectCodeListItem> ThirdList = AddChildList(parentList, f, 5); List<SelectListItem> ThirdList = AddChildList(parentList, f, 5);
f.setChildren(ThirdList); f.setChildren(ThirdList);
}); });
}); });
...@@ -417,16 +407,17 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD ...@@ -417,16 +407,17 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
return list; return list;
} }
private List<SelectCodeListItem> AddChildList(List<SystemParameter> parentList, SelectCodeListItem s, int CodeLenght) { private List<SelectListItem> AddChildList(List<SystemParameter> parentList, SelectListItem s, int CodeLenght) {
List<SelectCodeListItem> SelectList = new ArrayList<>(); List<SelectListItem> SelectList = new ArrayList<>();
List<SystemParameter> itemList = parentList.stream().filter(f -> f.getSystemCode().contains(s.getDescription()) && f.getSystemCode().length() == CodeLenght).collect(Collectors.toList()); List<SystemParameter> itemList = parentList.stream().filter(f -> f.getSystemCode().contains(s.getDescription()) && f.getSystemCode().length() == CodeLenght).collect(Collectors.toList());
itemList.forEach(e -> { itemList.forEach(e -> {
SelectCodeListItem treeListItem = new SelectCodeListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>()); SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
SelectList.add(treeListItem); SelectList.add(treeListItem);
}); });
return SelectList; return SelectList;
} }
public List<SpecDTO> getSpecArray() { public List<SpecDTO> getSpecArray() {
List<SpecDTO> list = null; List<SpecDTO> list = null;
Object obj = redisUtils.get(RedisKey.SpecArrayList); Object obj = redisUtils.get(RedisKey.SpecArrayList);
......
package com.yiboshi.science.entity;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.io.Serializable;
import java.util.List;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class SelectCodeListItem implements Serializable {
/** 获取或设置选定项的文本 */
private String label;
/** 获取或设置选定项的值 */
private String value;
/** description */
private String description;
/** 获取或设置选定项的文本 */
private boolean selected;
/** 获取或设置一个值,该值指示是否禁用 */
private boolean disabled;
/** 子选项 */
private List<SelectCodeListItem> children;
}
...@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; ...@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -21,16 +22,25 @@ import java.util.List; ...@@ -21,16 +22,25 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class SelectListItem implements Serializable { public class SelectListItem implements Serializable {
/** 获取或设置选定项的文本 */
private String title ; public SelectListItem(String a, String b, String d, boolean s, boolean e, List<SelectListItem> ar) {
/** 获取或设置选定项的值 */ title = a;
private String key ; label = a;
/** description */ key = b;
private String description ; value = b;
/** 获取或设置选定项的文本 */ description = d;
private boolean selected ; selected = s;
/** 获取或设置一个值,该值指示是否禁用 */ disabled = e;
private boolean disabled ; children = ar;
/** 子选项 */ }
private List<SelectListItem> children ;
private String title;
private String key;
private String label;
private String value;
private String description;
private boolean selected;
private boolean disabled;
private List<SelectListItem> children;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment