Merge branch 'dev/cdssman20200727_init' into debug

aipt-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -171,12 +171,10 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
                 Map<Long, List<ConceptDetail>> conceptDetailMap
                         = EntityUtil.makeEntityListMap(conceptDetailList, "conceptId");
                 for (Concept concept : conceptList) {
+                    retSubMap = new LinkedHashMap<>();
                     if (retMap.containsKey(concept.getLibName())) {
                         retSubMap = retMap.get(concept.getLibName());
                     }
-                    if (retSubMap == null) {
-                        retSubMap = new LinkedHashMap<>();
-                    }
                     if (conceptDetailMap.containsKey(concept.getId())
                             && ListUtil.isNotEmpty(conceptDetailMap.get(concept.getId()))) {
                         retSubMap.put(concept.getLibType(), conceptDetailMap.get(concept.getId()));

cdssman-service/src/main/java/com/diagbot/dto/PermissionAllDTO.java

@@ -0,0 +1,41 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 10:20
+ */
+@Setter
+@Getter
+public class PermissionAllDTO {
+    private Long id;
+
+    private Long tokenId;
+
+    /**
+     * 系统资源id
+     */
+    private Long permissionId;
+
+    private Long hospitalId;
+
+    private String hospitalName;
+
+    /**
+     * 特殊处理参数
+     */
+    private String paramKey;
+
+    /**
+     * 特殊处理参数值
+     */
+    private String paramValue;
+
+    private String permissionName;
+
+    private String permissionUrl;
+
+}

cdssman-service/src/main/java/com/diagbot/dto/PermissionsAllDTO.java

@@ -0,0 +1,41 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 10:54
+ */
+@Setter
+@Getter
+public class PermissionsAllDTO {
+    private Long id;
+
+
+    /**
+     * 资源名称
+     */
+    private String name;
+
+    /**
+     * 资源编码
+     */
+    private String code;
+
+    /**
+     * 资源Url
+     */
+    @TableField("permissionUrl")
+    private String permissionUrl;
+    /**
+     * 资源描述
+     */
+    private String descritpion;
+
+    private Integer type;
+}

cdssman-service/src/main/java/com/diagbot/entity/DisclaimerInfo.java

@@ -1,9 +1,9 @@
 package com.diagbot.entity;
 
-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.util.Date;
 
@@ -85,6 +85,7 @@ public class DisclaimerInfo implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -92,6 +93,7 @@ public class DisclaimerInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -99,6 +101,7 @@ public class DisclaimerInfo implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -106,6 +109,7 @@ public class DisclaimerInfo implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -113,6 +117,7 @@ public class DisclaimerInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -120,6 +125,7 @@ public class DisclaimerInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getTitle() {
         return title;
     }
@@ -127,6 +133,7 @@ public class DisclaimerInfo implements Serializable {
     public void setTitle(String title) {
         this.title = title;
     }
+
     public String getDescription() {
         return description;
     }
@@ -134,6 +141,7 @@ public class DisclaimerInfo implements Serializable {
     public void setDescription(String description) {
         this.description = description;
     }
+
     public String getOrderNo() {
         return orderNo;
     }
@@ -141,6 +149,7 @@ public class DisclaimerInfo implements Serializable {
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
+
     public String getStatus() {
         return status;
     }
@@ -148,6 +157,7 @@ public class DisclaimerInfo implements Serializable {
     public void setStatus(String status) {
         this.status = status;
     }
+
     public String getDisclaimerCode() {
         return disclaimerCode;
     }
@@ -155,6 +165,7 @@ public class DisclaimerInfo implements Serializable {
     public void setDisclaimerCode(String disclaimerCode) {
         this.disclaimerCode = disclaimerCode;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -166,18 +177,18 @@ public class DisclaimerInfo implements Serializable {
     @Override
     public String toString() {
         return "DisclaimerInfo{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", title=" + title +
-            ", description=" + description +
-            ", orderNo=" + orderNo +
-            ", status=" + status +
-            ", disclaimerCode=" + disclaimerCode +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", title=" + title +
+                ", description=" + description +
+                ", orderNo=" + orderNo +
+                ", status=" + status +
+                ", disclaimerCode=" + disclaimerCode +
+                ", remark=" + remark +
+                "}";
     }
 }

cdssman-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-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.time.LocalDateTime;
 
 /**
  * <p>
@@ -97,6 +98,7 @@ public class HospitalInfo implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -104,6 +106,7 @@ public class HospitalInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
@@ -111,6 +114,7 @@ public class HospitalInfo implements Serializable {
     public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public LocalDateTime getGmtModified() {
         return gmtModified;
     }
@@ -118,6 +122,7 @@ public class HospitalInfo implements Serializable {
     public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -125,6 +130,7 @@ public class HospitalInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -132,6 +138,7 @@ public class HospitalInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getCode() {
         return code;
     }
@@ -139,6 +146,7 @@ public class HospitalInfo implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
     public String getName() {
         return name;
     }
@@ -146,6 +154,7 @@ public class HospitalInfo implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public String getAddress() {
         return address;
     }
@@ -153,6 +162,7 @@ public class HospitalInfo implements Serializable {
     public void setAddress(String address) {
         this.address = address;
     }
+
     public String getSpell() {
         return spell;
     }
@@ -160,6 +170,7 @@ public class HospitalInfo implements Serializable {
     public void setSpell(String spell) {
         this.spell = spell;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -167,6 +178,7 @@ public class HospitalInfo implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
     public Integer getOrderNo() {
         return orderNo;
     }
@@ -174,6 +186,7 @@ public class HospitalInfo implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+
     public Integer getConnect() {
         return connect;
     }
@@ -181,6 +194,7 @@ public class HospitalInfo implements Serializable {
     public void setConnect(Integer connect) {
         this.connect = connect;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -192,20 +206,20 @@ public class HospitalInfo implements Serializable {
     @Override
     public String toString() {
         return "HospitalInfo{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", code=" + code +
-            ", name=" + name +
-            ", address=" + address +
-            ", spell=" + spell +
-            ", status=" + status +
-            ", orderNo=" + orderNo +
-            ", connect=" + connect +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", code=" + code +
+                ", name=" + name +
+                ", address=" + address +
+                ", spell=" + spell +
+                ", status=" + status +
+                ", orderNo=" + orderNo +
+                ", connect=" + connect +
+                ", remark=" + remark +
+                "}";
     }
 }

cdssman-service/src/main/java/com/diagbot/entity/Permission.java

@@ -0,0 +1,210 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统资源表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+@TableName("sys_permission")
+public class Permission implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 资源ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 资源名称
+     */
+    private String name;
+
+    /**
+     * 资源编码
+     */
+    private String code;
+
+    /**
+     * 资源Url
+     */
+    @TableField("permissionUrl")
+    private String permissionUrl;
+
+    /**
+     * 资源允许的请求方式
+     */
+    private String method;
+
+    /**
+     * 资源描述
+     */
+    private String descritpion;
+
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getPermissionUrl() {
+        return permissionUrl;
+    }
+
+    public void setPermissionUrl(String permissionUrl) {
+        this.permissionUrl = permissionUrl;
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public void setMethod(String method) {
+        this.method = method;
+    }
+
+    public String getDescritpion() {
+        return descritpion;
+    }
+
+    public void setDescritpion(String descritpion) {
+        this.descritpion = descritpion;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "Permission{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", code=" + code +
+                ", permissionUrl=" + permissionUrl +
+                ", method=" + method +
+                ", descritpion=" + descritpion +
+                ", type=" + type +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/Plan.java

@@ -1,15 +1,15 @@
 package com.diagbot.entity;
 
-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.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wangfeng
@@ -80,6 +80,7 @@ public class Plan implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -87,6 +88,7 @@ public class Plan implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -94,6 +96,7 @@ public class Plan implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -101,6 +104,7 @@ public class Plan implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -108,6 +112,7 @@ public class Plan implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -115,6 +120,7 @@ public class Plan implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getHospitalId() {
         return hospitalId;
     }
@@ -122,6 +128,7 @@ public class Plan implements Serializable {
     public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
+
     public String getPlanName() {
         return planName;
     }
@@ -129,6 +136,7 @@ public class Plan implements Serializable {
     public void setPlanName(String planName) {
         this.planName = planName;
     }
+
     public String getPlanCode() {
         return planCode;
     }
@@ -136,6 +144,7 @@ public class Plan implements Serializable {
     public void setPlanCode(String planCode) {
         this.planCode = planCode;
     }
+
     public Integer getPlanStatus() {
         return planStatus;
     }
@@ -143,6 +152,7 @@ public class Plan implements Serializable {
     public void setPlanStatus(Integer planStatus) {
         this.planStatus = planStatus;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -154,17 +164,17 @@ public class Plan implements Serializable {
     @Override
     public String toString() {
         return "Plan{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", hospitalId=" + hospitalId +
-            ", planName=" + planName +
-            ", planCode=" + planCode +
-            ", planStatus=" + planStatus +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", hospitalId=" + hospitalId +
+                ", planName=" + planName +
+                ", planCode=" + planCode +
+                ", planStatus=" + planStatus +
+                ", remark=" + remark +
+                "}";
     }
 }

cdssman-service/src/main/java/com/diagbot/entity/PlanDetail.java

@@ -1,15 +1,15 @@
 package com.diagbot.entity;
 
-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.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wangfeng
@@ -97,6 +97,7 @@ public class PlanDetail implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -104,6 +105,7 @@ public class PlanDetail implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -111,6 +113,7 @@ public class PlanDetail implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -118,6 +121,7 @@ public class PlanDetail implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -125,6 +129,7 @@ public class PlanDetail implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -132,6 +137,7 @@ public class PlanDetail implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getHospitalId() {
         return hospitalId;
     }
@@ -139,6 +145,7 @@ public class PlanDetail implements Serializable {
     public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
+
     public Long getPlanId() {
         return planId;
     }
@@ -146,6 +153,7 @@ public class PlanDetail implements Serializable {
     public void setPlanId(Long planId) {
         this.planId = planId;
     }
+
     public String getName() {
         return name;
     }
@@ -153,6 +161,7 @@ public class PlanDetail implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -160,6 +169,7 @@ public class PlanDetail implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
     public Integer getNumber() {
         return number;
     }
@@ -167,6 +177,7 @@ public class PlanDetail implements Serializable {
     public void setNumber(Integer number) {
         this.number = number;
     }
+
     public Integer getOrderNo() {
         return orderNo;
     }
@@ -174,6 +185,7 @@ public class PlanDetail implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+
     public String getCode() {
         return code;
     }
@@ -181,6 +193,7 @@ public class PlanDetail implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
     public String getValue() {
         return value;
     }
@@ -188,6 +201,7 @@ public class PlanDetail implements Serializable {
     public void setValue(String value) {
         this.value = value;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -199,21 +213,21 @@ public class PlanDetail implements Serializable {
     @Override
     public String toString() {
         return "PlanDetail{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", hospitalId=" + hospitalId +
-            ", planId=" + planId +
-            ", name=" + name +
-            ", status=" + status +
-            ", number=" + number +
-            ", orderNo=" + orderNo +
-            ", code=" + code +
-            ", value=" + value +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", hospitalId=" + hospitalId +
+                ", planId=" + planId +
+                ", name=" + name +
+                ", status=" + status +
+                ", number=" + number +
+                ", orderNo=" + orderNo +
+                ", code=" + code +
+                ", value=" + value +
+                ", remark=" + remark +
+                "}";
     }
 }

cdssman-service/src/main/java/com/diagbot/entity/TokenHospital.java

@@ -1,15 +1,15 @@
 package com.diagbot.entity;
 
-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.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wangfeng
@@ -88,6 +88,7 @@ public class TokenHospital implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -95,6 +96,7 @@ public class TokenHospital implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -102,6 +104,7 @@ public class TokenHospital implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -109,6 +112,7 @@ public class TokenHospital implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -116,6 +120,7 @@ public class TokenHospital implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -123,6 +128,7 @@ public class TokenHospital implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getHospitalId() {
         return hospitalId;
     }
@@ -130,6 +136,7 @@ public class TokenHospital implements Serializable {
     public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
+
     public String getAppidToken() {
         return appidToken;
     }
@@ -137,6 +144,7 @@ public class TokenHospital implements Serializable {
     public void setAppidToken(String appidToken) {
         this.appidToken = appidToken;
     }
+
     public Date getStartTime() {
         return startTime;
     }
@@ -144,6 +152,7 @@ public class TokenHospital implements Serializable {
     public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
+
     public Date getEndTime() {
         return endTime;
     }
@@ -151,6 +160,7 @@ public class TokenHospital implements Serializable {
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
     public Integer getValidDays() {
         return validDays;
     }
@@ -158,6 +168,7 @@ public class TokenHospital implements Serializable {
     public void setValidDays(Integer validDays) {
         this.validDays = validDays;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -169,18 +180,18 @@ public class TokenHospital implements Serializable {
     @Override
     public String toString() {
         return "TokenHospital{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", hospitalId=" + hospitalId +
-            ", appidToken=" + appidToken +
-            ", startTime=" + startTime +
-            ", endTime=" + endTime +
-            ", validDays=" + validDays +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", hospitalId=" + hospitalId +
+                ", appidToken=" + appidToken +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", validDays=" + validDays +
+                ", remark=" + remark +
+                "}";
     }
 }

cdssman-service/src/main/java/com/diagbot/entity/TokenPermission.java

@@ -0,0 +1,180 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+@TableName("sys_token_permission")
+public class TokenPermission implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 资源ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * tokenId
+     */
+    private Long tokenId;
+
+    /**
+     * url资源id
+     */
+    private Long permissionId;
+
+    /**
+     * 特殊处理参数
+     */
+    private String paramKey;
+
+    /**
+     * 特殊处理参数值
+     */
+    private String paramValue;
+
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Long getTokenId() {
+        return tokenId;
+    }
+
+    public void setTokenId(Long tokenId) {
+        this.tokenId = tokenId;
+    }
+
+    public Long getPermissionId() {
+        return permissionId;
+    }
+
+    public void setPermissionId(Long permissionId) {
+        this.permissionId = permissionId;
+    }
+
+    public String getParamKey() {
+        return paramKey;
+    }
+
+    public void setParamKey(String paramKey) {
+        this.paramKey = paramKey;
+    }
+
+    public String getParamValue() {
+        return paramValue;
+    }
+
+    public void setParamValue(String paramValue) {
+        this.paramValue = paramValue;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "TokenPermission{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", tokenId=" + tokenId +
+                ", permissionId=" + permissionId +
+                ", paramKey=" + paramKey +
+                ", paramValue=" + paramValue +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -2,24 +2,27 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
  * <p>
- * 系统操作日志表
+ * 系统用户表
  * </p>
  *
- * @author gaodm
- * @since 2018-09-14
+ * @author wangfeng
+ * @since 2020-08-11
  */
-public class SysLog implements Serializable {
+@TableName("sys_user")
+public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 日志ID
+     * 用户ID
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -50,35 +53,34 @@ public class SysLog implements Serializable {
     private String modifier;
 
     /**
-     * 访问者的IP
+     * 用户名
      */
-    private String ip;
+    private String username;
 
     /**
-     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     * 用户密码
      */
-    private Integer sysType;
+    private String password;
 
     /**
-     * 方法
+     * 联系人
      */
-    private String method;
+    private String linkman;
 
     /**
-     * 操作名
+     * 是否启用(0:停用，1：启用)
      */
-    private String operation;
+    private Integer status;
 
     /**
-     * 参数
+     * 1内部用户，0外部用户（默认0）
      */
-    private String params;
+    private Integer type;
 
     /**
-     * 用户名
+     * 备注
      */
-    private String username;
-
+    private String remark;
 
     public Long getId() {
         return id;
@@ -128,69 +130,69 @@ public class SysLog implements Serializable {
         this.modifier = modifier;
     }
 
-    public String getIp() {
-        return ip;
+    public String getUsername() {
+        return username;
     }
 
-    public void setIp(String ip) {
-        this.ip = ip;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
-    public Integer getSysType() {
-        return sysType;
+    public String getPassword() {
+        return password;
     }
 
-    public void setSysType(Integer sysType) {
-        this.sysType = sysType;
+    public void setPassword(String password) {
+        this.password = password;
     }
 
-    public String getMethod() {
-        return method;
+    public String getLinkman() {
+        return linkman;
     }
 
-    public void setMethod(String method) {
-        this.method = method;
+    public void setLinkman(String linkman) {
+        this.linkman = linkman;
     }
 
-    public String getOperation() {
-        return operation;
+    public Integer getStatus() {
+        return status;
     }
 
-    public void setOperation(String operation) {
-        this.operation = operation;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
-    public String getParams() {
-        return params;
+    public Integer getType() {
+        return type;
     }
 
-    public void setParams(String params) {
-        this.params = params;
+    public void setType(Integer type) {
+        this.type = type;
     }
 
-    public String getUsername() {
-        return username;
+    public String getRemark() {
+        return remark;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 
     @Override
     public String toString() {
-        return "SysLog{" +
+        return "User{" +
                 "id=" + id +
                 ", isDeleted=" + isDeleted +
                 ", gmtCreate=" + gmtCreate +
                 ", gmtModified=" + gmtModified +
                 ", creator=" + creator +
                 ", modifier=" + modifier +
-                ", ip=" + ip +
-                ", sysType=" + sysType +
-                ", method=" + method +
-                ", operation=" + operation +
-                ", params=" + params +
                 ", username=" + username +
+                ", password=" + password +
+                ", linkman=" + linkman +
+                ", status=" + status +
+                ", type=" + type +
+                ", remark=" + remark +
                 "}";
     }
 }

cdssman-service/src/main/java/com/diagbot/entity/UserHospital.java

@@ -0,0 +1,155 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户-机构表映射表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+@TableName("sys_user_hospital")
+public class UserHospital implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 用户主键
+     */
+    private Long userId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "UserHospital{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", userId=" + userId +
+                ", hospitalId=" + hospitalId +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/UserRole.java

@@ -0,0 +1,156 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统用户角色关联表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+@TableName("sys_user_role")
+public class UserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户和角色关联ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 系统用户表.用户ID
+     */
+    private Long userId;
+
+    /**
+     * 系统角色表.角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "UserRole{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", userId=" + userId +
+                ", roleId=" + roleId +
+                ", remark=" + remark +
+                "}";
+    }
+}

cdssman-service/src/main/java/com/diagbot/entity/VersionDetail.java

@@ -1,9 +1,9 @@
 package com.diagbot.entity;
 
-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.util.Date;
 
@@ -85,6 +85,7 @@ public class VersionDetail implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -92,6 +93,7 @@ public class VersionDetail implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -99,6 +101,7 @@ public class VersionDetail implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -106,6 +109,7 @@ public class VersionDetail implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -113,6 +117,7 @@ public class VersionDetail implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -120,6 +125,7 @@ public class VersionDetail implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getVersionId() {
         return versionId;
     }
@@ -127,6 +133,7 @@ public class VersionDetail implements Serializable {
     public void setVersionId(Long versionId) {
         this.versionId = versionId;
     }
+
     public String getTitle() {
         return title;
     }
@@ -134,6 +141,7 @@ public class VersionDetail implements Serializable {
     public void setTitle(String title) {
         this.title = title;
     }
+
     public String getDescription() {
         return description;
     }
@@ -141,6 +149,7 @@ public class VersionDetail implements Serializable {
     public void setDescription(String description) {
         this.description = description;
     }
+
     public String getOrderNo() {
         return orderNo;
     }
@@ -148,6 +157,7 @@ public class VersionDetail implements Serializable {
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
+
     public String getStatus() {
         return status;
     }
@@ -155,6 +165,7 @@ public class VersionDetail implements Serializable {
     public void setStatus(String status) {
         this.status = status;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -166,18 +177,18 @@ public class VersionDetail implements Serializable {
     @Override
     public String toString() {
         return "VersionDetail{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", versionId=" + versionId +
-            ", title=" + title +
-            ", description=" + description +
-            ", orderNo=" + orderNo +
-            ", status=" + status +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", versionId=" + versionId +
+                ", title=" + title +
+                ", description=" + description +
+                ", orderNo=" + orderNo +
+                ", status=" + status +
+                ", remark=" + remark +
+                "}";
     }
 }

cdssman-service/src/main/java/com/diagbot/entity/VersionInfo.java

@@ -1,10 +1,9 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -73,6 +72,7 @@ public class VersionInfo implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -80,6 +80,7 @@ public class VersionInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -87,6 +88,7 @@ public class VersionInfo implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -94,6 +96,7 @@ public class VersionInfo implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -101,6 +104,7 @@ public class VersionInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -108,6 +112,7 @@ public class VersionInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getName() {
         return name;
     }
@@ -115,6 +120,7 @@ public class VersionInfo implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public Date getRefreshTime() {
         return refreshTime;
     }
@@ -122,6 +128,7 @@ public class VersionInfo implements Serializable {
     public void setRefreshTime(Date refreshTime) {
         this.refreshTime = refreshTime;
     }
+
     public String getStatus() {
         return status;
     }
@@ -129,6 +136,7 @@ public class VersionInfo implements Serializable {
     public void setStatus(String status) {
         this.status = status;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -140,16 +148,16 @@ public class VersionInfo implements Serializable {
     @Override
     public String toString() {
         return "VersionInfo{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", name=" + name +
-            ", refreshTime=" + refreshTime +
-            ", status=" + status +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", refreshTime=" + refreshTime +
+                ", status=" + status +
+                ", remark=" + remark +
+                "}";
     }
 }

cdssman-service/src/main/java/com/diagbot/facade/PermissionFacade.java

@@ -0,0 +1,30 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.PermissionsAllDTO;
+import com.diagbot.entity.Permission;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.PermissionServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.vo.PermissionsAllVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 10:31
+ */
+@Component
+public class PermissionFacade extends PermissionServiceImpl {
+
+    public List<PermissionsAllDTO> getPermissionAlls(PermissionsAllVO permissionsAllVO) {
+        QueryWrapper<Permission> permissionQuery = new QueryWrapper<>();
+        permissionQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq(permissionsAllVO.getType() != null, "type", permissionsAllVO.getType());
+        List<Permission> list = list(permissionQuery);
+        List<PermissionsAllDTO> data = BeanUtil.listCopyTo(list, PermissionsAllDTO.class);
+        return data;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/PlanDetailFacade.java

@@ -72,8 +72,10 @@ public class PlanDetailFacade extends PlanDetailServiceImpl {
                 .eq("hospital_id", planDetailSaveVO.getHospitalId())//医院id
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", UserUtils.getCurrentPrincipleID())
-                .set("gmt_modified", DateUtil.now());
+                .set("gmt_modified",now)
+                .set("gmt_create", now)
+                .set("creator",UserUtils.getCurrentPrincipleID())
+                .set("modifier",UserUtils.getCurrentPrincipleID());
         update(new PlanDetail(), planDetailUpdate);
         List<PlanDetail> planDetailList = new ArrayList<>();
         List<HospitalPlanDetailSaveVO> planDetailData = planDetailSaveVO.getPlanDetail();

cdssman-service/src/main/java/com/diagbot/facade/PlanFacade.java

@@ -62,8 +62,10 @@ public class PlanFacade extends PlanServiceImpl {
             UpdateWrapper<Plan> planQuery = new UpdateWrapper<>();
             planQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("id", hospitalPlanSaveVO.getId())
-                    .set("gmt_modified", now)
-                    .set("modifier", UserUtils.getCurrentPrincipleID())
+                    .set("gmt_modified",now)
+                    .set("gmt_create", now)
+                    .set("creator",UserUtils.getCurrentPrincipleID())
+                    .set("modifier",UserUtils.getCurrentPrincipleID())
                     .set("hospital_id", hospitalPlanSaveVO.getHospitalId())
                     .set("plan_name", hospitalPlanSaveVO.getPlanName())
                     .set("plan_code", hospitalPlanSaveVO.getPlanCode())

cdssman-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 {
-}

cdssman-service/src/main/java/com/diagbot/facade/TokenHospitalFacade.java

@@ -148,4 +148,20 @@ public class TokenHospitalFacade extends TokenHospitalServiceImpl {
         return tokenHospital;
     }
 
+    /**
+     * 根据医院Id提供Token id
+     * @param hospitalId
+     * @return
+     */
+    public Long getHospitalTokenId(Long hospitalId) {
+        QueryWrapper<TokenHospital> tokenHospitalFand = new QueryWrapper<>();
+        tokenHospitalFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId);
+        TokenHospital tokenHospital = getOne(tokenHospitalFand);
+        if (null == tokenHospital) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该医院未生成Token！");
+        }
+        return tokenHospital.getId();
+    }
+
 }

cdssman-service/src/main/java/com/diagbot/facade/TokenPermissionFacade.java

@@ -0,0 +1,104 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.PermissionAllDTO;
+import com.diagbot.entity.TokenPermission;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.TokenPermissionServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.PermissionTokenAllVO;
+import com.diagbot.vo.PermissionTokenCancelVO;
+import com.diagbot.vo.PermissionTokenUpadataVO;
+import com.diagbot.vo.TokenPermissionAllVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 10:18
+ */
+@Component
+public class TokenPermissionFacade extends TokenPermissionServiceImpl {
+
+    @Autowired
+    TokenHospitalFacade tokenHospitalFacade;
+
+    public List<PermissionAllDTO> getPermissionAlls(TokenPermissionAllVO tokenPermissionAllVO) {
+        List<PermissionAllDTO> data = getPermissionAll(tokenPermissionAllVO);
+        return data;
+    }
+
+    /**
+     * @param permissionTokenAllVO
+     * @return
+     */
+    public Boolean boundPermissionTokens(PermissionTokenAllVO permissionTokenAllVO) {
+        Date now = DateUtil.now();
+        Long tokenId = tokenHospitalFacade.getHospitalTokenId(permissionTokenAllVO.getHospitalId());
+        TokenPermission tokenPermission = new TokenPermission();
+        BeanUtil.copyProperties(permissionTokenAllVO, tokenPermission);
+        tokenPermission.setCreator(UserUtils.getCurrentPrincipleID());
+        tokenPermission.setModifier(UserUtils.getCurrentPrincipleID());
+        tokenPermission.setTokenId(tokenId);
+        tokenPermission.setGmtModified(now);
+        tokenPermission.setGmtCreate(now);
+        return save(tokenPermission);
+    }
+
+    /**
+     * @param permissionTokenUpadataVO
+     * @return
+     */
+    public Boolean updataPermissionToken(PermissionTokenUpadataVO permissionTokenUpadataVO) {
+        Date now = DateUtil.now();
+        checkTokenPermission(permissionTokenUpadataVO.getId());
+        UpdateWrapper<TokenPermission> tokenPermission = new UpdateWrapper<>();
+        tokenPermission.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", permissionTokenUpadataVO.getId())
+                .eq("permission_id", permissionTokenUpadataVO.getPermissionId())
+                .set("param_key", permissionTokenUpadataVO.getParamKey())
+                .set("param_value", permissionTokenUpadataVO.getParamValue())
+                .set("gmt_modified", now)
+                .set("gmt_create", now)
+                .set("creator", UserUtils.getCurrentPrincipleID())
+                .set("modifier", UserUtils.getCurrentPrincipleID());
+        return update(new TokenPermission(), tokenPermission);
+
+    }
+
+    /**
+     * 判断数据是否存在有效
+     *
+     * @param id
+     */
+    private TokenPermission checkTokenPermission(Long id) {
+        // 1.先判断数据是否存在有效
+        QueryWrapper<TokenPermission> tokenPermissionData = new QueryWrapper<>();
+        tokenPermissionData.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+        TokenPermission tokenData = getOne(tokenPermissionData, false);
+        if (null == tokenData) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
+        return tokenData;
+    }
+
+    public Boolean cancelPermissionToken(PermissionTokenCancelVO permissionTokenCancelVO) {
+        checkTokenPermission(permissionTokenCancelVO.getId());
+        UpdateWrapper<TokenPermission> tokenPermission = new UpdateWrapper<>();
+        tokenPermission.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", permissionTokenCancelVO.getId())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("gmt_modified", DateUtil.now())
+                .set("modifier", UserUtils.getCurrentPrincipleID());
+        return update(new TokenPermission(), tokenPermission);
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -0,0 +1,44 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.User;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.UserServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.UserInfoVO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-11 10:13
+ */
+@Component
+public class UserFacade extends UserServiceImpl {
+
+    public User addUser(UserInfoVO userInfoVO) {
+        Date now = DateUtil.now();
+        QueryWrapper<User> userQuery = new QueryWrapper<>();
+        userQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("username", userInfoVO.getUsername());
+        int count = count(userQuery);
+        if(count>0){
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该数据已存在");
+        }
+        User user = new User();
+        BeanUtil.copyProperties(userInfoVO,user);
+        user.setGmtModified(now);
+        user.setGmtCreate(now);
+        user.setCreator(UserUtils.getCurrentPrincipleID());
+        user.setModifier(UserUtils.getCurrentPrincipleID());
+        boolean res = save(user);
+        return user;
+    }
+
+}

cdssman-service/src/main/java/com/diagbot/facade/UserHospitalFacade.java

@@ -0,0 +1,45 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.User;
+import com.diagbot.entity.UserHospital;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.UserHospitalServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.UserHospitalInfoVO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-11 11:24
+ */
+@Component
+public class UserHospitalFacade extends UserHospitalServiceImpl {
+
+    public UserHospital addUserHospital(UserHospitalInfoVO userHospitalInfoVO) {
+        Date now = DateUtil.now();
+        QueryWrapper<UserHospital> userQuery = new QueryWrapper<>();
+        userQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", userHospitalInfoVO.getUserId())
+                .eq("hospital_id", userHospitalInfoVO.getHospitalId());
+        int count = count(userQuery);
+        if (count > 0) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该数据已存在");
+        }
+        UserHospital userHospital = new UserHospital();
+        BeanUtil.copyProperties(userHospitalInfoVO,userHospital);
+        userHospital.setGmtModified(now);
+        userHospital.setGmtCreate(now);
+        userHospital.setCreator(UserUtils.getCurrentPrincipleID());
+        userHospital.setModifier(UserUtils.getCurrentPrincipleID());
+        boolean res = save(userHospital);
+        return userHospital;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/UserRoleFacade.java

@@ -0,0 +1,58 @@
+package com.diagbot.facade;
+
+import com.diagbot.entity.User;
+import com.diagbot.entity.UserRole;
+import com.diagbot.service.UserRoleService;
+import com.diagbot.service.impl.UserRoleServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.UserHospitalInfoVO;
+import com.diagbot.vo.UserInfoVO;
+import com.diagbot.vo.UserRoleInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-11 9:56
+ */
+@Component
+public class UserRoleFacade extends UserRoleServiceImpl {
+
+    @Autowired
+    UserFacade userFacade;
+    @Autowired
+    UserHospitalFacade userHospitalFacade;
+    @Autowired
+    UserRoleService userRoleService;
+
+    public boolean addUserRoles(UserRoleInfoVO userRoleInfoVO) {
+        boolean res = false;
+        Date now = DateUtil.now();
+        UserInfoVO userInfoVO = new UserInfoVO();
+        BeanUtil.copyProperties(userRoleInfoVO, userInfoVO);
+        //建立超级管理员基本信息
+        User user = userFacade.addUser(userInfoVO);
+        Long userId = user.getId();
+        if (userId != null) {
+            UserHospitalInfoVO userHospitalInfoVO = new UserHospitalInfoVO();
+            userHospitalInfoVO.setHospitalId(userRoleInfoVO.getHospitalId());
+            userHospitalInfoVO.setUserId(userId);
+            userHospitalFacade.addUserHospital(userHospitalInfoVO);
+            //
+            UserRole userRole = new UserRole();
+            userRole.setRoleId(-1L);
+            userRole.setUserId(userId);
+            userRole.setCreator(UserUtils.getCurrentPrincipleID());
+            userRole.setModifier(UserUtils.getCurrentPrincipleID());
+            userRole.setGmtCreate(now);
+            userRole.setGmtModified(now);
+            res = userRoleService.save(userRole);
+        }
+        return res;
+    }
+}

cdssman-service/src/main/java/com/diagbot/mapper/PermissionMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.Permission;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统资源表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+public interface PermissionMapper extends BaseMapper<Permission> {
+
+}

cdssman-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> {
-
-}

cdssman-service/src/main/java/com/diagbot/mapper/TokenPermissionMapper.java

@@ -0,0 +1,21 @@
+package com.diagbot.mapper;
+
+import com.diagbot.dto.PermissionAllDTO;
+import com.diagbot.entity.TokenPermission;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.TokenPermissionAllVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+public interface TokenPermissionMapper extends BaseMapper<TokenPermission> {
+
+    List<PermissionAllDTO> getPermissionAll(TokenPermissionAllVO tokenPermissionAllVO);
+}

cdssman-service/src/main/java/com/diagbot/mapper/UserHospitalMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.UserHospital;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户-机构表映射表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+public interface UserHospitalMapper extends BaseMapper<UserHospital> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.User;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统用户表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+public interface UserMapper extends BaseMapper<User> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/UserRoleMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.UserRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统用户角色关联表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+
+}

cdssman-service/src/main/java/com/diagbot/service/PermissionService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.Permission;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 系统资源表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+public interface PermissionService extends IService<Permission> {
+
+}

cdssman-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> {
-}

cdssman-service/src/main/java/com/diagbot/service/TokenPermissionService.java

@@ -0,0 +1,20 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.PermissionAllDTO;
+import com.diagbot.entity.TokenPermission;
+import com.diagbot.vo.TokenPermissionAllVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+public interface TokenPermissionService extends IService<TokenPermission> {
+    List<PermissionAllDTO> getPermissionAll(TokenPermissionAllVO tokenPermissionAllVO);
+}

cdssman-service/src/main/java/com/diagbot/service/UserHospitalService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.UserHospital;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户-机构表映射表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+public interface UserHospitalService extends IService<UserHospital> {
+
+}

cdssman-service/src/main/java/com/diagbot/service/UserRoleService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.UserRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 系统用户角色关联表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+public interface UserRoleService extends IService<UserRole> {
+
+}

cdssman-service/src/main/java/com/diagbot/service/UserService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.User;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 系统用户表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+public interface UserService extends IService<User> {
+
+}

cdssman-service/src/main/java/com/diagbot/service/impl/PermissionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.Permission;
+import com.diagbot.mapper.PermissionMapper;
+import com.diagbot.service.PermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统资源表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+@Service
+public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
+
+}

cdssman-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 {
-}

cdssman-service/src/main/java/com/diagbot/service/impl/TokenPermissionServiceImpl.java

@@ -0,0 +1,28 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.dto.PermissionAllDTO;
+import com.diagbot.entity.TokenPermission;
+import com.diagbot.mapper.TokenPermissionMapper;
+import com.diagbot.service.TokenPermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.TokenPermissionAllVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+@Service
+public class TokenPermissionServiceImpl extends ServiceImpl<TokenPermissionMapper, TokenPermission> implements TokenPermissionService {
+
+    @Override
+    public List<PermissionAllDTO> getPermissionAll(TokenPermissionAllVO tokenPermissionAllVO) {
+        return baseMapper.getPermissionAll(tokenPermissionAllVO);
+    }
+}

cdssman-service/src/main/java/com/diagbot/service/impl/UserHospitalServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.UserHospital;
+import com.diagbot.mapper.UserHospitalMapper;
+import com.diagbot.service.UserHospitalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户-机构表映射表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+@Service
+public class UserHospitalServiceImpl extends ServiceImpl<UserHospitalMapper, UserHospital> implements UserHospitalService {
+
+}

cdssman-service/src/main/java/com/diagbot/service/impl/UserRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.UserRole;
+import com.diagbot.mapper.UserRoleMapper;
+import com.diagbot.service.UserRoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统用户角色关联表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+@Service
+public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
+
+}

cdssman-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.User;
+import com.diagbot.mapper.UserMapper;
+import com.diagbot.service.UserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统用户表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+@Service
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+
+}

cdssman-service/src/main/java/com/diagbot/vo/PermissionTokenAllVO.java

@@ -0,0 +1,41 @@
+package com.diagbot.vo;
+
+import com.diagbot.biz.push.entity.Lis;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+import org.springframework.cloud.stream.annotation.StreamRetryTemplate;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 11:16
+ */
+@Setter
+@Getter
+public class PermissionTokenAllVO {
+
+    /**
+     * 资源Id
+     */
+    private Long permissionId;
+
+    /**
+     * 特殊处理参数
+     */
+    private String paramKey;
+
+    /**
+     * 特殊处理参数值
+     */
+    private String paramValue;
+
+    /**
+     * 医院ID
+     */
+    @NotNull(message = "请输入医院id")
+    private Long hospitalId;
+}

cdssman-service/src/main/java/com/diagbot/vo/PermissionTokenCancelVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 13:28
+ */
+@Setter
+@Getter
+public class PermissionTokenCancelVO {
+    private Long Id;
+}

cdssman-service/src/main/java/com/diagbot/vo/PermissionTokenUpadataVO.java

@@ -0,0 +1,31 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 11:38
+ */
+@Setter
+@Getter
+public class PermissionTokenUpadataVO {
+
+    @NotNull(message = "请输入id")
+    private Long id;
+    @NotNull(message = "请输入资源id")
+    private Long permissionId;
+    /**
+     * 特殊处理参数
+     */
+    private String paramKey;
+
+    /**
+     * 特殊处理参数值
+     */
+    private String paramValue;
+
+}

cdssman-service/src/main/java/com/diagbot/vo/PermissionsAllVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 10:57
+ */
+@Setter
+@Getter
+public class PermissionsAllVO {
+    private Integer type;
+}

cdssman-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;
-}

cdssman-service/src/main/java/com/diagbot/vo/TokenPermissionAllVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 10:21
+ */
+@Setter
+@Getter
+public class TokenPermissionAllVO {
+    private Long hospitalId;
+}

cdssman-service/src/main/java/com/diagbot/vo/TokenPermissionVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-10 11:20
+ */
+@Setter
+@Getter
+public class TokenPermissionVO {
+
+}

cdssman-service/src/main/java/com/diagbot/vo/UserHospitalInfoVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-11 11:26
+ */
+@Setter
+@Getter
+public class UserHospitalInfoVO {
+    /**
+     * 用户主键
+     */
+    private Long userId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+}

cdssman-service/src/main/java/com/diagbot/vo/UserInfoVO.java

@@ -0,0 +1,43 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-11 11:00
+ */
+@Setter
+@Getter
+public class UserInfoVO {
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    private String password;
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 是否启用(0:停用，1：启用)
+     */
+    private Integer status;
+
+    /**
+     * 1内部用户，0外部用户（默认0）
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

cdssman-service/src/main/java/com/diagbot/vo/UserRoleInfoVO.java

@@ -0,0 +1,47 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-11 10:07
+ */
+@Setter
+@Getter
+public class UserRoleInfoVO {
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @ApiModelProperty(hidden = true)
+    private String password = "{bcrypt}$2a$10$qhV.bPLz1xsjQKQc35Ohz.oMU2y.lffnogvLEK69u3Z1rbLpQVFh2";
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 是否启用(0:停用，1：启用)
+     */
+    @ApiModelProperty(hidden = true)
+    private Integer status = 1;
+
+    /**
+     * 1内部用户，0外部用户（默认0）
+     */
+    @ApiModelProperty(hidden = true)
+    private Integer type = 0;
+
+    private Long hospitalId;
+
+    @ApiModelProperty(hidden = true)
+    private Long roleId = -1L;
+}

cdssman-service/src/main/java/com/diagbot/web/PermissionController.java

@@ -0,0 +1,42 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.PermissionsAllDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.PermissionFacade;
+import com.diagbot.vo.PermissionsAllVO;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 系统资源表 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+@RestController
+@RequestMapping("/permission")
+@Api(value = "系统资源相关API", tags = { "系统资源相关API" })
+@SuppressWarnings("unchecked")
+public class PermissionController {
+    @Autowired
+    PermissionFacade permissionFacade;
+
+    @ApiOperation(value = "获取Token权限系统资源列表[by:wangfeng]",
+            notes = "")
+    @PostMapping("/getPermissionAll")
+    @SysLogger("getPermissionAll")
+    public RespDTO<List<PermissionsAllDTO>> getPermissionAll(@RequestBody PermissionsAllVO permissionsAllVO) {
+        return RespDTO.onSuc(permissionFacade.getPermissionAlls(permissionsAllVO));
+    }
+}

cdssman-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));
-    }
-}
-

cdssman-service/src/main/java/com/diagbot/web/TokenPermissionController.java

@@ -0,0 +1,70 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.PermissionAllDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.TokenPermissionFacade;
+import com.diagbot.vo.PermissionTokenAllVO;
+import com.diagbot.vo.PermissionTokenCancelVO;
+import com.diagbot.vo.PermissionTokenUpadataVO;
+import com.diagbot.vo.TokenPermissionAllVO;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-10
+ */
+@RestController
+@RequestMapping("/tokenPermission")
+@Api(value = "医院权限相关API", tags = { "医院权限相关API" })
+@SuppressWarnings("unchecked")
+public class TokenPermissionController {
+    @Autowired
+    private TokenPermissionFacade tokenPermissionFacade;
+
+    @ApiOperation(value = "获取医院权限列表[by:wangfeng]",
+            notes = "")
+    @PostMapping("/getTokenPermissionAll")
+    @SysLogger("getTokenPermissionAll")
+    public RespDTO<List<PermissionAllDTO>> getPermissionAll(@RequestBody TokenPermissionAllVO tokenPermissionAllVO) {
+        return RespDTO.onSuc(tokenPermissionFacade.getPermissionAlls(tokenPermissionAllVO));
+    }
+
+    @ApiOperation(value = "绑定系统资源Url和医院Token权限的关系[by:wangfeng]",
+            notes = "")
+    @PostMapping("/boundPermissionToken")
+    @SysLogger("boundPermissionToken")
+    public RespDTO<Boolean> boundPermissionToken(@RequestBody PermissionTokenAllVO permissionTokenAllVO) {
+        return RespDTO.onSuc(tokenPermissionFacade.boundPermissionTokens(permissionTokenAllVO));
+    }
+
+    @ApiOperation(value = "修改医院Token系统资源参数[by:wangfeng]",
+            notes = "")
+    @PostMapping("/updataPermissionToken")
+    @SysLogger("updataPermissionToken")
+    public RespDTO<Boolean> updataPermissionToken(@RequestBody PermissionTokenUpadataVO permissionTokenUpadataVO) {
+        return RespDTO.onSuc(tokenPermissionFacade.updataPermissionToken(permissionTokenUpadataVO));
+    }
+
+    @ApiOperation(value = "删除系统资源Url和医院Token权限的关系[by:wangfeng]",
+            notes = "")
+    @PostMapping("/cancelPermissionToken")
+    @SysLogger("cancelPermissionToken")
+    public RespDTO<Boolean> cancelPermissionToken(@RequestBody PermissionTokenCancelVO permissionTokenCancelVO) {
+        return RespDTO.onSuc(tokenPermissionFacade.cancelPermissionToken(permissionTokenCancelVO));
+    }
+
+}

cdssman-service/src/main/java/com/diagbot/web/UserController.java

@@ -0,0 +1,20 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 系统用户表 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+@Controller
+@RequestMapping("/user")
+public class UserController {
+
+}

cdssman-service/src/main/java/com/diagbot/web/UserHospitalController.java

@@ -0,0 +1,20 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 用户-机构表映射表 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+@Controller
+@RequestMapping("/userHospital")
+public class UserHospitalController {
+
+}

cdssman-service/src/main/java/com/diagbot/web/UserRoleController.java

@@ -0,0 +1,46 @@
+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.TokenHospitaDTO;
+import com.diagbot.facade.UserRoleFacade;
+import com.diagbot.vo.TokenHospitalVO;
+import com.diagbot.vo.UserRoleInfoVO;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * 系统用户角色关联表 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-11
+ */
+@RestController
+@RequestMapping("/userRole")
+@Api(value = "医院管理员相关API", tags = { "医院管理员相关API" })
+@SuppressWarnings("unchecked")
+public class UserRoleController {
+    @Autowired
+    UserRoleFacade userRoleFacade;
+
+    @ApiOperation(value = "添加医院管理员[by:wangfeng]",notes = "添加医院管理员")
+    @PostMapping("/addUserRole")
+    @SysLogger("addUserRole")
+    public RespDTO<Boolean> addUserRole(@RequestBody @Valid UserRoleInfoVO userRoleInfoVO) {
+        boolean res = userRoleFacade.addUserRoles(userRoleInfoVO);
+        return RespDTO.onSuc(res);
+    }
+}

cdssman-service/src/main/resources/mapper/PermissionMapper.xml

@@ -0,0 +1,22 @@
+<?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.PermissionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Permission">
+        <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="name" property="name" />
+        <result column="code" property="code" />
+        <result column="permissionUrl" property="permissionUrl" />
+        <result column="method" property="method" />
+        <result column="descritpion" property="descritpion" />
+        <result column="type" property="type" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

cdssman-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>

cdssman-service/src/main/resources/mapper/TokenPermissionMapper.xml

@@ -0,0 +1,43 @@
+<?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.TokenPermissionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.TokenPermission">
+        <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="token_id" property="tokenId"/>
+        <result column="permission_id" property="permissionId"/>
+        <result column="param_key" property="paramKey"/>
+        <result column="param_value" property="paramValue"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+    <select id="getPermissionAll" resultType="com.diagbot.dto.PermissionAllDTO">
+        SELECT
+        a.id ,
+        a.`param_key` AS param_Key,
+        a.`param_value` AS paramValue,
+        a.`permission_id` AS permissionId,
+        a.`token_id`AS tokenId,
+        c.`name` AS permissionName,
+        c.`permissionUrl` AS permissionUrl,
+        d.`id` AS hospitalId,
+        d.`name` AS hospitalName
+        FROM
+        sys_token_permission a ,
+        sys_token_hospital b ,
+        sys_permission c,
+        tran_hospital_info d
+        WHERE a.token_id = b.id
+        AND a.permission_id = c.id
+        AND d.id = b.hospital_id
+        <if test="hospitalId!=nulll">
+            b.hospital_id = #{hospitalId}
+        </if>
+    </select>
+
+</mapper>

cdssman-service/src/main/resources/mapper/UserHospitalMapper.xml

@@ -0,0 +1,18 @@
+<?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.UserHospitalMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.UserHospital">
+        <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="user_id" property="userId" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

cdssman-service/src/main/resources/mapper/UserMapper.xml

@@ -0,0 +1,21 @@
+<?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.UserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.User">
+        <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="username" property="username" />
+        <result column="password" property="password" />
+        <result column="linkman" property="linkman" />
+        <result column="status" property="status" />
+        <result column="type" property="type" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

cdssman-service/src/main/resources/mapper/UserRoleMapper.xml

@@ -0,0 +1,18 @@
+<?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.UserRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.UserRole">
+        <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="user_id" property="userId" />
+        <result column="role_id" property="roleId" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>