包名调整

bsoft-api/pom.xml

@@ -8,11 +8,11 @@
         <version>2.1.9.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>com.bsoft</groupId>
-    <artifactId>bsoft-api</artifactId>
+    <groupId>com.hs</groupId>
+    <artifactId>hs-api</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>bsoft-api</name>
+    <name>hs-api</name>
     <description>Demo project for Spring Boot</description>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

bsoft-api/src/main/java/com/bsoft/api/BsoftApiApplication.java → bsoft-api/src/main/java/com/hs/api/HsApiApplication.java

-package com.bsoft.api;
+package com.hs.api;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -8,12 +8,12 @@ import org.springframework.scheduling.annotation.EnableAsync;
 
 @EnableAsync
 @SpringBootApplication
-@MapperScan("com.bsoft.api.mapper")
-@ComponentScan(basePackages = {"com.bsoft.common.config","com.bsoft.api"})
-public class BsoftApiApplication {
+@MapperScan("com.hs.api.mapper")
+@ComponentScan(basePackages = {"com.bsoft.common.config","com.hs.api"})
+public class HsApiApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(BsoftApiApplication.class, args);
+        SpringApplication.run(HsApiApplication.class, args);
     }
 
 }

bsoft-api/src/main/java/com/bsoft/api/ServletInitializer.java → bsoft-api/src/main/java/com/hs/api/ServletInitializer.java

-package com.bsoft.api;
+package com.hs.api;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -7,6 +7,6 @@ public class ServletInitializer extends SpringBootServletInitializer {
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
         //Application的类名
-        return application.sources(BsoftApiApplication.class);
+        return application.sources(HsApiApplication.class);
     }
 }

bsoft-api/src/main/java/com/bsoft/api/common/Constants.java → bsoft-api/src/main/java/com/hs/api/common/Constants.java

-package com.bsoft.api.common;
+package com.hs.api.common;
 
 public interface Constants {
     String TOKEN_KEY = "Authorization";

bsoft-api/src/main/java/com/bsoft/api/common/Result.java → bsoft-api/src/main/java/com/hs/api/common/Result.java

-package com.bsoft.api.common;
+package com.hs.api.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bsoft-api/src/main/java/com/bsoft/api/common/annotations/CurrentUser.java → bsoft-api/src/main/java/com/hs/api/common/annotations/CurrentUser.java

-package com.bsoft.api.common.annotations;
+package com.hs.api.common.annotations;
 
 import java.lang.annotation.*;
 

bsoft-api/src/main/java/com/bsoft/api/common/annotations/Token.java → bsoft-api/src/main/java/com/hs/api/common/annotations/Token.java

-package com.bsoft.api.common.annotations;
+package com.hs.api.common.annotations;
 
 import org.springframework.core.annotation.AliasFor;
 

bsoft-api/src/main/java/com/hs/api/common/aspect/CorsFilter.java

+package com.hs.api.common.aspect;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+
+public class CorsFilter implements Filter {
+
+    @Override
+    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
+        String[] allowDomain = {"http://132.12.11.11:8888", "http://123.112.112.12:80", "http://123.16.12.23", "http://121.12.18.13:10195"};
+        Set allowedOrigins = new HashSet(Arrays.asList(allowDomain));
+        String originHeader = ((HttpServletRequest) req).getHeader("Origin");
+        if (allowedOrigins.contains(originHeader)) {
+            ((HttpServletResponse) res).setHeader("Access-Control-Allow-Origin", originHeader);
+            ((HttpServletResponse) res).setContentType("application/json;charset=UTF-8");
+            ((HttpServletResponse) res).setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+            ((HttpServletResponse) res).setHeader("Access-Control-Max-Age", "3600");
+            ((HttpServletResponse) res).setHeader("Access-Control-Allow-Headers", "Origin, No-Cache, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type, X-E4M-With,userId,token");//表明服务器支持的所有头信息字段
+            ((HttpServletResponse) res).setHeader("Access-Control-Allow-Credentials", "true"); //如果要把Cookie发到服务器，需要指定Access-Control-Allow-Credentials字段为true;
+            ((HttpServletResponse) res).setHeader("XDomainRequestAllowed", "1");
+        }
+        chain.doFilter(req, res);
+        return;
+    }
+
+    public void init(FilterConfig filterConfig) {
+        // something init
+    }
+
+    public void destroy() {
+        // destroy something
+    }
+}

bsoft-api/src/main/java/com/bsoft/api/common/aspect/RequestMappingAspect.java → bsoft-api/src/main/java/com/hs/api/common/aspect/RequestMappingAspect.java

-package com.bsoft.api.common.aspect;
+package com.hs.api.common.aspect;
 
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.aspectj.lang.ProceedingJoinPoint;

bsoft-api/src/main/java/com/bsoft/api/common/aspect/TokenAspect.java → bsoft-api/src/main/java/com/hs/api/common/aspect/TokenAspect.java

-package com.bsoft.api.common.aspect;
+package com.hs.api.common.aspect;
 
-import com.bsoft.api.common.Constants;
-import com.bsoft.api.common.exceptions.InvalidTokenException;
-import com.bsoft.api.common.utils.TokenUtil;
+import com.hs.api.common.Constants;
+import com.hs.api.common.exceptions.InvalidTokenException;
+import com.hs.api.common.utils.TokenUtil;
 import com.bsoft.common.utils.StringUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
 @Order(1)
 @Profile({"test","prod"})
 public class TokenAspect {
-    @Pointcut("@annotation(com.bsoft.api.common.annotations.Token)")
+    @Pointcut("@annotation(com.hs.api.common.annotations.Token)")
     public void tokenAspect() {
     }
 

bsoft-api/src/main/java/com/bsoft/api/common/base/RequestResult.java → bsoft-api/src/main/java/com/hs/api/common/base/RequestResult.java

-package com.bsoft.api.common.base;
+package com.hs.api.common.base;
 
 public class RequestResult {
     Integer code;

bsoft-api/src/main/java/com/bsoft/api/common/configurations/CurrentUserConfigure.java → bsoft-api/src/main/java/com/hs/api/common/configurations/CurrentUserConfigure.java

-package com.bsoft.api.common.configurations;
+package com.hs.api.common.configurations;
 
-import com.bsoft.api.common.resolvers.CurrentUserMethodArgumentResolver;
+import com.hs.api.common.resolvers.CurrentUserMethodArgumentResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;

bsoft-api/src/main/java/com/bsoft/api/common/configurations/LoginConfigure.java → bsoft-api/src/main/java/com/hs/api/common/configurations/LoginConfigure.java

-package com.bsoft.api.common.configurations;
+package com.hs.api.common.configurations;
 
-import com.bsoft.api.common.intercepters.LoginInterceptor;
+import com.hs.api.common.intercepters.LoginInterceptor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

bsoft-api/src/main/java/com/bsoft/api/common/enums/BudgetType.java → bsoft-api/src/main/java/com/hs/api/common/enums/BudgetType.java

-package com.bsoft.api.common.enums;
+package com.hs.api.common.enums;
 
 import java.util.ArrayList;
 import java.util.HashMap;

bsoft-api/src/main/java/com/bsoft/api/common/enums/DimType.java → bsoft-api/src/main/java/com/hs/api/common/enums/DimType.java

-package com.bsoft.api.common.enums;
+package com.hs.api.common.enums;
 
 public enum DimType {
     DATABASE(1,"需要从数据获取数据"),

bsoft-api/src/main/java/com/bsoft/api/common/enums/ProjectType.java → bsoft-api/src/main/java/com/hs/api/common/enums/ProjectType.java

-package com.bsoft.api.common.enums;
+package com.hs.api.common.enums;
 
 import java.util.ArrayList;
 import java.util.HashMap;

bsoft-api/src/main/java/com/bsoft/api/common/enums/RequestResultType.java → bsoft-api/src/main/java/com/hs/api/common/enums/RequestResultType.java

-package com.bsoft.api.common.enums;
+package com.hs.api.common.enums;
 
 public enum RequestResultType {
     SUCCESS(1,"成功"),

bsoft-api/src/main/java/com/bsoft/api/common/enums/StateType.java → bsoft-api/src/main/java/com/hs/api/common/enums/StateType.java

-package com.bsoft.api.common.enums;
+package com.hs.api.common.enums;
 
 public enum StateType {
     ON(1,"启用"),

bsoft-api/src/main/java/com/bsoft/api/common/enums/TypeState.java → bsoft-api/src/main/java/com/hs/api/common/enums/TypeState.java

-package com.bsoft.api.common.enums;
+package com.hs.api.common.enums;
 
 import java.util.ArrayList;
 import java.util.HashMap;

bsoft-api/src/main/java/com/bsoft/api/common/exceptions/DBConfigurationError.java → bsoft-api/src/main/java/com/hs/api/common/exceptions/DBConfigurationError.java

-package com.bsoft.api.common.exceptions;
+package com.hs.api.common.exceptions;
 
 public class DBConfigurationError extends ExceptionBase {
     public DBConfigurationError(String message) {

bsoft-api/src/main/java/com/bsoft/api/common/exceptions/ExceptionBase.java → bsoft-api/src/main/java/com/hs/api/common/exceptions/ExceptionBase.java

-package com.bsoft.api.common.exceptions;
+package com.hs.api.common.exceptions;
 
 public class ExceptionBase extends RuntimeException {
     public ExceptionBase() {

bsoft-api/src/main/java/com/bsoft/api/common/exceptions/InvalidTokenException.java → bsoft-api/src/main/java/com/hs/api/common/exceptions/InvalidTokenException.java

-package com.bsoft.api.common.exceptions;
+package com.hs.api.common.exceptions;
 
 public class InvalidTokenException extends ExceptionBase {
     public InvalidTokenException() {

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

-package com.bsoft.api.common.handlers;
+package com.hs.api.common.handlers;
 
-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.hs.api.common.Result;
+import com.hs.api.common.exceptions.DBConfigurationError;
+import com.hs.api.common.exceptions.ExceptionBase;
+import com.hs.api.common.exceptions.InvalidTokenException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindingResult;

bsoft-api/src/main/java/com/bsoft/api/common/intercepters/LoginInterceptor.java → bsoft-api/src/main/java/com/hs/api/common/intercepters/LoginInterceptor.java

-package com.bsoft.api.common.intercepters;
+package com.hs.api.common.intercepters;
 
-import com.bsoft.api.common.Constants;
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.utils.TokenUtil;
+import com.hs.api.common.Constants;
+import com.hs.api.common.Result;
+import com.hs.api.common.utils.TokenUtil;
 import org.slf4j.Logger;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

bsoft-api/src/main/java/com/bsoft/api/common/resolvers/CurrentUserMethodArgumentResolver.java → bsoft-api/src/main/java/com/hs/api/common/resolvers/CurrentUserMethodArgumentResolver.java

-package com.bsoft.api.common.resolvers;
+package com.hs.api.common.resolvers;
 
-import com.bsoft.api.common.Constants;
-import com.bsoft.api.common.annotations.CurrentUser;
-import com.bsoft.api.common.utils.TokenUtil;
-import com.bsoft.api.model.SysUser;
+import com.hs.api.common.Constants;
+import com.hs.api.common.annotations.CurrentUser;
+import com.hs.api.common.utils.TokenUtil;
+import com.hs.api.model.SysUser;
 import com.bsoft.common.utils.RedisUtil;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;

bsoft-api/src/main/java/com/bsoft/api/common/utils/SqlUtil.java → bsoft-api/src/main/java/com/hs/api/common/utils/SqlUtil.java

-package com.bsoft.api.common.utils;
+package com.hs.api.common.utils;
 
 public class SqlUtil {
     public static String TransactSQLInjection(String str) {

bsoft-api/src/main/java/com/bsoft/api/common/utils/TokenUtil.java → bsoft-api/src/main/java/com/hs/api/common/utils/TokenUtil.java

-package com.bsoft.api.common.utils;
+package com.hs.api.common.utils;
 
-import com.bsoft.api.model.SysUser;
+import com.hs.api.model.SysUser;
 import com.bsoft.common.utils.JWTUtil;
 import com.bsoft.common.utils.RedisUtil;
 

bsoft-api/src/main/java/com/bsoft/api/controller/BlockValuesController.java → bsoft-api/src/main/java/com/hs/api/controller/BlockValuesController.java

-package com.bsoft.api.controller;
-
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.annotations.CurrentUser;
-import com.bsoft.api.common.annotations.Token;
-import com.bsoft.api.model.reqmodel.BlockValues;
-import com.bsoft.api.model.reqmodel.BlockValuesNew;
-import com.bsoft.api.model.respmodel.BlockValue;
-import com.bsoft.api.service.BlockValuesService;
+package com.hs.api.controller;
+
+import com.hs.api.common.Result;
+import com.hs.api.common.annotations.CurrentUser;
+import com.hs.api.common.annotations.Token;
+import com.hs.api.model.reqmodel.BlockValues;
+import com.hs.api.model.reqmodel.BlockValuesNew;
+import com.hs.api.model.respmodel.BlockValue;
+import com.hs.api.service.BlockValuesService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bsoft-api/src/main/java/com/bsoft/api/controller/DeptController.java → bsoft-api/src/main/java/com/hs/api/controller/DeptController.java

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.annotations.CurrentUser;
-import com.bsoft.api.common.annotations.Token;
-import com.bsoft.api.model.SerDepartment;
-import com.bsoft.api.model.reqmodel.Disease;
-import com.bsoft.api.service.SysUserOrgRsService;
+import com.hs.api.common.Result;
+import com.hs.api.common.annotations.CurrentUser;
+import com.hs.api.common.annotations.Token;
+import com.hs.api.model.SerDepartment;
+import com.hs.api.model.reqmodel.Disease;
+import com.hs.api.service.SysUserOrgRsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bsoft-api/src/main/java/com/bsoft/api/controller/DimController.java → bsoft-api/src/main/java/com/hs/api/controller/DimController.java

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.annotations.Token;
-import com.bsoft.api.model.reqmodel.ReqDimValue;
-import com.bsoft.api.model.respmodel.DimValue;
-import com.bsoft.api.service.DicDimService;
+import com.hs.api.common.Result;
+import com.hs.api.common.annotations.Token;
+import com.hs.api.model.reqmodel.ReqDimValue;
+import com.hs.api.model.respmodel.DimValue;
+import com.hs.api.service.DicDimService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bsoft-api/src/main/java/com/bsoft/api/controller/DoctorController.java → bsoft-api/src/main/java/com/hs/api/controller/DoctorController.java

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.annotations.Token;
-import com.bsoft.api.model.SerDoctor;
-import com.bsoft.api.model.reqmodel.Doctor;
-import com.bsoft.api.service.SerDoctorService;
+import com.hs.api.common.Result;
+import com.hs.api.common.annotations.Token;
+import com.hs.api.model.SerDoctor;
+import com.hs.api.model.reqmodel.Doctor;
+import com.hs.api.service.SerDoctorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.annotations.Token;
-import com.bsoft.api.common.handlers.GlobalExceptionHandler;
-import com.bsoft.api.model.reqmodel.ExportReq;
-import com.bsoft.api.service.ExcelService;
+import com.hs.api.common.Result;
+import com.hs.api.common.annotations.Token;
+import com.hs.api.common.handlers.GlobalExceptionHandler;
+import com.hs.api.model.reqmodel.ExportReq;
+import com.hs.api.service.ExcelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringEscapeUtils;

bsoft-api/src/main/java/com/bsoft/api/controller/IndController.java → bsoft-api/src/main/java/com/hs/api/controller/IndController.java

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.service.DicIndService;
+import com.hs.api.service.DicIndService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

bsoft-api/src/main/java/com/bsoft/api/controller/LoginController.java → bsoft-api/src/main/java/com/hs/api/controller/LoginController.java

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.common.Result;
-import com.bsoft.api.model.reqmodel.CodeAndPwd;
-import com.bsoft.api.model.respmodel.LoginInfo;
-import com.bsoft.api.service.LoginService;
+import com.hs.api.common.Result;
+import com.hs.api.model.reqmodel.CodeAndPwd;
+import com.hs.api.model.respmodel.LoginInfo;
+import com.hs.api.service.LoginService;
 import com.bsoft.common.utils.HttpUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

bsoft-api/src/main/java/com/bsoft/api/controller/SerDiseaseController.java → bsoft-api/src/main/java/com/hs/api/controller/SerDiseaseController.java

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.annotations.CurrentUser;
-import com.bsoft.api.common.annotations.Token;
-import com.bsoft.api.model.SerDisease;
-import com.bsoft.api.model.reqmodel.Disease;
-import com.bsoft.api.model.respmodel.DiseaseLevel;
-import com.bsoft.api.service.SerDiseaseService;
+import com.hs.api.common.Result;
+import com.hs.api.common.annotations.CurrentUser;
+import com.hs.api.common.annotations.Token;
+import com.hs.api.model.SerDisease;
+import com.hs.api.model.reqmodel.Disease;
+import com.hs.api.model.respmodel.DiseaseLevel;
+import com.hs.api.service.SerDiseaseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bsoft-api/src/main/java/com/bsoft/api/controller/SerDiseaseDocController.java → bsoft-api/src/main/java/com/hs/api/controller/SerDiseaseDocController.java

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.annotations.Token;
-import com.bsoft.api.model.SerDiseaseDocRs;
-import com.bsoft.api.model.reqmodel.DiseaseDoc;
-import com.bsoft.api.service.SerDiseaseDocService;
+import com.hs.api.common.Result;
+import com.hs.api.common.annotations.Token;
+import com.hs.api.model.SerDiseaseDocRs;
+import com.hs.api.model.reqmodel.DiseaseDoc;
+import com.hs.api.service.SerDiseaseDocService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bsoft-api/src/main/java/com/bsoft/api/controller/SerProjValueController.java → bsoft-api/src/main/java/com/hs/api/controller/SerProjValueController.java

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.annotations.CurrentUser;
-import com.bsoft.api.common.annotations.Token;
-import com.bsoft.api.model.reqmodel.AddBudgetValue;
-import com.bsoft.api.model.reqmodel.QueryBudgetValue;
-import com.bsoft.api.model.reqmodel.QuerySummary;
-import com.bsoft.api.model.reqmodel.QuerySummary2;
-import com.bsoft.api.service.SerProjValueService;
+import com.hs.api.common.Result;
+import com.hs.api.common.annotations.CurrentUser;
+import com.hs.api.common.annotations.Token;
+import com.hs.api.model.reqmodel.AddBudgetValue;
+import com.hs.api.model.reqmodel.QueryBudgetValue;
+import com.hs.api.model.reqmodel.QuerySummary;
+import com.hs.api.model.reqmodel.QuerySummary2;
+import com.hs.api.service.SerProjValueService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;

bsoft-api/src/main/java/com/bsoft/api/controller/UserController.java → bsoft-api/src/main/java/com/hs/api/controller/UserController.java

-package com.bsoft.api.controller;
+package com.hs.api.controller;
 
-import com.bsoft.api.common.Result;
-import com.bsoft.api.common.annotations.CurrentUser;
-import com.bsoft.api.common.annotations.Token;
-import com.bsoft.api.model.SerDepartment;
-import com.bsoft.api.model.SysRole;
-import com.bsoft.api.model.SysUser;
-import com.bsoft.api.model.reqmodel.Disease;
-import com.bsoft.api.model.respmodel.SysMenuList;
-import com.bsoft.api.service.SysMenuService;
-import com.bsoft.api.service.SysUserOrgRsService;
-import com.bsoft.api.service.SysUserRoleRsService;
+import com.hs.api.common.Result;
+import com.hs.api.common.annotations.CurrentUser;
+import com.hs.api.common.annotations.Token;
+import com.hs.api.model.SerDepartment;
+import com.hs.api.model.SysRole;
+import com.hs.api.model.SysUser;
+import com.hs.api.model.reqmodel.Disease;
+import com.hs.api.model.respmodel.SysMenuList;
+import com.hs.api.service.SysMenuService;
+import com.hs.api.service.SysUserOrgRsService;
+import com.hs.api.service.SysUserRoleRsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bsoft-api/src/main/java/com/bsoft/api/mapper/BlockValuesMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/BlockValuesMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
 import java.util.List;
 import java.util.Map;

bsoft-api/src/main/java/com/bsoft/api/mapper/DicDimMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/DicDimMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.DicDim;
+import com.hs.api.model.DicDim;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/DicIndMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/DicIndMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.DicInd;
+import com.hs.api.model.DicInd;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/DicOrgMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/DicOrgMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.DicOrg;
-import com.bsoft.api.model.SerDepartment;
+import com.hs.api.model.DicOrg;
+import com.hs.api.model.SerDepartment;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerBlockMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerBlockMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerBlock;
+import com.hs.api.model.SerBlock;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDepartmentMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerDepartmentMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerDepartment;
+import com.hs.api.model.SerDepartment;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDeptDocRsMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerDeptDocRsMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerDeptDocRs;
+import com.hs.api.model.SerDeptDocRs;
 
 import java.math.BigDecimal;
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDimValueMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerDimValueMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerDimValue;
+import com.hs.api.model.SerDimValue;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDiseaseDocRsMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerDiseaseDocRsMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerDiseaseDocRs;
+import com.hs.api.model.SerDiseaseDocRs;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDiseaseMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerDiseaseMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerDisease;
-import com.bsoft.api.model.respmodel.DiseaseLevel;
+import com.hs.api.model.SerDisease;
+import com.hs.api.model.respmodel.DiseaseLevel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDoctorMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerDoctorMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerDoctor;
+import com.hs.api.model.SerDoctor;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageBlockRsMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerPageBlockRsMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerPageBlockRs;
+import com.hs.api.model.SerPageBlockRs;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageFieldMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerPageFieldMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerPageField;
+import com.hs.api.model.SerPageField;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerPageMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerPage;
+import com.hs.api.model.SerPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageProjFieldRsMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerPageProjFieldRsMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerPageProjFieldRs;
+import com.hs.api.model.SerPageProjFieldRs;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageProjMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerPageProjMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerPageProj;
+import com.hs.api.model.SerPageProj;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageProjValueMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerPageProjValueMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerPageProjValue;
-import com.bsoft.api.model.respmodel.SummaryNew;
-import com.bsoft.api.model.respmodel.SummaryValue;
+import com.hs.api.model.SerPageProjValue;
+import com.hs.api.model.respmodel.SummaryNew;
+import com.hs.api.model.respmodel.SummaryValue;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageValueConfigMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerPageValueConfigMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerPageValueConfig;
+import com.hs.api.model.SerPageValueConfig;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerProjMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerProjMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerProj;
-import com.bsoft.api.model.respmodel.ProjectInfo;
-import com.bsoft.api.model.respmodel.Summary;
+import com.hs.api.model.SerProj;
+import com.hs.api.model.respmodel.ProjectInfo;
+import com.hs.api.model.respmodel.Summary;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerProjValueMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerProjValueMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerProjValue;
-import com.bsoft.api.model.respmodel.SerProjValueResp;
+import com.hs.api.model.SerProjValue;
+import com.hs.api.model.respmodel.SerProjValueResp;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

bsoft-api/src/main/java/com/bsoft/api/mapper/SerProjValueSzMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SerProjValueSzMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SerProjValueSz;
+import com.hs.api.model.SerProjValueSz;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

bsoft-api/src/main/java/com/bsoft/api/mapper/SysMenuMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SysMenuMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SysMenu;
-import com.bsoft.api.model.respmodel.SysMenuList;
+import com.hs.api.model.SysMenu;
+import com.hs.api.model.respmodel.SysMenuList;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/SysRoleMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SysRoleMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SysRole;
+import com.hs.api.model.SysRole;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/SysRoleMenuRsMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SysRoleMenuRsMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SysRoleMenuRs;
+import com.hs.api.model.SysRoleMenuRs;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SysUserMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SysUser;
+import com.hs.api.model.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserMenuRsMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SysUserMenuRsMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SysUserMenuRs;
+import com.hs.api.model.SysUserMenuRs;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserOrgRsMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SysUserOrgRsMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SysUserOrgRs;
+import com.hs.api.model.SysUserOrgRs;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserRoleRsMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SysUserRoleRsMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SysRole;
-import com.bsoft.api.model.SysUserRoleRs;
+import com.hs.api.model.SysRole;
+import com.hs.api.model.SysUserRoleRs;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SysVersionMapper.java → bsoft-api/src/main/java/com/hs/api/mapper/SysVersionMapper.java

-package com.bsoft.api.mapper;
+package com.hs.api.mapper;
 
-import com.bsoft.api.model.SysVersion;
+import com.hs.api.model.SysVersion;
 
 import java.util.List;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

bsoft-api/src/main/java/com/bsoft/api/model/SerDepartment.java → bsoft-api/src/main/java/com/hs/api/model/SerDepartment.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

bsoft-api/src/main/java/com/bsoft/api/model/SerDeptDocRs.java → bsoft-api/src/main/java/com/hs/api/model/SerDeptDocRs.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 

bsoft-api/src/main/java/com/bsoft/api/model/SerDoctor.java → bsoft-api/src/main/java/com/hs/api/model/SerDoctor.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

bsoft-api/src/main/java/com/bsoft/api/model/SerPageField.java → bsoft-api/src/main/java/com/hs/api/model/SerPageField.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

bsoft-api/src/main/java/com/bsoft/api/model/SerPageProj.java → bsoft-api/src/main/java/com/hs/api/model/SerPageProj.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

bsoft-api/src/main/java/com/bsoft/api/model/SerPageProjFieldRs.java → bsoft-api/src/main/java/com/hs/api/model/SerPageProjFieldRs.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

bsoft-api/src/main/java/com/bsoft/api/model/SerPageProjValue.java → bsoft-api/src/main/java/com/hs/api/model/SerPageProjValue.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

bsoft-api/src/main/java/com/bsoft/api/model/SerPageValueConfig.java → bsoft-api/src/main/java/com/hs/api/model/SerPageValueConfig.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

bsoft-api/src/main/java/com/bsoft/api/model/SerProj.java → bsoft-api/src/main/java/com/hs/api/model/SerProj.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

bsoft-api/src/main/java/com/bsoft/api/model/SerProjValue.java → bsoft-api/src/main/java/com/hs/api/model/SerProjValue.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
-import com.bsoft.api.model.reqmodel.BudgetValue;
+import com.hs.api.model.reqmodel.BudgetValue;
 
 import java.math.BigDecimal;
 import java.util.Date;

bsoft-api/src/main/java/com/bsoft/api/model/SerProjValueSz.java → bsoft-api/src/main/java/com/hs/api/model/SerProjValueSz.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.math.BigDecimal;
 import java.util.Date;

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

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

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

bsoft-api/src/main/java/com/bsoft/api/model/SysVersion.java → bsoft-api/src/main/java/com/hs/api/model/SysVersion.java

-package com.bsoft.api.model;
+package com.hs.api.model;
 
 import java.util.Date;
 

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/AddBudgetValue.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/AddBudgetValue.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/BlockValues.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/BlockValues.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/BlockValuesNew.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/BlockValuesNew.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/BudgetValue.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/BudgetValue.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/CodeAndPwd.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/CodeAndPwd.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/DeptReq.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/DeptReq.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/Disease.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/Disease.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/DiseaseDoc.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/DiseaseDoc.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/Doctor.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/Doctor.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/ExportReq.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/ExportReq.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/QueryBudgetValue.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/QueryBudgetValue.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/QuerySummary.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/QuerySummary.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/QuerySummary2.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/QuerySummary2.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/ReqDimValue.java → bsoft-api/src/main/java/com/hs/api/model/reqmodel/ReqDimValue.java

-package com.bsoft.api.model.reqmodel;
+package com.hs.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/BlockValue.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/BlockValue.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import java.util.List;
 import java.util.Map;

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/DimValue.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/DimValue.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
-import com.bsoft.api.model.DicDim;
-import com.bsoft.api.model.SerDimValue;
+import com.hs.api.model.DicDim;
+import com.hs.api.model.SerDimValue;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/DiseaseLevel.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/DiseaseLevel.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import java.math.BigDecimal;
 import java.util.List;

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/EnumBean.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/EnumBean.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/ListPage.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/ListPage.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/LoginInfo.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/LoginInfo.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
-import com.bsoft.api.model.*;
+import com.hs.api.model.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/ProjectInfo.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/ProjectInfo.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/ProjectValue.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/ProjectValue.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/SerProjValueResp.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/SerProjValueResp.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
-import com.bsoft.api.model.SerProjValue;
-import com.bsoft.api.model.SerProjValueSz;
+import com.hs.api.model.SerProjValue;
+import com.hs.api.model.SerProjValueSz;
 import lombok.Data;
 
 import java.math.BigDecimal;

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/Summary.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/Summary.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/SummaryNew.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/SummaryNew.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import lombok.Data;
 

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/SummaryProjType.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/SummaryProjType.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/SummaryValue.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/SummaryValue.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
 import lombok.Data;
 

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/SysMenuList.java → bsoft-api/src/main/java/com/hs/api/model/respmodel/SysMenuList.java

-package com.bsoft.api.model.respmodel;
+package com.hs.api.model.respmodel;
 
-import com.bsoft.api.model.SysMenu;
+import com.hs.api.model.SysMenu;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/AsynBlockValuesService.java → bsoft-api/src/main/java/com/hs/api/service/AsynBlockValuesService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.common.handlers.GlobalExceptionHandler;
-import com.bsoft.api.model.respmodel.BlockValue;
+import com.hs.api.common.handlers.GlobalExceptionHandler;
+import com.hs.api.model.respmodel.BlockValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

bsoft-api/src/main/java/com/bsoft/api/service/BlockValuesService.java → bsoft-api/src/main/java/com/hs/api/service/BlockValuesService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.respmodel.BlockValue;
+import com.hs.api.model.respmodel.BlockValue;
 
 import java.util.List;
 import java.util.Map;

bsoft-api/src/main/java/com/bsoft/api/service/DicDimService.java → bsoft-api/src/main/java/com/hs/api/service/DicDimService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.DicDim;
-import com.bsoft.api.model.respmodel.DimValue;
+import com.hs.api.model.DicDim;
+import com.hs.api.model.respmodel.DimValue;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/DicIndService.java → bsoft-api/src/main/java/com/hs/api/service/DicIndService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.DicInd;
+import com.hs.api.model.DicInd;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/DicOrgService.java → bsoft-api/src/main/java/com/hs/api/service/DicOrgService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.DicOrg;
+import com.hs.api.model.DicOrg;
 
 public interface DicOrgService extends ServiceBase<DicOrg> {
 }

bsoft-api/src/main/java/com/bsoft/api/service/ExcelService.java → bsoft-api/src/main/java/com/hs/api/service/ExcelService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.common.handlers.GlobalExceptionHandler;
+import com.hs.api.common.handlers.GlobalExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

bsoft-api/src/main/java/com/bsoft/api/service/Impl/AsynBlockValuesServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/AsynBlockValuesServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.BlockValuesMapper;
-import com.bsoft.api.model.respmodel.BlockValue;
-import com.bsoft.api.service.AsynBlockValuesService;
+import com.hs.api.mapper.BlockValuesMapper;
+import com.hs.api.model.respmodel.BlockValue;
+import com.hs.api.service.AsynBlockValuesService;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 

bsoft-api/src/main/java/com/bsoft/api/service/Impl/BlockValuesServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/BlockValuesServiceImpl.java

-package com.bsoft.api.service.Impl;
-
-import com.bsoft.api.common.exceptions.DBConfigurationError;
-import com.bsoft.api.mapper.SerPageBlockRsMapper;
-import com.bsoft.api.mapper.SerPageMapper;
-import com.bsoft.api.model.SerPage;
-import com.bsoft.api.model.SerPageBlockRs;
-import com.bsoft.api.model.respmodel.BlockValue;
-import com.bsoft.api.service.AsynBlockValuesService;
-import com.bsoft.api.service.BlockValuesService;
+package com.hs.api.service.Impl;
+
+import com.hs.api.common.exceptions.DBConfigurationError;
+import com.hs.api.mapper.SerPageBlockRsMapper;
+import com.hs.api.mapper.SerPageMapper;
+import com.hs.api.model.SerPage;
+import com.hs.api.model.SerPageBlockRs;
+import com.hs.api.model.respmodel.BlockValue;
+import com.hs.api.service.AsynBlockValuesService;
+import com.hs.api.service.BlockValuesService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

bsoft-api/src/main/java/com/bsoft/api/service/Impl/DicDimServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/DicDimServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.common.enums.DimType;
-import com.bsoft.api.mapper.DicDimMapper;
-import com.bsoft.api.mapper.SerDimValueMapper;
-import com.bsoft.api.model.DicDim;
-import com.bsoft.api.model.SerDimValue;
-import com.bsoft.api.model.respmodel.DimValue;
-import com.bsoft.api.service.DicDimService;
+import com.hs.api.common.enums.DimType;
+import com.hs.api.mapper.DicDimMapper;
+import com.hs.api.mapper.SerDimValueMapper;
+import com.hs.api.model.DicDim;
+import com.hs.api.model.SerDimValue;
+import com.hs.api.model.respmodel.DimValue;
+import com.hs.api.service.DicDimService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/DicIndServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/DicIndServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.DicIndMapper;
-import com.bsoft.api.model.DicInd;
-import com.bsoft.api.service.DicIndService;
+import com.hs.api.mapper.DicIndMapper;
+import com.hs.api.model.DicInd;
+import com.hs.api.service.DicIndService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/DicOrgServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/DicOrgServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.DicOrgMapper;
-import com.bsoft.api.model.DicOrg;
-import com.bsoft.api.service.DicOrgService;
+import com.hs.api.mapper.DicOrgMapper;
+import com.hs.api.model.DicOrg;
+import com.hs.api.service.DicOrgService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/ExcelServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/ExcelServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.service.ExcelService;
+import com.hs.api.service.ExcelService;
 import me.chyxion.xls.TableToXls;
 import org.springframework.stereotype.Service;
 

bsoft-api/src/main/java/com/bsoft/api/service/Impl/LoginServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/LoginServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.common.exceptions.DBConfigurationError;
-import com.bsoft.api.common.utils.TokenUtil;
-import com.bsoft.api.mapper.DicOrgMapper;
-import com.bsoft.api.mapper.SysRoleMapper;
-import com.bsoft.api.mapper.SysUserMapper;
-import com.bsoft.api.mapper.SysVersionMapper;
-import com.bsoft.api.model.*;
-import com.bsoft.api.model.respmodel.LoginInfo;
-import com.bsoft.api.service.LoginService;
-import com.bsoft.api.service.UserService;
+import com.hs.api.common.exceptions.DBConfigurationError;
+import com.hs.api.common.utils.TokenUtil;
+import com.hs.api.mapper.DicOrgMapper;
+import com.hs.api.mapper.SysRoleMapper;
+import com.hs.api.mapper.SysUserMapper;
+import com.hs.api.mapper.SysVersionMapper;
+import com.hs.api.model.*;
+import com.hs.api.model.respmodel.LoginInfo;
+import com.hs.api.service.LoginService;
+import com.hs.api.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDeptServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SerDeptServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.SerDepartmentMapper;
-import com.bsoft.api.model.SerDepartment;
-import com.bsoft.api.service.SerDeptService;
+import com.hs.api.mapper.SerDepartmentMapper;
+import com.hs.api.model.SerDepartment;
+import com.hs.api.service.SerDeptService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDiseaseDocServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SerDiseaseDocServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.SerDiseaseDocRsMapper;
-import com.bsoft.api.model.SerDiseaseDocRs;
-import com.bsoft.api.service.SerDiseaseDocService;
+import com.hs.api.mapper.SerDiseaseDocRsMapper;
+import com.hs.api.model.SerDiseaseDocRs;
+import com.hs.api.service.SerDiseaseDocService;
 import com.bsoft.common.utils.StringUtil;
 import org.springframework.stereotype.Service;
 

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

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.common.exceptions.DBConfigurationError;
-import com.bsoft.api.mapper.DicOrgMapper;
-import com.bsoft.api.mapper.SerDiseaseMapper;
-import com.bsoft.api.mapper.SysRoleMapper;
-import com.bsoft.api.model.SerDepartment;
-import com.bsoft.api.model.SerDisease;
-import com.bsoft.api.model.SysRole;
-import com.bsoft.api.model.respmodel.DiseaseLevel;
-import com.bsoft.api.service.SerDiseaseService;
+import com.hs.api.common.exceptions.DBConfigurationError;
+import com.hs.api.mapper.DicOrgMapper;
+import com.hs.api.mapper.SerDiseaseMapper;
+import com.hs.api.mapper.SysRoleMapper;
+import com.hs.api.model.SerDepartment;
+import com.hs.api.model.SerDisease;
+import com.hs.api.model.SysRole;
+import com.hs.api.model.respmodel.DiseaseLevel;
+import com.hs.api.service.SerDiseaseService;
 import com.bsoft.common.utils.StringUtil;
 import org.springframework.stereotype.Service;
 

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDoctorServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SerDoctorServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.SerDoctorMapper;
-import com.bsoft.api.model.SerDoctor;
-import com.bsoft.api.service.SerDoctorService;
+import com.hs.api.mapper.SerDoctorMapper;
+import com.hs.api.model.SerDoctor;
+import com.hs.api.service.SerDoctorService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerProjValueServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SerProjValueServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.common.enums.BudgetType;
-import com.bsoft.api.common.enums.ProjectType;
-import com.bsoft.api.common.enums.StateType;
-import com.bsoft.api.common.enums.TypeState;
-import com.bsoft.api.mapper.*;
-import com.bsoft.api.model.DicOrg;
-import com.bsoft.api.model.SerPageValueConfig;
-import com.bsoft.api.model.SerProjValue;
-import com.bsoft.api.model.SerProjValueSz;
-import com.bsoft.api.model.reqmodel.AddBudgetValue;
-import com.bsoft.api.model.reqmodel.BudgetValue;
-import com.bsoft.api.model.respmodel.*;
-import com.bsoft.api.service.SerProjValueService;
+import com.hs.api.common.enums.BudgetType;
+import com.hs.api.common.enums.ProjectType;
+import com.hs.api.common.enums.StateType;
+import com.hs.api.common.enums.TypeState;
+import com.hs.api.mapper.*;
+import com.hs.api.model.DicOrg;
+import com.hs.api.model.SerPageValueConfig;
+import com.hs.api.model.SerProjValue;
+import com.hs.api.model.SerProjValueSz;
+import com.hs.api.model.reqmodel.AddBudgetValue;
+import com.hs.api.model.reqmodel.BudgetValue;
+import com.hs.api.model.respmodel.*;
+import com.hs.api.service.SerProjValueService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -130,7 +130,7 @@ public class SerProjValueServiceImpl implements SerProjValueService {
                     for (Map<String, Object> enumInfo : enumList) {
                         projType = new SummaryProjType();
                         projType.setProjTypeName(String.valueOf(enumInfo.get("description")));
-                            values = serProjValueMapper.selectValue((Integer) enumInfo.get("value"), null,
+                        values = serProjValueMapper.selectValue((Integer) enumInfo.get("value"), null,
                                 null, summary.getDeptCode(), date, budgetType, orgCode);
 //                        if (values != null && values.size() > 0) {
 //                            for (SerProjValueResp value : values) {

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SysMenuServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SysMenuServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.SysMenuMapper;
-import com.bsoft.api.model.SysMenu;
-import com.bsoft.api.model.respmodel.SysMenuList;
-import com.bsoft.api.service.SysMenuService;
+import com.hs.api.mapper.SysMenuMapper;
+import com.hs.api.model.SysMenu;
+import com.hs.api.model.respmodel.SysMenuList;
+import com.hs.api.service.SysMenuService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SysRoleMenuRsServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SysRoleMenuRsServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.SysRoleMenuRsMapper;
-import com.bsoft.api.model.SysRoleMenuRs;
-import com.bsoft.api.service.SysRoleMenuRsService;
+import com.hs.api.mapper.SysRoleMenuRsMapper;
+import com.hs.api.model.SysRoleMenuRs;
+import com.hs.api.service.SysRoleMenuRsService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SysRoleServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SysRoleServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.SysRoleMapper;
-import com.bsoft.api.model.SysRole;
-import com.bsoft.api.service.SysRoleService;
+import com.hs.api.mapper.SysRoleMapper;
+import com.hs.api.model.SysRole;
+import com.hs.api.service.SysRoleService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SysUserMenuRsServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SysUserMenuRsServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.SysUserMenuRsMapper;
-import com.bsoft.api.model.SysUserMenuRs;
-import com.bsoft.api.service.SysUserMenuRsService;
+import com.hs.api.mapper.SysUserMenuRsMapper;
+import com.hs.api.model.SysUserMenuRs;
+import com.hs.api.service.SysUserMenuRsService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SysUserOrgRsServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SysUserOrgRsServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.DicOrgMapper;
-import com.bsoft.api.mapper.SysUserOrgRsMapper;
-import com.bsoft.api.model.DicOrg;
-import com.bsoft.api.model.SerDepartment;
-import com.bsoft.api.model.SysUserOrgRs;
-import com.bsoft.api.service.SysUserOrgRsService;
+import com.hs.api.mapper.DicOrgMapper;
+import com.hs.api.mapper.SysUserOrgRsMapper;
+import com.hs.api.model.DicOrg;
+import com.hs.api.model.SerDepartment;
+import com.hs.api.model.SysUserOrgRs;
+import com.hs.api.service.SysUserOrgRsService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SysUserRoleServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/SysUserRoleServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.SysUserRoleRsMapper;
-import com.bsoft.api.model.SysRole;
-import com.bsoft.api.model.SysUserRoleRs;
-import com.bsoft.api.service.SysUserRoleRsService;
+import com.hs.api.mapper.SysUserRoleRsMapper;
+import com.hs.api.model.SysRole;
+import com.hs.api.model.SysUserRoleRs;
+import com.hs.api.service.SysUserRoleRsService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/Impl/UserServiceImpl.java → bsoft-api/src/main/java/com/hs/api/service/Impl/UserServiceImpl.java

-package com.bsoft.api.service.Impl;
+package com.hs.api.service.Impl;
 
-import com.bsoft.api.mapper.SysUserMapper;
-import com.bsoft.api.model.SysUser;
-import com.bsoft.api.service.UserService;
+import com.hs.api.mapper.SysUserMapper;
+import com.hs.api.model.SysUser;
+import com.hs.api.service.UserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

bsoft-api/src/main/java/com/bsoft/api/service/LoginService.java → bsoft-api/src/main/java/com/hs/api/service/LoginService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.*;
-import com.bsoft.api.model.respmodel.LoginInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
+import com.hs.api.model.respmodel.LoginInfo;
 
 public interface LoginService {
     LoginInfo login(String logName, String password, String macAddrss, String ip);

bsoft-api/src/main/java/com/bsoft/api/service/SerDeptService.java → bsoft-api/src/main/java/com/hs/api/service/SerDeptService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SerDepartment;
+import com.hs.api.model.SerDepartment;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/SerDiseaseDocService.java → bsoft-api/src/main/java/com/hs/api/service/SerDiseaseDocService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SerDiseaseDocRs;
+import com.hs.api.model.SerDiseaseDocRs;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/SerDiseaseService.java → bsoft-api/src/main/java/com/hs/api/service/SerDiseaseService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SerDisease;
-import com.bsoft.api.model.respmodel.DiseaseLevel;
+import com.hs.api.model.SerDisease;
+import com.hs.api.model.respmodel.DiseaseLevel;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/SerDoctorService.java → bsoft-api/src/main/java/com/hs/api/service/SerDoctorService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SerDoctor;
+import com.hs.api.model.SerDoctor;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/SerProjValueService.java → bsoft-api/src/main/java/com/hs/api/service/SerProjValueService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.reqmodel.AddBudgetValue;
+import com.hs.api.model.reqmodel.AddBudgetValue;
 
 import java.util.Map;
 

bsoft-api/src/main/java/com/bsoft/api/service/ServiceBase.java → bsoft-api/src/main/java/com/hs/api/service/ServiceBase.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/SysMenuService.java → bsoft-api/src/main/java/com/hs/api/service/SysMenuService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SysMenu;
-import com.bsoft.api.model.respmodel.SysMenuList;
+import com.hs.api.model.SysMenu;
+import com.hs.api.model.respmodel.SysMenuList;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/SysRoleMenuRsService.java → bsoft-api/src/main/java/com/hs/api/service/SysRoleMenuRsService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SysRoleMenuRs;
+import com.hs.api.model.SysRoleMenuRs;
 
 public interface SysRoleMenuRsService extends ServiceBase<SysRoleMenuRs> {
 }

bsoft-api/src/main/java/com/bsoft/api/service/SysRoleService.java → bsoft-api/src/main/java/com/hs/api/service/SysRoleService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SysRole;
+import com.hs.api.model.SysRole;
 
 public interface SysRoleService extends ServiceBase<SysRole> {
 }

bsoft-api/src/main/java/com/bsoft/api/service/SysUserMenuRsService.java → bsoft-api/src/main/java/com/hs/api/service/SysUserMenuRsService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SysUserMenuRs;
+import com.hs.api.model.SysUserMenuRs;
 
 public interface SysUserMenuRsService extends ServiceBase<SysUserMenuRs> {
 }

bsoft-api/src/main/java/com/bsoft/api/service/SysUserOrgRsService.java → bsoft-api/src/main/java/com/hs/api/service/SysUserOrgRsService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SerDepartment;
-import com.bsoft.api.model.SysUserOrgRs;
+import com.hs.api.model.SerDepartment;
+import com.hs.api.model.SysUserOrgRs;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/SysUserRoleRsService.java → bsoft-api/src/main/java/com/hs/api/service/SysUserRoleRsService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SysRole;
-import com.bsoft.api.model.SysUserRoleRs;
+import com.hs.api.model.SysRole;
+import com.hs.api.model.SysUserRoleRs;
 
 import java.util.List;
 

bsoft-api/src/main/java/com/bsoft/api/service/UserService.java → bsoft-api/src/main/java/com/hs/api/service/UserService.java

-package com.bsoft.api.service;
+package com.hs.api.service;
 
-import com.bsoft.api.model.SysUser;
+import com.hs.api.model.SysUser;
 
 public interface UserService {
     SysUser findByLoginName(String loginName);

bsoft-api/src/main/java/com/bsoft/api/unusecontroller/DicDimController.java → bsoft-api/src/main/java/com/hs/api/unusecontroller/DicDimController.java

-package com.bsoft.api.unusecontroller;
+package com.hs.api.unusecontroller;
 
-import com.bsoft.api.common.base.RequestResult;
-import com.bsoft.api.common.enums.RequestResultType;
-import com.bsoft.api.model.DicDim;
-import com.bsoft.api.model.respmodel.ListPage;
-import com.bsoft.api.service.DicDimService;
+import com.hs.api.common.base.RequestResult;
+import com.hs.api.common.enums.RequestResultType;
+import com.hs.api.model.DicDim;
+import com.hs.api.model.respmodel.ListPage;
+import com.hs.api.service.DicDimService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

bsoft-api/src/main/java/com/bsoft/api/unusecontroller/DicIndController.java → bsoft-api/src/main/java/com/hs/api/unusecontroller/DicIndController.java

-package com.bsoft.api.unusecontroller;
-
-import com.bsoft.api.common.base.RequestResult;
-import com.bsoft.api.common.enums.RequestResultType;
-import com.bsoft.api.model.DicDim;
-import com.bsoft.api.model.DicInd;
-import com.bsoft.api.model.respmodel.ListPage;
-import com.bsoft.api.service.DicIndService;
+package com.hs.api.unusecontroller;
+
+import com.hs.api.common.base.RequestResult;
+import com.hs.api.common.enums.RequestResultType;
+import com.hs.api.model.DicDim;
+import com.hs.api.model.DicInd;
+import com.hs.api.model.respmodel.ListPage;
+import com.hs.api.service.DicIndService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

bsoft-api/src/main/java/com/bsoft/api/unusecontroller/DicOrgController.java → bsoft-api/src/main/java/com/hs/api/unusecontroller/DicOrgController.java

-package com.bsoft.api.unusecontroller;
+package com.hs.api.unusecontroller;
 
-import com.bsoft.api.common.base.RequestResult;
-import com.bsoft.api.common.enums.RequestResultType;
-import com.bsoft.api.model.DicOrg;
-import com.bsoft.api.model.respmodel.ListPage;
-import com.bsoft.api.service.DicOrgService;
+import com.hs.api.common.base.RequestResult;
+import com.hs.api.common.enums.RequestResultType;
+import com.hs.api.model.DicOrg;
+import com.hs.api.model.respmodel.ListPage;
+import com.hs.api.service.DicOrgService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

bsoft-api/src/main/java/com/bsoft/api/unusecontroller/SysMenuController.java → bsoft-api/src/main/java/com/hs/api/unusecontroller/SysMenuController.java

-package com.bsoft.api.unusecontroller;
+package com.hs.api.unusecontroller;
 
-import com.bsoft.api.common.base.RequestResult;
-import com.bsoft.api.common.enums.RequestResultType;
-import com.bsoft.api.model.SysMenu;
-import com.bsoft.api.model.respmodel.ListPage;
-import com.bsoft.api.service.SysMenuService;
+import com.hs.api.common.base.RequestResult;
+import com.hs.api.common.enums.RequestResultType;
+import com.hs.api.model.SysMenu;
+import com.hs.api.model.respmodel.ListPage;
+import com.hs.api.service.SysMenuService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

bsoft-api/src/main/java/com/bsoft/api/unusecontroller/SysRoleController.java → bsoft-api/src/main/java/com/hs/api/unusecontroller/SysRoleController.java

-package com.bsoft.api.unusecontroller;
+package com.hs.api.unusecontroller;
 
-import com.bsoft.api.common.base.RequestResult;
-import com.bsoft.api.common.enums.RequestResultType;
-import com.bsoft.api.model.SysRole;
-import com.bsoft.api.model.respmodel.ListPage;
-import com.bsoft.api.service.SysRoleService;
+import com.hs.api.common.base.RequestResult;
+import com.hs.api.common.enums.RequestResultType;
+import com.hs.api.model.SysRole;
+import com.hs.api.model.respmodel.ListPage;
+import com.hs.api.service.SysRoleService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

bsoft-api/src/main/java/com/bsoft/api/unusecontroller/SysRoleMenuRsController.java → bsoft-api/src/main/java/com/hs/api/unusecontroller/SysRoleMenuRsController.java

-package com.bsoft.api.unusecontroller;
+package com.hs.api.unusecontroller;
 
-import com.bsoft.api.common.base.RequestResult;
-import com.bsoft.api.common.enums.RequestResultType;
-import com.bsoft.api.model.SysRoleMenuRs;
-import com.bsoft.api.model.respmodel.ListPage;
-import com.bsoft.api.service.SysRoleMenuRsService;
+import com.hs.api.common.base.RequestResult;
+import com.hs.api.common.enums.RequestResultType;
+import com.hs.api.model.SysRoleMenuRs;
+import com.hs.api.model.respmodel.ListPage;
+import com.hs.api.service.SysRoleMenuRsService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

bsoft-api/src/main/java/com/bsoft/api/unusecontroller/SysUserMenuRsController.java → bsoft-api/src/main/java/com/hs/api/unusecontroller/SysUserMenuRsController.java

-package com.bsoft.api.unusecontroller;
+package com.hs.api.unusecontroller;
 
-import com.bsoft.api.common.base.RequestResult;
-import com.bsoft.api.common.enums.RequestResultType;
-import com.bsoft.api.model.SysUserMenuRs;
-import com.bsoft.api.model.respmodel.ListPage;
-import com.bsoft.api.service.SysUserMenuRsService;
+import com.hs.api.common.base.RequestResult;
+import com.hs.api.common.enums.RequestResultType;
+import com.hs.api.model.SysUserMenuRs;
+import com.hs.api.model.respmodel.ListPage;
+import com.hs.api.service.SysUserMenuRsService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

bsoft-api/src/main/java/com/bsoft/api/unusecontroller/SysUserOrgController.java → bsoft-api/src/main/java/com/hs/api/unusecontroller/SysUserOrgController.java

-package com.bsoft.api.unusecontroller;
+package com.hs.api.unusecontroller;
 
-import com.bsoft.api.common.base.RequestResult;
-import com.bsoft.api.common.enums.RequestResultType;
-import com.bsoft.api.model.SysUserOrgRs;
-import com.bsoft.api.model.respmodel.ListPage;
-import com.bsoft.api.service.SysUserOrgRsService;
+import com.hs.api.common.base.RequestResult;
+import com.hs.api.common.enums.RequestResultType;
+import com.hs.api.model.SysUserOrgRs;
+import com.hs.api.model.respmodel.ListPage;
+import com.hs.api.service.SysUserOrgRsService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

bsoft-api/src/main/java/com/bsoft/api/unusecontroller/SysUserRoleRsController.java → bsoft-api/src/main/java/com/hs/api/unusecontroller/SysUserRoleRsController.java

-package com.bsoft.api.unusecontroller;
+package com.hs.api.unusecontroller;
 
-import com.bsoft.api.common.base.RequestResult;
-import com.bsoft.api.common.enums.RequestResultType;
-import com.bsoft.api.model.SysUserRoleRs;
-import com.bsoft.api.model.respmodel.ListPage;
-import com.bsoft.api.service.SysUserRoleRsService;
+import com.hs.api.common.base.RequestResult;
+import com.hs.api.common.enums.RequestResultType;
+import com.hs.api.model.SysUserRoleRs;
+import com.hs.api.model.respmodel.ListPage;
+import com.hs.api.service.SysUserRoleRsService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

bsoft-api/src/main/resources/application-test.properties

@@ -4,7 +4,7 @@ spring.datasource.username=root
 spring.datasource.password=Suvalue2016
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
-project.path=sy2/test
+project.path=localhost
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA40\uFF09
 spring.redis.database=1
@@ -22,7 +22,7 @@ spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=100000
 
 swagger.enabled=true
-swagger.basePackage=com.bsoft.api.controller
+swagger.basePackage=com.hs.api.controller
 
 spring.mvc.view.prefix=/WEB-INF/views/
 spring.mvc.view.suffix=.jsp

bsoft-api/src/main/resources/application.properties

-spring.application.name=bsoftapi
+spring.application.name=hs
 spring.profiles.active=test
 #server.port=8080
 #server.servlet.context-path=/api
 mybatis.mapper-locations=classpath:mapper/*.xml
-mybatis.type-aliases-package=com.bsoft.api.model
+mybatis.type-aliases-package=com.hs.api.model
 
+server.compression.enabled=true
+server.compression.min-response-size=1024
+server.compression.mime-types=application/json
 
 config.path.include[0]=/token
 config.path.include[1]=/user/**

bsoft-api/src/main/resources/mapper/BlockValuesMapper.xml

 <?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.bsoft.api.mapper.BlockValuesMapper">
+<mapper namespace="com.hs.api.mapper.BlockValuesMapper">
     <select id="selectByWhere" resultType="java.util.Map">
         select *
         from ${tableName} ${whereSql}

bsoft-api/src/main/resources/mapper/DicDimMapper.xml

 <?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.bsoft.api.mapper.DicDimMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.DicDim">
+<mapper namespace="com.hs.api.mapper.DicDimMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.DicDim">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -15,7 +15,7 @@
         from dic_dim_info
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.DicDim">
+    <insert id="insert" parameterType="com.hs.api.model.DicDim">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -26,7 +26,7 @@
         #{dimName,jdbcType=VARCHAR}, #{dimField,jdbcType=VARCHAR}, #{dimType,jdbcType=DECIMAL}
         )
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicDim">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.DicDim">
         update dic_dim_info
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/DicIndMapper.xml

 <?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.bsoft.api.mapper.DicIndMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.DicInd">
+<mapper namespace="com.hs.api.mapper.DicIndMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.DicInd">
         <result column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -20,7 +20,7 @@
         from dic_ind_info
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.DicInd">
+    <insert id="insert" parameterType="com.hs.api.model.DicInd">
         insert into dic_ind_info (CREATE_DATE, CREATE_USERID, `STATE`,
                                   IND_CODE, IND_NAME, COMPUTE_MODE,
                                   EXEC_SQL, `DESCRIBE`)
@@ -28,7 +28,7 @@
                 #{indCode,jdbcType=VARCHAR}, #{indName,jdbcType=VARCHAR}, #{computeMode,jdbcType=DECIMAL},
                 #{execSql,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicInd">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.DicInd">
         update dic_ind_info
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/DicOrgMapper.xml

 <?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.bsoft.api.mapper.DicOrgMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.DicOrg">
+<mapper namespace="com.hs.api.mapper.DicOrgMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.DicOrg">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -15,7 +15,7 @@
         <result column="ORG_ADDRESS" jdbcType="VARCHAR" property="orgAddress"/>
         <result column="PARENT_ID" jdbcType="DECIMAL" property="parentId"/>
     </resultMap>
-    <resultMap id="SummaryDept" type="com.bsoft.api.model.SerDepartment">
+    <resultMap id="SummaryDept" type="com.hs.api.model.SerDepartment">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -30,7 +30,7 @@
         from sys_subject
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.DicOrg">
+    <insert id="insert" parameterType="com.hs.api.model.DicOrg">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -43,7 +43,7 @@
         #{orgShortName,jdbcType=VARCHAR}, #{orgGroup,jdbcType=VARCHAR}, #{orgType,jdbcType=VARCHAR},
         #{orgAddress,jdbcType=VARCHAR}, #{parentId,jdbcType=DECIMAL})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicOrg">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.DicOrg">
         update sys_subject
         set CREATE_DATE    = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID  = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SerBlockMapper.xml

 <?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.bsoft.api.mapper.SerBlockMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerBlock">
+<mapper namespace="com.hs.api.mapper.SerBlockMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerBlock">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -15,7 +15,7 @@
         from SER_BLOCK
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerBlock">
+    <insert id="insert" parameterType="com.hs.api.model.SerBlock">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -26,7 +26,7 @@
         #{blockCode,jdbcType=VARCHAR}, #{blockName,jdbcType=VARCHAR}, #{returnType,jdbcType=DECIMAL}
         )
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerBlock">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerBlock">
         update SER_BLOCK
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SerDepartmentMapper.xml

 <?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.bsoft.api.mapper.SerDepartmentMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDepartment">
+<mapper namespace="com.hs.api.mapper.SerDepartmentMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerDepartment">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -15,7 +15,7 @@
         from SER_DEPARTMENT
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerDepartment">
+    <insert id="insert" parameterType="com.hs.api.model.SerDepartment">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -24,7 +24,7 @@
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
         #{orgId,jdbcType=VARCHAR}, #{ksbm,jdbcType=VARCHAR}, #{ksmc,jdbcType=VARCHAR})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerDepartment">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerDepartment">
         update SER_DEPARTMENT
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SerDeptDocRsMapper.xml

 <?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.bsoft.api.mapper.SerDeptDocRsMapper">
-  <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDeptDocRs">
+<mapper namespace="com.hs.api.mapper.SerDeptDocRsMapper">
+  <resultMap id="BaseResultMap" type="com.hs.api.model.SerDeptDocRs">
     <id column="ID" jdbcType="DECIMAL" property="id" />
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
@@ -17,7 +17,7 @@
     delete from SER_DEPT_DOC_RS
     where ID = #{id,jdbcType=DECIMAL}
   </delete>
-  <insert id="insert" parameterType="com.bsoft.api.model.SerDeptDocRs">
+  <insert id="insert" parameterType="com.hs.api.model.SerDeptDocRs">
     <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -28,7 +28,7 @@
       #{orgId,jdbcType=VARCHAR}, #{ksbm,jdbcType=VARCHAR}, #{ksmc,jdbcType=VARCHAR}, 
       #{ysbm,jdbcType=VARCHAR}, #{ysmc,jdbcType=VARCHAR}, #{yslx,jdbcType=VARCHAR})
   </insert>
-  <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerDeptDocRs">
+  <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerDeptDocRs">
     update SER_DEPT_DOC_RS
     set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SerDimValueMapper.xml

 <?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.bsoft.api.mapper.SerDimValueMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDimValue">
+<mapper namespace="com.hs.api.mapper.SerDimValueMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerDimValue">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="ORG_ID" jdbcType="DECIMAL" property="orgId"/>
         <result column="ITEM_NAME" jdbcType="VARCHAR" property="itemName"/>
@@ -14,7 +14,7 @@
         from SER_DIM_VALUE
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerDimValue">
+    <insert id="insert" parameterType="com.hs.api.model.SerDimValue">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -23,7 +23,7 @@
         values (#{orgId,jdbcType=DECIMAL}, #{itemName,jdbcType=VARCHAR}, #{itemValue,jdbcType=VARCHAR},
         #{date,jdbcType=DECIMAL}, #{dimId,jdbcType=DECIMAL})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerDimValue">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerDimValue">
         update SER_DIM_VALUE
         set ORG_ID     = #{orgId,jdbcType=DECIMAL},
             ITEM_NAME  = #{itemName,jdbcType=VARCHAR},

bsoft-api/src/main/resources/mapper/SerDiseaseDocRsMapper.xml

 <?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.bsoft.api.mapper.SerDiseaseDocRsMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDiseaseDocRs">
+<mapper namespace="com.hs.api.mapper.SerDiseaseDocRsMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerDiseaseDocRs">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="ORG_ID" jdbcType="DECIMAL" property="orgId"/>
         <result column="DOC_CODE" jdbcType="VARCHAR" property="docCode"/>
@@ -16,7 +16,7 @@
         from dic_disease_doc_rs
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerDiseaseDocRs">
+    <insert id="insert" parameterType="com.hs.api.model.SerDiseaseDocRs">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -27,7 +27,7 @@
         #{mdcCode,jdbcType=VARCHAR}, #{date,jdbcType=DECIMAL}, #{deptCode,jdbcType=VARCHAR},
         #{deptName,jdbcType=VARCHAR})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerDiseaseDocRs">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerDiseaseDocRs">
         update dic_disease_doc_rs
         set ORG_ID    = #{orgId,jdbcType=DECIMAL},
             DOC_CODE  = #{docCode,jdbcType=VARCHAR},

bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml

 <?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.bsoft.api.mapper.SerDiseaseMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDisease">
+<mapper namespace="com.hs.api.mapper.SerDiseaseMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerDisease">
         <result column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -17,7 +17,7 @@
         <result column="PARENT_CODE" jdbcType="VARCHAR" property="parentCode"/>
         <result column="GROUP_TYPE" jdbcType="VARCHAR" property="groupType"/>
     </resultMap>
-    <resultMap id="DiseaseLevel" type="com.bsoft.api.model.respmodel.DiseaseLevel">
+    <resultMap id="DiseaseLevel" type="com.hs.api.model.respmodel.DiseaseLevel">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="MDC_CODE" jdbcType="VARCHAR" property="mdcCode"/>
         <result column="MDC_NAME" jdbcType="VARCHAR" property="mdcName"/>
@@ -30,7 +30,7 @@
         <result column="GROUP_TYPE" jdbcType="VARCHAR" property="groupType"/>
         <result column="ZLS" jdbcType="VARCHAR" property="zls"/>
     </resultMap>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerDisease">
+    <insert id="insert" parameterType="com.hs.api.model.SerDisease">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>

bsoft-api/src/main/resources/mapper/SerDoctorMapper.xml

 <?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.bsoft.api.mapper.SerDoctorMapper">
-  <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDoctor">
+<mapper namespace="com.hs.api.mapper.SerDoctorMapper">
+  <resultMap id="BaseResultMap" type="com.hs.api.model.SerDoctor">
     <id column="ID" jdbcType="DECIMAL" property="id" />
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
@@ -15,7 +15,7 @@
     delete from SER_DOCTOR
     where ID = #{id,jdbcType=DECIMAL}
   </delete>
-  <insert id="insert" parameterType="com.bsoft.api.model.SerDoctor">
+  <insert id="insert" parameterType="com.hs.api.model.SerDoctor">
     <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -26,7 +26,7 @@
       #{orgId,jdbcType=VARCHAR}, #{ysbm,jdbcType=VARCHAR}, #{ysmc,jdbcType=VARCHAR}, 
       #{yslx,jdbcType=VARCHAR})
   </insert>
-  <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerDoctor">
+  <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerDoctor">
     update SER_DOCTOR
     set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SerPageBlockRsMapper.xml

 <?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.bsoft.api.mapper.SerPageBlockRsMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPageBlockRs">
+<mapper namespace="com.hs.api.mapper.SerPageBlockRsMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerPageBlockRs">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -16,7 +16,7 @@
         from dic_page_block_rs
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerPageBlockRs">
+    <insert id="insert" parameterType="com.hs.api.model.SerPageBlockRs">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -28,7 +28,7 @@
         #{whereClause,jdbcType=VARCHAR},#{tableName,jdbcType=VARCHAR}
         )
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerPageBlockRs">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerPageBlockRs">
         update dic_page_block_rs
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SerPageFieldMapper.xml

 <?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.bsoft.api.mapper.SerPageFieldMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPageField">
+<mapper namespace="com.hs.api.mapper.SerPageFieldMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerPageField">
         <result column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -10,7 +10,7 @@
         <result column="FIELD_NAME" jdbcType="VARCHAR" property="fieldName"/>
         <result column="REMARK" jdbcType="VARCHAR" property="remark"/>
     </resultMap>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerPageField">
+    <insert id="insert" parameterType="com.hs.api.model.SerPageField">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>

bsoft-api/src/main/resources/mapper/SerPageMapper.xml

 <?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.bsoft.api.mapper.SerPageMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPage">
+<mapper namespace="com.hs.api.mapper.SerPageMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerPage">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -14,7 +14,7 @@
         from dic_page_info
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerPage">
+    <insert id="insert" parameterType="com.hs.api.model.SerPage">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -23,7 +23,7 @@
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
         #{pageCode,jdbcType=VARCHAR}, #{pageName,jdbcType=VARCHAR})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerPage">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerPage">
         update dic_page_info
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
@@ -65,7 +65,7 @@
         </if>
         and f.count =#{dimCount,jdbcType=INTEGER}
     </select>
-    <select id="selectByCodeAndDimList" resultType="com.bsoft.api.model.SerPage">
+    <select id="selectByCodeAndDimList" resultType="com.hs.api.model.SerPage">
         select d.* from dic_page_info d,
         <if test="dimCount != 0">
             (select a.id,COUNT(b.ID) count

bsoft-api/src/main/resources/mapper/SerPageProjFieldRsMapper.xml

 <?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.bsoft.api.mapper.SerPageProjFieldRsMapper">
-  <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPageProjFieldRs">
+<mapper namespace="com.hs.api.mapper.SerPageProjFieldRsMapper">
+  <resultMap id="BaseResultMap" type="com.hs.api.model.SerPageProjFieldRs">
     <result column="ID" jdbcType="DECIMAL" property="id" />
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
@@ -12,7 +12,7 @@
     <result column="REMARK" jdbcType="VARCHAR" property="remark" />
     <result column="SORT" jdbcType="DECIMAL" property="sort" />
   </resultMap>
-  <insert id="insert" parameterType="com.bsoft.api.model.SerPageProjFieldRs">
+  <insert id="insert" parameterType="com.hs.api.model.SerPageProjFieldRs">
     <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
       SELECT LAST_INSERT_ID()
     </selectKey>

bsoft-api/src/main/resources/mapper/SerPageProjMapper.xml

 <?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.bsoft.api.mapper.SerPageProjMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPageProj">
+<mapper namespace="com.hs.api.mapper.SerPageProjMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerPageProj">
         <result column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -10,7 +10,7 @@
         <result column="PROJ_CODE" jdbcType="VARCHAR" property="projCode"/>
         <result column="PROJ_TYPE" jdbcType="VARCHAR" property="projType"/>
     </resultMap>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerPageProj">
+    <insert id="insert" parameterType="com.hs.api.model.SerPageProj">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>

bsoft-api/src/main/resources/mapper/SerPageProjValueMapper.xml

 <?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.bsoft.api.mapper.SerPageProjValueMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPageProjValue">
+<mapper namespace="com.hs.api.mapper.SerPageProjValueMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerPageProjValue">
         <result column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -15,10 +15,10 @@
         <result column="FIELD_VALUE" jdbcType="VARCHAR" property="fieldValue"/>
         <result column="FIELD_UNIT" jdbcType="VARCHAR" property="fieldUnit"/>
     </resultMap>
-    <resultMap id="SummaryNew" type="com.bsoft.api.model.respmodel.SummaryNew">
+    <resultMap id="SummaryNew" type="com.hs.api.model.respmodel.SummaryNew">
         <result column="DEPT_CODE" jdbcType="VARCHAR" property="deptCode"/>
     </resultMap>
-    <resultMap id="SummaryValue" type="com.bsoft.api.model.respmodel.SummaryValue">
+    <resultMap id="SummaryValue" type="com.hs.api.model.respmodel.SummaryValue">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="PROJ_NAME" jdbcType="VARCHAR" property="projName"/>
         <result column="FIELD_NAME" jdbcType="VARCHAR" property="fieldName"/>
@@ -26,7 +26,7 @@
         <result column="FIELD_VALUE" jdbcType="VARCHAR" property="fieldValue"/>
         <result column="FIELD_UNIT" jdbcType="VARCHAR" property="fieldUnit"/>
     </resultMap>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerPageProjValue">
+    <insert id="insert" parameterType="com.hs.api.model.SerPageProjValue">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>

bsoft-api/src/main/resources/mapper/SerPageValueConfigMapper.xml

 <?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.bsoft.api.mapper.SerPageValueConfigMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPageValueConfig">
+<mapper namespace="com.hs.api.mapper.SerPageValueConfigMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerPageValueConfig">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -15,7 +15,7 @@
         from SER_PAGE_VALUE_CONFIG
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerPageValueConfig">
+    <insert id="insert" parameterType="com.hs.api.model.SerPageValueConfig">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -26,7 +26,7 @@
         #{page,jdbcType=DECIMAL}, #{pageName,jdbcType=VARCHAR}, #{sqlstr,jdbcType=VARCHAR}
         )
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerPageValueConfig">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerPageValueConfig">
         update SER_PAGE_VALUE_CONFIG
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SerProjMapper.xml

 <?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.bsoft.api.mapper.SerProjMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerProj">
+<mapper namespace="com.hs.api.mapper.SerProjMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerProj">
         <result column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -14,10 +14,10 @@
         <result column="SORT" jdbcType="DECIMAL" property="sort"/>
         <result column="PARENT" jdbcType="DECIMAL" property="parent"/>
     </resultMap>
-    <resultMap id="Summary" type="com.bsoft.api.model.respmodel.Summary">
+    <resultMap id="Summary" type="com.hs.api.model.respmodel.Summary">
         <result column="DEPT_CODE" jdbcType="VARCHAR" property="deptCode"/>
     </resultMap>
-    <resultMap id="ProjectInfo" type="com.bsoft.api.model.respmodel.ProjectInfo">
+    <resultMap id="ProjectInfo" type="com.hs.api.model.respmodel.ProjectInfo">
         <result column="EXPONENT_ID" jdbcType="DECIMAL" property="exponentId"/>
         <result column="EXPONENT_NAME" jdbcType="VARCHAR" property="exponentName"/>
     </resultMap>
@@ -26,7 +26,7 @@
         from SER_PROJ
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerProj">
+    <insert id="insert" parameterType="com.hs.api.model.SerProj">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -39,7 +39,7 @@
         #{isBudget,jdbcType=DECIMAL}, #{typeState,jdbcType=DECIMAL}, #{sort,jdbcType=DECIMAL}
         )
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerProj">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerProj">
         update dic_bgt_proj
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SerProjValueMapper.xml

 <?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.bsoft.api.mapper.SerProjValueMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerProjValue">
+<mapper namespace="com.hs.api.mapper.SerProjValueMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerProjValue">
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
         <result column="STATE" jdbcType="DECIMAL" property="state"/>
@@ -28,7 +28,7 @@
         <result column="DEPT_NAME" jdbcType="VARCHAR" property="deptName"/>
         <result column="HOSCODE" jdbcType="VARCHAR" property="hoscode"/>
     </resultMap>
-    <resultMap id="SerProjValueResp" extends="BaseResultMap" type="com.bsoft.api.model.respmodel.SerProjValueResp">
+    <resultMap id="SerProjValueResp" extends="BaseResultMap" type="com.hs.api.model.respmodel.SerProjValueResp">
         <result column="PROJ_NAME" jdbcType="VARCHAR" property="projName"/>
         <result column="IS_BUDGET" jdbcType="DECIMAL" property="isBudget"/>
         <result column="PARENT" jdbcType="DECIMAL" property="parent"/>
@@ -38,7 +38,7 @@
         from val_proj_value
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerProjValue">
+    <insert id="insert" parameterType="com.hs.api.model.SerProjValue">
         insert into val_proj_value (CREATE_DATE, CREATE_USERID, `STATE`,
                                     PROJ_ID, QNZ, WQQS,
                                     LS, MB, CSYSZ, CSYSZ_TB,
@@ -56,7 +56,7 @@
                 #{yszUnit,jdbcType=VARCHAR}, #{szUnit,jdbcType=VARCHAR}, #{wqqsZypzJs,jdbcType=DECIMAL},
                 #{deptName,jdbcType=VARCHAR}, #{hoscode,jdbcType=VARCHAR})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerProjValue">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerProjValue">
         update val_proj_value
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SerProjValueSzMapper.xml

 <?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.bsoft.api.mapper.SerProjValueSzMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerProjValueSz">
+<mapper namespace="com.hs.api.mapper.SerProjValueSzMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SerProjValueSz">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -18,7 +18,7 @@
         from VAL_PROJ_VALUE_SZ
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SerProjValueSz">
+    <insert id="insert" parameterType="com.hs.api.model.SerProjValueSz">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -29,7 +29,7 @@
         #{projId,jdbcType=DECIMAL}, #{sz,jdbcType=DECIMAL}, #{zxpl,jdbcType=DECIMAL}, #{date,jdbcType=DECIMAL},
         #{deptCode,jdbcType=VARCHAR}, #{hoscode,jdbcType=VARCHAR})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerProjValueSz">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerProjValueSz">
         update VAL_PROJ_VALUE_SZ
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SysMenuMapper.xml

 <?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.bsoft.api.mapper.SysMenuMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysMenu">
+<mapper namespace="com.hs.api.mapper.SysMenuMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SysMenu">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATA" jdbcType="TIMESTAMP" property="createData"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -13,13 +13,13 @@
         <result column="PAGE_CODE" jdbcType="VARCHAR" property="pageCode"/>
         <result column="SORT" jdbcType="DECIMAL" property="sort"/>
     </resultMap>
-    <resultMap id="sysMenuResultMap" type="com.bsoft.api.model.respmodel.SysMenuList" extends="BaseResultMap"/>
+    <resultMap id="sysMenuResultMap" type="com.hs.api.model.respmodel.SysMenuList" extends="BaseResultMap"/>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete
         from sys_menu
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SysMenu">
+    <insert id="insert" parameterType="com.hs.api.model.SysMenu">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -32,7 +32,7 @@
         #{parentId,jdbcType=DECIMAL}, #{pageCode,jdbcType=VARCHAR}, #{sort,jdbcType=DECIMAL}
         )
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysMenu">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SysMenu">
         update SYS_MENU
         set CREATE_DATA   = #{createData,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SysRoleMapper.xml

 <?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.bsoft.api.mapper.SysRoleMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysRole">
+<mapper namespace="com.hs.api.mapper.SysRoleMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SysRole">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -14,7 +14,7 @@
         from SYS_ROLE
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SysRole">
+    <insert id="insert" parameterType="com.hs.api.model.SysRole">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -23,7 +23,7 @@
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
         #{roleName,jdbcType=VARCHAR}, #{roleCode,jdbcType=DECIMAL})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysRole">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SysRole">
         update SYS_ROLE
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SysRoleMenuRsMapper.xml

 <?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.bsoft.api.mapper.SysRoleMenuRsMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysRoleMenuRs">
+<mapper namespace="com.hs.api.mapper.SysRoleMenuRsMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SysRoleMenuRs">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -14,7 +14,7 @@
         from SYS_ROLE_MENU_RS
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SysRoleMenuRs">
+    <insert id="insert" parameterType="com.hs.api.model.SysRoleMenuRs">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -23,7 +23,7 @@
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
         #{menuId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysRoleMenuRs">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SysRoleMenuRs">
         update SYS_ROLE_MENU_RS
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SysUserMapper.xml

 <?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.bsoft.api.mapper.SysUserMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUser">
+<mapper namespace="com.hs.api.mapper.SysUserMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SysUser">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -24,7 +24,7 @@
         from SYS_USER
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SysUser">
+    <insert id="insert" parameterType="com.hs.api.model.SysUser">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -39,7 +39,7 @@
         #{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP},
         #{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=VARCHAR}, #{macAddress,jdbcType=VARCHAR})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUser">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SysUser">
         update SYS_USER
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SysUserMenuRsMapper.xml

 <?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.bsoft.api.mapper.SysUserMenuRsMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUserMenuRs">
+<mapper namespace="com.hs.api.mapper.SysUserMenuRsMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SysUserMenuRs">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -14,7 +14,7 @@
         from SYS_USER_MENU_RS
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SysUserMenuRs">
+    <insert id="insert" parameterType="com.hs.api.model.SysUserMenuRs">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -23,7 +23,7 @@
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
         #{userId,jdbcType=DECIMAL}, #{menuId,jdbcType=DECIMAL})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUserMenuRs">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SysUserMenuRs">
         update SYS_USER_MENU_RS
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SysUserOrgRsMapper.xml

 <?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.bsoft.api.mapper.SysUserOrgRsMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUserOrgRs">
+<mapper namespace="com.hs.api.mapper.SysUserOrgRsMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SysUserOrgRs">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -14,7 +14,7 @@
         from sys_user_sbj_rs
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SysUserOrgRs">
+    <insert id="insert" parameterType="com.hs.api.model.SysUserOrgRs">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -23,7 +23,7 @@
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
         #{userId,jdbcType=DECIMAL}, #{orgId,jdbcType=DECIMAL})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUserOrgRs">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SysUserOrgRs">
         update sys_user_sbj_rs
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SysUserRoleRsMapper.xml

 <?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.bsoft.api.mapper.SysUserRoleRsMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUserRoleRs">
+<mapper namespace="com.hs.api.mapper.SysUserRoleRsMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SysUserRoleRs">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
@@ -14,7 +14,7 @@
         from SYS_USER_ROLE_RS
         where ID = #{id,jdbcType=DECIMAL}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SysUserRoleRs">
+    <insert id="insert" parameterType="com.hs.api.model.SysUserRoleRs">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -23,7 +23,7 @@
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
         #{userId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUserRoleRs">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SysUserRoleRs">
         update SYS_USER_ROLE_RS
         set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
             CREATE_USERID = #{createUserid,jdbcType=DECIMAL},

bsoft-api/src/main/resources/mapper/SysVersionMapper.xml

 <?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.bsoft.api.mapper.SysVersionMapper">
-    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysVersion">
+<mapper namespace="com.hs.api.mapper.SysVersionMapper">
+    <resultMap id="BaseResultMap" type="com.hs.api.model.SysVersion">
         <id column="ID" jdbcType="INTEGER" property="id"/>
         <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="BAH_DATE" jdbcType="INTEGER" property="bahDate"/>
@@ -13,7 +13,7 @@
         from sys_version
         where ID = #{id,jdbcType=INTEGER}
     </delete>
-    <insert id="insert" parameterType="com.bsoft.api.model.SysVersion">
+    <insert id="insert" parameterType="com.hs.api.model.SysVersion">
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -22,7 +22,7 @@
         values (#{updateTime,jdbcType=TIMESTAMP}, #{bahDate,jdbcType=INTEGER}, #{version,jdbcType=VARCHAR},
         #{remarks,jdbcType=LONGVARCHAR})
     </insert>
-    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysVersion">
+    <update id="updateByPrimaryKey" parameterType="com.hs.api.model.SysVersion">
         update sys_version
         set UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
             BAH_DATE    = #{bahDate,jdbcType=INTEGER},

bsoft-api/src/main/resources/更新日志.txt

-时间：2020.07.27		版本号：2.02.0727002
-时间：2020.07.27		版本号：2.02.0727002
+时间：2020.08.05		版本号：2.02.0805001
+时间：2020.08.05		版本号：2.02.0805001
+
+后端更新说明：
+                       包名调整
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+时间：2020.08.4		版本号：2.02.0804001
 
 前端更新说明：
-                 560 全院费用的三级病组层，点“转图表”，图的界面左下病组目录未出现，视频已发
-                 561 全院能效默认图，线多余
-                 562医保的科室内图趋势图上“rw同级均偏”线点不亮
-                 555 未显示同比为0的线
-
-                列表科室层过滤 只显示上级病组下的子病组
-                医保图形模块下钻，然后，上一页，然后点筛选
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-时间：2020.07.27		版本号：2.02.0727001
+                       575 全院的主病组 能效下趋势图 rw同级均偏无法点亮
+                       573 所有趋势图的柱子例数少时看不到，优化，固定高度
+                       572 能效的全院默认科室趋势图总量指数，例数偏离应分别只有一条折线，图标不需要分别显示两种颜色，多余的一条线删除
+                       569 成本默认全员图优化--加个饼的对应科室名，饼和右侧的表格高度一致
+                       574 导出execl名称优化
+                       554 成本科室内的中下病组和右下病组列表高亮对不上，左下的主病组要联动
+                       533 三级病组层医保支付率模糊化，10%一个区间，比如支付率83%，展现形式为80%~90%
+                       578 医保界面删指标
+                       520 趋势图可拖动标杆尺，先做一张能效的全院科室趋
+                       579 绩效科室内一级病组，二级病组加柱状图，表示正向得分，负向得分
+                       576 趋势图指标统一颜色
+                       569 成本默认全员图优化--加个饼的对应科室名，饼和右侧的表格高度一致
+                       577 住院预算编制界面，门诊预算编制报表导出
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+时间：2020.07.31		版本号：2.02.0731001
 
 前端更新说明：
-              556 全院，科室 医保错行，科室的成本错行
-              553 成本的科室内主病组=》一级病组=》二级病组=》一级病组=》主病组，异常
-              552 科室内医生列表未显示快速入口
-              527 科室内下钻到三级病组层，然后右上角筛选全院，然后，左下切换其他病组，中下和右下数据缺失
-              557 住院预算界面右上角筛选具体科室后，重新打开筛选浮框，只显示“全院”错误
-              558 科室内的默认能效分析，右上角点筛选应该为全院以及所有科室，选中全院应该是全院的默认能效分析图，而不是全院的主病组分析。
-              559 科室能效的二级病组层点转图表，再点“上一页”，界面空白
 
- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+        554 成本科室内的中下病组和右下病组列表高亮对不上
+        551 能效，医保，成本，费用，绩效科室的列表点下钻到科室的图后，左下目录点不开。（能效已解决，但左下目录切换时，界面数据下载慢
+        547 病组层优化，所有模块（科室内默认书把例数最多的主病组高亮效果默认不出现，左下长按后才出现）
+        565 数据显示在底部
+        570 成本默认界面趋势图优化
+        546  所有的导出报表数据拆分
+       569 成本默认全员图优化
+       528 右下列表切换时，把高亮效果带到右下列表
+       567 薪酬鱼骨图
+
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+时间：2020.07.27		版本号：2.02.0727002
+
+前端更新说明：
+
+            点击返回按钮  中间 出现病组名
 
 
-时间：2020.07.26		版本号：2.02.0726001
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+时间：2020.07.27		版本号：2.02.0727001
 
 前端更新说明：
-              1、 列表到科室层，右上角筛选全院，下钻到图表层，点击科室内面出现错乱。
 
- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+            556 全院，科室 医保错行，科室的成本错行
+			553 成本的科室内主病组=》一级病组=》二级病组=》一级病组=》主病组，异常
+			552 科室内医生列表未显示快速入口
+			527 科室内下钻到三级病组层，然后右上角筛选全院，然后，左下切换其他病组，中下和右下数据缺失
+			557 住院预算界面右上角筛选具体科室后，重新打开筛选浮框，只显示“全院”错误
+			558 科室内的默认能效分析，右上角点筛选应该为全院以及所有科室，选中全院应该是全院的默认能效分析图，而不是全院的主病组分析。
+			559 科室能效的二级病组层点转图表，再点“上一页”，界面空白
+			560 全院费用的三级病组层，点“转图表”，图的界面左下病组目录未出现，视频已发
+			561 全院能效默认图，线多余
+			562医保的科室内图趋势图上“rw同级均偏”线点不亮
+			555 未显示同比为0的线
+
+			列表科室层过滤 只显示上级病组下的子病组
+			医保图形模块下钻，然后，上一页，然后点筛选
+
 
 
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
 时间：2020.07.24		版本号：2.02.0724001
 
 前端更新说明：
@@ -43,7 +84,8 @@
             538 以下浮框字段删
             542 绩效的浮框总分是10分
             544 全院住院预算编制---》下钻---》上一页-----》右上筛选“心血管”----》下钻-----》下钻，能效的列表数据不出来
-            527 所有模块的图，全院的主病组层，一级病组层，二级病组层，右上角筛选只有全院和相关的科室；科室内的一级病组层，二级病组层，右上角筛选只出现本科室（选中），全院未选中，以及其他相关的有这个病组的科室名（未选中），参考列表的处理方式   解决
+            527 所有模块的图，全院的主病组层，一级病组层，二级病组层，右上角筛选只有全院和相关的科室；科室内的一级病组层，二级病组层，右上角筛选只出现本科室（选中），
+                   全院未选中，以及其他相关的有这个病组的科室名（未选中），参考列表的处理方式   解决
             540 增加收支比偏
             541 成本高亮联动
             543 绩效的趋势图，点击浮框高亮联动

bsoft-api/src/test/java/com/bsoft/api/BsoftApiApplicationTests.java → bsoft-api/src/test/java/com/hs/api/BsoftApiApplicationTests.java

-package com.bsoft.api;
+package com.hs.api;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;