1、swagger 关闭

2、druid stats 关闭
3、datasource2 去除

atms-api/pom.xml

@@ -20,11 +20,11 @@
             <!--<artifactId>ojdbc</artifactId>-->
             <!--<version>0.0.1</version>-->
         <!--</dependency>-->
-        <dependency>
+        <!--<dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc6</artifactId>
             <version>12.1.0.1-atlassian-hosted</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>pwc.taxtech.atms</groupId>
@@ -73,7 +73,8 @@
             <version>4.2.3.RELEASE</version>
         </dependency>
 
-        <dependency>
+        <!--去除swagger-->
+       <!-- <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>2.8.0</version>
@@ -82,7 +83,7 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
             <version>2.8.0</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>io.jsonwebtoken</groupId>

atms-api/src/main/java/pwc/taxtech/atms/SwaggerConfig.java

+/*
 package pwc.taxtech.atms;
 
 import java.util.ArrayList;
@@ -44,4 +45,4 @@ public class SwaggerConfig {
         return new ApiInfoBuilder().title("ATMS API").description("ATMS API").version("1.0").build();
         // .termsOfServiceUrl("http://localhost:8180")
     }
-}
+}*/
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/controller/AccountController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +22,7 @@ public class AccountController {
     @Autowired
     private UserAccountServiceImpl userAccountService;
 
-    @ApiOperation(value = "修改密码")
+//    @ApiOperation(value = "修改密码")
     @RequestMapping(value = "userPassword", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public OperationResultDto<LoginOutputDto> changeExternalUserPassword(
             @RequestBody(required = false) UserPasswordDto userPasswordDto) {
@@ -32,7 +31,7 @@ public class AccountController {
         return result;
     }
 
-    @ApiOperation(value = "忘记密码")
+//    @ApiOperation(value = "忘记密码")
     @RequestMapping(value = "ForgetPassword", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public OperationResultDto<Object> forgetPassword(@RequestParam(name = "mail") String mail) {
         logger.debug("enter forgetPassword");

atms-api/src/main/java/pwc/taxtech/atms/controller/ApprovalController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
@@ -42,7 +41,7 @@ public class ApprovalController {
         return ResponseEntity.ok().build();
     }
 
-    @ApiOperation(value = "提交报表")
+//    @ApiOperation(value = "提交报表")
     @ResponseBody
     @RequestMapping(value = "/commit", method = RequestMethod.POST)
     @Secured("vatApproval:commit")
@@ -65,7 +64,7 @@ public class ApprovalController {
         return approvalService.getTemplateInfo(templateId);
     }
 
-    @ApiOperation(value = "审批报表")
+//    @ApiOperation(value = "审批报表")
     @ResponseBody
     @RequestMapping(value = "/check/{projectId}/{period}",method = RequestMethod.PUT)
     @Secured("vatApproval:check")

atms-api/src/main/java/pwc/taxtech/atms/controller/AreaController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +24,7 @@ public class AreaController {
     @Autowired
     private AreaServiceImpl areaService;
 
-    @ApiOperation(value = "Active or Deactive the specific area.")
+//    @ApiOperation(value = "Active or Deactive the specific area.")
     @RequestMapping(value = "isactive", method = RequestMethod.POST)
     public @ResponseBody
     OperationResultDto<List<String>> setIsActive(@RequestBody AreaDto areaDto) {
@@ -33,7 +32,7 @@ public class AreaController {
         return areaService.setIsActive(areaDto);
     }
 
-    @ApiOperation(value = "Get area list")
+//    @ApiOperation(value = "Get area list")
     @RequestMapping(value = "getAreaList", method = RequestMethod.GET)
     public @ResponseBody
     List<AreaDto> getAreaList(@RequestParam(defaultValue = "1") int type) {
@@ -41,7 +40,7 @@ public class AreaController {
         return areaService.getAreaList(type);
     }
 
-    @ApiOperation(value = "Get Tree")
+//    @ApiOperation(value = "Get Tree")
     @RequestMapping(value = "tree", method = RequestMethod.GET)
     public @ResponseBody
     List<AreaDto> getAreaTree(@RequestParam(name = "type") int type) {

atms-api/src/main/java/pwc/taxtech/atms/controller/AreaRegionController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +26,7 @@ public class AreaRegionController {
     private AreaRegionServiceImpl areaRegionService;
 
     @SuppressWarnings("rawtypes")
-    @ApiOperation(value = "Adds the specified area.")
+//    @ApiOperation(value = "Adds the specified area.")
     @RequestMapping(value = "add", method = RequestMethod.POST)
     public @ResponseBody
     OperationResultDto add(@RequestBody AreaRegionInfo areaRegionInfo) {
@@ -36,7 +35,7 @@ public class AreaRegionController {
     }
 
     @SuppressWarnings("rawtypes")
-    @ApiOperation(value = "Update the specified area.")
+//    @ApiOperation(value = "Update the specified area.")
     @RequestMapping(value = "update", method = RequestMethod.POST)
     public @ResponseBody
     OperationResultDto update(@RequestBody AreaRegionInfo areaRegionInfo) {
@@ -44,7 +43,7 @@ public class AreaRegionController {
         return areaRegionService.update(areaRegionInfo);
     }
 
-    @ApiOperation(value = "Get cities")
+//    @ApiOperation(value = "Get cities")
     @RequestMapping(value = "getCities", method = RequestMethod.GET)
     public @ResponseBody
     List<AreaRegionDto> getCities(@RequestParam(name = "parentID") String parentId) {
@@ -52,7 +51,7 @@ public class AreaRegionController {
         return areaRegionService.getCities(parentId);
     }
 
-    @ApiOperation(value = "Get Provinces")
+//    @ApiOperation(value = "Get Provinces")
     @RequestMapping(value = "getProvinces", method = RequestMethod.GET)
     public @ResponseBody
     List<AreaRegionDto> getProvinces() {

atms-api/src/main/java/pwc/taxtech/atms/controller/BusinessUnitController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +26,7 @@ public class BusinessUnitController {
     @Autowired
     private BusinessUnitServiceImpl businessUnitService;
 
-    @ApiOperation(value = "主数据事业部查询", notes = "返回所有事业部数据")
+//    @ApiOperation(value = "主数据事业部查询", notes = "返回所有事业部数据")
     @RequestMapping(value = "/getlist", method = RequestMethod.GET)
     public @ResponseBody
     List<BusinessUnitDto> getBusinessUnits() {
@@ -35,14 +34,14 @@ public class BusinessUnitController {
         return businessUnitService.getBusinessUnits();
     }
 
-    @ApiOperation(value = "主数据事业部增加", notes = "根据Request Body的信息添加一个或多个新的事业部数据")
+//    @ApiOperation(value = "主数据事业部增加", notes = "根据Request Body的信息添加一个或多个新的事业部数据")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public void addBusinessUnits(@RequestBody List<BusinessUnitInputDto> businessUnitDtoList) {
         logger.debug("BusinessUnitController addBusinessUnits");
         businessUnitService.addBusinessUnits(businessUnitDtoList);
     }
 
-    @ApiOperation(value = "主数据事业部删除", notes = "根据给定的id删除一条事业部数据")
+//    @ApiOperation(value = "主数据事业部删除", notes = "根据给定的id删除一条事业部数据")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public @ResponseBody
     Integer deleteBusinessUnit(@RequestBody IdModel idModel) {
@@ -50,7 +49,7 @@ public class BusinessUnitController {
         return businessUnitService.deleteBusinessUnit(idModel);
     }
 
-    @ApiOperation(value = "主数据事业部修改", notes = "根据Request Body的信息修改一个或多个事业部数据")
+//    @ApiOperation(value = "主数据事业部修改", notes = "根据Request Body的信息修改一个或多个事业部数据")
     @RequestMapping(method = RequestMethod.PUT)
     public @ResponseBody
     Boolean updateBusinessUnits(@RequestBody List<BusinessUnitDto> businessUnitDtoList) {

atms-api/src/main/java/pwc/taxtech/atms/controller/CacheController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,14 +19,14 @@ public class CacheController {
     @Autowired
     private CacheServiceImpl cacheService;
 
-    @ApiOperation(value = "Get all cache")
+//    @ApiOperation(value = "Get all cache")
     @RequestMapping(value = "getallcache", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
     List<CacheDto> getAllCache() {
         return cacheService.getAllCache();
     }
 
-    @ApiOperation(value = "Get cache by key")
+//    @ApiOperation(value = "Get cache by key")
     @RequestMapping(value = "getcachebykey", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public CacheDto getCacheByKey(@RequestParam("cacheKey") String cacheKey) {
         return cacheService.getCacheByKey(cacheKey);

atms-api/src/main/java/pwc/taxtech/atms/controller/CustomerController.java

 package pwc.taxtech.atms.controller;
 
 import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import org.nutz.lang.Lang;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +43,7 @@ public class CustomerController {
     @Autowired
     private CustomerServiceImpl customerService;
 
-    @ApiOperation(value = "财务数据客户增加")
+//    @ApiOperation(value = "财务数据客户增加")
     // @ApiImplicitParam(name = "customerDtoList", value = "customerDto List",
     // required = true, dataType = "List<CustomerDto>")
     @RequestMapping(value = "/AddRange", method = RequestMethod.POST)
@@ -56,8 +54,8 @@ public class CustomerController {
         return customerService.addRange(customerDtoList);
     }
 
-    @ApiOperation(value = "财务数据账套下客户查询")
-    @ApiImplicitParam(name = "id", value = "记录Id", required = true, dataType = "java.lang.String")
+//    @ApiOperation(value = "财务数据账套下客户查询")
+//    @ApiImplicitParam(name = "id", value = "记录Id", required = true, dataType = "java.lang.String")
     @RequestMapping(value = "/getByID", method = RequestMethod.GET)
     public @ResponseBody
     CustomerValidateInfoDto getById(@RequestParam(name = "ID") String setId) {
@@ -65,7 +63,7 @@ public class CustomerController {
         return customerService.getByEnterpriseAccountSetId(setId);
     }
 
-    @ApiOperation(value = "财务数据所有客户查询")
+//    @ApiOperation(value = "财务数据所有客户查询")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     public @ResponseBody
     List<CustomerDto> getCustomer() {
@@ -73,7 +71,7 @@ public class CustomerController {
         return customerService.getCustomer();
     }
 
-    @ApiOperation(value = "财务数据客户删除")
+//    @ApiOperation(value = "财务数据客户删除")
     // @ApiImplicitParam(name = "customerDtoList", value = "customerDto List",
     // required = true, dataType = "List<CustomerDto>")
     @RequestMapping(value = "/DeleteRange", method = RequestMethod.POST)
@@ -83,7 +81,7 @@ public class CustomerController {
         return customerService.deleteRange(customerDtoList);
     }
 
-    @ApiOperation(value = "财务数据客户修改")
+//    @ApiOperation(value = "财务数据客户修改")
     // @ApiImplicitParam(name = "customerDtoList", value = "customerDto List",
     // required = true, dataType = "List<CustomerDto>")
     @RequestMapping(value = "/UpdateRange", method = RequestMethod.POST)
@@ -94,7 +92,7 @@ public class CustomerController {
         return customerService.updateRange(customerDtoList);
     }
 
-    @ApiOperation(value = "批量上传账套下客户列表")
+//    @ApiOperation(value = "批量上传账套下客户列表")
     // @ApiImplicitParam(name = "file", value = "file", required = true, dataType =
     // "CommonsMultipartFile")
     @RequestMapping(value = "/Upload", method = RequestMethod.POST)

atms-api/src/main/java/pwc/taxtech/atms/controller/DataInitController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
 import org.joda.time.DateTime;
 import org.nutz.lang.Lang;
@@ -44,7 +43,7 @@ public class DataInitController {
     @Autowired
     private DataInitServiceImpl dataInitService;
 
-    @ApiOperation(value = "Download basic data initialization template")
+//    @ApiOperation(value = "Download basic data initialization template")
     @RequestMapping(value = {"/downloadTemplate"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public void downloadTemplate(HttpServletResponse response) {
 
@@ -79,7 +78,7 @@ public class DataInitController {
         }
     }
 
-    @ApiOperation(value = "Upload initial data")
+//    @ApiOperation(value = "Upload initial data")
     @RequestMapping(value = {"/Upload"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
     Object uploadInitData(@RequestParam String action,

atms-api/src/main/java/pwc/taxtech/atms/controller/DimensionController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,73 +24,73 @@ public class DimensionController {
     @Autowired
     private DimensionServiceImpl dimensionService;
 
-    @ApiOperation(value = "获取有效纬度、纬度值个数")
+//    @ApiOperation(value = "获取有效纬度、纬度值个数")
     @RequestMapping(value = "getDimensionStatics", method = RequestMethod.GET)
     public @ResponseBody
     List<DimensionDto> getDimensionStatics() {
         return dimensionService.getDimensionStatics();
     }
 
-    @ApiOperation(value = "获取所有维度值")
+//    @ApiOperation(value = "获取所有维度值")
     @RequestMapping(value = "getAllDimensionList", method = RequestMethod.GET)
     public @ResponseBody
     List<DimensionDto> getAllDimensionList() {
         return dimensionService.getAllDimensionList();
     }
 
-    @ApiOperation(value = "获取有效纬度列表")
+//    @ApiOperation(value = "获取有效纬度列表")
     @RequestMapping(value = "getDimensionList", method = RequestMethod.GET)
     public List<DimensionDto> getDimensionList() {
         return dimensionService.getDimensionList();
     }
 
-    @ApiOperation(value = "获取单独的维度")
+//    @ApiOperation(value = "获取单独的维度")
     @RequestMapping(value = "getDimensionById", method = RequestMethod.GET)
     public DimensinTypeOrgDto getDimensionById(@RequestParam("id") String id) {
         return dimensionService.getDimensionById(id);
     }
 
-    @ApiOperation(value = "获取维度机构列表")
+//    @ApiOperation(value = "获取维度机构列表")
     @RequestMapping(value = "getAllDimensionOrgList", method = RequestMethod.GET)
     public List<DimensionValueOrgDto> getAllDimensionOrgList() {
         return dimensionService.getAllDimensionOrgList();
     }
 
     @SuppressWarnings("rawtypes")
-    @ApiOperation(value = "更新维度")
+//    @ApiOperation(value = "更新维度")
     @RequestMapping(value = "/updateDimension", method = RequestMethod.POST)
     public OperationResultDto updateDimension(@RequestBody DimensionDto model) {
         return dimensionService.updateDimension(model);
     }
 
-    @ApiOperation(value = "获取维度值列表")
+//    @ApiOperation(value = "获取维度值列表")
     @RequestMapping(value = "getDimensionValueList", method = RequestMethod.GET)
     public List<DimensionValueDto> getDimensionValueList(@RequestParam("dimensionId") String dimensionId) {
         return dimensionService.getDimensionValueList(dimensionId);
     }
 
-    @ApiOperation(value = "获取有效维度列表")
+//    @ApiOperation(value = "获取有效维度列表")
     @RequestMapping(value = "getDevDimensionTreeList", method = RequestMethod.GET)
     @SuppressWarnings("rawtypes")
     public List<DevTreeDto> getDevDimensionTreeList() {
         return dimensionService.getDevDimensionTreeList();
     }
 
-    @ApiOperation(value = "添加维度")
+//    @ApiOperation(value = "添加维度")
     @RequestMapping(value = "/addDimension", method = RequestMethod.POST)
     @SuppressWarnings("rawtypes")
     public OperationResultDto addDimension(@RequestBody DimensionDto model) {
         return dimensionService.addDimension(model);
     }
 
-    @ApiOperation(value = "添加维度值")
+//    @ApiOperation(value = "添加维度值")
     @RequestMapping(value = "/addDimensionValue", method = RequestMethod.POST)
     @SuppressWarnings("rawtypes")
     public OperationResultDto addDimensionValue(@RequestBody DimensionValueDto model) {
         return dimensionService.addDimensionValue(model);
     }
 
-    @ApiOperation(value = "更新维度值")
+//    @ApiOperation(value = "更新维度值")
     @RequestMapping(value = "/updateDimensionValue", method = RequestMethod.POST)
     @SuppressWarnings("rawtypes")
     public OperationResultDto updateDimensionValue(@RequestBody DimensionValueDto model) {

atms-api/src/main/java/pwc/taxtech/atms/controller/ExcelDataController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +20,7 @@ public class ExcelDataController {
     private ExcelDataServiceImpl excelDataService;
 
     @ResponseBody
-    @ApiOperation(value = "导入报表数据")
+//    @ApiOperation(value = "导入报表数据")
     @RequestMapping(value = "importExcelDataFile", method = RequestMethod.POST)
     public OperationResultDto parseExcelData(@RequestParam MultipartFile file,
                                              @RequestParam Long templateID,

atms-api/src/main/java/pwc/taxtech/atms/controller/FormulaController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,7 +16,7 @@ public class FormulaController extends BaseController {
     FormulaServiceImpl formulaService;
 
     @ResponseBody
-    @ApiOperation(value = "")
+//    @ApiOperation(value = "")
     @RequestMapping(value = "get", method = RequestMethod.GET)
     public OperationResultDto getAllFormulaList() {
         try {
@@ -29,7 +28,7 @@ public class FormulaController extends BaseController {
     }
 
     @ResponseBody
-    @ApiOperation(value = "")
+//    @ApiOperation(value = "")
     @RequestMapping(value = "param/get", method = RequestMethod.GET)
     public OperationResultDto getAllFormulaConfigList() {
         try {
@@ -41,7 +40,7 @@ public class FormulaController extends BaseController {
     }
 
     @ResponseBody
-    @ApiOperation(value = "")
+//    @ApiOperation(value = "")
     @RequestMapping(value = "parammapping/get", method = RequestMethod.GET)
     public OperationResultDto getAllFormulaParamMappingList() {
         try {

atms-api/src/main/java/pwc/taxtech/atms/controller/KeyValueConfigController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import javassist.tools.web.BadHttpRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -39,7 +38,7 @@ public class KeyValueConfigController {
     @Autowired
     private TemplateFormulaServiceImpl templateFormulaService;
 
-    @ApiOperation(value = "get keyValueConfig")
+//    @ApiOperation(value = "get keyValueConfig")
     @RequestMapping(value = "", method = RequestMethod.GET)
     public @ResponseBody
     List<KeyValueConfigDisplayDto> get() {

atms-api/src/main/java/pwc/taxtech/atms/controller/MenuController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,7 @@ public class MenuController {
     @Autowired
     private MenuServiceImpl menuService;
 
-    @ApiOperation(value = "获取用于显示的菜单列表", notes = "请提供条件参数serviceId")
+//    @ApiOperation(value = "获取用于显示的菜单列表", notes = "请提供条件参数serviceId")
     @RequestMapping(value = "/display", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
     List<MenuDisplayDto> getMenusForDisplay(@RequestParam("serviceId") Integer serviceId , @RequestParam("userId") String userId) {
@@ -36,7 +35,7 @@ public class MenuController {
         return menuService.getMenusForDisplay(serviceId, userId);
     }
 
-    @ApiOperation(value = "获取菜单列表", notes = "请提供条件参数serviceId")
+//    @ApiOperation(value = "获取菜单列表", notes = "请提供条件参数serviceId")
     @RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
     List<MenuDto> getMenus(@RequestParam("serviceId") Integer serviceId) {
@@ -44,7 +43,7 @@ public class MenuController {
         return menuService.getMenus(serviceId);
     }
 
-    @ApiOperation(value = "获取菜单列表", notes = "请提供条件参数serviceId")
+//    @ApiOperation(value = "获取菜单列表", notes = "请提供条件参数serviceId")
     @RequestMapping(value="/role", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
     List<MenuDto> getMenus(@RequestParam("serviceId") Integer serviceId, @RequestParam("userId") String userId) {
@@ -54,7 +53,7 @@ public class MenuController {
     }
 
     @ResponseBody
-    @ApiOperation(value = "更新菜单项", notes = "更新菜单项")
+//    @ApiOperation(value = "更新菜单项", notes = "更新菜单项")
     @RequestMapping(method = RequestMethod.PUT)
     public OperationResultDto updateMenu(@RequestBody Menu menu) {
         try {

atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +30,8 @@ public class OperationLogController {
     @Autowired
     private OperationLogServiceImpl operationLogService;
 
-    @ApiOperation(value = "查询日志")
-    @ApiImplicitParam(name = "queryOperateParamDto", value = "queryOperateParamDto", required = true, dataType = "QueryOperateParamDto")
+//    @ApiOperation(value = "查询日志")
+//    @ApiImplicitParam(name = "queryOperateParamDto", value = "queryOperateParamDto", required = true, dataType = "QueryOperateParamDto")
     @RequestMapping(value = "getorgloglist", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
     PagingResultDto<OperationLogDto> getOperationLogList(@RequestBody QueryOperateParamDto queryOperateParamDto) {
@@ -41,7 +39,7 @@ public class OperationLogController {
         return operationLogService.getOperationLogList(queryOperateParamDto);
     }
 
-    @ApiOperation(value = "添加进入项目日志")
+//    @ApiOperation(value = "添加进入项目日志")
     @RequestMapping(value = "addEnterProjectLog/{userName}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public void addEnterProjectLog(String userName, String logContent) {
         OperationLogDto dto = new OperationLogDto();

atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,28 +43,28 @@ public class OrganizationController {
     @Autowired
     UserServiceImpl userService;
 
-    @ApiOperation(value = "根据使用的方式获取机构的列表")
+//    @ApiOperation(value = "根据使用的方式获取机构的列表")
     @RequestMapping(value = "getjson", method = RequestMethod.GET)
     public @ResponseBody
     List<NavTreeDto> getOrgListToJson(@RequestParam("useType") Integer useType) {
         return organizationService.getOrgListToJson(useType);
     }
 
-    @ApiOperation(value = "获取根据机构筛选的属性和机构名称")
+//    @ApiOperation(value = "获取根据机构筛选的属性和机构名称")
     @RequestMapping(value = "getOrganizationFilterList", method = RequestMethod.GET)
     public @ResponseBody
     List<OrganizationDto> getOrganizationFilterList() {
         return organizationService.getOrganizationFilterList();
     }
 
-    @ApiOperation(value = "根据使用的方式获取机构的展示列表")
+//    @ApiOperation(value = "根据使用的方式获取机构的展示列表")
     @RequestMapping(value = "display", method = RequestMethod.GET)
     public @ResponseBody
     List<OrganizationDto> getOrgList(@RequestParam("useType") Integer useType) {
         return organizationService.getOrgList(useType);
     }
 
-    @ApiOperation(value = "获取行业列表")
+//    @ApiOperation(value = "获取行业列表")
     @RequestMapping(value = "getProjectIndustrys", method = RequestMethod.GET)
     public @ResponseBody
     List<IndustryDto> getProjectIndustry() {
@@ -73,7 +72,7 @@ public class OrganizationController {
         return organizationService.getProjectIndustryList();
     }
 
-    @ApiOperation(value = "层级显示机构列表_列表显示")
+//    @ApiOperation(value = "层级显示机构列表_列表显示")
     @RequestMapping(value = "getOrgListLevel", method = RequestMethod.GET)
     public @ResponseBody
     List<OrgBasicDto> getOrgListLevel() {
@@ -81,7 +80,7 @@ public class OrganizationController {
         return organizationService.getOrgListLevel();
     }
 
-    @ApiOperation(value = "纳税人识别号唯一性验证")
+//    @ApiOperation(value = "纳税人识别号唯一性验证")
     @RequestMapping(value = "taxPayerNumberUniqueValidate", method = RequestMethod.POST)
     public @ResponseBody
     Boolean taxPayerNumberUniqueValidate(@RequestBody OrganizationValidateDto validateDto) {
@@ -89,7 +88,7 @@ public class OrganizationController {
         return organizationService.taxPayerNumberUniqueValidate(validateDto);
     }
 
-    @ApiOperation(value = "获取机构展示面板（Dashboard)")
+//    @ApiOperation(value = "获取机构展示面板（Dashboard)")
     @RequestMapping(value = "getOrgDashboard", method = RequestMethod.POST)
     public @ResponseBody
     List<DimensionOrgDtoDashboard> getOrgDashboardPost(
@@ -101,7 +100,7 @@ public class OrganizationController {
         return organizationService.getOrgDashboard(dimensionId, parentOrgId, param);
     }
 
-    @ApiOperation(value = "获取单个机构展示面板(Dashboard)")
+//    @ApiOperation(value = "获取单个机构展示面板(Dashboard)")
     @RequestMapping(value = "getOrgDashboardOnly", method = RequestMethod.GET)
     public @ResponseBody
     List<DimensionOrgDtoDashboard> getOrgDashboard(@RequestParam("dimensionId") String dimensionId,
@@ -112,14 +111,14 @@ public class OrganizationController {
         return organizationService.getOrgDashboard(dimensionId, parentOrgId, param);
     }
 
-    @ApiOperation(value = "显示覆盖区域统计数据")
+//    @ApiOperation(value = "显示覆盖区域统计数据")
     @RequestMapping(value = "getAreaStatistics", method = RequestMethod.GET)
     public AreaOrganizationStatistics getAreaStatistics() {
         logger.info("POST /api/v1/org/getAreaStatistics");
         return organizationService.getAreaStatistics();
     }
 
-    @ApiOperation(value = "获取机构上层维度")
+//    @ApiOperation(value = "获取机构上层维度")
     @RequestMapping(value = "getOrgBuAreaIndustryUser", method = RequestMethod.GET)
     public @ResponseBody
     List<DimensionRoleDto> getOrgBuAreaIndustryUser(@RequestParam("userID") String userId) {
@@ -127,7 +126,7 @@ public class OrganizationController {
         return userRoleService.getOrgBuAreaIndustryUser(userId);
     }
 
-    @ApiOperation(value = "显示覆盖区域统计数据")
+//    @ApiOperation(value = "显示覆盖区域统计数据")
     @RequestMapping(value = "getOrgCustomDashbord", method = RequestMethod.GET)
     public OrgDto getOrgCustomDashbord(
             @RequestParam(value = "dimensionValueId", required = false) String dimensionValueId,
@@ -137,7 +136,7 @@ public class OrganizationController {
         return organizationService.getOrgCustomDashbord(dimensionValueId, parentDimensionId, attributeId);
     }
 
-    @ApiOperation(value = "获取区域下的所有机构")
+//    @ApiOperation(value = "获取区域下的所有机构")
     @RequestMapping(value = "getOrganizationListByAreaId", method = RequestMethod.GET)
     public List<OrganizationDto> getOrganizationListByAreaId(
             @RequestParam(value = "areaId", required = true) String areaId,
@@ -147,7 +146,7 @@ public class OrganizationController {
     }
 
     @SuppressWarnings("rawtypes")
-    @ApiOperation(value = "禁用选中机构信息")
+//    @ApiOperation(value = "禁用选中机构信息")
     @RequestMapping(value = "disableOrgs", method = RequestMethod.POST)
     public @ResponseBody
     OperationResultDto disableOrgs(@RequestBody List<String> orgIds) {
@@ -156,7 +155,7 @@ public class OrganizationController {
     }
 
     @SuppressWarnings("rawtypes")
-    @ApiOperation(value = "启用选中机构信息")
+//    @ApiOperation(value = "启用选中机构信息")
     @RequestMapping(value = "enableOrgs", method = RequestMethod.GET)
     public @ResponseBody
     OperationResultDto enableOrgs(@RequestParam("orgId") String orgId) {
@@ -164,7 +163,7 @@ public class OrganizationController {
         return organizationService.enableOrgs(orgId);
     }
 
-    @ApiOperation(value = "通过orgId获取一个组织的信息")
+//    @ApiOperation(value = "通过orgId获取一个组织的信息")
     @RequestMapping(value = "displaySingle", method = RequestMethod.GET)
     public @ResponseBody
     OrganizationDto getSingleOrgByOrgId(@RequestParam("orgId") String orgId) {
@@ -172,7 +171,7 @@ public class OrganizationController {
         return organizationService.getSingleOrgByOrgId(orgId);
     }
 
-    @ApiOperation(value = "机构代码唯一性验证")
+//    @ApiOperation(value = "机构代码唯一性验证")
     @RequestMapping(value = "codeUniqueValidate", method = RequestMethod.POST)
     public @ResponseBody
     Boolean codeUniqueValidate(@RequestBody OrganizationValidateDto validateDto) {
@@ -181,7 +180,7 @@ public class OrganizationController {
     }
 
     @SuppressWarnings("rawtypes")
-    @ApiOperation(value = "为当前的维度添加现有的机构，可以批量的添加", notes = "机构管理>卡片视角>点击机构+>关联现有机构>确定")
+//    @ApiOperation(value = "为当前的维度添加现有的机构，可以批量的添加", notes = "机构管理>卡片视角>点击机构+>关联现有机构>确定")
     @RequestMapping(value = "updateOrgToDimension", method = RequestMethod.POST)
     public @ResponseBody
     OperationResultDto updateOrgToDimension(@RequestBody UpdateOrgDimensionDto dto) {
@@ -189,7 +188,7 @@ public class OrganizationController {
                 dto.getOrgDtoList());
     }
 
-    @ApiOperation(value = "增加机构信息")
+//    @ApiOperation(value = "增加机构信息")
     @RequestMapping(value = "add", method = RequestMethod.POST)
     public @ResponseBody
     OperationResultDto<Object> addOrg(@RequestBody OrganizationDto orgDto) {
@@ -200,7 +199,7 @@ public class OrganizationController {
         return organizationService.addOrg(orgDto);
     }
 
-    @ApiOperation(value = "更新机构信息")
+//    @ApiOperation(value = "更新机构信息")
     @RequestMapping(value = "update", method = RequestMethod.PUT)
     public @ResponseBody
     OperationResultDto<Object> updateOrg(@RequestBody OrganizationDto orgDto) {
@@ -211,7 +210,7 @@ public class OrganizationController {
         return organizationService.updateOrg(orgDto);
     }
 
-    @ApiOperation(value = "删除用户维度权限设置")
+//    @ApiOperation(value = "删除用户维度权限设置")
     @RequestMapping(value = "deleteUserDimensionValue", method = RequestMethod.POST)
     public @ResponseBody
     Boolean deleteUserDimensionValue(@RequestBody DimensionRoleDto dto,
@@ -220,7 +219,7 @@ public class OrganizationController {
         return true;
     }
 
-    @ApiOperation(value = "获取机构通用信息", notes = "机构管理>卡片视角>机构视图>点击机构灰色区域文字")
+//    @ApiOperation(value = "获取机构通用信息", notes = "机构管理>卡片视角>机构视图>点击机构灰色区域文字")
     @RequestMapping(value = "getGeneralInfo", method = RequestMethod.GET)
     public @ResponseBody
     OrgGeneralInfoDto getGeneralInfo(@RequestParam("orgId") String orgId) {
@@ -229,7 +228,7 @@ public class OrganizationController {
     }
 
     @ResponseBody
-    @ApiOperation(value = "获取机构树信息", notes = "科目对应>复制对应关系>弹出层")
+//    @ApiOperation(value = "获取机构树信息", notes = "科目对应>复制对应关系>弹出层")
     @RequestMapping(value = "getOrgIvhTreeList", method = RequestMethod.GET)
     public List<DevTreeDto> getOrgIvhTreeList(@RequestParam("useType") Integer useType,
                                               @RequestParam("orgSetID") String orgSetId) {

atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationStructureController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +24,7 @@ public class OrganizationStructureController {
     @Autowired
     private OrganizationStructureServiceImpl organizationStructureService;
 
-    @ApiOperation(value = "主数据机构层级查询")
+//    @ApiOperation(value = "主数据机构层级查询")
     @RequestMapping(value = "/getlist", method = RequestMethod.GET)
     public @ResponseBody
     List<OrganizationStructureDto> getOrganizationStructures() {
@@ -34,7 +32,7 @@ public class OrganizationStructureController {
         return organizationStructureService.getOrganizationStructures();
     }
 
-    @ApiOperation(value = "主数据机构层级增加")
+//    @ApiOperation(value = "主数据机构层级增加")
 //    @ApiImplicitParam(name = "organizationStructureDtoList", value = "organizationStructureDto List", required = true, dataType = "List<OrganizationStructureDto>")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public void addOrganizationStructures(@RequestBody List<OrganizationStructureInputDto> organizationStructureDtoList) {
@@ -42,8 +40,8 @@ public class OrganizationStructureController {
         organizationStructureService.addOrganizationStructures(organizationStructureDtoList);
     }
 
-    @ApiOperation(value = "主数据机构层级删除")
-    @ApiImplicitParam(name = "idModel", value = "idModel", required = true, dataType = "IdModel")
+//    @ApiOperation(value = "主数据机构层级删除")
+//    @ApiImplicitParam(name = "idModel", value = "idModel", required = true, dataType = "IdModel")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public @ResponseBody
     Integer deleteOrganizationStructure(@RequestBody IdModel idModel) {
@@ -51,7 +49,7 @@ public class OrganizationStructureController {
         return organizationStructureService.deleteOrganizationStructure(idModel);
     }
 
-    @ApiOperation(value = "主数据机构层级修改")
+//    @ApiOperation(value = "主数据机构层级修改")
 //    @ApiImplicitParam(name = "organizationStructureDtoList", value = "organizationStructureDto List", required = true, dataType = "List<OrganizationStructureDto>")
     @RequestMapping(method = RequestMethod.PUT)
     public @ResponseBody

atms-api/src/main/java/pwc/taxtech/atms/controller/PermissionController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +24,7 @@ public class PermissionController {
     @Autowired
     private PermissionServiceImpl permissionService;
 
-    @ApiOperation(value = "Active or Deactive the specific area.")
+//    @ApiOperation(value = "Active or Deactive the specific area.")
     @RequestMapping(value = "getIvhTreePermissionsByRoleID", method = RequestMethod.GET)
     public @ResponseBody
     RolePermissionDisplayDto getIvhTreePermissionsByRoleId(@RequestParam String roleID,
@@ -34,7 +33,7 @@ public class PermissionController {
         return permissionService.getIvhTreePermissionsByRoleId(roleID, serviceType);
     }
 
-    @ApiOperation(value = "通过传入的角色Id列表获取树形结构权限")
+//    @ApiOperation(value = "通过传入的角色Id列表获取树形结构权限")
     @RequestMapping(value = "getIvhTreePermissionsByRoleIDList", method = RequestMethod.POST)
     public @ResponseBody
     List<DevTreeDto> getIvhTreePermissionsByRoleIdList(@RequestBody List<String> roleIdList,
@@ -42,7 +41,7 @@ public class PermissionController {
         return permissionService.getIvhTreePermissionsByRoleIdList(roleIdList, serviceType);
     }
 
-    @ApiOperation(value = "获取所有权限树形结构列表")
+//    @ApiOperation(value = "获取所有权限树形结构列表")
     @RequestMapping(value = "getAllPermissions", method = RequestMethod.GET)
     public @ResponseBody
     List<DevTreeDto> getAllPermissions(@RequestParam String serviceType) {

atms-api/src/main/java/pwc/taxtech/atms/controller/ProjectController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +21,7 @@ public class ProjectController {
     @Autowired
     private ProjectServiceImpl projectService;
 
-    @ApiOperation(value = "listService", notes = "Get service list")
+//    @ApiOperation(value = "listService", notes = "Get service list")
     @RequestMapping(value = "listService", method = RequestMethod.GET)
     public @ResponseBody
     List<ServiceTypeDto> getServiceList() {
@@ -31,7 +29,7 @@ public class ProjectController {
         return projectService.getServiceList();
     }
 
-    @ApiOperation(value = "getProjectClientList", notes = "Get project Client list")
+//    @ApiOperation(value = "getProjectClientList", notes = "Get project Client list")
     @RequestMapping(value = "getProjectClientList", method = RequestMethod.GET)
     public @ResponseBody
     List<ProjectClientDto> getProjectClientList() {
@@ -39,14 +37,14 @@ public class ProjectController {
         return projectService.getProjectClientList();
     }
 
-    @ApiOperation(value = "getProject", notes = "Get Project")
+//    @ApiOperation(value = "getProject", notes = "Get Project")
     @RequestMapping(value = "getProject", method = RequestMethod.GET)
     public @ResponseBody
     ProjectDisplayDto GetProjectById(@RequestParam String projectId) {
         return projectService.getProjectById(projectId);
     }
 
-    @ApiOperation(value = "getAllProjectList", notes = "Get All  List")
+//    @ApiOperation(value = "getAllProjectList", notes = "Get All  List")
     @RequestMapping(value = "getAllProjectList", method = RequestMethod.GET)
     public @ResponseBody
     List<ProjectDisplayDto> getAllProjectList(String orgId, String serviceId, Integer projectYear) {
@@ -54,16 +52,16 @@ public class ProjectController {
         return projectService.getAllProjectList(orgId, serviceId == null ? "" : serviceId, projectYear);
     }
 
-    @ApiOperation(value = "add", notes = "add a project")
+//    @ApiOperation(value = "add", notes = "add a project")
     @RequestMapping(value = "add", method = RequestMethod.POST)
-    @ApiImplicitParam(name = "projectDto", value = "projectDto", required = true, dataType = "ProjectDisplayDto")
+//    @ApiImplicitParam(name = "projectDto", value = "projectDto", required = true, dataType = "ProjectDisplayDto")
     public @ResponseBody
     AddProjectResult AddProject(@RequestBody ProjectDisplayDto projectDto, String userName) {
         if (userName == null || userName.isEmpty()) userName = "test";//TODO: should use session username future(neo)
         return projectService.addProject(projectDto, userName);
     }
 
-    @ApiOperation(value = "getProjectAllStatus", notes = "get project all status")
+//    @ApiOperation(value = "getProjectAllStatus", notes = "get project all status")
     @RequestMapping(value = "getProjectAllStatus/{id}", method = RequestMethod.GET)
     public @ResponseBody
     Map<Integer, Integer> getProjectAllStatus(@PathVariable String id) {

atms-api/src/main/java/pwc/taxtech/atms/controller/ProjectInfoController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -25,7 +24,7 @@ public class ProjectInfoController {
     @Autowired
     private IdentityServiceImpl identityService;
 
-    @ApiOperation(value = "isProjectImportedData", notes = "")
+//    @ApiOperation(value = "isProjectImportedData", notes = "")
     @RequestMapping(value = "isProjectImportedData/{projectId}/{serviceType}/{importTypeId}", method = RequestMethod.GET)
     public @ResponseBody
     OperationResultDto<Boolean> isProjectImportedData(@PathVariable String projectId, @PathVariable Integer serviceType,
@@ -33,7 +32,7 @@ public class ProjectInfoController {
         return projectInfoService.isProjectImportedData(projectId, serviceType, importTypeId);
     }
 
-    @ApiOperation(value = "isProjectImportedData", notes = "")
+//    @ApiOperation(value = "isProjectImportedData", notes = "")
     @RequestMapping(value = "isProjectImportedData/{projectId}/{importTypeId}", method = RequestMethod.GET)
     public @ResponseBody
     OperationResultDto<Boolean> isProjectImportedData(@PathVariable String projectId, @PathVariable Integer importTypeId) {
@@ -41,7 +40,7 @@ public class ProjectInfoController {
     }
 
 
-    @ApiOperation(value = "getProjectImportType", notes = "")
+//    @ApiOperation(value = "getProjectImportType", notes = "")
     @RequestMapping(value = "getProjectImportType", method = RequestMethod.POST)
     public OperationResultDto<List<PeriodInfo>> getProjectImportType(@RequestBody QueryImportType queryImportType) {
         return projectInfoService.getProjectImportType(queryImportType.getProjectId(), queryImportType.getPeriods(),
@@ -49,7 +48,7 @@ public class ProjectInfoController {
                 , identityService.getIdentityUser().getId());
     }
 
-    @ApiOperation(value = "getImportType", notes = "")
+//    @ApiOperation(value = "getImportType", notes = "")
     @RequestMapping(value = "getImportType/{projectId}/{periodId}/{serviceType}", method = RequestMethod.GET)
     public ResponseEntity getImportType(@PathVariable String projectId, @PathVariable Integer periodId,
                                         @PathVariable Integer serviceType) {

atms-api/src/main/java/pwc/taxtech/atms/controller/ProjectStatusManageController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -20,7 +19,7 @@ public class ProjectStatusManageController {
     @Autowired
     private IdentityServiceImpl identityService;
 
-    @ApiOperation(value = "setProjectStatus", notes = "")
+//    @ApiOperation(value = "setProjectStatus", notes = "")
     @RequestMapping(value = {"/setProjectStatus/{projectId}/{periodId}/{status}"}, method = RequestMethod.GET,
             produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ResponseBody
@@ -31,7 +30,7 @@ public class ProjectStatusManageController {
     }
 
 
-    @ApiOperation(value = "getProjectStatus", notes = "")
+//    @ApiOperation(value = "getProjectStatus", notes = "")
     @RequestMapping(value = {"getProjectStatus/{projectId}/{periodId}"}, method = RequestMethod.GET,
             produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ResponseBody

atms-api/src/main/java/pwc/taxtech/atms/controller/RegionController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +22,7 @@ public class RegionController {
     @Autowired
     private RegionServiceImpl regionService;
 
-    @ApiOperation(value = "getSettingRegionTree", notes = "生成区域及省市树形结构")
+//    @ApiOperation(value = "getSettingRegionTree", notes = "生成区域及省市树形结构")
     @RequestMapping(value = {"/getSettingRegionTree"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ResponseBody
     public List<DevTreeDto<VMRegionDevTreeData>> getSettingRegionTree() {
@@ -31,7 +30,7 @@ public class RegionController {
     }
 
 
-    @ApiOperation(value = "getProvinceAndCityTreeList", notes = "生成省市树形结构")
+//    @ApiOperation(value = "getProvinceAndCityTreeList", notes = "生成省市树形结构")
     @RequestMapping(value = {"/getProvinceAndCityTreeList"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ResponseBody
     public List<DevTreeDto<IvhTreeDto<Region>>> getProvinceAndCityTreeList() {
@@ -39,7 +38,7 @@ public class RegionController {
     }
 
     @SuppressWarnings("rawtypes")
-    @ApiOperation(value = "根据分区获取分区和行政区域树", notes = "机构管理/卡片/区域/点击区域编辑按钮")
+//    @ApiOperation(value = "根据分区获取分区和行政区域树", notes = "机构管理/卡片/区域/点击区域编辑按钮")
     @RequestMapping(value = "getAreRegionTreeByNodeId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public List<DevTreeDto> getAreRegionTreeByNodeId(@RequestParam("areaId") String areaId) {
         return regionService.getAreaRegionTreeByNodeId(areaId);

atms-api/src/main/java/pwc/taxtech/atms/controller/RuleEngineeConfigController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +24,7 @@ public class RuleEngineeConfigController {
     @Autowired
     RuleEngineeConfigServiceImpl ruleEngineeConfigService;
 
-    @ApiOperation(value = "Get TaxPayerReportMapping", notes = "Return TaxPayerReportMapping")
+//    @ApiOperation(value = "Get TaxPayerReportMapping", notes = "Return TaxPayerReportMapping")
     @RequestMapping(value = "taxPayerReportMapping", method = RequestMethod.GET)
     public @ResponseBody
     List<TaxPayerReportRuleDto> getTaxPayerReportMapping() {
@@ -33,7 +32,7 @@ public class RuleEngineeConfigController {
         return ruleEngineeConfigService.getTaxPayerReportMapping();
     }
 
-    @ApiOperation(value = "Get TaxRuleSetting", notes = "Return TaxRuleSetting")
+//    @ApiOperation(value = "Get TaxRuleSetting", notes = "Return TaxRuleSetting")
     @RequestMapping(value = "taxRuleSetting", method = RequestMethod.GET)
     public @ResponseBody
     List<TaxRuleSettingDto> getTaxRuleSetting() {
@@ -41,7 +40,7 @@ public class RuleEngineeConfigController {
         return ruleEngineeConfigService.getTaxRuleSetting();
     }
 
-    @ApiOperation(value = "", notes = "saveTaxRuleSettings")
+//    @ApiOperation(value = "", notes = "saveTaxRuleSettings")
     @RequestMapping(value = "taxRuleSetting/Save", method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public void saveTaxRuleSettings(@RequestBody BatchUpdateTaxRuleDto batchUpdateTaxRule) {
         logger.debug("RuleEngineeConfigController SaveTaxRuleSettings");

atms-api/src/main/java/pwc/taxtech/atms/controller/ServiceTypeController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +23,7 @@ public class ServiceTypeController {
     private ServiceTypeServiceImpl serviceTypeService;
 
     @ResponseBody
-    @ApiOperation(value = "获取ServiceType列表")
+//    @ApiOperation(value = "获取ServiceType列表")
     @RequestMapping(value = "getlist", method = RequestMethod.GET)
     public List<ServiceTypeDto> getList() {
         return projectService.getServiceList();

atms-api/src/main/java/pwc/taxtech/atms/controller/StatisticAttributeController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +21,7 @@ public class StatisticAttributeController {
     @Autowired
     private StatisticAttributeServiceImpl statisticAttributeService;
 
-    @ApiOperation(value = "显示自定义显示字段")
+//    @ApiOperation(value = "显示自定义显示字段")
     @RequestMapping(value = "getByParentDimensionID", method = RequestMethod.GET)
     public @ResponseBody
     List<StatisticAttributeDisplayDto> getDimensionStatics(
@@ -30,7 +29,7 @@ public class StatisticAttributeController {
         return statisticAttributeService.getStatisticAttributeListByDimensionId(parentDimensionId, null);
     }
 
-    @ApiOperation(value = "自定义显示字段下拉框")
+//    @ApiOperation(value = "自定义显示字段下拉框")
     @RequestMapping(value = "get", method = RequestMethod.GET)
     public @ResponseBody
     List<StatisticAttributeDto> getStatisticAttributeList(
@@ -38,7 +37,7 @@ public class StatisticAttributeController {
         return statisticAttributeService.getStatisticAttributeList(dictionaryCode);
     }
 
-    @ApiOperation(value = "更新显示自定义显示字段")
+//    @ApiOperation(value = "更新显示自定义显示字段")
     @RequestMapping(value = "update", method = RequestMethod.POST)
     @SuppressWarnings("rawtypes")
     public OperationResultDto updateDimension(
@@ -46,7 +45,7 @@ public class StatisticAttributeController {
         return statisticAttributeService.updateStatisticAttribute(modelList);
     }
 
-    @ApiOperation(value = "机构管理/卡片/机构/点击自定义显示内容按钮")
+//    @ApiOperation(value = "机构管理/卡片/机构/点击自定义显示内容按钮")
     @RequestMapping(value = "getOrgSubChildrenStatAttributeList", method = RequestMethod.GET)
     public @ResponseBody
     List<StatisticAttributeDisplayDto> getOrgSubChildrenStatAttributeList(

atms-api/src/main/java/pwc/taxtech/atms/controller/StdAccountController.java

 package pwc.taxtech.atms.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -25,7 +24,7 @@ public class StdAccountController extends BaseController {
     private StdAccountServiceImpl stdAccountService;
 
     @ResponseBody
-    @ApiOperation(value = "获取科目层级")
+//    @ApiOperation(value = "获取科目层级")
     @RequestMapping(value = "stdAccountHierarchy", method = RequestMethod.GET)
     public List<StdAccountFancyTreeDto> getStdAccountHierarchy(@RequestParam(name = "orgID") String orgId) {
         if (StringUtils.isBlank(orgId)) {
@@ -41,7 +40,7 @@ public class StdAccountController extends BaseController {
     }
 
     @ResponseBody
-    @ApiOperation(value = "查看对应关系")
+//    @ApiOperation(value = "查看对应关系")
     @RequestMapping(value = "getStdAccountLinkEtsAccount", method = RequestMethod.GET)
     public List<StandardAccountDto> getStdAccountLinkEtsAccount(@RequestParam String orgId,
                                                                 @RequestParam String accountSetId) {
@@ -56,7 +55,7 @@ public class StdAccountController extends BaseController {
         return Collections.emptyList();
     }
 
-    @ApiOperation(value = "根据行业查找科目")
+//    @ApiOperation(value = "根据行业查找科目")
     @RequestMapping(value = "stdAccount/byIndustry/{industryId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
     List<StandardAccountDto> getStdAccountByIndustry(@PathVariable String industryId) {

atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateGroupController.java

 package pwc.taxtech.atms.controller;
 
 import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +34,7 @@ public class TemplateGroupController {
     @Autowired
     private HttpFileService httpFileService;
 
-    @ApiOperation(value = "获取所有的模板分组")
+//    @ApiOperation(value = "获取所有的模板分组")
     @RequestMapping(value = "getall", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
     List<TemplateGroupDto> get() {
@@ -43,7 +42,7 @@ public class TemplateGroupController {
         return templateGroupService.get();
     }
 
-    @ApiOperation(value = "根据服务类型和行业获取模板分组")
+//    @ApiOperation(value = "根据服务类型和行业获取模板分组")
     @RequestMapping(value = "getByIndustry/{serviceTypeId}/{industryId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
     List<TemplateGroupDto> getTemplateGroupByIndustry(@PathVariable int serviceTypeId, @RequestParam Integer taxPayType, @PathVariable String industryId) {
@@ -76,7 +75,7 @@ public class TemplateGroupController {
     }
 
     @ResponseBody
-    @ApiOperation(value = "获取Sheet名称")
+//    @ApiOperation(value = "获取Sheet名称")
     @RequestMapping(value = "getSheetNameList", method = RequestMethod.POST)
     public OperationResultDto getSheetNameList(@RequestParam MultipartFile file,
                                                @RequestParam String filename,
@@ -93,7 +92,7 @@ public class TemplateGroupController {
     }
 
     @ResponseBody
-    @ApiOperation(value = "导入模板")
+//    @ApiOperation(value = "导入模板")
     @RequestMapping(value = "importTemplateGroupExcelFile", method = RequestMethod.POST)
     public OperationResultDto importTemplateGroupExcelFile(@RequestParam MultipartFile file,
                                                            @RequestParam String filename,
@@ -121,7 +120,7 @@ public class TemplateGroupController {
 
 
     @ResponseBody
-    @ApiOperation(value = "导入报表")
+//    @ApiOperation(value = "导入报表")
     @RequestMapping(value = "importTemplateExcelFile", method = RequestMethod.POST)
     public OperationResultDto importTemplateExcelFile(@RequestParam MultipartFile file,
                                                       @RequestParam Long templateGroupID,
@@ -143,7 +142,7 @@ public class TemplateGroupController {
     }
 
     @ResponseBody
-    @ApiOperation(value = "模板另存为")
+//    @ApiOperation(value = "模板另存为")
     @RequestMapping(value = "addTemplateGroup", method = RequestMethod.POST)
     public OperationResultDto addTemplateGroup(@RequestBody TemplateGroupDto templateGroupDto) {
         try {

atms-api/src/main/resources/applicationContext-datasource.xml

@@ -37,14 +37,14 @@
                   value="20" />
 
         <!-- 配置监控统计拦截的filters -->
-        <property name="filters" value="stat" />
+        <!--<property name="filters" value="stat" />-->
     </bean>
 
     <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
         <property name="dataSource" ref="dataSource"/>
     </bean>
 
-    <bean id="druid-stat-interceptor" class="com.alibaba.druid.support.spring.stat.DruidStatInterceptor">
+    <!--<bean id="druid-stat-interceptor" class="com.alibaba.druid.support.spring.stat.DruidStatInterceptor">
     </bean>
 
     <bean id="druid-stat-pointcut" class="org.springframework.aop.support.JdkRegexpMethodPointcut" scope="prototype">
@@ -59,5 +59,5 @@
 
     <aop:config>
         <aop:advisor advice-ref="druid-stat-interceptor" pointcut-ref="druid-stat-pointcut"/>
-    </aop:config>
+    </aop:config>-->
 </beans>
\ No newline at end of file

atms-api/src/main/resources/applicationContext.xml

@@ -26,11 +26,6 @@
     </property>
   </bean>
 
-  <bean id="datasource2" class="com.alibaba.druid.pool.DruidDataSource">
-    <property name="url" value="${jdbc2_url}" />
-    <property name="username" value="${jdbc2_user}" />
-    <property name="password" value="${jdbc2_password}" />
-  </bean>
   <!-- **************************************************************** -->
   <!-- 启用注解, 启用component-scan -->
   <!-- **************************************************************** -->
@@ -40,12 +35,6 @@
 
   <import resource="applicationContext-datasource.xml" />
 
-  <bean id="sqlSessionFactory2" class="org.mybatis.spring.SqlSessionFactoryBean">
-    <property name="dataSource" ref="datasource2"/>
-    <property name="configLocation" value="classpath:sqlMapConfig.xml"/>
-    <property name="mapperLocations" value="classpath*:pwc/taxtech/atms/**/*Mapper.xml"/>
-  </bean>
-
   <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
     <property name="dataSource" ref="dataSource" />
     <property name="configLocation" value="classpath:sqlMapConfig.xml" />
@@ -60,15 +49,6 @@
     <constructor-arg ref="sqlSessionFactory" />
   </bean>
 
-  <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-    <property name="basePackage" value="pwc.taxtech.atms.invoice" />
-    <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory2"/>
-  </bean>
-  <bean id="transactionManager2" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-    <property name="dataSource" ref="datasource2" />
-  </bean>
-  <!-- <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer"> <property name="basePackage" value="pwc.taxtech.atms" /> </bean> -->
-
   <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
     <property name="dataSource" ref="dataSource" />
   </bean>

atms-api/src/main/resources/conf/conf_profile_dev.properties

@@ -4,11 +4,6 @@ jdbc_password=tax@Admin2018
 #jdbc_password=111111
 jdbc_admin_db=tax@Admin2018
 
-jdbc2_url=jdbc:mysql://10.158.230.144:3306/tax_admin_didi?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-jdbc2_user=root
-jdbc2_password=tax@Admin2018
-jdbc2_admin_db=tax@Admin2018
-
 jdbc_url_demo=jdbc:mysql://10.158.230.144:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 
 mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster

atms-api/src/main/webapp/WEB-INF/web.xml

@@ -82,7 +82,7 @@
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>
 
-	<servlet>
+	<!--<servlet>
 		<servlet-name>DruidStatView</servlet-name>
 		<servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
 		<init-param>
@@ -101,7 +101,7 @@
 	<servlet-mapping>
 		<servlet-name>DruidStatView</servlet-name>
 		<url-pattern>/druid/*</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping>-->
 	<welcome-file-list>
 		<welcome-file>index.jsp</welcome-file>
 		<welcome-file>index.html</welcome-file>

atms-api/src/main/webapp/index.html

-<html><head><meta http-equiv="refresh" content="0; url=swagger-ui.html" /></head><body>Loading...</body></html>
+<html>
\ No newline at end of file
+<head>
+    <!--<meta http-equiv="refresh" content="0; url=swagger-ui.html"/>-->
+    <meta content="0;"/>
+    <title>atms</title>
+</head>
+<body>api-index</body>
+</html>
\ No newline at end of file