jiangjiazhi / center

Download as
Browse Code »

Commit cffa813e807835afc4abc15ac9e583267bc5e6c7

Authored by maliang
1 parent 5d4f18109e
Exists in master

添加诊断信息

Showing 17 changed files with 504 additions and 32 deletions

parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.java View file @ cffa813
... ... @@ -12,8 +12,8 @@
12 12 * Mapper接口
13 13 * </p>
14 14 *
15   - * @author maliang
16   - * @since 2017-03-28
  15 + * @author fangcheng
  16 + * @since 2017-03-30
17 17 */
18 18 @Repository
19 19 public interface DiagnoseConfMapper extends BaseMapper<DiagnoseConf> {
parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseSourceMapper.java View file @ cffa813
  1 +package com.lyms.base.common.dao.conf;
  2 +
  3 +import com.lyms.base.common.entity.conf.DiagnoseSource;
  4 +import com.baomidou.mybatisplus.mapper.BaseMapper;
  5 +import org.springframework.stereotype.Repository;
  6 +import java.io.Serializable;
  7 +/**
  8 + * <p>
  9 + * Mapper接口
  10 + * </p>
  11 + *
  12 + * @author fangcheng
  13 + * @since 2017-03-30
  14 + */
  15 +@Repository
  16 +public interface DiagnoseSourceMapper extends BaseMapper<DiagnoseSource> {
  17 +
  18 + public Integer deleteLogicById(Serializable id);
  19 +
  20 +}
parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseSourceMapper.xml View file @ cffa813
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.lyms.base.common.dao.conf.DiagnoseSourceMapper">
  4 +
  5 + <!-- 通用查询映射结果 -->
  6 + <resultMap id="BaseResultMap" type="com.lyms.base.common.entity.conf.DiagnoseSource">
  7 + <result column="ID" property="id" />
  8 + <result column="NAME" property="name" />
  9 + <result column="TYPE" property="type" />
  10 + <result column="ENABLE" property="enable" />
  11 + </resultMap>
  12 +
  13 + <!-- 通用查询结果列 -->
  14 + <sql id="Base_Column_List">
  15 + ID AS id, NAME AS name, TYPE AS type, ENABLE AS enable
  16 + </sql>
  17 +</mapper>
parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseVersionMapper.java View file @ cffa813
  1 +package com.lyms.base.common.dao.conf;
  2 +
  3 +import com.lyms.base.common.entity.conf.DiagnoseVersion;
  4 +import com.baomidou.mybatisplus.mapper.BaseMapper;
  5 +import org.springframework.stereotype.Repository;
  6 +import java.io.Serializable;
  7 +/**
  8 + * <p>
  9 + * Mapper接口
  10 + * </p>
  11 + *
  12 + * @author fangcheng
  13 + * @since 2017-03-30
  14 + */
  15 +@Repository
  16 +public interface DiagnoseVersionMapper extends BaseMapper<DiagnoseVersion> {
  17 +
  18 + public Integer deleteLogicById(Serializable id);
  19 +
  20 +}
parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseVersionMapper.xml View file @ cffa813
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.lyms.base.common.dao.conf.DiagnoseVersionMapper">
  4 +
  5 + <!-- 通用查询映射结果 -->
  6 + <resultMap id="BaseResultMap" type="com.lyms.base.common.entity.conf.DiagnoseVersion">
  7 + <result column="ID" property="id" />
  8 + <result column="NAME" property="name" />
  9 + <result column="ENABLE" property="enable" />
  10 + </resultMap>
  11 +
  12 + <!-- 通用查询结果列 -->
  13 + <sql id="Base_Column_List">
  14 + ID AS id, NAME AS name, ENABLE AS enable
  15 + </sql>
  16 +</mapper>
parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseSource.java View file @ cffa813
  1 +package com.lyms.base.common.entity.conf;
  2 +
  3 +import com.baomidou.mybatisplus.annotations.TableId;
  4 +import com.baomidou.mybatisplus.annotations.TableField;
  5 +import com.baomidou.mybatisplus.annotations.TableName;
  6 +import java.io.Serializable;
  7 +
  8 +/**
  9 + * <p>
  10 + * 诊断项定义资源表
  11 + * </p>
  12 + *
  13 + * @author fangcheng
  14 + * @since 2017-03-30
  15 + */
  16 +@TableName("DIAGNOSE_SOURCE")
  17 +public class DiagnoseSource implements Serializable {
  18 +
  19 + private static final long serialVersionUID = 1L;
  20 +
  21 + /**
  22 + *
  23 + */
  24 + @TableField(value="ID")
  25 + private String id;
  26 + /**
  27 + * 诊断项名称
  28 + */
  29 + @TableField(value="NAME")
  30 + private String name;
  31 + /**
  32 + * 诊断所属划分：0所有，1妇女，2男性，3儿童
  33 + */
  34 + @TableField(value="TYPE")
  35 + private String type;
  36 + /**
  37 + * 是否启用，默认1启用
  38 + */
  39 + @TableField(value="ENABLE")
  40 + private Integer enable;
  41 +
  42 +
  43 + public String getId() {
  44 + return id;
  45 + }
  46 +
  47 + public void setId(String id) {
  48 + this.id = id;
  49 + }
  50 +
  51 + public String getName() {
  52 + return name;
  53 + }
  54 +
  55 + public void setName(String name) {
  56 + this.name = name;
  57 + }
  58 +
  59 + public String getType() {
  60 + return type;
  61 + }
  62 +
  63 + public void setType(String type) {
  64 + this.type = type;
  65 + }
  66 +
  67 + public Integer getEnable() {
  68 + return enable;
  69 + }
  70 +
  71 + public void setEnable(Integer enable) {
  72 + this.enable = enable;
  73 + }
  74 +
  75 +}
parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseVersion.java View file @ cffa813
  1 +package com.lyms.base.common.entity.conf;
  2 +
  3 +import com.baomidou.mybatisplus.annotations.TableId;
  4 +import com.baomidou.mybatisplus.annotations.TableField;
  5 +import com.baomidou.mybatisplus.annotations.TableName;
  6 +import java.io.Serializable;
  7 +
  8 +/**
  9 + * <p>
  10 + * 诊断版本表
  11 + * </p>
  12 + *
  13 + * @author fangcheng
  14 + * @since 2017-03-30
  15 + */
  16 +@TableName("DIAGNOSE_VERSION")
  17 +public class DiagnoseVersion implements Serializable {
  18 +
  19 + private static final long serialVersionUID = 1L;
  20 +
  21 + /**
  22 + *
  23 + */
  24 + @TableField(value="ID")
  25 + private String id;
  26 + /**
  27 + * 高危版本名称
  28 + */
  29 + @TableField(value="NAME")
  30 + private String name;
  31 + /**
  32 + * 是否启用
  33 + */
  34 + @TableField(value="ENABLE")
  35 + private Integer enable;
  36 +
  37 +
  38 + public String getId() {
  39 + return id;
  40 + }
  41 +
  42 + public void setId(String id) {
  43 + this.id = id;
  44 + }
  45 +
  46 + public String getName() {
  47 + return name;
  48 + }
  49 +
  50 + public void setName(String name) {
  51 + this.name = name;
  52 + }
  53 +
  54 + public Integer getEnable() {
  55 + return enable;
  56 + }
  57 +
  58 + public void setEnable(Integer enable) {
  59 + this.enable = enable;
  60 + }
  61 +
  62 +}
parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseConfService.java View file @ cffa813
1 1 package com.lyms.base.common.service.conf;
2 2  
3   -import java.io.Serializable;
4   -
5 3 import com.lyms.base.common.entity.conf.DiagnoseConf;
6 4 import com.lyms.web.service.BaseService;
  5 +import java.io.Serializable;
7 6  
8 7 /**
9 8 * <p>
10 9 * 服务类
11 10 * </p>
12 11 *
13   - * @author maliang
14   - * @since 2017-03-28
  12 + * @author fangcheng
  13 + * @since 2017-03-30
15 14 */
16 15 public interface DiagnoseConfService extends BaseService<DiagnoseConf> {
17 16  
18   - /**
19   - * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
20   - * <li>@param id 删除主键id
21   - * <li>@return 大于0修改成功，否则为失败
22   - */
23   - public Integer deleteLogicById(Serializable id);
24   -
  17 + /**
  18 + * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
  19 + * <li>@param id 删除主键id
  20 + * <li>@return 大于0修改成功，否则为失败
  21 + */
  22 + public Integer deleteLogicById(Serializable id);
  23 +
25 24 }
parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseSourceService.java View file @ cffa813
  1 +package com.lyms.base.common.service.conf;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +import com.lyms.base.common.entity.conf.DiagnoseSource;
  7 +import com.lyms.exception.SystemException;
  8 +import com.lyms.web.service.BaseService;
  9 +
  10 +/**
  11 + * <p>
  12 + * 服务类
  13 + * </p>
  14 + *
  15 + * @author fangcheng
  16 + * @since 2017-03-30
  17 + */
  18 +public interface DiagnoseSourceService extends BaseService<DiagnoseSource> {
  19 +
  20 + /**
  21 + * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
  22 + * <li>@param id 删除主键id
  23 + * <li>@return 大于0修改成功，否则为失败
  24 + */
  25 + public Integer deleteLogicById(Serializable id);
  26 +
  27 + /**
  28 + * <li>@Description:创建诊断资源信息
  29 + * <li>@param highriskSource
  30 + * <li>@return
  31 + * <li>@throws SystemException
  32 + * <li>创建人：maliang
  33 + * <li>创建时间：2017年3月28日
  34 + * <li>修改人：
  35 + * <li>修改时间：
  36 + */
  37 + public String createDiagnoseSource(DiagnoseSource diagnoseSource) throws SystemException;
  38 +
  39 + /**
  40 + * <li>@Description:启用/禁用资源信息
  41 + * <li>@param id
  42 + * <li>@return
  43 + * <li>@throws SystemException
  44 + * <li>创建人：maliang
  45 + * <li>创建时间：2017年3月28日
  46 + * <li>修改人：
  47 + * <li>修改时间：
  48 + */
  49 + public boolean enable(Serializable id) throws SystemException;
  50 +
  51 + /**
  52 + * <li>@Description:获取争端资源信息
  53 + * <li>@return
  54 + * <li>@throws SystemException
  55 + * <li>创建人：maliang
  56 + * <li>创建时间：2017年3月28日
  57 + * <li>修改人：
  58 + * <li>修改时间：
  59 + */
  60 + public List<DiagnoseSource> getDiagnoseSource() throws SystemException;
  61 +
  62 +}
parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseVersionService.java View file @ cffa813
  1 +package com.lyms.base.common.service.conf;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +import com.lyms.base.common.entity.conf.DiagnoseVersion;
  7 +import com.lyms.exception.SystemException;
  8 +import com.lyms.web.service.BaseService;
  9 +
  10 +/**
  11 + * <p>
  12 + * 服务类
  13 + * </p>
  14 + *
  15 + * @author fangcheng
  16 + * @since 2017-03-30
  17 + */
  18 +public interface DiagnoseVersionService extends BaseService<DiagnoseVersion> {
  19 +
  20 + /**
  21 + * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
  22 + * <li>@param id 删除主键id
  23 + * <li>@return 大于0修改成功，否则为失败
  24 + */
  25 + public Integer deleteLogicById(Serializable id);
  26 +
  27 + /**
  28 + * <li>@Description:启用/禁用
  29 + * <li>@param id
  30 + * <li>@return
  31 + * <li>创建人：maliang
  32 + * <li>创建时间：2017年3月28日
  33 + * <li>修改人：
  34 + * <li>修改时间：
  35 + */
  36 + public boolean enable(Serializable id) throws SystemException;
  37 +
  38 + /**
  39 + * <li>@Description:根据ID获取版本信息
  40 + * <li>@param id
  41 + * <li>@return
  42 + * <li>@throws SystemException
  43 + * <li>创建人：maliang
  44 + * <li>创建时间：2017年3月28日
  45 + * <li>修改人：
  46 + * <li>修改时间：
  47 + */
  48 + public List<DiagnoseVersion> getEnableDiagnoseVersionBy(Serializable id) throws SystemException;
  49 +
  50 + /**
  51 + * <li>@Description:添加版本号
  52 + * <li>@param version
  53 + * <li>@return
  54 + * <li>@throws SystemException
  55 + * <li>创建人：maliang
  56 + * <li>创建时间：2017年3月28日
  57 + * <li>修改人：
  58 + * <li>修改时间：
  59 + */
  60 + public String createVersion(DiagnoseVersion version) throws SystemException;
  61 +
  62 +}
parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseConfServiceImpl.java View file @ cffa813
1 1 package com.lyms.base.common.service.conf.impl;
2 2  
3   -import java.io.Serializable;
4   -
5   -import com.baomidou.mybatisplus.service.impl.ServiceImpl;
6   -import com.lyms.base.common.dao.conf.DiagnoseConfMapper;
7 3 import com.lyms.base.common.entity.conf.DiagnoseConf;
  4 +import com.lyms.base.common.dao.conf.DiagnoseConfMapper;
8 5 import com.lyms.base.common.service.conf.DiagnoseConfService;
  6 +import com.baomidou.mybatisplus.service.impl.ServiceImpl;
  7 +import org.springframework.stereotype.Service;
  8 +import java.io.Serializable;
9 9  
10 10 /**
11 11 * <p>
12   - * 服务类
  12 + * 区域组诊断版本项配置表 服务实现类
13 13 * </p>
14 14 *
15   - * @author maliang
16   - * @since 2017-03-28
  15 + * @author fangcheng
  16 + * @since 2017-03-30
17 17 */
18   -public class DiagnoseConfServiceImpl extends ServiceImpl<DiagnoseConfMapper, DiagnoseConf>
19   - implements DiagnoseConfService {
20   -
21   - @Override
22   - public Integer deleteLogicById(Serializable id) {
23   - return null;
  18 +@Service
  19 +public class DiagnoseConfServiceImpl extends ServiceImpl<DiagnoseConfMapper, DiagnoseConf> implements DiagnoseConfService {
  20 +
  21 + public Integer deleteLogicById(Serializable id){
  22 + return baseMapper.deleteLogicById(id);
24 23 }
25   -
26 24 }
parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseSourceServiceImpl.java View file @ cffa813
  1 +package com.lyms.base.common.service.conf.impl;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +import com.baomidou.mybatisplus.service.impl.ServiceImpl;
  9 +import com.lyms.base.common.dao.conf.DiagnoseSourceMapper;
  10 +import com.lyms.base.common.entity.conf.DiagnoseSource;
  11 +import com.lyms.base.common.service.conf.DiagnoseSourceService;
  12 +import com.lyms.exception.SystemException;
  13 +
  14 +/**
  15 + * <p>
  16 + * 诊断项定义资源表 服务实现类
  17 + * </p>
  18 + *
  19 + * @since 2017-03-30
  20 + */
  21 +@Service
  22 +public class DiagnoseSourceServiceImpl extends ServiceImpl<DiagnoseSourceMapper, DiagnoseSource>
  23 + implements DiagnoseSourceService {
  24 +
  25 + public Integer deleteLogicById(Serializable id) {
  26 + return baseMapper.deleteLogicById(id);
  27 + }
  28 +
  29 + @Override
  30 + public String createDiagnoseSource(DiagnoseSource diagnoseSource) throws SystemException {
  31 + // TODO Auto-generated method stub
  32 + return null;
  33 + }
  34 +
  35 + @Override
  36 + public boolean enable(Serializable id) throws SystemException {
  37 + // TODO Auto-generated method stub
  38 + return false;
  39 + }
  40 +
  41 + @Override
  42 + public List<DiagnoseSource> getDiagnoseSource() throws SystemException {
  43 + // TODO Auto-generated method stub
  44 + return null;
  45 + }
  46 +}
parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseVersionServiceImpl.java View file @ cffa813
  1 +package com.lyms.base.common.service.conf.impl;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +import com.baomidou.mybatisplus.service.impl.ServiceImpl;
  9 +import com.lyms.base.common.dao.conf.DiagnoseVersionMapper;
  10 +import com.lyms.base.common.entity.conf.DiagnoseVersion;
  11 +import com.lyms.base.common.service.conf.DiagnoseVersionService;
  12 +import com.lyms.exception.SystemException;
  13 +
  14 +/**
  15 + * <p>
  16 + * 诊断版本表 服务实现类
  17 + * </p>
  18 + *
  19 + * @since 2017-03-30
  20 + */
  21 +@Service
  22 +public class DiagnoseVersionServiceImpl extends ServiceImpl<DiagnoseVersionMapper, DiagnoseVersion>
  23 + implements DiagnoseVersionService {
  24 +
  25 + public Integer deleteLogicById(Serializable id) {
  26 + return baseMapper.deleteLogicById(id);
  27 + }
  28 +
  29 + @Override
  30 + public boolean enable(Serializable id) throws SystemException {
  31 + // TODO Auto-generated method stub
  32 + return false;
  33 + }
  34 +
  35 + @Override
  36 + public List<DiagnoseVersion> getEnableDiagnoseVersionBy(Serializable id) throws SystemException {
  37 + // TODO Auto-generated method stub
  38 + return null;
  39 + }
  40 +
  41 + @Override
  42 + public String createVersion(DiagnoseVersion version) throws SystemException {
  43 + // TODO Auto-generated method stub
  44 + return null;
  45 + }
  46 +}
parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/DiagnoseConfController.java View file @ cffa813
1 1 package com.lyms.hospital.controller.conf;
2 2  
  3 +import org.springframework.stereotype.Controller;
  4 +import org.springframework.web.bind.annotation.RequestMapping;
  5 +
3 6 import com.lyms.web.controller.BaseController;
4 7  
5 8 /**
6   - * @author maliang
7   - * @since 2017-03-28
  9 + * <p>
  10 + * 区域组诊断版本项配置表 前端控制器
  11 + * </p>
  12 + *
  13 + * @author fangcheng
  14 + * @since 2017-03-30
8 15 */
  16 +@Controller
  17 +@RequestMapping("/diagnoseConf")
9 18 public class DiagnoseConfController extends BaseController {
10 19  
11 20 }
parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/DiagnoseSourceController.java View file @ cffa813
  1 +package com.lyms.hospital.controller.conf;
  2 +
  3 +import org.springframework.stereotype.Controller;
  4 +import org.springframework.web.bind.annotation.RequestMapping;
  5 +
  6 +import com.lyms.web.controller.BaseController;
  7 +
  8 +/**
  9 + * <p>
  10 + * 诊断项定义资源表 前端控制器
  11 + * </p>
  12 + *
  13 + * @author fangcheng
  14 + * @since 2017-03-30
  15 + */
  16 +@Controller
  17 +@RequestMapping("/diagnoseSource")
  18 +public class DiagnoseSourceController extends BaseController {
  19 +
  20 +}
parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/DiagnoseVersionController.java View file @ cffa813
  1 +package com.lyms.hospital.controller.conf;
  2 +
  3 +import org.springframework.stereotype.Controller;
  4 +import org.springframework.web.bind.annotation.RequestMapping;
  5 +
  6 +import com.lyms.web.controller.BaseController;
  7 +
  8 +/**
  9 + * <p>
  10 + * 诊断版本表 前端控制器
  11 + * </p>
  12 + *
  13 + * @author fangcheng
  14 + * @since 2017-03-30
  15 + */
  16 +@Controller
  17 +@RequestMapping("/diagnoseVersion")
  18 +public class DiagnoseVersionController extends BaseController {
  19 +
  20 +}
parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java View file @ cffa813
... ... @@ -48,11 +48,11 @@
48 48  
49 49 // strategy.setInclude(new String[] {
50 50 // "SYS_USERS","SYS_USER_ROLE_MAPS","SYS_ROLES" }); // 需要生成的表
51   - strategy.setInclude(new String[] { "HISTORY_SOURCE"}); // 需要生成的表
  51 + strategy.setInclude(new String[] { "DIAGNOSE_VERSION", "DIAGNOSE_SOURCE", "DIAGNOSE_CONF" }); // 需要生成的表
52 52 // pc.setParent("com.lyms.hospital");
53   - pc.setParent("com.lyms.hospital");
  53 + pc.setParent("com.lyms.base.common");
54 54  
55   - pc.setFunctionName("history"); // com.lyms.hospital.web.controller.sys
  55 + pc.setFunctionName("conf"); // com.lyms.hospital.web.controller.sys
56 56 // 加在controller后面
57 57 // pc.setModuleName("sys"); //com.lyms.hospital.sys.controller
58 58 // 加在controller前面