xiongzhu 3 лет назад
Родитель
Сommit
44c8f8a1de

+ 6 - 0
pom.xml

@@ -274,6 +274,12 @@
             <artifactId>googleauth</artifactId>
             <version>1.5.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.8</version>
+        </dependency>
     </dependencies>
 
 </project>

+ 12 - 0
src/main/java/com/izouma/jmrh/annotations/SearchableOne.java

@@ -0,0 +1,12 @@
+package com.izouma.jmrh.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SearchableOne {
+    boolean value() default true;
+}

+ 115 - 0
src/main/java/com/izouma/jmrh/domain/Expert.java

@@ -0,0 +1,115 @@
+package com.izouma.jmrh.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.jmrh.annotations.Searchable;
+import com.izouma.jmrh.converter.LongArrayConverter;
+import com.izouma.jmrh.dto.ExpertDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import java.time.LocalDate;
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+@Entity
+@ApiModel(value = "技术经理人")
+public class Expert extends BaseEntity {
+
+    @ExcelProperty(value = "照片")
+    @ApiModelProperty(value = "照片")
+    private String avatar;
+
+    @ExcelProperty(value = "姓名")
+    @Searchable
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ExcelProperty(value = "性别")
+    @ApiModelProperty(value = "出生年月")
+    private String sex;
+
+    @ExcelProperty(value = "出生年月")
+    @ApiModelProperty(value = "出生年月")
+    private LocalDate birthday;
+
+    @ExcelProperty(value = "单位")
+    @ApiModelProperty(value = "单位")
+    private String work;
+
+    @ExcelProperty(value = "学历")
+    @Searchable
+    @ApiModelProperty(value = "学历")
+    private String academicQualification;
+
+    @ExcelProperty(value = "职称")
+    @Searchable
+    @ApiModelProperty(value = "职称")
+    private String jobTitle;
+
+    @ExcelProperty(value = "职位")
+    @ApiModelProperty(value = "职位")
+    private String position;
+
+    @ExcelProperty(value = "电话")
+    @Searchable
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ExcelProperty(value = "邮箱")
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ExcelProperty(value = "通讯地址")
+    @ApiModelProperty(value = "通讯地址")
+    private String address;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "研究方向")
+    private Long affiliation;
+
+    /**
+     * setting
+     */
+    @ExcelIgnore
+    @Convert(converter = LongArrayConverter.class)
+    @ApiModelProperty(value = "专业领域")
+    private List<Long> field;
+
+    @Searchable
+    @ExcelProperty(value = "个人简介")
+    @Column(columnDefinition = "TEXT")
+    @ApiModelProperty(value = "个人简介")
+    private String selfIntroduction;
+
+    @ExcelIgnore
+    @Transient
+    private List<String> fieldName;
+
+    @ExcelProperty(value = "专业领域")
+    private String fieldNames;
+
+    @ExcelProperty(value = "研究方向")
+    @Transient
+    private String affiliationName;
+
+    public Expert(ExpertDTO dto) {
+        BeanUtil.copyProperties(dto, this);
+    }
+
+    @Column(columnDefinition = "bit 1 default 0")
+    private boolean del = false;
+}

+ 34 - 0
src/main/java/com/izouma/jmrh/domain/Setting.java

@@ -0,0 +1,34 @@
+package com.izouma.jmrh.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@ApiModel(value = "参数设置")
+public class Setting extends BaseEntity {
+
+    private String name;
+
+    private Long parent;
+
+    private int flag;
+
+    private Integer sort;
+
+    @Transient
+    private List<Setting> children = new ArrayList<>();
+
+}

+ 63 - 0
src/main/java/com/izouma/jmrh/dto/ExpertDTO.java

@@ -0,0 +1,63 @@
+package com.izouma.jmrh.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.izouma.jmrh.utils.excel.LocalDateConverter;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+@ApiModel(value = "技术经理人")
+public class ExpertDTO extends BaseRowModel {
+
+    @ExcelProperty(value = "照片")
+    private String avatar;
+
+    @ExcelProperty(value = "姓名")
+    private String name;
+
+    @ExcelProperty(value = "性别")
+    private String sex;
+
+    @ExcelProperty(value = "出生年月", converter = LocalDateConverter.class)
+    private LocalDate birthday;
+
+    @ExcelProperty(value = "单位")
+    private String work;
+
+    @ExcelProperty(value = "学历")
+    private String academicQualification;
+
+    @ExcelProperty(value = "职称")
+    private String jobTitle;
+
+    @ExcelProperty(value = "职位")
+    private String position;
+
+    @ExcelProperty(value = "电话")
+    private String phone;
+
+    @ExcelProperty(value = "邮箱")
+    private String email;
+
+    @ExcelProperty(value = "通讯地址")
+    private String address;
+
+    @ExcelProperty(value = "个人简介")
+    private String selfIntroduction;
+
+    @ExcelProperty(value = "专业领域")
+    private String fieldNames;
+
+    @ExcelProperty(value = "研究方向")
+    private String affiliationName;
+
+}

+ 15 - 0
src/main/java/com/izouma/jmrh/repo/ExpertRepo.java

@@ -0,0 +1,15 @@
+package com.izouma.jmrh.repo;
+
+import com.izouma.jmrh.domain.Expert;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+public interface ExpertRepo extends JpaRepository<Expert, Long>, JpaSpecificationExecutor<Expert> {
+
+    List<Expert> findAllByNameLike(String name);
+}

+ 24 - 0
src/main/java/com/izouma/jmrh/repo/SettingRepo.java

@@ -0,0 +1,24 @@
+package com.izouma.jmrh.repo;
+
+import com.izouma.jmrh.domain.Setting;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+public interface SettingRepo extends JpaRepository<Setting, Long>, JpaSpecificationExecutor<Setting> {
+
+    List<Setting> findAllByFlag(int flag);
+
+    List<Setting> findAllByFlagIn(Iterable<Integer> flags);
+
+    @Query(nativeQuery = true, value = "SELECT ifnull(max(flag + 1),1) FROM setting")
+    int nextFlag();
+
+
+    @Query(nativeQuery = true, value = "SELECT ifnull(max(sort + 1),1) FROM setting")
+    int nextSort();
+}

+ 121 - 0
src/main/java/com/izouma/jmrh/service/ExpertService.java

@@ -0,0 +1,121 @@
+package com.izouma.jmrh.service;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.izouma.jmrh.converter.StringArrayConverter;
+import com.izouma.jmrh.domain.Expert;
+import com.izouma.jmrh.domain.Setting;
+import com.izouma.jmrh.dto.ExpertDTO;
+import com.izouma.jmrh.dto.PageQuery;
+import com.izouma.jmrh.exception.BusinessException;
+import com.izouma.jmrh.repo.ExpertRepo;
+import com.izouma.jmrh.repo.SettingRepo;
+import com.izouma.jmrh.utils.JpaUtils;
+import com.izouma.jmrh.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.Predicate;
+import javax.transaction.Transactional;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class ExpertService {
+
+    private final ExpertRepo expertRepo;
+    private final SettingRepo settingRepo;
+
+    public Page<Expert> all(PageQuery pageQuery, Long field) {
+        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.newArrayList(1, 15))
+                .stream()
+                .collect(Collectors.toMap(Setting::getId, Setting::getName));
+
+        return expertRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
+                    List<Predicate> and = JpaUtils.toPredicates(pageQuery, Expert.class, root, criteriaQuery, criteriaBuilder);
+                    if (ObjectUtil.isNotNull(field)) {
+                        Expression<Long> function = criteriaBuilder.function("FIND_IN_SET", Long.class, criteriaBuilder.literal(field), root
+                                .get("field"));
+                        and.add(criteriaBuilder.greaterThan(function, 0L));
+                    }
+
+                    return criteriaBuilder.and(and.toArray(new Predicate[0]));
+                }), JpaUtils.toPageRequest(pageQuery))
+                .map(manager -> {
+                    List<String> names = manager.getField()
+                            .stream()
+                            .map(settingMap::get)
+                            .collect(Collectors.toList());
+                    manager.setFieldName(names);
+                    manager.setFieldNames(String.join(",", names));
+                    manager.setAffiliationName(settingMap.get(manager.getAffiliation()));
+                    return manager;
+                });
+    }
+
+    public Expert get(Long id) {
+
+        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.newArrayList(1, 15))
+                .stream()
+                .collect(Collectors.toMap(Setting::getId, Setting::getName));
+        Expert expert = expertRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        expert.setFieldName(expert.getField()
+                .stream()
+                .map(settingMap::get)
+                .collect(Collectors.toList()));
+        expert.setAffiliationName(settingMap.get(expert.getAffiliation()));
+        return expert;
+    }
+
+    /*
+    导入
+    */
+    @Transactional(rollbackOn = Exception.class)
+    public void upload(InputStream is) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+        byte[] buffer = new byte[1024];
+        int len;
+        while ((len = is.read(buffer)) > -1) {
+            baos.write(buffer, 0, len);
+        }
+        baos.flush();
+
+        InputStream indicatorStream = new ByteArrayInputStream(baos.toByteArray());
+        List<ExpertDTO> dtos =
+                ExcelUtils.readExcel(indicatorStream, ExpertDTO.class, 1, 1);
+
+//        List<Expert> experts = dtos.stream().map(Expert::new).collect(Collectors.toList());
+        List<Expert> experts = new ArrayList<>();
+        List<Setting> settings = settingRepo.findAllByFlagIn(CollUtil.newArrayList(1, 15));
+        dtos.forEach(dto -> {
+            Expert expert = new Expert(dto);
+            if (StrUtil.isNotBlank(dto.getFieldNames())) {
+                StringArrayConverter sc = new StringArrayConverter();
+                List<String> names = sc.convertToEntityAttribute(dto.getFieldNames());
+                expert.setField(settings.stream()
+                        .filter(setting -> setting.getFlag() == 1 && names.contains(setting.getName()))
+                        .map(Setting::getId)
+                        .collect(Collectors.toList()));
+            }
+            settings.stream()
+                    .filter(setting -> setting.getFlag() == 15 && setting.getName()
+                            .equals(dto.getAffiliationName()))
+                    .findFirst()
+                    .ifPresent(setting -> expert.setAffiliation(setting.getId()));
+            experts.add(expert);
+        });
+        expertRepo.saveAll(experts);
+
+    }
+}

+ 54 - 0
src/main/java/com/izouma/jmrh/service/SettingService.java

@@ -0,0 +1,54 @@
+package com.izouma.jmrh.service;
+
+import com.izouma.jmrh.domain.Setting;
+import com.izouma.jmrh.dto.PageQuery;
+import com.izouma.jmrh.repo.SettingRepo;
+import com.izouma.jmrh.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service
+@AllArgsConstructor
+public class SettingService {
+
+    private final SettingRepo settingRepo;
+
+    public Page<Setting> all(PageQuery pageQuery) {
+        return settingRepo.findAll(JpaUtils.toSpecification(pageQuery, Setting.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public List<Setting> getTree(List<Setting> list) {
+        Map<Long, Setting> dtoMap = new HashMap<>();
+        for (Setting node : list) {
+            dtoMap.put(node.getId(), node);
+        }
+
+        List<Setting> resultList = new ArrayList<>();
+        for (Map.Entry<Long, Setting> entry : dtoMap.entrySet()) {
+            Setting node = entry.getValue();
+            if (node.getParent() == null) {
+                // 如果是顶层节点,直接添加到结果集合中
+                resultList.add(node);
+            } else {
+                // 如果不是顶层节点,找其父节点,并且添加到父节点的子节点集合中
+                if (dtoMap.get(node.getParent()) != null) {
+                    dtoMap.get(node.getParent()).getChildren().add(node);
+                }
+            }
+        }
+        this.sortMenu(resultList);
+        return resultList;
+    }
+
+    private void sortMenu(List<Setting> menus) {
+        menus.sort(Comparator.comparingLong(Setting::getSort));
+        for (Setting menu : menus) {
+            if (menu.getChildren() != null) {
+                sortMenu(menu.getChildren());
+            }
+        }
+    }
+}

+ 200 - 0
src/main/java/com/izouma/jmrh/utils/JpaUtils.java

@@ -0,0 +1,200 @@
+package com.izouma.jmrh.utils;
+
+import cn.hutool.core.convert.Convert;
+import com.izouma.jmrh.annotations.Searchable;
+import com.izouma.jmrh.annotations.SearchableOne;
+import com.izouma.jmrh.dto.PageQuery;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.regex.Pattern;
+
+@Slf4j
+@SuppressWarnings("ALL")
+public class JpaUtils {
+    public static PageRequest toPageRequest(PageQuery pageQuery) {
+        PageRequest pageRequest;
+        if (StringUtils.isNotEmpty(pageQuery.getSort())) {
+            List<Sort.Order> orders = new ArrayList<>();
+            for (String sortStr : pageQuery.getSort().split(";")) {
+                String direction = "asc";
+                String prop = sortStr;
+                if (sortStr.contains(",asc") || sortStr.contains(",desc")) {
+                    prop = sortStr.split(",")[0];
+                    direction = sortStr.split(",")[1];
+                }
+                orders.add("asc".equals(direction) ? Sort.Order.asc(prop) : Sort.Order.desc(prop));
+            }
+            pageRequest = PageRequest.of(pageQuery.getPage(), pageQuery.getSize(), Sort.by(orders));
+        } else {
+            pageRequest = PageRequest.of(pageQuery.getPage(), pageQuery.getSize());
+        }
+        return pageRequest;
+    }
+
+    public static <T> Specification<T> toSpecification(PageQuery pageQuery, Class<?> queryClass) {
+        return (Specification<T>) (root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> and = toPredicates(pageQuery, queryClass, root, criteriaQuery, criteriaBuilder);
+            return criteriaBuilder.and(and.toArray(new Predicate[0]));
+        };
+    }
+
+    public static <T> List<Predicate> toPredicates(PageQuery pageQuery, Class<?> queryClass, Root<T> root,
+                                                   CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+        List<Predicate> and = new ArrayList<>();
+        pageQuery.getQuery().forEach((property, value) -> {
+            if (value == null) {
+                return;
+            }
+            if (String.class.equals(value.getClass())) {
+                if (StringUtils.isEmpty((String) value)) {
+                    return;
+                }
+            }
+            Field field = getDeclaredField(queryClass, property);
+            if (field == null) return;
+
+            Class fieldType = field.getType();
+            if (Enum.class.isAssignableFrom(fieldType)) {
+                if (value instanceof Collection) {
+                    if (!((Collection) value).isEmpty()) {
+                        List list = new ArrayList();
+                        for (Object o : ((Collection) value)) {
+                            list.add(Enum.valueOf(fieldType, String.valueOf(o)));
+                        }
+                        and.add(root.get(property).in(list));
+                    }
+                } else if (value instanceof String && StringUtils.isNotEmpty((String) value)) {
+                    if (((String) value).contains(",")) {
+                        String[] arr = ((String) value).split(",");
+                        List list = new ArrayList();
+                        for (String s : arr) {
+                            list.add(Enum.valueOf(fieldType, s));
+                        }
+                        and.add(root.get(property).in(list));
+                    } else {
+                        and.add(criteriaBuilder.and(criteriaBuilder
+                                .equal(root.get(property), Enum.valueOf(fieldType, String.valueOf(value)))));
+                    }
+                }
+            } else if (LocalDateTime.class == fieldType) {
+                if (value instanceof List) {
+                    List list = (List) value;
+                    if (list.size() == 1) {
+                        LocalDateTime start = DateTimeUtils
+                                .toLocalDateTime((String) list.get(0), "yyyy-MM-dd HH:mm:ss");
+                        and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
+                    } else if (list.size() == 2) {
+//                        LocalDateTime end = DateTimeUtils
+//                                .toLocalDateTime((String) list.get(1), "yyyy-MM-dd HH:mm:ss");
+//                        and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
+                        LocalDateTime start = DateTimeUtils.toLocalDateTime((String) list.get(0), "yyyy-MM-dd HH:mm:ss");
+                        and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
+                        LocalDateTime end = DateTimeUtils.toLocalDateTime((String) list.get(1), "yyyy-MM-dd HH:mm:ss");
+                        and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
+                    }
+                } else if (value instanceof String && Pattern
+                        .matches("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}$", (String) value)) {
+                    String[] arr = ((String) value).split(",");
+                    LocalDateTime start = DateTimeUtils.toLocalDateTime(arr[0], "yyyy-MM-dd HH:mm:ss");
+                    and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
+                    LocalDateTime end = DateTimeUtils.toLocalDateTime(arr[1], "yyyy-MM-dd HH:mm:ss");
+                    and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
+                } else {
+                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), DateTimeUtils
+                            .toLocalDateTime((String) value, "yyyy-MM-dd HH:mm:ss"))));
+                }
+            } else if (LocalDate.class == fieldType) {
+                if (value instanceof List) {
+                    List list = (List) value;
+                    if (list.size() == 1) {
+                        LocalDate start = DateTimeUtils
+                                .toLocalDate((String) list.get(0), "yyyy-MM-dd");
+                        and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
+                    } else if (list.size() == 2) {
+                        LocalDate end = DateTimeUtils
+                                .toLocalDate((String) list.get(1), "yyyy-MM-dd");
+                        and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
+                    }
+                } else if (value instanceof String && Pattern
+                        .matches("^\\d{4}-\\d{2}-\\d{2},\\d{4}-\\d{2}-\\d{2}$", (String) value)) {
+                    String[] arr = ((String) value).split(",");
+                    LocalDate start = DateTimeUtils.toLocalDate(arr[0], "yyyy-MM-dd");
+                    and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
+                    LocalDate end = DateTimeUtils.toLocalDate(arr[1], "yyyy-MM-dd");
+                    and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
+                } else {
+                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), DateTimeUtils
+                            .toLocalDate((String) value, "yyyy-MM-dd"))));
+                }
+            } else if (String.class == fieldType) {
+                SearchableOne annotation = field.getAnnotation(SearchableOne.class);
+                if (annotation != null && annotation.value()) {
+                    and.add(criteriaBuilder.like(root.get(field.getName()), "%" + value + "%"));
+                } else {
+                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
+                }
+
+            } else if (BigDecimal.class == fieldType) {
+                if (value instanceof String && Pattern.matches("^\\d+,\\d+$", (String) value)) {
+                    String[] arr = ((String) value).split(",");
+                    and.add(criteriaBuilder.between(root.get(property), Convert.convert(Integer.class, arr[0]), Convert
+                            .convert(Integer.class, arr[1])));
+                } else if (value instanceof Integer || value instanceof Long || value instanceof String && Pattern.matches("^\\d+", (String) value)) {
+                    and.add(criteriaBuilder.greaterThan(root.get(property), Convert.convert(Integer.class, value)));
+                }
+            } else {
+                and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
+            }
+        });
+        if (StringUtils.isNotEmpty(pageQuery.getSearch())) {
+            Field[] fields = queryClass.getDeclaredFields();
+            List<Predicate> or = new ArrayList<>();
+            try {
+                if (StringUtils.isNumeric(pageQuery.getSearch())) {
+                    or.add(criteriaBuilder.equal(root.get("id"), Long.parseLong(pageQuery.getSearch())));
+                }
+            } catch (Exception ignored) {
+            }
+            for (Field field : fields) {
+                Searchable annotation = field.getAnnotation(Searchable.class);
+                if (annotation == null) {
+                    continue;
+                }
+                if (!annotation.value()) {
+                    continue;
+                }
+                or.add(criteriaBuilder.like(root.get(field.getName()), "%" + pageQuery.getSearch() + "%"));
+            }
+            and.add(criteriaBuilder.or(or.toArray(new Predicate[0])));
+        }
+        return and;
+    }
+
+    private static Field getDeclaredField(Class<?> clazz, String property) {
+        String className = clazz.getName();
+        while (clazz != null && clazz != Object.class) {
+            try {
+                return clazz.getDeclaredField(property);
+            } catch (NoSuchFieldException ignored) {
+            }
+            clazz = clazz.getSuperclass();
+        }
+        log.error("no such field [{}] in class [{}]", property, className);
+        return null;
+    }
+}

+ 28 - 0
src/main/java/com/izouma/jmrh/utils/excel/ExcelListener.java

@@ -0,0 +1,28 @@
+package com.izouma.jmrh.utils.excel;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.metadata.BaseRowModel;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+public class ExcelListener<T extends BaseRowModel> extends AnalysisEventListener<T> {
+    private final List<T> rows = new ArrayList<>();
+
+    @Override
+    public void invoke(T object, AnalysisContext context) {
+        rows.add(object);
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        log.info("read {} rows %n", rows.size());
+    }
+
+    public List<T> getRows() {
+        return rows;
+    }
+}

+ 44 - 0
src/main/java/com/izouma/jmrh/utils/excel/ExcelUtils.java

@@ -1,10 +1,15 @@
 package com.izouma.jmrh.utils.excel;
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelReader;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import io.swagger.annotations.ApiModel;
+import org.apache.poi.poifs.filesystem.FileMagic;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -54,4 +59,43 @@ public class ExcelUtils<T> {
                 .registerConverter(new PrimitiveBooleanConverter())
                 .doWrite(data);
     }
+
+
+    /**
+     * 从Excel中读取文件,读取的文件是一个DTO类,该类必须继承BaseRowModel
+     * 具体实例参考 : MemberMarketDto.java
+     * 参考:https://github.com/alibaba/easyexcel
+     * 字符流必须支持标记,FileInputStream 不支持标记,可以使用BufferedInputStream 代替
+     * BufferedInputStream bis = new BufferedInputStream(new FileInputStream(...));
+     */
+    public static <T extends BaseRowModel> List<T> readExcel(final InputStream inputStream, final Class<? extends BaseRowModel> clazz, int sheetNo, int headLineMun) {
+        if (null == inputStream) {
+            throw new NullPointerException("the inputStream is null!");
+        }
+        ExcelListener<T> listener = new ExcelListener<>();
+        // 这里因为EasyExcel-1.1.1版本的bug,所以需要选用下面这个标记已经过期的版本
+        ExcelReader reader = new ExcelReader(inputStream, valueOf(inputStream), null, listener);
+        reader.read(new com.alibaba.excel.metadata.Sheet(sheetNo, headLineMun, clazz));
+
+        return listener.getRows();
+    }
+
+    /**
+     * 根据输入流,判断为xls还是xlsx,该方法原本存在于easyexcel 1.1.0 的ExcelTypeEnum中。
+     */
+    public static ExcelTypeEnum valueOf(InputStream inputStream) {
+        try {
+            FileMagic fileMagic = FileMagic.valueOf(inputStream);
+            if (FileMagic.OLE2.equals(fileMagic)) {
+                return ExcelTypeEnum.XLS;
+            }
+            if (FileMagic.OOXML.equals(fileMagic)) {
+                return ExcelTypeEnum.XLSX;
+            }
+            throw new IllegalArgumentException("excelTypeEnum can not null");
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

+ 85 - 0
src/main/java/com/izouma/jmrh/web/ExpertController.java

@@ -0,0 +1,85 @@
+package com.izouma.jmrh.web;
+
+import cn.hutool.core.convert.Convert;
+import com.izouma.jmrh.domain.Expert;
+import com.izouma.jmrh.dto.PageQuery;
+import com.izouma.jmrh.exception.BusinessException;
+import com.izouma.jmrh.repo.ExpertRepo;
+import com.izouma.jmrh.service.ExpertService;
+import com.izouma.jmrh.utils.ObjUtils;
+import com.izouma.jmrh.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/expert")
+@AllArgsConstructor
+public class ExpertController extends BaseController {
+    private final ExpertService expertService;
+    private final ExpertRepo    expertRepo;
+
+    @PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Expert save(@RequestBody Expert record) {
+        if (record.getId() != null) {
+            Expert orig = expertRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return expertRepo.save(orig);
+        }
+        return expertRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Expert> all(@RequestBody PageQuery pageQuery) {
+        Map<String, Object> query = pageQuery.getQuery();
+        Object fieldObj = query.get("field");
+        Long field = Convert.convert(Long.class, fieldObj);
+        query.remove("field");
+
+        return expertService.all(pageQuery, field);
+    }
+
+    @GetMapping("/get/{id}")
+    public Expert get(@PathVariable Long id) {
+        return expertService.get(id);
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        expertRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Expert> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    //    @PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/upload")
+    public void uploadFile(@RequestParam("file") MultipartFile file) {
+        InputStream is;
+        try {
+            is = file.getInputStream();
+            expertService.upload(is);
+        } catch (IOException e) {
+            log.error("上传失败", e);
+            throw new BusinessException("上传失败", e.getMessage());
+        }
+    }
+}
+

+ 77 - 0
src/main/java/com/izouma/jmrh/web/SettingController.java

@@ -0,0 +1,77 @@
+package com.izouma.jmrh.web;
+
+import com.izouma.jmrh.domain.Setting;
+import com.izouma.jmrh.dto.PageQuery;
+import com.izouma.jmrh.exception.BusinessException;
+import com.izouma.jmrh.repo.SettingRepo;
+import com.izouma.jmrh.service.SettingService;
+import com.izouma.jmrh.utils.ObjUtils;
+import com.izouma.jmrh.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/setting")
+@AllArgsConstructor
+public class SettingController extends BaseController {
+    private final SettingService settingService;
+    private final SettingRepo settingRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Setting save(@RequestBody Setting record) {
+        if (record.getId() != null) {
+            Setting orig = settingRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return settingRepo.save(orig);
+        }
+        if (record.getParent() == null) {
+            record.setFlag(settingRepo.nextFlag());
+        }
+        if (record.getSort() == null) {
+            record.setSort(settingRepo.nextSort());
+        }
+        return settingRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Setting> all(@RequestBody PageQuery pageQuery) {
+        return settingService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Setting get(@PathVariable Long id) {
+        return settingRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        settingRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Setting> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/allList")
+    public List<Setting> allList() {
+        return settingService.getTree(settingRepo.findAll());
+    }
+
+    @PostMapping("/byFlag")
+    public List<Setting> byFlag(int flag) {
+        List<Setting> tree = settingService.getTree(settingRepo.findAllByFlag(flag));
+        return tree.get(0).getChildren();
+    }
+}
+

+ 64 - 0
src/main/vue/src/components/SettingSelect.vue

@@ -0,0 +1,64 @@
+<template>
+    <el-select
+        :value="value"
+        :placeholder="`请选择${name}`"
+        clearable
+        filterable
+        @change="changeSelect"
+        class="filter-item"
+    >
+        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+    </el-select>
+</template>
+
+<script>
+export default {
+    props: {
+        value: {
+            type: [Number, String],
+            default: ''
+        },
+        flag: {
+            type: Number,
+            default: 1
+        },
+        name: {
+            type: String,
+            default: '类型'
+        }
+    },
+    data() {
+        return {
+            options: []
+        };
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.getList();
+        });
+    },
+    methods: {
+        getList() {
+            this.$http
+                .post('/setting/byFlag', { flag: this.flag })
+                .then(res => {
+                    this.options = res.map(item => {
+                        return {
+                            label: item.name,
+                            value: item.id
+                        };
+                    });
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        },
+        changeSelect(val) {
+            this.$emit('input', val);
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped></style>

+ 16 - 0
src/main/vue/src/router.js

@@ -514,6 +514,22 @@ const router = new Router({
                     meta: {
                         title: '指标管理'
                     }
+                },
+                {
+                    path: '/expertEdit',
+                    name: 'ExpertEdit',
+                    component: () => import(/* webpackChunkName: "expertEdit" */ '@/views/ExpertEdit.vue'),
+                    meta: {
+                        title: '专家编辑'
+                    }
+                },
+                {
+                    path: '/expertList',
+                    name: 'ExpertList',
+                    component: () => import(/* webpackChunkName: "expertList" */ '@/views/ExpertList.vue'),
+                    meta: {
+                        title: '专家'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

+ 229 - 0
src/main/vue/src/views/ExpertEdit.vue

@@ -0,0 +1,229 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 600px"
+        >
+            <el-form-item prop="avatar" label="照片">
+                <single-upload v-model="formData.avatar"></single-upload>
+            </el-form-item>
+            <el-form-item prop="name" label="姓名">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="sex" label="性别">
+                <el-select v-model="formData.sex" clearable filterable placeholder="请选择" @change="chageAvatar">
+                    <el-option v-for="item in sexOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="birthday" label="出生年月">
+                <el-date-picker
+                    v-model="formData.birthday"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                >
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="work" label="单位">
+                <el-input v-model="formData.work"></el-input>
+            </el-form-item>
+            <el-form-item prop="academicQualification" label="学历">
+                <el-input v-model="formData.academicQualification"></el-input>
+            </el-form-item>
+            <el-form-item prop="jobTitle" label="职称">
+                <el-input v-model="formData.jobTitle"></el-input>
+            </el-form-item>
+            <el-form-item prop="position" label="职位">
+                <el-input v-model="formData.position"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="电话">
+                <el-input v-model="formData.phone"></el-input>
+            </el-form-item>
+            <el-form-item prop="email" label="邮箱">
+                <el-input v-model="formData.email"></el-input>
+            </el-form-item>
+            <el-form-item prop="address" label="通讯地址">
+                <el-input v-model="formData.address"></el-input>
+            </el-form-item>
+            <el-form-item prop="affiliation" label="研究方向">
+                <el-radio-group v-model="formData.affiliation">
+                    <el-radio v-for="item in affiliations" :key="item.value" :label="item.value">
+                        {{ item.label }}
+                    </el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item prop="field" label="专业领域">
+                <el-select
+                    v-model="formData.field"
+                    multiple
+                    clearable
+                    filterable
+                    placeholder="请选择"
+                    style="width: 100%"
+                >
+                    <el-option v-for="item in fieldOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="selfIntroduction" label="个人简介">
+                <el-input type="textarea" v-model="formData.selfIntroduction" :rows="10"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'ExpertEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('expert/get/' + this.$route.query.id)
+                .then(res => {
+                    if (!res.avatar) {
+                        res.avatar =
+                            'https://zhirongip.oss-cn-hangzhou.aliyuncs.com/image/2021-08-13-09-59-23yoEbtbgH.png';
+                        if (res.sex == '女') {
+                            res.avatar =
+                                'https://zhirongip.oss-cn-hangzhou.aliyuncs.com/image/2021-08-13-09-59-33aDGeVuix.png';
+                        }
+                    }
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .post('/setting/byFlag', { flag: 1 })
+            .then(res => {
+                if (res.length > 0) {
+                    res.forEach(item => {
+                        this.fieldOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post('/setting/byFlag', { flag: 15 })
+            .then(res => {
+                if (res.length > 0) {
+                    res.forEach(item => {
+                        this.affiliations.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                avatar: 'https://zhirongip.oss-cn-hangzhou.aliyuncs.com/image/2021-08-13-09-59-23yoEbtbgH.png'
+            },
+            rules: {
+                phone: [
+                    {
+                        pattern: /^1[3-9]\d{9}$/,
+                        message: '请输入正确的手机号',
+                        trigger: 'blur'
+                    }
+                ],
+                email: [
+                    {
+                        type: 'email',
+                        message: '请输入正确的邮箱地址',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            sexOptions: [
+                { label: '男', value: '男' },
+                { label: '女', value: '女' }
+            ],
+            fieldOptions: [],
+            affiliations: [],
+            avatars: [
+                'https://zhirongip.oss-cn-hangzhou.aliyuncs.com/image/2021-08-13-09-59-23yoEbtbgH.png',
+                'https://zhirongip.oss-cn-hangzhou.aliyuncs.com/image/2021-08-13-09-59-33aDGeVuix.png'
+            ]
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/expert/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/expert/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        },
+        chageAvatar(res) {
+            let avatar = this.formData.avatar;
+            if (res == '男' && (avatar == this.avatars[1] || avatar == '')) {
+                this.formData.avatar = this.avatars[0];
+            } else if (res == '女' && (avatar == this.avatars[0] || avatar == '')) {
+                this.formData.avatar = this.avatars[1];
+            }
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

+ 332 - 0
src/main/vue/src/views/ExpertList.vue

@@ -0,0 +1,332 @@
+<template>
+    <div class="list-view">
+        <page-title> </page-title>
+        <div class="filters-container">
+            <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
+                新增
+            </el-button>
+            <el-button
+                @click="download"
+                icon="el-icon-download"
+                :loading="downloading"
+                :disabled="fetchingData || totalElements < 1"
+                class="filter-item"
+            >
+                导出
+            </el-button>
+            <el-upload
+                :action="uploadUrl"
+                :before-upload="beforeUpload"
+                :headers="headers"
+                :show-file-list="false"
+                ref="upload"
+                :on-success="onSuccess"
+                class="uploader"
+                :on-error="onfail"
+            >
+                <el-button icon="el-icon-upload2" slot="trigger" size="small" class="filter-item">导入</el-button>
+            </el-upload>
+            <setting-select name="专业领域" :flag="1" v-model="field" @input="getData"></setting-select>
+            <setting-select name="研究方向" :flag="15" v-model="affiliation" @input="getData"></setting-select>
+            <el-select v-model="sex" @change="getData" clearable class="filter-item" placeholder="请选择性别">
+                <el-option v-for="item in sexOptions" :key="item" :value="item" :label="item"></el-option>
+            </el-select>
+            <el-input
+                v-model="academicQualification"
+                clearable
+                class="filter-item"
+                @keyup.enter.native="getData"
+                placeholder="请输入学历"
+            ></el-input>
+            <el-input
+                v-model="jobTitle"
+                clearable
+                class="filter-item"
+                @keyup.enter.native="getData"
+                placeholder="请输入职称"
+            ></el-input>
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="60"> </el-table-column>
+            <el-table-column prop="avatar" label="照片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.avatar"
+                        fit="cover"
+                        :preview-src-list="[row.avatar]"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="name" label="姓名"> </el-table-column>
+            <el-table-column prop="sex" label="性别"> </el-table-column>
+            <el-table-column prop="birthday" label="出生年月"> </el-table-column>
+            <el-table-column prop="work" label="单位"> </el-table-column>
+            <el-table-column prop="academicQualification" label="学历"> </el-table-column>
+            <el-table-column prop="jobTitle" label="职称"> </el-table-column>
+            <el-table-column prop="position" label="职位"> </el-table-column>
+            <el-table-column prop="phone" label="电话" min-width="100"> </el-table-column>
+            <el-table-column prop="email" label="邮箱" min-width="100"> </el-table-column>
+            <el-table-column prop="address" label="通讯地址"> </el-table-column>
+            <el-table-column prop="affiliationName" label="研究方向"> </el-table-column>
+            <el-table-column prop="fieldName" label="专业领域" show-overflow-tooltip min-width="150">
+                <template slot-scope="{ row }">
+                    <span>{{ row.fieldName.join(',') }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+import SettingSelect from '../components/SettingSelect.vue';
+import resolveUrl from 'resolve-url';
+
+export default {
+    name: 'ExpertList',
+    components: { SettingSelect },
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/expert/all',
+            downloading: false,
+            sexOptions: ['男', '女'],
+            affiliation: '',
+            field: '',
+            sex: '',
+            academicQualification: '',
+            jobTitle: '',
+            uploadUrl: ''
+        };
+    },
+    created() {
+        this.uploadUrl = resolveUrl(this.$baseUrl, 'expert/upload');
+    },
+    computed: {
+        headers() {
+            return {
+                Authorization: 'Bearer ' + localStorage.getItem('token')
+            };
+        },
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        getData() {
+            this.tableData = [];
+            let urlQuery = { ...this.$route.query };
+            delete urlQuery.sort;
+            delete urlQuery.page;
+            delete urlQuery.size;
+            let data = {
+                page: this.page - 1,
+                size: this.pageSize,
+                sort: this.sortStr,
+                query: urlQuery
+            };
+            if (this.beforeGetData) {
+                let mergeData = this.beforeGetData();
+                if (mergeData) {
+                    data = { ...data, ...mergeData };
+                }
+            }
+            this.fetchingData = true;
+            this.$http
+                .post(this.url, data, { body: 'json' })
+                .then(res => {
+                    this.fetchingData = false;
+                    this.tableData = res.content;
+                    this.totalPages = res.totalPages;
+                    this.totalElements = res.totalElements;
+                    if (this.afterGetData) {
+                        this.afterGetData(res);
+                    }
+                })
+                .catch(e => {
+                    this.fetchingData = false;
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        },
+        sexFormatter(row, column, cellValue, index) {
+            let selectedOption = this.sexOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return {
+                sort: 'createdAt,desc',
+                search: this.search,
+                query: {
+                    field: this.field,
+                    affiliation: this.affiliation,
+                    sex: this.sex,
+                    academicQualification: this.academicQualification,
+                    jobTitle: this.jobTitle
+                }
+            };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/expertEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/expertEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/expert/excel', {
+                    responseType: 'blob',
+                    params: {
+                        size: 10000,
+                        query: {
+                            field: this.field,
+                            affiliation: this.affiliation,
+                            sex: this.sex,
+                            academicQualification: this.academicQualification,
+                            jobTitle: this.jobTitle
+                        }
+                    }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/expert/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        upload() {},
+        onfail(e) {
+            console.log(e);
+            this.$message.error('失败');
+            this.getData();
+        },
+        onSuccess() {
+            this.$message.success('上传成功');
+            this.getData();
+        },
+        beforeUpload() {
+            return this.$confirm('确认要导入文件数据吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.uploader {
+    display: inline-block;
+    margin: 0 10px;
+}
+</style>