4.4版本

pom.xml

@@ -202,6 +202,14 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <!--外部依赖 BOM-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-dependencies-bom</artifactId>
+                <version>${ruoyi.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -212,6 +220,7 @@
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+        <module>ruoyi-his</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -79,6 +79,12 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <!-- HIS 管理模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-his</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://39.97.252.22:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
+                username: devry
-                password: password
+                password: Devry@#123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -55,3 +55,12 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+
+#HIS WEBSERVICE CONFIG
+his:
+    client:
+        his-url: http://47.111.29.88:11013/WebService.asmx
+        his-public-url: http://47.111.29.88:11004/webservice.asmx
+        auth-code: 44200F7B173B00E136C04106FB29AA4A
+        his-host: http://127.0.0.1:8082
+        vendor-id: 510303001

ruoyi-admin/src/main/resources/application.yml

@@ -78,6 +78,10 @@ mybatis:
     mapperLocations: classpath*:mapper/**/*Mapper.xml
     # 加载全局的配置文件
     configLocation: classpath:mybatis/mybatis-config.xml
+mapper:
+  mappers: com.ruoyi.common.mappers.RuoYiBaseMapper
+  identity: mysql
+  not-empty: false
 
 # PageHelper分页插件
 pagehelper: 
@@ -109,7 +113,7 @@ shiro:
     # 设置Cookie的过期时间，天为单位
     maxAge: 30
     # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）KeyGenerator keygen = KeyGenerator.getInstance("AES"); SecretKey deskey = keygen.generateKey(); System.out.println(Base64.encodeToString(deskey.getEncoded()));
-    cipherKey: zSyK5Kp6PZAAjlT+eeNMlg==
+    cipherKey: +6sYiFMubS5NNEtC9xdMIw==
   session:
     # Session超时时间，-1代表永不过期（默认30分钟）
     expireTime: 30
@@ -127,9 +131,9 @@ xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
-  excludes: /system/notice/*
+  excludes: /system/notice/*,/bend/article/*,/bend/agreement/*
   # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*
+  urlPatterns: /system/*,/monitor/*,/tool/*,/his/*,/bend/*
 
 # Swagger配置
 swagger:

ruoyi-admin/src/main/resources/banner.txt

@@ -1,24 +1,2 @@
 Application Version: ${ruoyi.version}
 Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-//                          _ooOoo_                               //
-//                         o8888888o                              //
-//                         88" . "88                              //
-//                         (| ^_^ |)                              //
-//                         O\  =  /O                              //
-//                      ____/`---'\____                           //
-//                    .'  \\|     |//  `.                         //
-//                   /  \\|||  :  |||//  \                        //
-//                  /  _||||| -:- |||||-  \                       //
-//                  |   | \\\  -  /// |   |                       //
-//                  | \_|  ''\---/''  |   |                       //
-//                  \  .-\__  `-`  ___/-. /                       //
-//                ___`. .'  /--.--\  `. . ___                     //
-//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
-//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
-//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
-//      ========`-.____`-.___\_____/___.-`____.-'========         //
-//                           `=---='                              //
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//             佛祖保佑       永不宕机      永无BUG               //
-////////////////////////////////////////////////////////////////////

ruoyi-common/pom.xml

@@ -101,6 +101,27 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <!--自定义添加Jar依赖:2020/08/30-->
+        <dependency>
+            <groupId>com.bending.core</groupId>
+            <artifactId>bending-his-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -5,99 +5,65 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
 
 /**
  * Entity基类
  * 
  * @author ruoyi
  */
+@ApiModel(value = "Entity基类")
+@Data
 public class BaseEntity implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(notes = "主键ID")
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
     /** 搜索值 */
+    @ApiModelProperty(notes = "搜索值",hidden = true)
+    @Transient
     private String searchValue;
 
     /** 创建者 */
+    @ApiModelProperty(notes = "创建者",hidden = true)
+    @Transient
     private String createBy;
 
     /** 创建时间 */
+    @ApiModelProperty(notes = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /** 更新者 */
+    @ApiModelProperty(notes = "更新者",hidden = true)
+    @Transient
     private String updateBy;
 
     /** 更新时间 */
+    @ApiModelProperty(notes = "更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Transient
     private Date updateTime;
 
     /** 备注 */
+    @ApiModelProperty(notes = "备注",hidden = true)
+    @Transient
     private String remark;
 
     /** 请求参数 */
+    @ApiModelProperty(notes = "请求参数",hidden = true)
+    @Transient
     private Map<String, Object> params;
 
-    public String getSearchValue()
-    {
-        return searchValue;
-    }
-
-    public void setSearchValue(String searchValue)
-    {
-        this.searchValue = searchValue;
-    }
-
-    public String getCreateBy()
-    {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy)
-    {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime()
-    {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime)
-    {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy()
-    {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy)
-    {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime()
-    {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime)
-    {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark()
-    {
-        return remark;
-    }
-
-    public void setRemark(String remark)
-    {
-        this.remark = remark;
-    }
-
     public Map<String, Object> getParams()
     {
         if (params == null)

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java

@@ -1,6 +1,6 @@
 package com.ruoyi.framework.config;
 
-import org.mybatis.spring.annotation.MapperScan;
+import tk.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
@@ -13,6 +13,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 // 表示通过aop框架暴露该代理对象,AopContext能够访问
 @EnableAspectJAutoProxy(exposeProxy = true)
 // 指定要扫描的Mapper类的包的路径
+//@MapperScan("com.ruoyi.**.mapper")
 @MapperScan("com.ruoyi.**.mapper")
 public class ApplicationConfig
 {

ruoyi-generator/src/main/resources/generator.yml

@@ -2,10 +2,10 @@
 # 代码生成
 gen: 
   # 作者
-  author: ruoyi
+  author: bend
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
+  packageName: com.ruoyi.his
   # 自动去除表前缀，默认是false
-  autoRemovePre: false
+  autoRemovePre: true
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_
+  tablePrefix: sys_,bend_,his_

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -3,14 +3,17 @@ package ${packageName}.domain;
 #foreach ($import in $importList)
 import ${import};
 #end
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 #if($table.crud || $table.sub)
 import com.ruoyi.common.core.domain.BaseEntity;
 #elseif($table.tree)
 import com.ruoyi.common.core.domain.TreeEntity;
 #end
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.Table;
 
 /**
  * ${functionName}对象 ${tableName}
@@ -18,6 +21,10 @@ import com.ruoyi.common.core.domain.TreeEntity;
  * @author ${author}
  * @date ${datetime}
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "${functionName}")
+@Table(name = "${tableName}")
 #if($table.crud || $table.sub)
 #set($Entity="BaseEntity")
 #elseif($table.tree)
@@ -30,6 +37,7 @@ public class ${ClassName} extends ${Entity}
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField))
     /** $column.columnComment */
+    @ApiModelProperty(notes = "$column.columnComment")
 #if($column.list)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
@@ -51,54 +59,8 @@ public class ${ClassName} extends ${Entity}
 #end
 #if($table.sub)
     /** $table.subTable.functionName信息 */
+    @ApiModelProperty(notes = "$table.subTable.functionName信息")
     private List<${subClassName}> ${subclassName}List;
 
 #end
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
-        this.$column.javaField = $column.javaField;
-    }
-
-    public $column.javaType get${AttrName}() 
-    {
-        return $column.javaField;
-    }
-#end
-#end
-
-#if($table.sub)
-    public List<${subClassName}> get${subClassName}List()
-    {
-        return ${subclassName}List;
-    }
-
-    public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
-    {
-        this.${subclassName}List = ${subclassName}List;
-    }
-
-#end
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-#if($table.sub)
-            .append("${subclassName}List", get${subClassName}List())
-#end
-            .toString();
-    }
 }

ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

@@ -1,10 +1,11 @@
 package ${packageName}.mapper;
 
-import java.util.List;
+import com.ruoyi.common.mappers.RuoYiBaseMapper;
 import ${packageName}.domain.${ClassName};
 #if($table.sub)
 import ${packageName}.domain.${subClassName};
 #end
+import java.util.List;
 
 /**
  * ${functionName}Mapper接口
@@ -12,7 +13,7 @@ import ${packageName}.domain.${subClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
+public interface ${ClassName}Mapper extends RuoYiBaseMapper<${ClassName}>
 {
     /**
      * 查询${functionName}
@@ -66,7 +67,7 @@ public interface ${ClassName}Mapper
     /**
      * 批量删除${subTable.functionName}
      * 
-     * @param customerIds 需要删除的数据ID
+     * @param ${pkColumn.javaField}s 需要删除的数据ID
      * @return 结果
      */
     public int delete${subClassName}By${subTableFkClassName}s(String[] ${pkColumn.javaField}s);
@@ -83,7 +84,7 @@ public interface ${ClassName}Mapper
     /**
      * 通过${functionName}ID删除${subTable.functionName}信息
      * 
-     * @param roleId 角色ID
+     * @param ${pkColumn.javaField} ${functionName}ID
      * @return 结果
      */
     public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});

ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm

@@ -3,10 +3,13 @@ package ${packageName}.domain;
 #foreach ($import in $subImportList)
 import ${import};
 #end
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.Table;
 
 /**
  * ${subTable.functionName}对象 ${subTableName}
@@ -14,6 +17,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ${author}
  * @date ${datetime}
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "${functionName}")
+@Table(name = "${subTableName}")
 public class ${subClassName} extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -21,6 +28,7 @@ public class ${subClassName} extends BaseEntity
 #foreach ($column in $subTable.columns)
 #if(!$table.isSuperColumn($column.javaField))
     /** $column.columnComment */
+    @ApiModelProperty(notes = "$column.columnComment")
 #if($column.list)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
@@ -40,36 +48,4 @@ public class ${subClassName} extends BaseEntity
 
 #end
 #end
-#foreach ($column in $subTable.columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
-        this.$column.javaField = $column.javaField;
-    }
-
-    public $column.javaType get${AttrName}() 
-    {
-        return $column.javaField;
-    }
-#end
-#end
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $subTable.columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-            .toString();
-    }
 }