参数拦截

bsoft-api/src/main/java/com/bsoft/api/common/handlers/GlobalExceptionHandler.java

@@ -4,8 +4,6 @@ import com.bsoft.api.common.Result;
 import com.bsoft.api.common.exceptions.DBConfigurationError;
 import com.bsoft.api.common.exceptions.ExceptionBase;
 import com.bsoft.api.common.exceptions.InvalidTokenException;
-import com.bsoft.common.utils.HttpUtil;
-import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindingResult;

bsoft-api/src/main/java/com/bsoft/api/controller/ExcelController.java

@@ -26,7 +26,7 @@ public class ExcelController {
     private ExcelService excelService;
 
     @PostMapping("export")
-    @Token
+//    @Token
     @ApiOperation("将Table转换为Xls")
     public Object tableToXls(HttpServletRequest request,@RequestBody ExportReq info){
         String tableStr =StringEscapeUtils.unescapeHtml4(info.getTabaleStr());

bsoft-api/src/main/java/com/bsoft/api/model/DicDim.java

@@ -42,4 +42,14 @@ public class DicDim {
     public void setDimType(Long dimType) {
         this.dimType = dimType;
     }
+
+    @Override
+    public String toString() {
+        return "DicDim{" +
+                "id=" + id +
+                ", dimName='" + dimName + '\'' +
+                ", dimField='" + dimField + '\'' +
+                ", dimType=" + dimType +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/DicInd.java

@@ -102,4 +102,20 @@ public class DicInd {
     public void setDescribe(String describe) {
         this.describe = describe;
     }
+
+    @Override
+    public String toString() {
+        return "DicInd{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", indCode='" + indCode + '\'' +
+                ", indName='" + indName + '\'' +
+                ", indField='" + indField + '\'' +
+                ", computeMode=" + computeMode +
+                ", execSql='" + execSql + '\'' +
+                ", describe='" + describe + '\'' +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/DicOrg.java

@@ -92,4 +92,19 @@ public class DicOrg {
     public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
+
+    @Override
+    public String toString() {
+        return "DicOrg{" +
+                "id=" + id +
+                ", orgCode='" + orgCode + '\'' +
+                ", orgName='" + orgName + '\'' +
+                ", orgNo='" + orgNo + '\'' +
+                ", orgShortName='" + orgShortName + '\'' +
+                ", orgGroup='" + orgGroup + '\'' +
+                ", orgType='" + orgType + '\'' +
+                ", orgAddress='" + orgAddress + '\'' +
+                ", parentId=" + parentId +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerBlock.java

@@ -72,4 +72,17 @@ public class SerBlock {
     public void setReturnType(Short returnType) {
         this.returnType = returnType;
     }
+
+    @Override
+    public String toString() {
+        return "SerBlock{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", blockCode='" + blockCode + '\'' +
+                ", blockName='" + blockName + '\'' +
+                ", returnType=" + returnType +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerDimValue.java

@@ -63,6 +63,18 @@ public class SerDimValue {
         this.dimId = dimId;
     }
 
+    @Override
+    public String toString() {
+        return "SerDimValue{" +
+                "id=" + id +
+                ", orgId=" + orgId +
+                ", itemName='" + itemName + '\'' +
+                ", itemValue='" + itemValue + '\'' +
+                ", date=" + date +
+                ", dimId=" + dimId +
+                '}';
+    }
+
     public enum Dim_Type{
         DATABASE(1, "需要从数据获取数据"),NODATA(0, "无所获取"),;
 

bsoft-api/src/main/java/com/bsoft/api/model/SerDisease.java

@@ -94,4 +94,18 @@ public class SerDisease {
         this.orgName = orgName;
     }
 
+    @Override
+    public String toString() {
+        return "SerDisease{" +
+                "id=" + id +
+                ", mdcCode='" + mdcCode + '\'' +
+                ", mdcName='" + mdcName + '\'' +
+                ", date=" + date +
+                ", mdcNum=" + mdcNum +
+                ", parentId=" + parentId +
+                ", level=" + level +
+                ", orgId=" + orgId +
+                ", orgName='" + orgName + '\'' +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerDiseaseDocRs.java

@@ -82,4 +82,18 @@ public class SerDiseaseDocRs {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
+
+    @Override
+    public String toString() {
+        return "SerDiseaseDocRs{" +
+                "id=" + id +
+                ", orgId=" + orgId +
+                ", docCode='" + docCode + '\'' +
+                ", docName='" + docName + '\'' +
+                ", mdcCode='" + mdcCode + '\'' +
+                ", date=" + date +
+                ", deptCode='" + deptCode + '\'' +
+                ", deptName='" + deptName + '\'' +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerPage.java

@@ -62,4 +62,16 @@ public class SerPage {
     public void setPageName(String pageName) {
         this.pageName = pageName;
     }
+
+    @Override
+    public String toString() {
+        return "SerPage{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", pageCode='" + pageCode + '\'' +
+                ", pageName='" + pageName + '\'' +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerPageBlockRs.java

@@ -72,4 +72,17 @@ public class SerPageBlockRs {
     public void setPageId(Long pageId) {
         this.pageId = pageId;
     }
+
+    @Override
+    public String toString() {
+        return "SerPageBlockRs{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", blockId=" + blockId +
+                ", pageId=" + pageId +
+                ", whereClause='" + whereClause + '\'' +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerPageDimRs.java

@@ -62,4 +62,16 @@ public class SerPageDimRs {
     public void setPageId(Long pageId) {
         this.pageId = pageId;
     }
+
+    @Override
+    public String toString() {
+        return "SerPageDimRs{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", dimId=" + dimId +
+                ", pageId=" + pageId +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SysMenu.java

@@ -63,4 +63,15 @@ public class SysMenu {
         this.parentId = parentId;
     }
 
+    @Override
+    public String toString() {
+        return "SysMenu{" +
+                "id=" + id +
+                ", projectId=" + projectId +
+                ", menuName='" + menuName + '\'' +
+                ", menuUrl='" + menuUrl + '\'' +
+                ", menuImage='" + menuImage + '\'' +
+                ", parentId=" + parentId +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SysOrg.java

@@ -122,4 +122,22 @@ public class SysOrg {
     public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
+
+    @Override
+    public String toString() {
+        return "SysOrg{" +
+                "id=" + id +
+                ", createData=" + createData +
+                ", createUserid='" + createUserid + '\'' +
+                ", state=" + state +
+                ", orgCode='" + orgCode + '\'' +
+                ", orgName='" + orgName + '\'' +
+                ", orgNo='" + orgNo + '\'' +
+                ", orgShortName='" + orgShortName + '\'' +
+                ", orgGroup='" + orgGroup + '\'' +
+                ", orgType='" + orgType + '\'' +
+                ", orgAddress='" + orgAddress + '\'' +
+                ", parentId=" + parentId +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SysProject.java

@@ -62,4 +62,16 @@ public class SysProject {
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
+
+    @Override
+    public String toString() {
+        return "SysProject{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", projectCode='" + projectCode + '\'' +
+                ", projectName='" + projectName + '\'' +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SysRole.java

@@ -72,4 +72,17 @@ public class SysRole {
     public void setRoleCode(Long roleCode) {
         this.roleCode = roleCode;
     }
+
+    @Override
+    public String toString() {
+        return "SysRole{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", roleName='" + roleName + '\'' +
+                ", projectId=" + projectId +
+                ", roleCode=" + roleCode +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SysRoleMenuRs.java

@@ -62,4 +62,16 @@ public class SysRoleMenuRs {
     public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
+
+    @Override
+    public String toString() {
+        return "SysRoleMenuRs{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", menuId=" + menuId +
+                ", roleId=" + roleId +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SysUser.java

@@ -514,4 +514,22 @@ public class SysUser {
     public void setLastIp(String lastIp) {
         this.lastIp = lastIp;
     }
+
+    @Override
+    public String toString() {
+        return "SysUser{" +
+                "id=" + id +
+                ", userCode='" + userCode + '\'' +
+                ", userName='" + userName + '\'' +
+                ", password='" + password + '\'' +
+                ", idcard='" + idcard + '\'' +
+                ", sex='" + sex + '\'' +
+                ", mobile='" + mobile + '\'' +
+                ", pageCount=" + pageCount +
+                ", errorCount=" + errorCount +
+                ", errorTime=" + errorTime +
+                ", lastTime=" + lastTime +
+                ", lastIp='" + lastIp + '\'' +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SysUserMenuRs.java

@@ -62,4 +62,16 @@ public class SysUserMenuRs {
     public void setMenuId(Long menuId) {
         this.menuId = menuId;
     }
+
+    @Override
+    public String toString() {
+        return "SysUserMenuRs{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", userId=" + userId +
+                ", menuId=" + menuId +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SysUserOrgRs.java

@@ -62,4 +62,16 @@ public class SysUserOrgRs {
     public void setOrgId(Long orgId) {
         this.orgId = orgId;
     }
+
+    @Override
+    public String toString() {
+        return "SysUserOrgRs{" +
+                "id=" + id +
+                ", createDate=" + createDate +
+                ", createUserid=" + createUserid +
+                ", state=" + state +
+                ", userId=" + userId +
+                ", orgId=" + orgId +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SysUserRoleRs.java

@@ -32,4 +32,13 @@ public class SysUserRoleRs {
     public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
+
+    @Override
+    public String toString() {
+        return "SysUserRoleRs{" +
+                "id=" + id +
+                ", userId=" + userId +
+                ", roleId=" + roleId +
+                '}';
+    }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDiseaseServiceImpl.java

@@ -30,6 +30,9 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
 
     @Override
     public List<SerDisease> selectByMdcName(String date, String mdcName,String docCode,String deptCode) {
+        mdcName= StringUtil.isNullOrEmpty(mdcName)?null:mdcName;
+        docCode= StringUtil.isNullOrEmpty(docCode)?null:docCode;
+        deptCode= StringUtil.isNullOrEmpty(deptCode)?null:deptCode;
         return serDiseaseMapper.selectByMdcName(date,mdcName,docCode,deptCode);
     }