包名调整

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;