智能预问诊

prec-service/src/main/java/com/diagbot/dto/PhysicalInfoDTO.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 体质名称
+ * @author: gaodm
+ * @time: 2019/5/30 11:20
+ */
+@Getter
+@Setter
+public class PhysicalInfoDTO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 体质名称
+     */
+    private String physical;
+
+    /**
+     * 体质描述
+     */
+    private String description;
+}

prec-service/src/main/java/com/diagbot/dto/SearchEvaluatorDTO.java

@@ -0,0 +1,71 @@
+package com.diagbot.dto;
+
+import com.diagbot.enums.SexEnum;
+import com.diagbot.util.ListUtil;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/5/30 10:53
+ */
+
+@Getter
+@Setter
+public class SearchEvaluatorDTO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 性别(1：男 2：女)
+     */
+    private Integer sex;
+
+    /**
+     * 性别名称(1：男 2：女)
+     */
+    private String sexName;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 体质结果
+     */
+    private String physicalRes;
+
+    /**
+     * 需要显示的体质逗号隔开
+     */
+    private String physicalTypes;
+
+    public String getSexName(){
+        return SexEnum.getName(this.getSex());
+    }
+
+    //体质显示列表
+    private List<PhysicalInfoDTO> physicalInfoDTOList = ListUtil.newArrayList();
+}

prec-service/src/main/java/com/diagbot/entity/Evaluator.java

@@ -1,11 +1,12 @@
 package com.diagbot.entity;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -34,12 +35,12 @@ public class Evaluator implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -125,18 +126,18 @@ public class Evaluator implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

prec-service/src/main/java/com/diagbot/entity/User.java

@@ -9,19 +9,19 @@ import java.util.Date;
 
 /**
  * <p>
- * 系统用户表
+ * 体质基本信息表
  * </p>
  *
  * @author gaodm
- * @since 2018-08-30
+ * @since 2019-05-30
  */
-@TableName("sys_user")
-public class User implements Serializable {
+@TableName("prec_physical_info")
+public class PhysicalInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 用户ID
+     * 主键
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -52,15 +52,14 @@ public class User implements Serializable {
     private String modifier;
 
     /**
-     * 用户密码
+     * 体质名称
      */
-    private String password;
+    private String physical;
 
     /**
-     * 用户名
+     * 体质描述
      */
-    private String username;
-
+    private String description;
 
     public Long getId() {
         return id;
@@ -69,7 +68,6 @@ public class User implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
-
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -77,7 +75,6 @@ public class User implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -85,7 +82,6 @@ public class User implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -93,7 +89,6 @@ public class User implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
-
     public String getCreator() {
         return creator;
     }
@@ -101,7 +96,6 @@ public class User implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
-
     public String getModifier() {
         return modifier;
     }
@@ -109,34 +103,32 @@ public class User implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
-
-    public String getPassword() {
-        return password;
+    public String getPhysical() {
+        return physical;
     }
 
-    public void setPassword(String password) {
-        this.password = password;
+    public void setPhysical(String physical) {
+        this.physical = physical;
     }
-
-    public String getUsername() {
-        return username;
+    public String getDescription() {
+        return description;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setDescription(String description) {
+        this.description = description;
     }
 
     @Override
     public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", password=" + password +
-                ", username=" + username +
-                "}";
+        return "PhysicalInfo{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", physical=" + physical +
+        ", description=" + description +
+        "}";
     }
 }

prec-service/src/main/java/com/diagbot/enums/SexEnum.java

@@ -0,0 +1,50 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author gaodm
+ * @Description: TODO
+ * @date 2018年12月11日 下午2:31:42
+ */
+public enum SexEnum implements KeyedNamed {
+    Disable(1, "男"),
+    Enable(2, "女");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    SexEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static SexEnum getEnum(Integer key) {
+        for (SexEnum item : SexEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        SexEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

prec-service/src/main/java/com/diagbot/facade/EnumsDataFacade.java

@@ -0,0 +1,30 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.EnumsDataService;
+import com.diagbot.util.EnumEntriesBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 枚举数据装饰类
+ * @author: gaodm
+ * @time: 2018/9/19 14:28
+ */
+@Component
+public class EnumsDataFacade {
+    @Autowired
+    private EnumsDataService enumsDataService;
+
+    /**
+     * 用户枚举数据获取
+     *
+     * @return 用户枚举类map
+     */
+    public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
+        return enumsDataService.getEnumsData();
+    }
+
+}

prec-service/src/main/java/com/diagbot/facade/EvaluatorFacade.java

@@ -1,12 +1,82 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.SearchEvaluatorDTO;
+import com.diagbot.dto.PhysicalInfoDTO;
+import com.diagbot.entity.Evaluator;
+import com.diagbot.entity.PhysicalInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.SexEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.EvaluatorServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RegexValidateUtil;
+import com.diagbot.vo.AddEvaluatorVO;
+import com.diagbot.vo.SearchEvaluatorVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description:
  * @author: gaodm
  * @time: 2019/5/30 10:41
  */
 @Component
-public class EvaluatorFacade {
+public class EvaluatorFacade extends EvaluatorServiceImpl {
+    @Autowired
+    private PhysicalInfoFacade physicalInfoFacade;
+
+    public Boolean addEvaluator(AddEvaluatorVO addDeptInfoVO) {
+        //参数验证
+        if (!RegexValidateUtil.checkMobileNumber(addDeptInfoVO.getPhone())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,
+                    "请输入正确的手机号");
+        }
+        if (null == SexEnum.getName(addDeptInfoVO.getSex())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,
+                    "请输入正确的性别类型");
+        }
+
+        Evaluator evaluator = new Evaluator();
+        BeanUtil.copyProperties(addDeptInfoVO, evaluator);
+        //计算
+        //保存结果
+        Date now = DateUtil.now();
+        evaluator.setIsDeleted(IsDeleteEnum.N.getKey());
+        evaluator.setGmtCreate(now);
+        evaluator.setGmtModified(now);
+        Boolean res = this.save(evaluator);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "评估结果提交失败！");
+        }
+        return res;
+    }
+
+    public IPage<SearchEvaluatorDTO> getEvaluatorPage(SearchEvaluatorVO searchEvaluatorVO) {
+        IPage<SearchEvaluatorDTO> res = this.getEvaluators(searchEvaluatorVO);
+        if (ListUtil.isNotEmpty(res.getRecords())){
+            Map<String, PhysicalInfo> pMap = physicalInfoFacade.getPhysicalMap();
+
+            for (SearchEvaluatorDTO searchEvaluatorDTO : res.getRecords()){
+                String[] physicalTypes = searchEvaluatorDTO.getPhysicalTypes().split(",");
+                List<PhysicalInfoDTO> physicalInfoDTOList = ListUtil.newArrayList();
+                for (String s : physicalTypes){
+                    PhysicalInfoDTO  physicalInfoDTO = new PhysicalInfoDTO();
+                    if (null != pMap.get(s)){
+                        BeanUtil.copyProperties(pMap.get(s), physicalInfoDTO);
+                        physicalInfoDTOList.add(physicalInfoDTO);
+                    }
+                }
+                searchEvaluatorDTO.setPhysicalInfoDTOList(physicalInfoDTOList);
+            }
+        }
+        return res;
+    }
 }

prec-service/src/main/java/com/diagbot/facade/PhysicalInfoFacade.java

@@ -0,0 +1,29 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.PhysicalInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.PhysicalInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/5/30 12:22
+ */
+@Component
+public class PhysicalInfoFacade extends PhysicalInfoServiceImpl {
+    public Map<String, PhysicalInfo> getPhysicalMap(){
+        QueryWrapper<PhysicalInfo> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<PhysicalInfo> list = this.list(queryWrapper);
+        Map<String, PhysicalInfo> map = new HashMap();
+        map = list.stream().collect(Collectors.toMap(k->k.getId().toString(), v->v));
+        return map;
+    }
+}

prec-service/src/main/java/com/diagbot/facade/SysLogFacade.java

@@ -1,13 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.SysLogServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 用户日志业务层
- * @author: gaodm
- * @time: 2018/8/6 9:11
- */
-@Component
-public class SysLogFacade extends SysLogServiceImpl {
-}

prec-service/src/main/java/com/diagbot/mapper/EvaluatorMapper.java

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.SearchEvaluatorDTO;
 import com.diagbot.entity.Evaluator;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.SearchEvaluatorVO;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EvaluatorMapper extends BaseMapper<Evaluator> {
 
+    IPage<SearchEvaluatorDTO> getEvaluators(SearchEvaluatorVO searchEvaluatorVO);
 }

prec-service/src/main/java/com/diagbot/mapper/PhysicalInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.PhysicalInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 体质基本信息表 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-05-30
+ */
+public interface PhysicalInfoMapper extends BaseMapper<PhysicalInfo> {
+
+}

prec-service/src/main/java/com/diagbot/mapper/SysLogMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.SysLog;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface SysLogMapper extends BaseMapper<SysLog> {
-
-}

prec-service/src/main/java/com/diagbot/service/EnumsDataService.java

@@ -0,0 +1,20 @@
+package com.diagbot.service;
+
+import com.diagbot.util.EnumEntriesBuilder;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 枚举数据接口类
+ * @author: gaodm
+ * @time: 2018/9/19 14:25
+ */
+public interface EnumsDataService {
+    /**
+     * 用户枚举数据获取
+     *
+     * @return 用户枚举类map
+     */
+    Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData();
+}

prec-service/src/main/java/com/diagbot/service/EvaluatorService.java

@@ -1,7 +1,10 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.SearchEvaluatorDTO;
 import com.diagbot.entity.Evaluator;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.SearchEvaluatorVO;
 
 /**
  * <p>
@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface EvaluatorService extends IService<Evaluator> {
 
+    IPage<SearchEvaluatorDTO> getEvaluators(SearchEvaluatorVO searchEvaluatorVO);
+
 }

prec-service/src/main/java/com/diagbot/service/PhysicalInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.PhysicalInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 体质基本信息表 服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-05-30
+ */
+public interface PhysicalInfoService extends IService<PhysicalInfo> {
+
+}

prec-service/src/main/java/com/diagbot/service/SysLogService.java

@@ -1,15 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.SysLog;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface SysLogService extends IService<SysLog> {
-}

prec-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -0,0 +1,31 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.enums.SexEnum;
+import com.diagbot.service.EnumsDataService;
+import com.diagbot.util.EnumEntriesBuilder;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 枚举数据接口是实现类
+ * @author: gaodm
+ * @time: 2018/9/19 14:27
+ */
+@Service
+public class EnumsDataServiceImpl implements EnumsDataService {
+
+    /**
+     * 用户枚举数据获取
+     *
+     * @return 用户枚举类map
+     */
+    @Override
+    public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
+        Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
+                .addEnums("sexEnum", SexEnum.values())
+                .build();
+        return enumMap;
+    }
+}

prec-service/src/main/java/com/diagbot/service/impl/EvaluatorServiceImpl.java

@@ -1,9 +1,12 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.SearchEvaluatorDTO;
 import com.diagbot.entity.Evaluator;
 import com.diagbot.mapper.EvaluatorMapper;
 import com.diagbot.service.EvaluatorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.SearchEvaluatorVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class EvaluatorServiceImpl extends ServiceImpl<EvaluatorMapper, Evaluator> implements EvaluatorService {
 
+    public IPage<SearchEvaluatorDTO> getEvaluators(SearchEvaluatorVO searchEvaluatorVO) {
+        return baseMapper.getEvaluators(searchEvaluatorVO);
+    }
+
 }

prec-service/src/main/java/com/diagbot/service/impl/PhysicalInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.PhysicalInfo;
+import com.diagbot.mapper.PhysicalInfoMapper;
+import com.diagbot.service.PhysicalInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 体质基本信息表 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-05-30
+ */
+@Service
+public class PhysicalInfoServiceImpl extends ServiceImpl<PhysicalInfoMapper, PhysicalInfo> implements PhysicalInfoService {
+
+}

prec-service/src/main/java/com/diagbot/service/impl/SysLogServiceImpl.java

@@ -1,19 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.SysLog;
-import com.diagbot.mapper.SysLogMapper;
-import com.diagbot.service.SysLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-@Service
-public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implements SysLogService {
-}

prec-service/src/main/java/com/diagbot/vo/AddEvaluatorVO.java

@@ -0,0 +1,78 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/5/30 10:53
+ */
+
+@Getter
+@Setter
+public class AddEvaluatorVO {
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "请输入姓名")
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "请输手机号")
+    private String phone;
+
+    /**
+     * 性别(1：男 2：女)
+     */
+    @NotNull(message = "请输入性别")
+    private Integer sex;
+
+    /**
+     * 年龄
+     */
+    @NotNull(message = "请输入年龄")
+    private Integer age;
+
+    /**
+     * 平和质转化分
+     */
+    @NotNull(message = "请输入平和质转化分")
+    private BigDecimal mildValue;
+
+    /**
+     * 气虚质转化分
+     */
+    @NotNull(message = "请输入气虚质转化分")
+    private BigDecimal faintValue;
+
+    /**
+     * 湿滞质转化分
+     */
+    @NotNull(message = "请输入湿滞质转化分")
+    private BigDecimal wetValue;
+
+    /**
+     * 心肝火旺质转化分
+     */
+    @NotNull(message = "请输入心肝火旺质转化分")
+    private BigDecimal heartValue;
+
+    /**
+     * 积滞质转化分
+     */
+    @NotNull(message = "请输入积滞质转化分")
+    private BigDecimal stagnantValue;
+
+    /**
+     * 异禀体质转化分
+     */
+    @NotNull(message = "请输入异禀体质转化分")
+    private BigDecimal exceptValue;
+}

prec-service/src/main/java/com/diagbot/vo/SearchEvaluatorVO.java

@@ -0,0 +1,34 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/5/30 10:53
+ */
+
+@Getter
+@Setter
+public class SearchEvaluatorVO extends Page {
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 性别(1：男 2：女)
+     */
+    private Integer sex;
+}

prec-service/src/main/java/com/diagbot/vo/SysLogVo.java

@@ -1,21 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/8/6 10:16
- */
-@Getter
-@Setter
-public class SysLogVo {
-    private Date createDate;
-    private String ip;
-    private String method;
-    private String operation;
-    private String params;
-}

prec-service/src/main/java/com/diagbot/web/EnumsController.java

@@ -0,0 +1,35 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.EnumsDataFacade;
+import com.diagbot.util.EnumEntriesBuilder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 智能预问诊枚举数据获取类
+ * @author: gaodm
+ * @time: 2018/9/19 14:32
+ */
+@RestController
+@Api(value = "智能预问诊枚举数据获取API", tags = { "智能预问诊枚举数据获取API" })
+@SuppressWarnings("unchecked")
+public class EnumsController {
+    @Autowired
+    private EnumsDataFacade enumsDataFacade;
+
+    @ApiOperation(value = "智能预问诊枚举数据获取[by:gaodm]",
+            notes = "智能预问诊枚举数据获取")
+    @PostMapping("/getPrecEnumsData")
+    @SysLogger("getPrecEnumsData")
+    public RespDTO<Map<String, List<EnumEntriesBuilder.Entry>>> getEnumsData() {
+        return RespDTO.onSuc(enumsDataFacade.getEnumsData());
+    }
+}

prec-service/src/main/java/com/diagbot/web/EvaluatorController.java

@@ -1,10 +1,23 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SearchEvaluatorDTO;
 import com.diagbot.facade.EvaluatorFacade;
+import com.diagbot.vo.AddEvaluatorVO;
+import com.diagbot.vo.SearchEvaluatorVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
 
 /**
  * <p>
@@ -14,10 +27,39 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @author gaodm
  * @since 2019-05-30
  */
-@Controller
+@RestController
 @RequestMapping("/evaluator")
+@SuppressWarnings("unchecked")
+@Api(value = "体质评估API", tags = { "体质评估API" })
 public class EvaluatorController {
     @Autowired
     private EvaluatorFacade evaluatorFacade;
 
+    @ApiOperation(value = "体质评估——添加[by:gaodm]",
+            notes = "name: 姓名,必填<br>" +
+                    "phone: 手机号,必填<br>" +
+                    "sex: 性别(1：男 2：女),必填<br>" +
+                    "age: 年龄,必填<br>" +
+                    "mildValue: 平和质转化分,必填<br>" +
+                    "faintValue: 气虚质转化分,必填<br>" +
+                    "wetValue: 湿滞质转化分,必填<br>" +
+                    "heartValue: 心肝火旺质转化分,必填<br>" +
+                    "stagnantValue: 积滞质转化分,必填<br>" +
+                    "exceptValue: 异禀体质转化分,必填")
+    @PostMapping("/addEvaluator")
+    @SysLogger("addEvaluator")
+    @Transactional
+    public RespDTO<Boolean> addEvaluator(@RequestBody @Valid AddEvaluatorVO addDeptInfoVO){
+        return RespDTO.onSuc(evaluatorFacade.addEvaluator(addDeptInfoVO));
+    }
+
+    @ApiOperation(value = "体质评估——获取体质评估分页信息[by:gaodm]",
+            notes = "name: 姓名<br>" +
+                    "phone: 手机号<br>" +
+                    "sex: 性别(1：男 2：女)")
+    @PostMapping("/getEvaluatorPage")
+    @SysLogger("getEvaluatorPage")
+    public RespDTO<IPage<SearchEvaluatorDTO>> getEvaluatorPage(@RequestBody SearchEvaluatorVO searchEvaluatorVO){
+        return RespDTO.onSuc(evaluatorFacade.getEvaluatorPage(searchEvaluatorVO));
+    }
 }

prec-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -1,110 +0,0 @@
-package com.diagbot.web;
-
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.SysLog;
-import com.diagbot.facade.SysLogFacade;
-import com.diagbot.vo.SysLogVo;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-
-/**
- * @Description: 日志操作控制层
- * @author: gaodm
- * @time: 2018/8/30 10:12
- */
-@RestController
-@RequestMapping("/log")
-public class SysLogController {
-
-    @Autowired
-    private SysLogFacade sysLogFacade;
-
-    /**
-     * 新增日志信息
-     *
-     * @param sysLogVo 新增日志输入参数
-     * @return 新增日志是否成功
-     */
-    @ApiOperation(value = "添加日志", notes = "添加日志")
-    @PostMapping("/add")
-    @SysLogger("postLog")
-    public RespDTO add(@RequestBody SysLogVo sysLogVo) {
-        //初始化新增日志信息
-        SysLog sysLog = new SysLog();
-        sysLog.setGmtCreate(new Date());
-        sysLog.setIp(sysLogVo.getIp());
-        sysLog.setMethod(sysLogVo.getMethod());
-        sysLog.setOperation(sysLogVo.getOperation());
-        sysLog.setParams(sysLogVo.getParams());
-        return RespDTO.onSuc(sysLogFacade.save(sysLog) ? "添加成功" : "添加失败");
-    }
-
-    /**
-     * 删除日志
-     *
-     * @param id 日志信息ID
-     * @return 删除是否成功
-     */
-    @ApiOperation(value = "删除日志", notes = "删除日志")
-    @DeleteMapping("/delete/{id}")
-    @SysLogger("deleteLog")
-    public RespDTO delete(@PathVariable(value = "id") Integer id) {
-        return RespDTO.onSuc(sysLogFacade.removeById(id) ? "删除成功" : "删除失败");
-    }
-
-    /**
-     * 修改日志
-     *
-     * @param sysLog 修改日志输入参数
-     * @return 修改是否成功
-     */
-    @ApiOperation(value = "修改日志", notes = "修改日志")
-    @PostMapping("/update")
-    @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog sysLog) {
-        return RespDTO.onSuc(sysLogFacade.updateById(sysLog) ? "修改成功" : "修改失败");
-    }
-
-    /**
-     * 获取日志列表
-     *
-     * @return 日志列信息
-     */
-    @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
-    @GetMapping("/list")
-    @SysLogger("listLog")
-    public RespDTO list() {
-        Wrapper<SysLog> wrapper = new QueryWrapper<>();
-        return RespDTO.onSuc(sysLogFacade.list(wrapper));
-    }
-
-    /**
-     * 获取日志翻页信息
-     *
-     * @return 日志翻页信息
-     */
-    @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
-    @GetMapping("/page")
-    @SysLogger("pageLog")
-    public RespDTO page() {
-        //初始化日志翻页参数
-        IPage<SysLog> wrapper = new Page<>();
-        return RespDTO.onSuc(sysLogFacade.page(wrapper, null));
-    }
-}
-

prec-service/src/main/resources/mapper/EvaluatorMapper.xml

@@ -24,4 +24,29 @@
         <result column="physical_types" property="physicalTypes" />
     </resultMap>
 
+
+    <select id="getEvaluators" resultType="com.diagbot.dto.SearchEvaluatorDTO">
+        SELECT
+        a.id as id,
+        a.gmt_create as gmtCreate,
+        a.name as name,
+        a.phone as phone,
+        a.sex as sex,
+        a.age as age,
+        a.physical_res as physicalRes,
+        a.physical_types as physicalTypes
+        FROM prec_evaluator a
+        WHERE
+        a.is_deleted = 'N'
+        <if test="name != null and name != ''">
+            AND a.`name` LIKE CONCAT('%',#{name},'%')
+        </if>
+        <if test="phone != null and phone != ''">
+            AND a.`phone` LIKE CONCAT('%',#{phone},'%')
+        </if>
+        <if test="sex != null">
+            AND a.`sex` = #{sex}
+        </if>
+        ORDER BY a.gmt_create DESC
+    </select>
 </mapper>

prec-service/src/main/resources/mapper/PhysicalInfoMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.PhysicalInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.PhysicalInfo">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="physical" property="physical" />
+        <result column="description" property="description" />
+    </resultMap>
+
+</mapper>

prec-service/src/main/resources/mapper/SysLogMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.SysLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
-        <id column="id" property="id"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="ip" property="ip"/>
-        <result column="sys_type" property="sysType"/>
-        <result column="method" property="method"/>
-        <result column="operation" property="operation"/>
-        <result column="params" property="params"/>
-        <result column="username" property="username"/>
-    </resultMap>
-
-</mapper>

prec-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "prec_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "prec_evaluator" }); // 需要生成的表
+        strategy.setInclude(new String[] { "prec_physical_info" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);