Skip to content

T
traffic-front
Commit 54c83dc7 authored by gary's avatar gary
Browse files
Options

1、swagger 关闭 

2、druid stats 关闭
3、datasource2 去除
parent 3b821dac
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 254 deletions
atms-api/pom.xml
View file @ 54c83dc7
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<!--<artifactId>ojdbc</artifactId>--> <!--<artifactId>ojdbc</artifactId>-->
<!--<version>0.0.1</version>--> <!--<version>0.0.1</version>-->
<!--</dependency>--> <!--</dependency>-->
<dependency> <!--<dependency>
<groupId>com.oracle</groupId> <groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId> <artifactId>ojdbc6</artifactId>
<version>12.1.0.1-atlassian-hosted</version> <version>12.1.0.1-atlassian-hosted</version>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>pwc.taxtech.atms</groupId> <groupId>pwc.taxtech.atms</groupId>
...@@ -73,7 +73,8 @@ ...@@ -73,7 +73,8 @@
<version>4.2.3.RELEASE</version> <version>4.2.3.RELEASE</version>
</dependency> </dependency>
<dependency> <!--去除swagger-->
<!-- <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.8.0</version> <version>2.8.0</version>
...@@ -82,7 +83,7 @@ ...@@ -82,7 +83,7 @@
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.8.0</version> <version>2.8.0</version>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
......
atms-api/src/main/java/pwc/taxtech/atms/SwaggerConfig.java
View file @ 54c83dc7
/*
package pwc.taxtech.atms; package pwc.taxtech.atms;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -44,4 +45,4 @@ public class SwaggerConfig { ...@@ -44,4 +45,4 @@ public class SwaggerConfig {
return new ApiInfoBuilder().title("ATMS API").description("ATMS API").version("1.0").build(); return new ApiInfoBuilder().title("ATMS API").description("ATMS API").version("1.0").build();
// .termsOfServiceUrl("http://localhost:8180") // .termsOfServiceUrl("http://localhost:8180")
} }
} }*/
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/controller/AccountController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -23,7 +22,7 @@ public class AccountController { ...@@ -23,7 +22,7 @@ public class AccountController {
@Autowired @Autowired
private UserAccountServiceImpl userAccountService; 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) @RequestMapping(value = "userPassword", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
public OperationResultDto<LoginOutputDto> changeExternalUserPassword( public OperationResultDto<LoginOutputDto> changeExternalUserPassword(
@RequestBody(required = false) UserPasswordDto userPasswordDto) { @RequestBody(required = false) UserPasswordDto userPasswordDto) {
...@@ -32,7 +31,7 @@ public class AccountController { ...@@ -32,7 +31,7 @@ public class AccountController {
return result; return result;
} }
@ApiOperation(value = "忘记密码") // @ApiOperation(value = "忘记密码")
@RequestMapping(value = "ForgetPassword", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "ForgetPassword", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public OperationResultDto<Object> forgetPassword(@RequestParam(name = "mail") String mail) { public OperationResultDto<Object> forgetPassword(@RequestParam(name = "mail") String mail) {
logger.debug("enter forgetPassword"); logger.debug("enter forgetPassword");
......
atms-api/src/main/java/pwc/taxtech/atms/controller/ApprovalController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.activiti.engine.RepositoryService; import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService; import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService; import org.activiti.engine.TaskService;
...@@ -42,7 +41,7 @@ public class ApprovalController { ...@@ -42,7 +41,7 @@ public class ApprovalController {
return ResponseEntity.ok().build(); return ResponseEntity.ok().build();
} }
@ApiOperation(value = "提交报表") // @ApiOperation(value = "提交报表")
@ResponseBody @ResponseBody
@RequestMapping(value = "/commit", method = RequestMethod.POST) @RequestMapping(value = "/commit", method = RequestMethod.POST)
@Secured("vatApproval:commit") @Secured("vatApproval:commit")
...@@ -65,7 +64,7 @@ public class ApprovalController { ...@@ -65,7 +64,7 @@ public class ApprovalController {
return approvalService.getTemplateInfo(templateId); return approvalService.getTemplateInfo(templateId);
} }
@ApiOperation(value = "审批报表") // @ApiOperation(value = "审批报表")
@ResponseBody @ResponseBody
@RequestMapping(value = "/check/{projectId}/{period}",method = RequestMethod.PUT) @RequestMapping(value = "/check/{projectId}/{period}",method = RequestMethod.PUT)
@Secured("vatApproval:check") @Secured("vatApproval:check")
......
atms-api/src/main/java/pwc/taxtech/atms/controller/AreaController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -25,7 +24,7 @@ public class AreaController { ...@@ -25,7 +24,7 @@ public class AreaController {
@Autowired @Autowired
private AreaServiceImpl areaService; 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) @RequestMapping(value = "isactive", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
OperationResultDto<List<String>> setIsActive(@RequestBody AreaDto areaDto) { OperationResultDto<List<String>> setIsActive(@RequestBody AreaDto areaDto) {
...@@ -33,7 +32,7 @@ public class AreaController { ...@@ -33,7 +32,7 @@ public class AreaController {
return areaService.setIsActive(areaDto); return areaService.setIsActive(areaDto);
} }
@ApiOperation(value = "Get area list") // @ApiOperation(value = "Get area list")
@RequestMapping(value = "getAreaList", method = RequestMethod.GET) @RequestMapping(value = "getAreaList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<AreaDto> getAreaList(@RequestParam(defaultValue = "1") int type) { List<AreaDto> getAreaList(@RequestParam(defaultValue = "1") int type) {
...@@ -41,7 +40,7 @@ public class AreaController { ...@@ -41,7 +40,7 @@ public class AreaController {
return areaService.getAreaList(type); return areaService.getAreaList(type);
} }
@ApiOperation(value = "Get Tree") // @ApiOperation(value = "Get Tree")
@RequestMapping(value = "tree", method = RequestMethod.GET) @RequestMapping(value = "tree", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<AreaDto> getAreaTree(@RequestParam(name = "type") int type) { List<AreaDto> getAreaTree(@RequestParam(name = "type") int type) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/AreaRegionController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -27,7 +26,7 @@ public class AreaRegionController { ...@@ -27,7 +26,7 @@ public class AreaRegionController {
private AreaRegionServiceImpl areaRegionService; private AreaRegionServiceImpl areaRegionService;
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Adds the specified area.") // @ApiOperation(value = "Adds the specified area.")
@RequestMapping(value = "add", method = RequestMethod.POST) @RequestMapping(value = "add", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
OperationResultDto add(@RequestBody AreaRegionInfo areaRegionInfo) { OperationResultDto add(@RequestBody AreaRegionInfo areaRegionInfo) {
...@@ -36,7 +35,7 @@ public class AreaRegionController { ...@@ -36,7 +35,7 @@ public class AreaRegionController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Update the specified area.") // @ApiOperation(value = "Update the specified area.")
@RequestMapping(value = "update", method = RequestMethod.POST) @RequestMapping(value = "update", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
OperationResultDto update(@RequestBody AreaRegionInfo areaRegionInfo) { OperationResultDto update(@RequestBody AreaRegionInfo areaRegionInfo) {
...@@ -44,7 +43,7 @@ public class AreaRegionController { ...@@ -44,7 +43,7 @@ public class AreaRegionController {
return areaRegionService.update(areaRegionInfo); return areaRegionService.update(areaRegionInfo);
} }
@ApiOperation(value = "Get cities") // @ApiOperation(value = "Get cities")
@RequestMapping(value = "getCities", method = RequestMethod.GET) @RequestMapping(value = "getCities", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<AreaRegionDto> getCities(@RequestParam(name = "parentID") String parentId) { List<AreaRegionDto> getCities(@RequestParam(name = "parentID") String parentId) {
...@@ -52,7 +51,7 @@ public class AreaRegionController { ...@@ -52,7 +51,7 @@ public class AreaRegionController {
return areaRegionService.getCities(parentId); return areaRegionService.getCities(parentId);
} }
@ApiOperation(value = "Get Provinces") // @ApiOperation(value = "Get Provinces")
@RequestMapping(value = "getProvinces", method = RequestMethod.GET) @RequestMapping(value = "getProvinces", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<AreaRegionDto> getProvinces() { List<AreaRegionDto> getProvinces() {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/BusinessUnitController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -27,7 +26,7 @@ public class BusinessUnitController { ...@@ -27,7 +26,7 @@ public class BusinessUnitController {
@Autowired @Autowired
private BusinessUnitServiceImpl businessUnitService; private BusinessUnitServiceImpl businessUnitService;
@ApiOperation(value = "主数据事业部查询", notes = "返回所有事业部数据") // @ApiOperation(value = "主数据事业部查询", notes = "返回所有事业部数据")
@RequestMapping(value = "/getlist", method = RequestMethod.GET) @RequestMapping(value = "/getlist", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<BusinessUnitDto> getBusinessUnits() { List<BusinessUnitDto> getBusinessUnits() {
...@@ -35,14 +34,14 @@ public class BusinessUnitController { ...@@ -35,14 +34,14 @@ public class BusinessUnitController {
return businessUnitService.getBusinessUnits(); return businessUnitService.getBusinessUnits();
} }
@ApiOperation(value = "主数据事业部增加", notes = "根据Request Body的信息添加一个或多个新的事业部数据") // @ApiOperation(value = "主数据事业部增加", notes = "根据Request Body的信息添加一个或多个新的事业部数据")
@RequestMapping(value = "/add", method = RequestMethod.POST) @RequestMapping(value = "/add", method = RequestMethod.POST)
public void addBusinessUnits(@RequestBody List<BusinessUnitInputDto> businessUnitDtoList) { public void addBusinessUnits(@RequestBody List<BusinessUnitInputDto> businessUnitDtoList) {
logger.debug("BusinessUnitController addBusinessUnits"); logger.debug("BusinessUnitController addBusinessUnits");
businessUnitService.addBusinessUnits(businessUnitDtoList); businessUnitService.addBusinessUnits(businessUnitDtoList);
} }
@ApiOperation(value = "主数据事业部删除", notes = "根据给定的id删除一条事业部数据") // @ApiOperation(value = "主数据事业部删除", notes = "根据给定的id删除一条事业部数据")
@RequestMapping(value = "/delete", method = RequestMethod.POST) @RequestMapping(value = "/delete", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
Integer deleteBusinessUnit(@RequestBody IdModel idModel) { Integer deleteBusinessUnit(@RequestBody IdModel idModel) {
...@@ -50,7 +49,7 @@ public class BusinessUnitController { ...@@ -50,7 +49,7 @@ public class BusinessUnitController {
return businessUnitService.deleteBusinessUnit(idModel); return businessUnitService.deleteBusinessUnit(idModel);
} }
@ApiOperation(value = "主数据事业部修改", notes = "根据Request Body的信息修改一个或多个事业部数据") // @ApiOperation(value = "主数据事业部修改", notes = "根据Request Body的信息修改一个或多个事业部数据")
@RequestMapping(method = RequestMethod.PUT) @RequestMapping(method = RequestMethod.PUT)
public @ResponseBody public @ResponseBody
Boolean updateBusinessUnits(@RequestBody List<BusinessUnitDto> businessUnitDtoList) { Boolean updateBusinessUnits(@RequestBody List<BusinessUnitDto> businessUnitDtoList) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/CacheController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -20,14 +19,14 @@ public class CacheController { ...@@ -20,14 +19,14 @@ public class CacheController {
@Autowired @Autowired
private CacheServiceImpl cacheService; 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) @RequestMapping(value = "getallcache", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
List<CacheDto> getAllCache() { List<CacheDto> getAllCache() {
return cacheService.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) @RequestMapping(value = "getcachebykey", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public CacheDto getCacheByKey(@RequestParam("cacheKey") String cacheKey) { public CacheDto getCacheByKey(@RequestParam("cacheKey") String cacheKey) {
return cacheService.getCacheByKey(cacheKey); return cacheService.getCacheByKey(cacheKey);
......
atms-api/src/main/java/pwc/taxtech/atms/controller/CustomerController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.nutz.lang.Lang; import org.nutz.lang.Lang;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -45,7 +43,7 @@ public class CustomerController { ...@@ -45,7 +43,7 @@ public class CustomerController {
@Autowired @Autowired
private CustomerServiceImpl customerService; private CustomerServiceImpl customerService;
@ApiOperation(value = "财务数据客户增加") // @ApiOperation(value = "财务数据客户增加")
// @ApiImplicitParam(name = "customerDtoList", value = "customerDto List", // @ApiImplicitParam(name = "customerDtoList", value = "customerDto List",
// required = true, dataType = "List<CustomerDto>") // required = true, dataType = "List<CustomerDto>")
@RequestMapping(value = "/AddRange", method = RequestMethod.POST) @RequestMapping(value = "/AddRange", method = RequestMethod.POST)
...@@ -56,8 +54,8 @@ public class CustomerController { ...@@ -56,8 +54,8 @@ public class CustomerController {
return customerService.addRange(customerDtoList); return customerService.addRange(customerDtoList);
} }
@ApiOperation(value = "财务数据账套下客户查询") // @ApiOperation(value = "财务数据账套下客户查询")
@ApiImplicitParam(name = "id", value = "记录Id", required = true, dataType = "java.lang.String") // @ApiImplicitParam(name = "id", value = "记录Id", required = true, dataType = "java.lang.String")
@RequestMapping(value = "/getByID", method = RequestMethod.GET) @RequestMapping(value = "/getByID", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
CustomerValidateInfoDto getById(@RequestParam(name = "ID") String setId) { CustomerValidateInfoDto getById(@RequestParam(name = "ID") String setId) {
...@@ -65,7 +63,7 @@ public class CustomerController { ...@@ -65,7 +63,7 @@ public class CustomerController {
return customerService.getByEnterpriseAccountSetId(setId); return customerService.getByEnterpriseAccountSetId(setId);
} }
@ApiOperation(value = "财务数据所有客户查询") // @ApiOperation(value = "财务数据所有客户查询")
@RequestMapping(value = "/get", method = RequestMethod.GET) @RequestMapping(value = "/get", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<CustomerDto> getCustomer() { List<CustomerDto> getCustomer() {
...@@ -73,7 +71,7 @@ public class CustomerController { ...@@ -73,7 +71,7 @@ public class CustomerController {
return customerService.getCustomer(); return customerService.getCustomer();
} }
@ApiOperation(value = "财务数据客户删除") // @ApiOperation(value = "财务数据客户删除")
// @ApiImplicitParam(name = "customerDtoList", value = "customerDto List", // @ApiImplicitParam(name = "customerDtoList", value = "customerDto List",
// required = true, dataType = "List<CustomerDto>") // required = true, dataType = "List<CustomerDto>")
@RequestMapping(value = "/DeleteRange", method = RequestMethod.POST) @RequestMapping(value = "/DeleteRange", method = RequestMethod.POST)
...@@ -83,7 +81,7 @@ public class CustomerController { ...@@ -83,7 +81,7 @@ public class CustomerController {
return customerService.deleteRange(customerDtoList); return customerService.deleteRange(customerDtoList);
} }
@ApiOperation(value = "财务数据客户修改") // @ApiOperation(value = "财务数据客户修改")
// @ApiImplicitParam(name = "customerDtoList", value = "customerDto List", // @ApiImplicitParam(name = "customerDtoList", value = "customerDto List",
// required = true, dataType = "List<CustomerDto>") // required = true, dataType = "List<CustomerDto>")
@RequestMapping(value = "/UpdateRange", method = RequestMethod.POST) @RequestMapping(value = "/UpdateRange", method = RequestMethod.POST)
...@@ -94,7 +92,7 @@ public class CustomerController { ...@@ -94,7 +92,7 @@ public class CustomerController {
return customerService.updateRange(customerDtoList); return customerService.updateRange(customerDtoList);
} }
@ApiOperation(value = "批量上传账套下客户列表") // @ApiOperation(value = "批量上传账套下客户列表")
// @ApiImplicitParam(name = "file", value = "file", required = true, dataType = // @ApiImplicitParam(name = "file", value = "file", required = true, dataType =
// "CommonsMultipartFile") // "CommonsMultipartFile")
@RequestMapping(value = "/Upload", method = RequestMethod.POST) @RequestMapping(value = "/Upload", method = RequestMethod.POST)
......
atms-api/src/main/java/pwc/taxtech/atms/controller/DataInitController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.nutz.lang.Lang; import org.nutz.lang.Lang;
...@@ -44,7 +43,7 @@ public class DataInitController { ...@@ -44,7 +43,7 @@ public class DataInitController {
@Autowired @Autowired
private DataInitServiceImpl dataInitService; 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) @RequestMapping(value = {"/downloadTemplate"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downloadTemplate(HttpServletResponse response) { public void downloadTemplate(HttpServletResponse response) {
...@@ -79,7 +78,7 @@ public class DataInitController { ...@@ -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) @RequestMapping(value = {"/Upload"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
Object uploadInitData(@RequestParam String action, Object uploadInitData(@RequestParam String action,
......
atms-api/src/main/java/pwc/taxtech/atms/controller/DimensionController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -25,73 +24,73 @@ public class DimensionController { ...@@ -25,73 +24,73 @@ public class DimensionController {
@Autowired @Autowired
private DimensionServiceImpl dimensionService; private DimensionServiceImpl dimensionService;
@ApiOperation(value = "获取有效纬度、纬度值个数") // @ApiOperation(value = "获取有效纬度、纬度值个数")
@RequestMapping(value = "getDimensionStatics", method = RequestMethod.GET) @RequestMapping(value = "getDimensionStatics", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<DimensionDto> getDimensionStatics() { List<DimensionDto> getDimensionStatics() {
return dimensionService.getDimensionStatics(); return dimensionService.getDimensionStatics();
} }
@ApiOperation(value = "获取所有维度值") // @ApiOperation(value = "获取所有维度值")
@RequestMapping(value = "getAllDimensionList", method = RequestMethod.GET) @RequestMapping(value = "getAllDimensionList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<DimensionDto> getAllDimensionList() { List<DimensionDto> getAllDimensionList() {
return dimensionService.getAllDimensionList(); return dimensionService.getAllDimensionList();
} }
@ApiOperation(value = "获取有效纬度列表") // @ApiOperation(value = "获取有效纬度列表")
@RequestMapping(value = "getDimensionList", method = RequestMethod.GET) @RequestMapping(value = "getDimensionList", method = RequestMethod.GET)
public List<DimensionDto> getDimensionList() { public List<DimensionDto> getDimensionList() {
return dimensionService.getDimensionList(); return dimensionService.getDimensionList();
} }
@ApiOperation(value = "获取单独的维度") // @ApiOperation(value = "获取单独的维度")
@RequestMapping(value = "getDimensionById", method = RequestMethod.GET) @RequestMapping(value = "getDimensionById", method = RequestMethod.GET)
public DimensinTypeOrgDto getDimensionById(@RequestParam("id") String id) { public DimensinTypeOrgDto getDimensionById(@RequestParam("id") String id) {
return dimensionService.getDimensionById(id); return dimensionService.getDimensionById(id);
} }
@ApiOperation(value = "获取维度机构列表") // @ApiOperation(value = "获取维度机构列表")
@RequestMapping(value = "getAllDimensionOrgList", method = RequestMethod.GET) @RequestMapping(value = "getAllDimensionOrgList", method = RequestMethod.GET)
public List<DimensionValueOrgDto> getAllDimensionOrgList() { public List<DimensionValueOrgDto> getAllDimensionOrgList() {
return dimensionService.getAllDimensionOrgList(); return dimensionService.getAllDimensionOrgList();
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "更新维度") // @ApiOperation(value = "更新维度")
@RequestMapping(value = "/updateDimension", method = RequestMethod.POST) @RequestMapping(value = "/updateDimension", method = RequestMethod.POST)
public OperationResultDto updateDimension(@RequestBody DimensionDto model) { public OperationResultDto updateDimension(@RequestBody DimensionDto model) {
return dimensionService.updateDimension(model); return dimensionService.updateDimension(model);
} }
@ApiOperation(value = "获取维度值列表") // @ApiOperation(value = "获取维度值列表")
@RequestMapping(value = "getDimensionValueList", method = RequestMethod.GET) @RequestMapping(value = "getDimensionValueList", method = RequestMethod.GET)
public List<DimensionValueDto> getDimensionValueList(@RequestParam("dimensionId") String dimensionId) { public List<DimensionValueDto> getDimensionValueList(@RequestParam("dimensionId") String dimensionId) {
return dimensionService.getDimensionValueList(dimensionId); return dimensionService.getDimensionValueList(dimensionId);
} }
@ApiOperation(value = "获取有效维度列表") // @ApiOperation(value = "获取有效维度列表")
@RequestMapping(value = "getDevDimensionTreeList", method = RequestMethod.GET) @RequestMapping(value = "getDevDimensionTreeList", method = RequestMethod.GET)
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public List<DevTreeDto> getDevDimensionTreeList() { public List<DevTreeDto> getDevDimensionTreeList() {
return dimensionService.getDevDimensionTreeList(); return dimensionService.getDevDimensionTreeList();
} }
@ApiOperation(value = "添加维度") // @ApiOperation(value = "添加维度")
@RequestMapping(value = "/addDimension", method = RequestMethod.POST) @RequestMapping(value = "/addDimension", method = RequestMethod.POST)
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public OperationResultDto addDimension(@RequestBody DimensionDto model) { public OperationResultDto addDimension(@RequestBody DimensionDto model) {
return dimensionService.addDimension(model); return dimensionService.addDimension(model);
} }
@ApiOperation(value = "添加维度值") // @ApiOperation(value = "添加维度值")
@RequestMapping(value = "/addDimensionValue", method = RequestMethod.POST) @RequestMapping(value = "/addDimensionValue", method = RequestMethod.POST)
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public OperationResultDto addDimensionValue(@RequestBody DimensionValueDto model) { public OperationResultDto addDimensionValue(@RequestBody DimensionValueDto model) {
return dimensionService.addDimensionValue(model); return dimensionService.addDimensionValue(model);
} }
@ApiOperation(value = "更新维度值") // @ApiOperation(value = "更新维度值")
@RequestMapping(value = "/updateDimensionValue", method = RequestMethod.POST) @RequestMapping(value = "/updateDimensionValue", method = RequestMethod.POST)
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public OperationResultDto updateDimensionValue(@RequestBody DimensionValueDto model) { public OperationResultDto updateDimensionValue(@RequestBody DimensionValueDto model) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/EnterpriseAccountManagerController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.nutz.lang.Lang; import org.nutz.lang.Lang;
...@@ -55,14 +54,14 @@ public class EnterpriseAccountManagerController { ...@@ -55,14 +54,14 @@ public class EnterpriseAccountManagerController {
@Autowired @Autowired
private FileService fileService; private FileService fileService;
@ApiOperation(value = "Get the enterprise account set list") // @ApiOperation(value = "Get the enterprise account set list")
@RequestMapping(value = {"/getEnterpriseAccountSetList"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/getEnterpriseAccountSetList"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
List<EnterpriseAccountSetDto> getEnterpriseAccountSetList() { List<EnterpriseAccountSetDto> getEnterpriseAccountSetList() {
return enterpriseAccountSetService.getEnterpriseAccountSetList(); return enterpriseAccountSetService.getEnterpriseAccountSetList();
} }
@ApiOperation(value = "Gets the enterprise account set") // @ApiOperation(value = "Gets the enterprise account set")
@RequestMapping(value = {"/getEnterpriseAccountSet"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/getEnterpriseAccountSet"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
EnterpriseAccountSetDto getEnterpriseAccountSet(@RequestParam String id) { EnterpriseAccountSetDto getEnterpriseAccountSet(@RequestParam String id) {
...@@ -70,7 +69,7 @@ public class EnterpriseAccountManagerController { ...@@ -70,7 +69,7 @@ public class EnterpriseAccountManagerController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Updates the enterprise account set") // @ApiOperation(value = "Updates the enterprise account set")
@RequestMapping(value = {"/updateEnterpriseAccountSet"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/updateEnterpriseAccountSet"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto updateEnterpriseAccountSet(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) { OperationResultDto updateEnterpriseAccountSet(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) {
...@@ -78,7 +77,7 @@ public class EnterpriseAccountManagerController { ...@@ -78,7 +77,7 @@ public class EnterpriseAccountManagerController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Enterprises the account set name validate") // @ApiOperation(value = "Enterprises the account set name validate")
@RequestMapping(value = {"/enterpriseAccountSetNameValidate"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/enterpriseAccountSetNameValidate"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto enterpriseAccountSetNameValidate(@RequestParam String id, @RequestParam String name) { OperationResultDto enterpriseAccountSetNameValidate(@RequestParam String id, @RequestParam String name) {
...@@ -89,7 +88,7 @@ public class EnterpriseAccountManagerController { ...@@ -89,7 +88,7 @@ public class EnterpriseAccountManagerController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Enterprises the account set code validate") // @ApiOperation(value = "Enterprises the account set code validate")
@RequestMapping(value = {"/enterpriseAccountSetCodeValidate"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/enterpriseAccountSetCodeValidate"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto enterpriseAccountSetCodeValidate(@RequestParam String id, @RequestParam String code) { OperationResultDto enterpriseAccountSetCodeValidate(@RequestParam String id, @RequestParam String code) {
...@@ -100,7 +99,7 @@ public class EnterpriseAccountManagerController { ...@@ -100,7 +99,7 @@ public class EnterpriseAccountManagerController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Enterprises the account set org validate") // @ApiOperation(value = "Enterprises the account set org validate")
@RequestMapping(value = {"/enterpriseAccountSetOrgValidate"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/enterpriseAccountSetOrgValidate"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto enterpriseAccountSetOrgValidate(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) { OperationResultDto enterpriseAccountSetOrgValidate(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) {
...@@ -108,7 +107,7 @@ public class EnterpriseAccountManagerController { ...@@ -108,7 +107,7 @@ public class EnterpriseAccountManagerController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Add the oganization link to an enterprises account set") // @ApiOperation(value = "Add the oganization link to an enterprises account set")
@RequestMapping(value = {"/addEnterpriseAccountSetOrg"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/addEnterpriseAccountSetOrg"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto addEnterpriseAccountSetOrg(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) { OperationResultDto addEnterpriseAccountSetOrg(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) {
...@@ -116,7 +115,7 @@ public class EnterpriseAccountManagerController { ...@@ -116,7 +115,7 @@ public class EnterpriseAccountManagerController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Update the oganization link to an enterprises account set") // @ApiOperation(value = "Update the oganization link to an enterprises account set")
@RequestMapping(value = {"/updateEnterpriseAccountSetOrg"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/updateEnterpriseAccountSetOrg"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto updateEnterpriseAccountSetOrg(@RequestBody EnterpriseAccountSetOrgDto enterpriseAccountSetOrgDto) { OperationResultDto updateEnterpriseAccountSetOrg(@RequestBody EnterpriseAccountSetOrgDto enterpriseAccountSetOrgDto) {
...@@ -124,14 +123,14 @@ public class EnterpriseAccountManagerController { ...@@ -124,14 +123,14 @@ public class EnterpriseAccountManagerController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Delete the oganization link to an enterprises account set") // @ApiOperation(value = "Delete the oganization link to an enterprises account set")
@RequestMapping(value = {"/deleteEnterpriseAccountSetOrg"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/deleteEnterpriseAccountSetOrg"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto deleteEnterpriseAccountSetOrg(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) { OperationResultDto deleteEnterpriseAccountSetOrg(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) {
return enterpriseAccountSetService.deleteEnterpriseAccountSetOrg(enterpriseAccountSetDto); return enterpriseAccountSetService.deleteEnterpriseAccountSetOrg(enterpriseAccountSetDto);
} }
@ApiOperation(value = "Download Enterprise account template") // @ApiOperation(value = "Download Enterprise account template")
@RequestMapping(value = {"/downEntepriseAccountTemplate"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/downEntepriseAccountTemplate"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downEntepriseAccountTemplate(HttpServletResponse response) { public void downEntepriseAccountTemplate(HttpServletResponse response) {
...@@ -167,7 +166,7 @@ public class EnterpriseAccountManagerController { ...@@ -167,7 +166,7 @@ public class EnterpriseAccountManagerController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "Upload and save enterprise accounts.") // @ApiOperation(value = "Upload and save enterprise accounts.")
@RequestMapping(value = {"/Upload"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/Upload"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto uploadEnterpriseAccount(@ModelAttribute EnterpriseAccountUploadDto uploadForm, OperationResultDto uploadEnterpriseAccount(@ModelAttribute EnterpriseAccountUploadDto uploadForm,
...@@ -224,28 +223,28 @@ public class EnterpriseAccountManagerController { ...@@ -224,28 +223,28 @@ public class EnterpriseAccountManagerController {
return OperationResultDto.success(); return OperationResultDto.success();
} }
@ApiOperation(value = "Gets the list by enterprise account set identifier.") // @ApiOperation(value = "Gets the list by enterprise account set identifier.")
@RequestMapping(value = {"/getListByEnterpriseAccountSetID"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/getListByEnterpriseAccountSetID"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
EnterpriseAccountAndValidateInfo getListByEnterpriseAccountSetId(@RequestParam String enterpriseAccountSetID) { EnterpriseAccountAndValidateInfo getListByEnterpriseAccountSetId(@RequestParam String enterpriseAccountSetID) {
return enterpriseAccountService.getListByEnterpriseAccountSetId(enterpriseAccountSetID); return enterpriseAccountService.getListByEnterpriseAccountSetId(enterpriseAccountSetID);
} }
@ApiOperation(value = "Gets the specified enterprise account by identifier") // @ApiOperation(value = "Gets the specified enterprise account by identifier")
@RequestMapping(value = {"/getsingle"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/getsingle"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
EnterpriseAccountDto getEnterpriseAccount(@RequestParam String id) { EnterpriseAccountDto getEnterpriseAccount(@RequestParam String id) {
return enterpriseAccountService.getEnterpriseAccount(id); return enterpriseAccountService.getEnterpriseAccount(id);
} }
@ApiOperation(value = "Add an enterprise account") // @ApiOperation(value = "Add an enterprise account")
@RequestMapping(value = {"/add"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/add"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto<List<EnterpriseAccountDto>> addEnterpriseAccount(@RequestBody EnterpriseAccountDto enterpriseAccountDto) { OperationResultDto<List<EnterpriseAccountDto>> addEnterpriseAccount(@RequestBody EnterpriseAccountDto enterpriseAccountDto) {
return enterpriseAccountService.addEnterpriseAccount(enterpriseAccountDto); return enterpriseAccountService.addEnterpriseAccount(enterpriseAccountDto);
} }
@ApiOperation(value = "Update an enterprise account") // @ApiOperation(value = "Update an enterprise account")
@RequestMapping(value = {"/update"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/update"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto<List<EnterpriseAccountDto>> updateEnterpriseAccount(@RequestBody EnterpriseAccountDto enterpriseAccountDto) { OperationResultDto<List<EnterpriseAccountDto>> updateEnterpriseAccount(@RequestBody EnterpriseAccountDto enterpriseAccountDto) {
...@@ -253,14 +252,14 @@ public class EnterpriseAccountManagerController { ...@@ -253,14 +252,14 @@ public class EnterpriseAccountManagerController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "一键删除重复企业科目") // @ApiOperation(value = "一键删除重复企业科目")
@RequestMapping(value = {"/clearRepeatEnterpriseAccountList"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/clearRepeatEnterpriseAccountList"}, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto clearRepeatEnterpriseAccountList(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) { OperationResultDto clearRepeatEnterpriseAccountList(@RequestBody EnterpriseAccountSetDto enterpriseAccountSetDto) {
return enterpriseAccountService.clearRepeatEnterpriseAccountList(enterpriseAccountSetDto); return enterpriseAccountService.clearRepeatEnterpriseAccountList(enterpriseAccountSetDto);
} }
@ApiOperation(value = "获取企业账套Mapping") // @ApiOperation(value = "获取企业账套Mapping")
@RequestMapping(value = {"/getAccountMappingOrg"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/getAccountMappingOrg"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
List<AccountMappingDto> getAccountMappingOrg(@RequestParam(name = "organizationID") String organizationId) { List<AccountMappingDto> getAccountMappingOrg(@RequestParam(name = "organizationID") String organizationId) {
...@@ -268,14 +267,14 @@ public class EnterpriseAccountManagerController { ...@@ -268,14 +267,14 @@ public class EnterpriseAccountManagerController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "按组织机构查找") // @ApiOperation(value = "按组织机构查找")
@RequestMapping(value = "getEnterpriseAccountSetListByOrgID", method = RequestMethod.GET) @RequestMapping(value = "getEnterpriseAccountSetListByOrgID", method = RequestMethod.GET)
public List<EnterpriseAccountSetDto> getEnterpriseAccountSetListByOrgId(@RequestParam(name = "orgID") String orgId) { public List<EnterpriseAccountSetDto> getEnterpriseAccountSetListByOrgId(@RequestParam(name = "orgID") String orgId) {
return enterpriseAccountService.getEnterpriseAccountSetListByOrgId(orgId); return enterpriseAccountService.getEnterpriseAccountSetListByOrgId(orgId);
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "科目对应列表") // @ApiOperation(value = "科目对应列表")
@RequestMapping(value = "getEnterpriseAccountList", method = RequestMethod.GET) @RequestMapping(value = "getEnterpriseAccountList", method = RequestMethod.GET)
public List<EnterpriseAccountDto> getEnterpriseAccountList(@RequestParam(name = "espID") String espId, public List<EnterpriseAccountDto> getEnterpriseAccountList(@RequestParam(name = "espID") String espId,
@RequestParam(name = "orgID") String orgId, @RequestParam(name = "orgID") String orgId,
...@@ -284,7 +283,7 @@ public class EnterpriseAccountManagerController { ...@@ -284,7 +283,7 @@ public class EnterpriseAccountManagerController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "科目自动对应") // @ApiOperation(value = "科目自动对应")
@RequestMapping(value = "autoMap", method = RequestMethod.GET) @RequestMapping(value = "autoMap", method = RequestMethod.GET)
public OperationResultDto autoMap(@RequestParam String orgId, @RequestParam String accountSetId) { public OperationResultDto autoMap(@RequestParam String orgId, @RequestParam String accountSetId) {
try { try {
...@@ -296,7 +295,7 @@ public class EnterpriseAccountManagerController { ...@@ -296,7 +295,7 @@ public class EnterpriseAccountManagerController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "手动对应") // @ApiOperation(value = "手动对应")
@RequestMapping(value = "mapAccount", method = RequestMethod.POST) @RequestMapping(value = "mapAccount", method = RequestMethod.POST)
public OperationResultDto mapAccount(@RequestBody AccountMapDto dto) { public OperationResultDto mapAccount(@RequestBody AccountMapDto dto) {
try { try {
...@@ -308,7 +307,7 @@ public class EnterpriseAccountManagerController { ...@@ -308,7 +307,7 @@ public class EnterpriseAccountManagerController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "取消对应") // @ApiOperation(value = "取消对应")
@RequestMapping(value = "clearMap", method = RequestMethod.POST) @RequestMapping(value = "clearMap", method = RequestMethod.POST)
public OperationResultDto clearMap(@RequestBody String[] epAccountIds, @RequestParam String orgId) { public OperationResultDto clearMap(@RequestBody String[] epAccountIds, @RequestParam String orgId) {
try { try {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/ExcelDataController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -21,7 +20,7 @@ public class ExcelDataController { ...@@ -21,7 +20,7 @@ public class ExcelDataController {
private ExcelDataServiceImpl excelDataService; private ExcelDataServiceImpl excelDataService;
@ResponseBody @ResponseBody
@ApiOperation(value = "导入报表数据") // @ApiOperation(value = "导入报表数据")
@RequestMapping(value = "importExcelDataFile", method = RequestMethod.POST) @RequestMapping(value = "importExcelDataFile", method = RequestMethod.POST)
public OperationResultDto parseExcelData(@RequestParam MultipartFile file, public OperationResultDto parseExcelData(@RequestParam MultipartFile file,
@RequestParam Long templateID, @RequestParam Long templateID,
......
atms-api/src/main/java/pwc/taxtech/atms/controller/FormulaController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
...@@ -17,7 +16,7 @@ public class FormulaController extends BaseController { ...@@ -17,7 +16,7 @@ public class FormulaController extends BaseController {
FormulaServiceImpl formulaService; FormulaServiceImpl formulaService;
@ResponseBody @ResponseBody
@ApiOperation(value = "") // @ApiOperation(value = "")
@RequestMapping(value = "get", method = RequestMethod.GET) @RequestMapping(value = "get", method = RequestMethod.GET)
public OperationResultDto getAllFormulaList() { public OperationResultDto getAllFormulaList() {
try { try {
...@@ -29,7 +28,7 @@ public class FormulaController extends BaseController { ...@@ -29,7 +28,7 @@ public class FormulaController extends BaseController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "") // @ApiOperation(value = "")
@RequestMapping(value = "param/get", method = RequestMethod.GET) @RequestMapping(value = "param/get", method = RequestMethod.GET)
public OperationResultDto getAllFormulaConfigList() { public OperationResultDto getAllFormulaConfigList() {
try { try {
...@@ -41,7 +40,7 @@ public class FormulaController extends BaseController { ...@@ -41,7 +40,7 @@ public class FormulaController extends BaseController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "") // @ApiOperation(value = "")
@RequestMapping(value = "parammapping/get", method = RequestMethod.GET) @RequestMapping(value = "parammapping/get", method = RequestMethod.GET)
public OperationResultDto getAllFormulaParamMappingList() { public OperationResultDto getAllFormulaParamMappingList() {
try { try {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/KeyValueConfigController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import javassist.tools.web.BadHttpRequest; import javassist.tools.web.BadHttpRequest;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -39,7 +38,7 @@ public class KeyValueConfigController { ...@@ -39,7 +38,7 @@ public class KeyValueConfigController {
@Autowired @Autowired
private TemplateFormulaServiceImpl templateFormulaService; private TemplateFormulaServiceImpl templateFormulaService;
@ApiOperation(value = "get keyValueConfig") // @ApiOperation(value = "get keyValueConfig")
@RequestMapping(value = "", method = RequestMethod.GET) @RequestMapping(value = "", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<KeyValueConfigDisplayDto> get() { List<KeyValueConfigDisplayDto> get() {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/MenuController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -28,7 +27,7 @@ public class MenuController { ...@@ -28,7 +27,7 @@ public class MenuController {
@Autowired @Autowired
private MenuServiceImpl menuService; private MenuServiceImpl menuService;
@ApiOperation(value = "获取用于显示的菜单列表", notes = "请提供条件参数serviceId") // @ApiOperation(value = "获取用于显示的菜单列表", notes = "请提供条件参数serviceId")
@RequestMapping(value = "/display", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/display", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
List<MenuDisplayDto> getMenusForDisplay(@RequestParam("serviceId") Integer serviceId , @RequestParam("userId") String userId) { List<MenuDisplayDto> getMenusForDisplay(@RequestParam("serviceId") Integer serviceId , @RequestParam("userId") String userId) {
...@@ -36,7 +35,7 @@ public class MenuController { ...@@ -36,7 +35,7 @@ public class MenuController {
return menuService.getMenusForDisplay(serviceId, userId); return menuService.getMenusForDisplay(serviceId, userId);
} }
@ApiOperation(value = "获取菜单列表", notes = "请提供条件参数serviceId") // @ApiOperation(value = "获取菜单列表", notes = "请提供条件参数serviceId")
@RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
List<MenuDto> getMenus(@RequestParam("serviceId") Integer serviceId) { List<MenuDto> getMenus(@RequestParam("serviceId") Integer serviceId) {
...@@ -44,7 +43,7 @@ public class MenuController { ...@@ -44,7 +43,7 @@ public class MenuController {
return menuService.getMenus(serviceId); return menuService.getMenus(serviceId);
} }
@ApiOperation(value = "获取菜单列表", notes = "请提供条件参数serviceId") // @ApiOperation(value = "获取菜单列表", notes = "请提供条件参数serviceId")
@RequestMapping(value="/role", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value="/role", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
List<MenuDto> getMenus(@RequestParam("serviceId") Integer serviceId, @RequestParam("userId") String userId) { List<MenuDto> getMenus(@RequestParam("serviceId") Integer serviceId, @RequestParam("userId") String userId) {
...@@ -54,7 +53,7 @@ public class MenuController { ...@@ -54,7 +53,7 @@ public class MenuController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "更新菜单项", notes = "更新菜单项") // @ApiOperation(value = "更新菜单项", notes = "更新菜单项")
@RequestMapping(method = RequestMethod.PUT) @RequestMapping(method = RequestMethod.PUT)
public OperationResultDto updateMenu(@RequestBody Menu menu) { public OperationResultDto updateMenu(@RequestBody Menu menu) {
try { try {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -32,8 +30,8 @@ public class OperationLogController { ...@@ -32,8 +30,8 @@ public class OperationLogController {
@Autowired @Autowired
private OperationLogServiceImpl operationLogService; private OperationLogServiceImpl operationLogService;
@ApiOperation(value = "查询日志") // @ApiOperation(value = "查询日志")
@ApiImplicitParam(name = "queryOperateParamDto", value = "queryOperateParamDto", required = true, dataType = "QueryOperateParamDto") // @ApiImplicitParam(name = "queryOperateParamDto", value = "queryOperateParamDto", required = true, dataType = "QueryOperateParamDto")
@RequestMapping(value = "getorgloglist", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getorgloglist", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
PagingResultDto<OperationLogDto> getOperationLogList(@RequestBody QueryOperateParamDto queryOperateParamDto) { PagingResultDto<OperationLogDto> getOperationLogList(@RequestBody QueryOperateParamDto queryOperateParamDto) {
...@@ -41,7 +39,7 @@ public class OperationLogController { ...@@ -41,7 +39,7 @@ public class OperationLogController {
return operationLogService.getOperationLogList(queryOperateParamDto); return operationLogService.getOperationLogList(queryOperateParamDto);
} }
@ApiOperation(value = "添加进入项目日志") // @ApiOperation(value = "添加进入项目日志")
@RequestMapping(value = "addEnterProjectLog/{userName}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "addEnterProjectLog/{userName}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void addEnterProjectLog(String userName, String logContent) { public void addEnterProjectLog(String userName, String logContent) {
OperationLogDto dto = new OperationLogDto(); OperationLogDto dto = new OperationLogDto();
......
atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -44,28 +43,28 @@ public class OrganizationController { ...@@ -44,28 +43,28 @@ public class OrganizationController {
@Autowired @Autowired
UserServiceImpl userService; UserServiceImpl userService;
@ApiOperation(value = "根据使用的方式获取机构的列表") // @ApiOperation(value = "根据使用的方式获取机构的列表")
@RequestMapping(value = "getjson", method = RequestMethod.GET) @RequestMapping(value = "getjson", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<NavTreeDto> getOrgListToJson(@RequestParam("useType") Integer useType) { List<NavTreeDto> getOrgListToJson(@RequestParam("useType") Integer useType) {
return organizationService.getOrgListToJson(useType); return organizationService.getOrgListToJson(useType);
} }
@ApiOperation(value = "获取根据机构筛选的属性和机构名称") // @ApiOperation(value = "获取根据机构筛选的属性和机构名称")
@RequestMapping(value = "getOrganizationFilterList", method = RequestMethod.GET) @RequestMapping(value = "getOrganizationFilterList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<OrganizationDto> getOrganizationFilterList() { List<OrganizationDto> getOrganizationFilterList() {
return organizationService.getOrganizationFilterList(); return organizationService.getOrganizationFilterList();
} }
@ApiOperation(value = "根据使用的方式获取机构的展示列表") // @ApiOperation(value = "根据使用的方式获取机构的展示列表")
@RequestMapping(value = "display", method = RequestMethod.GET) @RequestMapping(value = "display", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<OrganizationDto> getOrgList(@RequestParam("useType") Integer useType) { List<OrganizationDto> getOrgList(@RequestParam("useType") Integer useType) {
return organizationService.getOrgList(useType); return organizationService.getOrgList(useType);
} }
@ApiOperation(value = "获取行业列表") // @ApiOperation(value = "获取行业列表")
@RequestMapping(value = "getProjectIndustrys", method = RequestMethod.GET) @RequestMapping(value = "getProjectIndustrys", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<IndustryDto> getProjectIndustry() { List<IndustryDto> getProjectIndustry() {
...@@ -73,7 +72,7 @@ public class OrganizationController { ...@@ -73,7 +72,7 @@ public class OrganizationController {
return organizationService.getProjectIndustryList(); return organizationService.getProjectIndustryList();
} }
@ApiOperation(value = "层级显示机构列表_列表显示") // @ApiOperation(value = "层级显示机构列表_列表显示")
@RequestMapping(value = "getOrgListLevel", method = RequestMethod.GET) @RequestMapping(value = "getOrgListLevel", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<OrgBasicDto> getOrgListLevel() { List<OrgBasicDto> getOrgListLevel() {
...@@ -81,7 +80,7 @@ public class OrganizationController { ...@@ -81,7 +80,7 @@ public class OrganizationController {
return organizationService.getOrgListLevel(); return organizationService.getOrgListLevel();
} }
@ApiOperation(value = "纳税人识别号唯一性验证") // @ApiOperation(value = "纳税人识别号唯一性验证")
@RequestMapping(value = "taxPayerNumberUniqueValidate", method = RequestMethod.POST) @RequestMapping(value = "taxPayerNumberUniqueValidate", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
Boolean taxPayerNumberUniqueValidate(@RequestBody OrganizationValidateDto validateDto) { Boolean taxPayerNumberUniqueValidate(@RequestBody OrganizationValidateDto validateDto) {
...@@ -89,7 +88,7 @@ public class OrganizationController { ...@@ -89,7 +88,7 @@ public class OrganizationController {
return organizationService.taxPayerNumberUniqueValidate(validateDto); return organizationService.taxPayerNumberUniqueValidate(validateDto);
} }
@ApiOperation(value = "获取机构展示面板（Dashboard)") // @ApiOperation(value = "获取机构展示面板（Dashboard)")
@RequestMapping(value = "getOrgDashboard", method = RequestMethod.POST) @RequestMapping(value = "getOrgDashboard", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
List<DimensionOrgDtoDashboard> getOrgDashboardPost( List<DimensionOrgDtoDashboard> getOrgDashboardPost(
...@@ -101,7 +100,7 @@ public class OrganizationController { ...@@ -101,7 +100,7 @@ public class OrganizationController {
return organizationService.getOrgDashboard(dimensionId, parentOrgId, param); return organizationService.getOrgDashboard(dimensionId, parentOrgId, param);
} }
@ApiOperation(value = "获取单个机构展示面板(Dashboard)") // @ApiOperation(value = "获取单个机构展示面板(Dashboard)")
@RequestMapping(value = "getOrgDashboardOnly", method = RequestMethod.GET) @RequestMapping(value = "getOrgDashboardOnly", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<DimensionOrgDtoDashboard> getOrgDashboard(@RequestParam("dimensionId") String dimensionId, List<DimensionOrgDtoDashboard> getOrgDashboard(@RequestParam("dimensionId") String dimensionId,
...@@ -112,14 +111,14 @@ public class OrganizationController { ...@@ -112,14 +111,14 @@ public class OrganizationController {
return organizationService.getOrgDashboard(dimensionId, parentOrgId, param); return organizationService.getOrgDashboard(dimensionId, parentOrgId, param);
} }
@ApiOperation(value = "显示覆盖区域统计数据") // @ApiOperation(value = "显示覆盖区域统计数据")
@RequestMapping(value = "getAreaStatistics", method = RequestMethod.GET) @RequestMapping(value = "getAreaStatistics", method = RequestMethod.GET)
public AreaOrganizationStatistics getAreaStatistics() { public AreaOrganizationStatistics getAreaStatistics() {
logger.info("POST /api/v1/org/getAreaStatistics"); logger.info("POST /api/v1/org/getAreaStatistics");
return organizationService.getAreaStatistics(); return organizationService.getAreaStatistics();
} }
@ApiOperation(value = "获取机构上层维度") // @ApiOperation(value = "获取机构上层维度")
@RequestMapping(value = "getOrgBuAreaIndustryUser", method = RequestMethod.GET) @RequestMapping(value = "getOrgBuAreaIndustryUser", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<DimensionRoleDto> getOrgBuAreaIndustryUser(@RequestParam("userID") String userId) { List<DimensionRoleDto> getOrgBuAreaIndustryUser(@RequestParam("userID") String userId) {
...@@ -127,7 +126,7 @@ public class OrganizationController { ...@@ -127,7 +126,7 @@ public class OrganizationController {
return userRoleService.getOrgBuAreaIndustryUser(userId); return userRoleService.getOrgBuAreaIndustryUser(userId);
} }
@ApiOperation(value = "显示覆盖区域统计数据") // @ApiOperation(value = "显示覆盖区域统计数据")
@RequestMapping(value = "getOrgCustomDashbord", method = RequestMethod.GET) @RequestMapping(value = "getOrgCustomDashbord", method = RequestMethod.GET)
public OrgDto getOrgCustomDashbord( public OrgDto getOrgCustomDashbord(
@RequestParam(value = "dimensionValueId", required = false) String dimensionValueId, @RequestParam(value = "dimensionValueId", required = false) String dimensionValueId,
...@@ -137,7 +136,7 @@ public class OrganizationController { ...@@ -137,7 +136,7 @@ public class OrganizationController {
return organizationService.getOrgCustomDashbord(dimensionValueId, parentDimensionId, attributeId); return organizationService.getOrgCustomDashbord(dimensionValueId, parentDimensionId, attributeId);
} }
@ApiOperation(value = "获取区域下的所有机构") // @ApiOperation(value = "获取区域下的所有机构")
@RequestMapping(value = "getOrganizationListByAreaId", method = RequestMethod.GET) @RequestMapping(value = "getOrganizationListByAreaId", method = RequestMethod.GET)
public List<OrganizationDto> getOrganizationListByAreaId( public List<OrganizationDto> getOrganizationListByAreaId(
@RequestParam(value = "areaId", required = true) String areaId, @RequestParam(value = "areaId", required = true) String areaId,
...@@ -147,7 +146,7 @@ public class OrganizationController { ...@@ -147,7 +146,7 @@ public class OrganizationController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "禁用选中机构信息") // @ApiOperation(value = "禁用选中机构信息")
@RequestMapping(value = "disableOrgs", method = RequestMethod.POST) @RequestMapping(value = "disableOrgs", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
OperationResultDto disableOrgs(@RequestBody List<String> orgIds) { OperationResultDto disableOrgs(@RequestBody List<String> orgIds) {
...@@ -156,7 +155,7 @@ public class OrganizationController { ...@@ -156,7 +155,7 @@ public class OrganizationController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "启用选中机构信息") // @ApiOperation(value = "启用选中机构信息")
@RequestMapping(value = "enableOrgs", method = RequestMethod.GET) @RequestMapping(value = "enableOrgs", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
OperationResultDto enableOrgs(@RequestParam("orgId") String orgId) { OperationResultDto enableOrgs(@RequestParam("orgId") String orgId) {
...@@ -164,7 +163,7 @@ public class OrganizationController { ...@@ -164,7 +163,7 @@ public class OrganizationController {
return organizationService.enableOrgs(orgId); return organizationService.enableOrgs(orgId);
} }
@ApiOperation(value = "通过orgId获取一个组织的信息") // @ApiOperation(value = "通过orgId获取一个组织的信息")
@RequestMapping(value = "displaySingle", method = RequestMethod.GET) @RequestMapping(value = "displaySingle", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
OrganizationDto getSingleOrgByOrgId(@RequestParam("orgId") String orgId) { OrganizationDto getSingleOrgByOrgId(@RequestParam("orgId") String orgId) {
...@@ -172,7 +171,7 @@ public class OrganizationController { ...@@ -172,7 +171,7 @@ public class OrganizationController {
return organizationService.getSingleOrgByOrgId(orgId); return organizationService.getSingleOrgByOrgId(orgId);
} }
@ApiOperation(value = "机构代码唯一性验证") // @ApiOperation(value = "机构代码唯一性验证")
@RequestMapping(value = "codeUniqueValidate", method = RequestMethod.POST) @RequestMapping(value = "codeUniqueValidate", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
Boolean codeUniqueValidate(@RequestBody OrganizationValidateDto validateDto) { Boolean codeUniqueValidate(@RequestBody OrganizationValidateDto validateDto) {
...@@ -181,7 +180,7 @@ public class OrganizationController { ...@@ -181,7 +180,7 @@ public class OrganizationController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "为当前的维度添加现有的机构，可以批量的添加", notes = "机构管理>卡片视角>点击机构+>关联现有机构>确定") // @ApiOperation(value = "为当前的维度添加现有的机构，可以批量的添加", notes = "机构管理>卡片视角>点击机构+>关联现有机构>确定")
@RequestMapping(value = "updateOrgToDimension", method = RequestMethod.POST) @RequestMapping(value = "updateOrgToDimension", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
OperationResultDto updateOrgToDimension(@RequestBody UpdateOrgDimensionDto dto) { OperationResultDto updateOrgToDimension(@RequestBody UpdateOrgDimensionDto dto) {
...@@ -189,7 +188,7 @@ public class OrganizationController { ...@@ -189,7 +188,7 @@ public class OrganizationController {
dto.getOrgDtoList()); dto.getOrgDtoList());
} }
@ApiOperation(value = "增加机构信息") // @ApiOperation(value = "增加机构信息")
@RequestMapping(value = "add", method = RequestMethod.POST) @RequestMapping(value = "add", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
OperationResultDto<Object> addOrg(@RequestBody OrganizationDto orgDto) { OperationResultDto<Object> addOrg(@RequestBody OrganizationDto orgDto) {
...@@ -200,7 +199,7 @@ public class OrganizationController { ...@@ -200,7 +199,7 @@ public class OrganizationController {
return organizationService.addOrg(orgDto); return organizationService.addOrg(orgDto);
} }
@ApiOperation(value = "更新机构信息") // @ApiOperation(value = "更新机构信息")
@RequestMapping(value = "update", method = RequestMethod.PUT) @RequestMapping(value = "update", method = RequestMethod.PUT)
public @ResponseBody public @ResponseBody
OperationResultDto<Object> updateOrg(@RequestBody OrganizationDto orgDto) { OperationResultDto<Object> updateOrg(@RequestBody OrganizationDto orgDto) {
...@@ -211,7 +210,7 @@ public class OrganizationController { ...@@ -211,7 +210,7 @@ public class OrganizationController {
return organizationService.updateOrg(orgDto); return organizationService.updateOrg(orgDto);
} }
@ApiOperation(value = "删除用户维度权限设置") // @ApiOperation(value = "删除用户维度权限设置")
@RequestMapping(value = "deleteUserDimensionValue", method = RequestMethod.POST) @RequestMapping(value = "deleteUserDimensionValue", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
Boolean deleteUserDimensionValue(@RequestBody DimensionRoleDto dto, Boolean deleteUserDimensionValue(@RequestBody DimensionRoleDto dto,
...@@ -220,7 +219,7 @@ public class OrganizationController { ...@@ -220,7 +219,7 @@ public class OrganizationController {
return true; return true;
} }
@ApiOperation(value = "获取机构通用信息", notes = "机构管理>卡片视角>机构视图>点击机构灰色区域文字") // @ApiOperation(value = "获取机构通用信息", notes = "机构管理>卡片视角>机构视图>点击机构灰色区域文字")
@RequestMapping(value = "getGeneralInfo", method = RequestMethod.GET) @RequestMapping(value = "getGeneralInfo", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
OrgGeneralInfoDto getGeneralInfo(@RequestParam("orgId") String orgId) { OrgGeneralInfoDto getGeneralInfo(@RequestParam("orgId") String orgId) {
...@@ -229,7 +228,7 @@ public class OrganizationController { ...@@ -229,7 +228,7 @@ public class OrganizationController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "获取机构树信息", notes = "科目对应>复制对应关系>弹出层") // @ApiOperation(value = "获取机构树信息", notes = "科目对应>复制对应关系>弹出层")
@RequestMapping(value = "getOrgIvhTreeList", method = RequestMethod.GET) @RequestMapping(value = "getOrgIvhTreeList", method = RequestMethod.GET)
public List<DevTreeDto> getOrgIvhTreeList(@RequestParam("useType") Integer useType, public List<DevTreeDto> getOrgIvhTreeList(@RequestParam("useType") Integer useType,
@RequestParam("orgSetID") String orgSetId) { @RequestParam("orgSetID") String orgSetId) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationStructureController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -26,7 +24,7 @@ public class OrganizationStructureController { ...@@ -26,7 +24,7 @@ public class OrganizationStructureController {
@Autowired @Autowired
private OrganizationStructureServiceImpl organizationStructureService; private OrganizationStructureServiceImpl organizationStructureService;
@ApiOperation(value = "主数据机构层级查询") // @ApiOperation(value = "主数据机构层级查询")
@RequestMapping(value = "/getlist", method = RequestMethod.GET) @RequestMapping(value = "/getlist", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<OrganizationStructureDto> getOrganizationStructures() { List<OrganizationStructureDto> getOrganizationStructures() {
...@@ -34,7 +32,7 @@ public class OrganizationStructureController { ...@@ -34,7 +32,7 @@ public class OrganizationStructureController {
return organizationStructureService.getOrganizationStructures(); return organizationStructureService.getOrganizationStructures();
} }
@ApiOperation(value = "主数据机构层级增加") // @ApiOperation(value = "主数据机构层级增加")
// @ApiImplicitParam(name = "organizationStructureDtoList", value = "organizationStructureDto List", required = true, dataType = "List<OrganizationStructureDto>") // @ApiImplicitParam(name = "organizationStructureDtoList", value = "organizationStructureDto List", required = true, dataType = "List<OrganizationStructureDto>")
@RequestMapping(value = "/add", method = RequestMethod.POST) @RequestMapping(value = "/add", method = RequestMethod.POST)
public void addOrganizationStructures(@RequestBody List<OrganizationStructureInputDto> organizationStructureDtoList) { public void addOrganizationStructures(@RequestBody List<OrganizationStructureInputDto> organizationStructureDtoList) {
...@@ -42,8 +40,8 @@ public class OrganizationStructureController { ...@@ -42,8 +40,8 @@ public class OrganizationStructureController {
organizationStructureService.addOrganizationStructures(organizationStructureDtoList); organizationStructureService.addOrganizationStructures(organizationStructureDtoList);
} }
@ApiOperation(value = "主数据机构层级删除") // @ApiOperation(value = "主数据机构层级删除")
@ApiImplicitParam(name = "idModel", value = "idModel", required = true, dataType = "IdModel") // @ApiImplicitParam(name = "idModel", value = "idModel", required = true, dataType = "IdModel")
@RequestMapping(value = "/delete", method = RequestMethod.POST) @RequestMapping(value = "/delete", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
Integer deleteOrganizationStructure(@RequestBody IdModel idModel) { Integer deleteOrganizationStructure(@RequestBody IdModel idModel) {
...@@ -51,7 +49,7 @@ public class OrganizationStructureController { ...@@ -51,7 +49,7 @@ public class OrganizationStructureController {
return organizationStructureService.deleteOrganizationStructure(idModel); return organizationStructureService.deleteOrganizationStructure(idModel);
} }
@ApiOperation(value = "主数据机构层级修改") // @ApiOperation(value = "主数据机构层级修改")
// @ApiImplicitParam(name = "organizationStructureDtoList", value = "organizationStructureDto List", required = true, dataType = "List<OrganizationStructureDto>") // @ApiImplicitParam(name = "organizationStructureDtoList", value = "organizationStructureDto List", required = true, dataType = "List<OrganizationStructureDto>")
@RequestMapping(method = RequestMethod.PUT) @RequestMapping(method = RequestMethod.PUT)
public @ResponseBody public @ResponseBody
......
atms-api/src/main/java/pwc/taxtech/atms/controller/PermissionController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -25,7 +24,7 @@ public class PermissionController { ...@@ -25,7 +24,7 @@ public class PermissionController {
@Autowired @Autowired
private PermissionServiceImpl permissionService; 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) @RequestMapping(value = "getIvhTreePermissionsByRoleID", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
RolePermissionDisplayDto getIvhTreePermissionsByRoleId(@RequestParam String roleID, RolePermissionDisplayDto getIvhTreePermissionsByRoleId(@RequestParam String roleID,
...@@ -34,7 +33,7 @@ public class PermissionController { ...@@ -34,7 +33,7 @@ public class PermissionController {
return permissionService.getIvhTreePermissionsByRoleId(roleID, serviceType); return permissionService.getIvhTreePermissionsByRoleId(roleID, serviceType);
} }
@ApiOperation(value = "通过传入的角色Id列表获取树形结构权限") // @ApiOperation(value = "通过传入的角色Id列表获取树形结构权限")
@RequestMapping(value = "getIvhTreePermissionsByRoleIDList", method = RequestMethod.POST) @RequestMapping(value = "getIvhTreePermissionsByRoleIDList", method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
List<DevTreeDto> getIvhTreePermissionsByRoleIdList(@RequestBody List<String> roleIdList, List<DevTreeDto> getIvhTreePermissionsByRoleIdList(@RequestBody List<String> roleIdList,
...@@ -42,7 +41,7 @@ public class PermissionController { ...@@ -42,7 +41,7 @@ public class PermissionController {
return permissionService.getIvhTreePermissionsByRoleIdList(roleIdList, serviceType); return permissionService.getIvhTreePermissionsByRoleIdList(roleIdList, serviceType);
} }
@ApiOperation(value = "获取所有权限树形结构列表") // @ApiOperation(value = "获取所有权限树形结构列表")
@RequestMapping(value = "getAllPermissions", method = RequestMethod.GET) @RequestMapping(value = "getAllPermissions", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<DevTreeDto> getAllPermissions(@RequestParam String serviceType) { List<DevTreeDto> getAllPermissions(@RequestParam String serviceType) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/ProjectController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -23,7 +21,7 @@ public class ProjectController { ...@@ -23,7 +21,7 @@ public class ProjectController {
@Autowired @Autowired
private ProjectServiceImpl projectService; private ProjectServiceImpl projectService;
@ApiOperation(value = "listService", notes = "Get service list") // @ApiOperation(value = "listService", notes = "Get service list")
@RequestMapping(value = "listService", method = RequestMethod.GET) @RequestMapping(value = "listService", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<ServiceTypeDto> getServiceList() { List<ServiceTypeDto> getServiceList() {
...@@ -31,7 +29,7 @@ public class ProjectController { ...@@ -31,7 +29,7 @@ public class ProjectController {
return projectService.getServiceList(); 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) @RequestMapping(value = "getProjectClientList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<ProjectClientDto> getProjectClientList() { List<ProjectClientDto> getProjectClientList() {
...@@ -39,14 +37,14 @@ public class ProjectController { ...@@ -39,14 +37,14 @@ public class ProjectController {
return projectService.getProjectClientList(); return projectService.getProjectClientList();
} }
@ApiOperation(value = "getProject", notes = "Get Project") // @ApiOperation(value = "getProject", notes = "Get Project")
@RequestMapping(value = "getProject", method = RequestMethod.GET) @RequestMapping(value = "getProject", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
ProjectDisplayDto GetProjectById(@RequestParam String projectId) { ProjectDisplayDto GetProjectById(@RequestParam String projectId) {
return projectService.getProjectById(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) @RequestMapping(value = "getAllProjectList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<ProjectDisplayDto> getAllProjectList(String orgId, String serviceId, Integer projectYear) { List<ProjectDisplayDto> getAllProjectList(String orgId, String serviceId, Integer projectYear) {
...@@ -54,16 +52,16 @@ public class ProjectController { ...@@ -54,16 +52,16 @@ public class ProjectController {
return projectService.getAllProjectList(orgId, serviceId == null ? "" : serviceId, projectYear); 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) @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 public @ResponseBody
AddProjectResult AddProject(@RequestBody ProjectDisplayDto projectDto, String userName) { AddProjectResult AddProject(@RequestBody ProjectDisplayDto projectDto, String userName) {
if (userName == null || userName.isEmpty()) userName = "test";//TODO: should use session username future(neo) if (userName == null || userName.isEmpty()) userName = "test";//TODO: should use session username future(neo)
return projectService.addProject(projectDto, userName); 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) @RequestMapping(value = "getProjectAllStatus/{id}", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
Map<Integer, Integer> getProjectAllStatus(@PathVariable String id) { Map<Integer, Integer> getProjectAllStatus(@PathVariable String id) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/ProjectInfoController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -25,7 +24,7 @@ public class ProjectInfoController { ...@@ -25,7 +24,7 @@ public class ProjectInfoController {
@Autowired @Autowired
private IdentityServiceImpl identityService; private IdentityServiceImpl identityService;
@ApiOperation(value = "isProjectImportedData", notes = "") // @ApiOperation(value = "isProjectImportedData", notes = "")
@RequestMapping(value = "isProjectImportedData/{projectId}/{serviceType}/{importTypeId}", method = RequestMethod.GET) @RequestMapping(value = "isProjectImportedData/{projectId}/{serviceType}/{importTypeId}", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
OperationResultDto<Boolean> isProjectImportedData(@PathVariable String projectId, @PathVariable Integer serviceType, OperationResultDto<Boolean> isProjectImportedData(@PathVariable String projectId, @PathVariable Integer serviceType,
...@@ -33,7 +32,7 @@ public class ProjectInfoController { ...@@ -33,7 +32,7 @@ public class ProjectInfoController {
return projectInfoService.isProjectImportedData(projectId, serviceType, importTypeId); return projectInfoService.isProjectImportedData(projectId, serviceType, importTypeId);
} }
@ApiOperation(value = "isProjectImportedData", notes = "") // @ApiOperation(value = "isProjectImportedData", notes = "")
@RequestMapping(value = "isProjectImportedData/{projectId}/{importTypeId}", method = RequestMethod.GET) @RequestMapping(value = "isProjectImportedData/{projectId}/{importTypeId}", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
OperationResultDto<Boolean> isProjectImportedData(@PathVariable String projectId, @PathVariable Integer importTypeId) { OperationResultDto<Boolean> isProjectImportedData(@PathVariable String projectId, @PathVariable Integer importTypeId) {
...@@ -41,7 +40,7 @@ public class ProjectInfoController { ...@@ -41,7 +40,7 @@ public class ProjectInfoController {
} }
@ApiOperation(value = "getProjectImportType", notes = "") // @ApiOperation(value = "getProjectImportType", notes = "")
@RequestMapping(value = "getProjectImportType", method = RequestMethod.POST) @RequestMapping(value = "getProjectImportType", method = RequestMethod.POST)
public OperationResultDto<List<PeriodInfo>> getProjectImportType(@RequestBody QueryImportType queryImportType) { public OperationResultDto<List<PeriodInfo>> getProjectImportType(@RequestBody QueryImportType queryImportType) {
return projectInfoService.getProjectImportType(queryImportType.getProjectId(), queryImportType.getPeriods(), return projectInfoService.getProjectImportType(queryImportType.getProjectId(), queryImportType.getPeriods(),
...@@ -49,7 +48,7 @@ public class ProjectInfoController { ...@@ -49,7 +48,7 @@ public class ProjectInfoController {
, identityService.getIdentityUser().getId()); , identityService.getIdentityUser().getId());
} }
@ApiOperation(value = "getImportType", notes = "") // @ApiOperation(value = "getImportType", notes = "")
@RequestMapping(value = "getImportType/{projectId}/{periodId}/{serviceType}", method = RequestMethod.GET) @RequestMapping(value = "getImportType/{projectId}/{periodId}/{serviceType}", method = RequestMethod.GET)
public ResponseEntity getImportType(@PathVariable String projectId, @PathVariable Integer periodId, public ResponseEntity getImportType(@PathVariable String projectId, @PathVariable Integer periodId,
@PathVariable Integer serviceType) { @PathVariable Integer serviceType) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/ProjectStatusManageController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -20,7 +19,7 @@ public class ProjectStatusManageController { ...@@ -20,7 +19,7 @@ public class ProjectStatusManageController {
@Autowired @Autowired
private IdentityServiceImpl identityService; private IdentityServiceImpl identityService;
@ApiOperation(value = "setProjectStatus", notes = "") // @ApiOperation(value = "setProjectStatus", notes = "")
@RequestMapping(value = {"/setProjectStatus/{projectId}/{periodId}/{status}"}, method = RequestMethod.GET, @RequestMapping(value = {"/setProjectStatus/{projectId}/{periodId}/{status}"}, method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_UTF8_VALUE) produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody @ResponseBody
...@@ -31,7 +30,7 @@ public class ProjectStatusManageController { ...@@ -31,7 +30,7 @@ public class ProjectStatusManageController {
} }
@ApiOperation(value = "getProjectStatus", notes = "") // @ApiOperation(value = "getProjectStatus", notes = "")
@RequestMapping(value = {"getProjectStatus/{projectId}/{periodId}"}, method = RequestMethod.GET, @RequestMapping(value = {"getProjectStatus/{projectId}/{periodId}"}, method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_UTF8_VALUE) produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody @ResponseBody
......
atms-api/src/main/java/pwc/taxtech/atms/controller/RegionController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -23,7 +22,7 @@ public class RegionController { ...@@ -23,7 +22,7 @@ public class RegionController {
@Autowired @Autowired
private RegionServiceImpl regionService; private RegionServiceImpl regionService;
@ApiOperation(value = "getSettingRegionTree", notes = "生成区域及省市树形结构") // @ApiOperation(value = "getSettingRegionTree", notes = "生成区域及省市树形结构")
@RequestMapping(value = {"/getSettingRegionTree"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = {"/getSettingRegionTree"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody @ResponseBody
public List<DevTreeDto<VMRegionDevTreeData>> getSettingRegionTree() { public List<DevTreeDto<VMRegionDevTreeData>> getSettingRegionTree() {
...@@ -31,7 +30,7 @@ public class RegionController { ...@@ -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) @RequestMapping(value = {"/getProvinceAndCityTreeList"}, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody @ResponseBody
public List<DevTreeDto<IvhTreeDto<Region>>> getProvinceAndCityTreeList() { public List<DevTreeDto<IvhTreeDto<Region>>> getProvinceAndCityTreeList() {
...@@ -39,7 +38,7 @@ public class RegionController { ...@@ -39,7 +38,7 @@ public class RegionController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "根据分区获取分区和行政区域树", notes = "机构管理/卡片/区域/点击区域编辑按钮") // @ApiOperation(value = "根据分区获取分区和行政区域树", notes = "机构管理/卡片/区域/点击区域编辑按钮")
@RequestMapping(value = "getAreRegionTreeByNodeId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getAreRegionTreeByNodeId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<DevTreeDto> getAreRegionTreeByNodeId(@RequestParam("areaId") String areaId) { public List<DevTreeDto> getAreRegionTreeByNodeId(@RequestParam("areaId") String areaId) {
return regionService.getAreaRegionTreeByNodeId(areaId); return regionService.getAreaRegionTreeByNodeId(areaId);
......
atms-api/src/main/java/pwc/taxtech/atms/controller/RoleController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -43,7 +42,7 @@ public class RoleController { ...@@ -43,7 +42,7 @@ public class RoleController {
@Autowired @Autowired
private RoleServiceImpl roleService; private RoleServiceImpl roleService;
@ApiOperation(value = "获取用户树形列表", notes = "返回所有用户的树形列表") // @ApiOperation(value = "获取用户树形列表", notes = "返回所有用户的树形列表")
@RequestMapping(value = "getRoleTreeList", method = RequestMethod.GET) @RequestMapping(value = "getRoleTreeList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<NavTreeDto> getRoleTreeList() { List<NavTreeDto> getRoleTreeList() {
...@@ -51,7 +50,7 @@ public class RoleController { ...@@ -51,7 +50,7 @@ public class RoleController {
return roleService.getRoleTreeList(); return roleService.getRoleTreeList();
} }
@ApiOperation(value = "获取所有用户角色", notes = "返回所有用户的角色") // @ApiOperation(value = "获取所有用户角色", notes = "返回所有用户的角色")
@RequestMapping(value = "getAllOwnUserRoleList", method = RequestMethod.GET) @RequestMapping(value = "getAllOwnUserRoleList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<UserRoleInfo> getAllOwnUserRoleList() { List<UserRoleInfo> getAllOwnUserRoleList() {
...@@ -59,7 +58,7 @@ public class RoleController { ...@@ -59,7 +58,7 @@ public class RoleController {
return roleService.getAllOwnUserRoleList(); return roleService.getAllOwnUserRoleList();
} }
@ApiOperation(value = "获取可访问的所有机构", notes = "返回可访问的所有机构") // @ApiOperation(value = "获取可访问的所有机构", notes = "返回可访问的所有机构")
@RequestMapping(value = "getAllUserRoleList", method = RequestMethod.GET) @RequestMapping(value = "getAllUserRoleList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<UserRoleInfo> getAllUserRoleList() { List<UserRoleInfo> getAllUserRoleList() {
...@@ -67,7 +66,7 @@ public class RoleController { ...@@ -67,7 +66,7 @@ public class RoleController {
return roleService.getAllUserRoleList(); return roleService.getAllUserRoleList();
} }
@ApiOperation(value = "通过传入的用户Id获取该用户的所有角色") // @ApiOperation(value = "通过传入的用户Id获取该用户的所有角色")
@RequestMapping(value = "getAllRoleListByUserID", method = RequestMethod.GET) @RequestMapping(value = "getAllRoleListByUserID", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<UserRoleDto> getAllRoleListByUserId(@RequestParam("userID") String userId, List<UserRoleDto> getAllRoleListByUserId(@RequestParam("userID") String userId,
...@@ -76,7 +75,7 @@ public class RoleController { ...@@ -76,7 +75,7 @@ public class RoleController {
return roleService.getAllRoleListByUserId(userId, serviceTypeId); return roleService.getAllRoleListByUserId(userId, serviceTypeId);
} }
@ApiOperation(value = "获取所有角色") // @ApiOperation(value = "获取所有角色")
@RequestMapping(value = "displayByServiceGroup", method = RequestMethod.GET) @RequestMapping(value = "displayByServiceGroup", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<RoleDtoTree> getRoleList() { List<RoleDtoTree> getRoleList() {
...@@ -84,21 +83,21 @@ public class RoleController { ...@@ -84,21 +83,21 @@ public class RoleController {
return roleService.getRoleList(); return roleService.getRoleList();
} }
@ApiOperation(value = "获取角色下用户列表") // @ApiOperation(value = "获取角色下用户列表")
@RequestMapping(value = "getUsersByRoleID", method = RequestMethod.GET) @RequestMapping(value = "getUsersByRoleID", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<UserRoleDto> getUsersByRoleId(@RequestParam("roleId") String roleId) { List<UserRoleDto> getUsersByRoleId(@RequestParam("roleId") String roleId) {
return roleService.getUsersByRoleId(roleId); return roleService.getUsersByRoleId(roleId);
} }
@ApiOperation(value = "获取角色下额外用户列表") // @ApiOperation(value = "获取角色下额外用户列表")
@RequestMapping(value = "getExtraUsersByRoleID", method = RequestMethod.GET) @RequestMapping(value = "getExtraUsersByRoleID", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<UserRoleDto> getExtraUsersByRoleId(@RequestParam("roleId") String roleId) { List<UserRoleDto> getExtraUsersByRoleId(@RequestParam("roleId") String roleId) {
return roleService.getExtraUsersByRoleId(roleId); return roleService.getExtraUsersByRoleId(roleId);
} }
@ApiOperation(value = "删除角色下用户") // @ApiOperation(value = "删除角色下用户")
@RequestMapping(value = "removeUserRole", method = RequestMethod.POST) @RequestMapping(value = "removeUserRole", method = RequestMethod.POST)
@Secured("role:edit") @Secured("role:edit")
public @ResponseBody public @ResponseBody
...@@ -108,14 +107,14 @@ public class RoleController { ...@@ -108,14 +107,14 @@ public class RoleController {
return true; return true;
} }
@ApiOperation(value = "Get role list by role type") // @ApiOperation(value = "Get role list by role type")
@RequestMapping(value = "displayByRoleType", method = RequestMethod.GET) @RequestMapping(value = "displayByRoleType", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<RoleDto> getRoleListByRoleType(@RequestParam("roleTypeId") String roleTypeId) { List<RoleDto> getRoleListByRoleType(@RequestParam("roleTypeId") String roleTypeId) {
return roleService.getRoleListByRoleType(roleTypeId); return roleService.getRoleListByRoleType(roleTypeId);
} }
@ApiOperation(value = "增加角色分类") // @ApiOperation(value = "增加角色分类")
@RequestMapping(value = "addRoleCategory", method = RequestMethod.GET) @RequestMapping(value = "addRoleCategory", method = RequestMethod.GET)
@Secured("roleCategory:add") @Secured("roleCategory:add")
public @ResponseBody public @ResponseBody
...@@ -125,7 +124,7 @@ public class RoleController { ...@@ -125,7 +124,7 @@ public class RoleController {
return true; return true;
} }
@ApiOperation(value = "更新角色分类名称") // @ApiOperation(value = "更新角色分类名称")
@RequestMapping(value = "updateRoleCategory", method = RequestMethod.GET) @RequestMapping(value = "updateRoleCategory", method = RequestMethod.GET)
@Secured("roleCategory:edit") @Secured("roleCategory:edit")
public @ResponseBody public @ResponseBody
...@@ -136,7 +135,7 @@ public class RoleController { ...@@ -136,7 +135,7 @@ public class RoleController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "删除角色分类") // @ApiOperation(value = "删除角色分类")
@RequestMapping(value = "deleteRoleCategory", method = RequestMethod.GET) @RequestMapping(value = "deleteRoleCategory", method = RequestMethod.GET)
@Secured("roleCategory:edit") @Secured("roleCategory:edit")
public @ResponseBody public @ResponseBody
...@@ -145,7 +144,7 @@ public class RoleController { ...@@ -145,7 +144,7 @@ public class RoleController {
} }
@SuppressWarnings({"unchecked", "rawtypes"}) @SuppressWarnings({"unchecked", "rawtypes"})
@ApiOperation(value = "Add a role info") // @ApiOperation(value = "Add a role info")
@RequestMapping(value = "add", method = RequestMethod.POST) @RequestMapping(value = "add", method = RequestMethod.POST)
@Secured("role:add") @Secured("role:add")
public @ResponseBody public @ResponseBody
...@@ -160,7 +159,7 @@ public class RoleController { ...@@ -160,7 +159,7 @@ public class RoleController {
return result; return result;
} }
@ApiOperation(value = "Update a role info") // @ApiOperation(value = "Update a role info")
@RequestMapping(value = "update", method = RequestMethod.PUT) @RequestMapping(value = "update", method = RequestMethod.PUT)
@Secured("role:edit") @Secured("role:edit")
public void updateRole(@RequestBody UpdateRoleInfo updateRole, @RequestParam("roleID") String roleId) { public void updateRole(@RequestBody UpdateRoleInfo updateRole, @RequestParam("roleID") String roleId) {
...@@ -168,7 +167,7 @@ public class RoleController { ...@@ -168,7 +167,7 @@ public class RoleController {
roleService.updateRole(updateRole, roleId); roleService.updateRole(updateRole, roleId);
} }
@ApiOperation(value = "Validate if the role name is unique") // @ApiOperation(value = "Validate if the role name is unique")
@RequestMapping(value = "validateRoleNameUnique", method = RequestMethod.GET) @RequestMapping(value = "validateRoleNameUnique", method = RequestMethod.GET)
public Boolean validateRoleNameUnique(@RequestParam("roleName") String roleName, public Boolean validateRoleNameUnique(@RequestParam("roleName") String roleName,
@RequestParam("oldRoleName") String oldRoleName) { @RequestParam("oldRoleName") String oldRoleName) {
...@@ -176,14 +175,14 @@ public class RoleController { ...@@ -176,14 +175,14 @@ public class RoleController {
return roleService.validateRoleNameUnique(roleName, oldRoleName); return roleService.validateRoleNameUnique(roleName, oldRoleName);
} }
@ApiOperation(value = "Need to check mapping between user and role, if yes not allow delete role") // @ApiOperation(value = "Need to check mapping between user and role, if yes not allow delete role")
@RequestMapping(value = "checkReferenceforRole", method = RequestMethod.GET) @RequestMapping(value = "checkReferenceforRole", method = RequestMethod.GET)
public Boolean checkExistReference(@RequestParam("roleID") String roleId) { public Boolean checkExistReference(@RequestParam("roleID") String roleId) {
return roleService.checkUserRole(roleId); return roleService.checkUserRole(roleId);
} }
@ApiOperation(value = "Delete a role info") // @ApiOperation(value = "Delete a role info")
@RequestMapping(value = "delete", method = RequestMethod.POST) @RequestMapping(value = "delete", method = RequestMethod.POST)
@Secured("role:edit") @Secured("role:edit")
public @ResponseBody public @ResponseBody
...@@ -193,7 +192,7 @@ public class RoleController { ...@@ -193,7 +192,7 @@ public class RoleController {
return roleService.getRoleList(); return roleService.getRoleList();
} }
@ApiOperation(value = "Get user role list by organizationId, dimensionId and dimensionValueId") // @ApiOperation(value = "Get user role list by organizationId, dimensionId and dimensionValueId")
@RequestMapping(value = "getUserRoleList", method = RequestMethod.GET) @RequestMapping(value = "getUserRoleList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<UserRoleInfo> getUserRoleList(@RequestParam("organizationID") String organizationId, List<UserRoleInfo> getUserRoleList(@RequestParam("organizationID") String organizationId,
...@@ -207,7 +206,7 @@ public class RoleController { ...@@ -207,7 +206,7 @@ public class RoleController {
return roleService.getUserRoleList(userRoleDimensionValueDto); return roleService.getUserRoleList(userRoleDimensionValueDto);
} }
@ApiOperation(value = "Get all role permission list by serviceType") // @ApiOperation(value = "Get all role permission list by serviceType")
@RequestMapping(value = "getAllRolePermission", method = RequestMethod.GET) @RequestMapping(value = "getAllRolePermission", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<RolePermissionDto> getAllRolePermission( List<RolePermissionDto> getAllRolePermission(
...@@ -216,7 +215,7 @@ public class RoleController { ...@@ -216,7 +215,7 @@ public class RoleController {
return roleService.getAllRolePermission(serviceTypeId); return roleService.getAllRolePermission(serviceTypeId);
} }
@ApiOperation(value = "更新用户角色列表") // @ApiOperation(value = "更新用户角色列表")
@RequestMapping(value = "updateUserRole", method = RequestMethod.POST) @RequestMapping(value = "updateUserRole", method = RequestMethod.POST)
@Secured("role:edit") @Secured("role:edit")
public Boolean updateUserRole(@RequestBody UserRoleUpdateDto userRoleDto) { public Boolean updateUserRole(@RequestBody UserRoleUpdateDto userRoleDto) {
...@@ -225,7 +224,7 @@ public class RoleController { ...@@ -225,7 +224,7 @@ public class RoleController {
return true; return true;
} }
@ApiOperation(value = "用户详情页面，增加范围") // @ApiOperation(value = "用户详情页面，增加范围")
@RequestMapping(value = "updateDimensionValues", method = RequestMethod.POST) @RequestMapping(value = "updateDimensionValues", method = RequestMethod.POST)
@Secured("role:edit") @Secured("role:edit")
public Boolean updateDimensionValues(@RequestBody DimensionValueUpdateDto dimensionValueUpdateDto) { public Boolean updateDimensionValues(@RequestBody DimensionValueUpdateDto dimensionValueUpdateDto) {
...@@ -234,7 +233,7 @@ public class RoleController { ...@@ -234,7 +233,7 @@ public class RoleController {
return true; return true;
} }
@ApiOperation(value = "用户详情页面，增加机构") // @ApiOperation(value = "用户详情页面，增加机构")
@RequestMapping(value = "updateUserOrg", method = RequestMethod.POST) @RequestMapping(value = "updateUserOrg", method = RequestMethod.POST)
@Secured("role:edit") @Secured("role:edit")
public Boolean updateUserOrg(@RequestBody List<String> orgIdList, @RequestParam("userID") String userId) { public Boolean updateUserOrg(@RequestBody List<String> orgIdList, @RequestParam("userID") String userId) {
...@@ -243,7 +242,7 @@ public class RoleController { ...@@ -243,7 +242,7 @@ public class RoleController {
return true; return true;
} }
@ApiOperation(value = "获取维度，角色，用户列表", notes = "机构/卡片/机构卡片/点击用户数") // @ApiOperation(value = "获取维度，角色，用户列表", notes = "机构/卡片/机构卡片/点击用户数")
@RequestMapping(value = "getDimensionRoleUserList", method = RequestMethod.GET) @RequestMapping(value = "getDimensionRoleUserList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<DimensionRole> getDimensionRoleUserList(@RequestParam("dimensionId") String dimensionId, List<DimensionRole> getDimensionRoleUserList(@RequestParam("dimensionId") String dimensionId,
...@@ -251,7 +250,7 @@ public class RoleController { ...@@ -251,7 +250,7 @@ public class RoleController {
return roleService.getDimensionRoleUserList(dimensionId, dimensionValueId); return roleService.getDimensionRoleUserList(dimensionId, dimensionValueId);
} }
@ApiOperation(value = "获取某一个维度的 用户 和 机构列表，角色列表", notes = "机构/卡片/机构卡片/点击用户数") // @ApiOperation(value = "获取某一个维度的 用户 和 机构列表，角色列表", notes = "机构/卡片/机构卡片/点击用户数")
@RequestMapping(value = "getDimensionUserRoleList", method = RequestMethod.GET) @RequestMapping(value = "getDimensionUserRoleList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<DimensionUser> getDimensionUserRoleList(@RequestParam("dimensionId") String dimensionId, List<DimensionUser> getDimensionUserRoleList(@RequestParam("dimensionId") String dimensionId,
...@@ -259,7 +258,7 @@ public class RoleController { ...@@ -259,7 +258,7 @@ public class RoleController {
return roleService.getDimensionUserRoleList(dimensionId, dimensionValueId); return roleService.getDimensionUserRoleList(dimensionId, dimensionValueId);
} }
@ApiOperation(value = "根据区域Id，获取区域用户角色信息", notes = "机构/卡片/区域卡片/选择区域/点击用户数") // @ApiOperation(value = "根据区域Id，获取区域用户角色信息", notes = "机构/卡片/区域卡片/选择区域/点击用户数")
@RequestMapping(value = "getActiveUserRoleListByAreaId", method = RequestMethod.GET) @RequestMapping(value = "getActiveUserRoleListByAreaId", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<UserRoleInfo> getActiveUserRoleListByAreaId(@RequestParam("areaId") String areaId) { List<UserRoleInfo> getActiveUserRoleListByAreaId(@RequestParam("areaId") String areaId) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/RuleEngineeConfigController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -25,7 +24,7 @@ public class RuleEngineeConfigController { ...@@ -25,7 +24,7 @@ public class RuleEngineeConfigController {
@Autowired @Autowired
RuleEngineeConfigServiceImpl ruleEngineeConfigService; RuleEngineeConfigServiceImpl ruleEngineeConfigService;
@ApiOperation(value = "Get TaxPayerReportMapping", notes = "Return TaxPayerReportMapping") // @ApiOperation(value = "Get TaxPayerReportMapping", notes = "Return TaxPayerReportMapping")
@RequestMapping(value = "taxPayerReportMapping", method = RequestMethod.GET) @RequestMapping(value = "taxPayerReportMapping", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<TaxPayerReportRuleDto> getTaxPayerReportMapping() { List<TaxPayerReportRuleDto> getTaxPayerReportMapping() {
...@@ -33,7 +32,7 @@ public class RuleEngineeConfigController { ...@@ -33,7 +32,7 @@ public class RuleEngineeConfigController {
return ruleEngineeConfigService.getTaxPayerReportMapping(); return ruleEngineeConfigService.getTaxPayerReportMapping();
} }
@ApiOperation(value = "Get TaxRuleSetting", notes = "Return TaxRuleSetting") // @ApiOperation(value = "Get TaxRuleSetting", notes = "Return TaxRuleSetting")
@RequestMapping(value = "taxRuleSetting", method = RequestMethod.GET) @RequestMapping(value = "taxRuleSetting", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<TaxRuleSettingDto> getTaxRuleSetting() { List<TaxRuleSettingDto> getTaxRuleSetting() {
...@@ -41,7 +40,7 @@ public class RuleEngineeConfigController { ...@@ -41,7 +40,7 @@ public class RuleEngineeConfigController {
return ruleEngineeConfigService.getTaxRuleSetting(); return ruleEngineeConfigService.getTaxRuleSetting();
} }
@ApiOperation(value = "", notes = "saveTaxRuleSettings") // @ApiOperation(value = "", notes = "saveTaxRuleSettings")
@RequestMapping(value = "taxRuleSetting/Save", method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "taxRuleSetting/Save", method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void saveTaxRuleSettings(@RequestBody BatchUpdateTaxRuleDto batchUpdateTaxRule) { public void saveTaxRuleSettings(@RequestBody BatchUpdateTaxRuleDto batchUpdateTaxRule) {
logger.debug("RuleEngineeConfigController SaveTaxRuleSettings"); logger.debug("RuleEngineeConfigController SaveTaxRuleSettings");
......
atms-api/src/main/java/pwc/taxtech/atms/controller/ServiceTypeController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -24,7 +23,7 @@ public class ServiceTypeController { ...@@ -24,7 +23,7 @@ public class ServiceTypeController {
private ServiceTypeServiceImpl serviceTypeService; private ServiceTypeServiceImpl serviceTypeService;
@ResponseBody @ResponseBody
@ApiOperation(value = "获取ServiceType列表") // @ApiOperation(value = "获取ServiceType列表")
@RequestMapping(value = "getlist", method = RequestMethod.GET) @RequestMapping(value = "getlist", method = RequestMethod.GET)
public List<ServiceTypeDto> getList() { public List<ServiceTypeDto> getList() {
return projectService.getServiceList(); return projectService.getServiceList();
......
atms-api/src/main/java/pwc/taxtech/atms/controller/StatisticAttributeController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -22,7 +21,7 @@ public class StatisticAttributeController { ...@@ -22,7 +21,7 @@ public class StatisticAttributeController {
@Autowired @Autowired
private StatisticAttributeServiceImpl statisticAttributeService; private StatisticAttributeServiceImpl statisticAttributeService;
@ApiOperation(value = "显示自定义显示字段") // @ApiOperation(value = "显示自定义显示字段")
@RequestMapping(value = "getByParentDimensionID", method = RequestMethod.GET) @RequestMapping(value = "getByParentDimensionID", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<StatisticAttributeDisplayDto> getDimensionStatics( List<StatisticAttributeDisplayDto> getDimensionStatics(
...@@ -30,7 +29,7 @@ public class StatisticAttributeController { ...@@ -30,7 +29,7 @@ public class StatisticAttributeController {
return statisticAttributeService.getStatisticAttributeListByDimensionId(parentDimensionId, null); return statisticAttributeService.getStatisticAttributeListByDimensionId(parentDimensionId, null);
} }
@ApiOperation(value = "自定义显示字段下拉框") // @ApiOperation(value = "自定义显示字段下拉框")
@RequestMapping(value = "get", method = RequestMethod.GET) @RequestMapping(value = "get", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<StatisticAttributeDto> getStatisticAttributeList( List<StatisticAttributeDto> getStatisticAttributeList(
...@@ -38,7 +37,7 @@ public class StatisticAttributeController { ...@@ -38,7 +37,7 @@ public class StatisticAttributeController {
return statisticAttributeService.getStatisticAttributeList(dictionaryCode); return statisticAttributeService.getStatisticAttributeList(dictionaryCode);
} }
@ApiOperation(value = "更新显示自定义显示字段") // @ApiOperation(value = "更新显示自定义显示字段")
@RequestMapping(value = "update", method = RequestMethod.POST) @RequestMapping(value = "update", method = RequestMethod.POST)
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public OperationResultDto updateDimension( public OperationResultDto updateDimension(
...@@ -46,7 +45,7 @@ public class StatisticAttributeController { ...@@ -46,7 +45,7 @@ public class StatisticAttributeController {
return statisticAttributeService.updateStatisticAttribute(modelList); return statisticAttributeService.updateStatisticAttribute(modelList);
} }
@ApiOperation(value = "机构管理/卡片/机构/点击自定义显示内容按钮") // @ApiOperation(value = "机构管理/卡片/机构/点击自定义显示内容按钮")
@RequestMapping(value = "getOrgSubChildrenStatAttributeList", method = RequestMethod.GET) @RequestMapping(value = "getOrgSubChildrenStatAttributeList", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
List<StatisticAttributeDisplayDto> getOrgSubChildrenStatAttributeList( List<StatisticAttributeDisplayDto> getOrgSubChildrenStatAttributeList(
......
atms-api/src/main/java/pwc/taxtech/atms/controller/StdAccountController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -25,7 +24,7 @@ public class StdAccountController extends BaseController { ...@@ -25,7 +24,7 @@ public class StdAccountController extends BaseController {
private StdAccountServiceImpl stdAccountService; private StdAccountServiceImpl stdAccountService;
@ResponseBody @ResponseBody
@ApiOperation(value = "获取科目层级") // @ApiOperation(value = "获取科目层级")
@RequestMapping(value = "stdAccountHierarchy", method = RequestMethod.GET) @RequestMapping(value = "stdAccountHierarchy", method = RequestMethod.GET)
public List<StdAccountFancyTreeDto> getStdAccountHierarchy(@RequestParam(name = "orgID") String orgId) { public List<StdAccountFancyTreeDto> getStdAccountHierarchy(@RequestParam(name = "orgID") String orgId) {
if (StringUtils.isBlank(orgId)) { if (StringUtils.isBlank(orgId)) {
...@@ -41,7 +40,7 @@ public class StdAccountController extends BaseController { ...@@ -41,7 +40,7 @@ public class StdAccountController extends BaseController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "查看对应关系") // @ApiOperation(value = "查看对应关系")
@RequestMapping(value = "getStdAccountLinkEtsAccount", method = RequestMethod.GET) @RequestMapping(value = "getStdAccountLinkEtsAccount", method = RequestMethod.GET)
public List<StandardAccountDto> getStdAccountLinkEtsAccount(@RequestParam String orgId, public List<StandardAccountDto> getStdAccountLinkEtsAccount(@RequestParam String orgId,
@RequestParam String accountSetId) { @RequestParam String accountSetId) {
...@@ -56,7 +55,7 @@ public class StdAccountController extends BaseController { ...@@ -56,7 +55,7 @@ public class StdAccountController extends BaseController {
return Collections.emptyList(); return Collections.emptyList();
} }
@ApiOperation(value = "根据行业查找科目") // @ApiOperation(value = "根据行业查找科目")
@RequestMapping(value = "stdAccount/byIndustry/{industryId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "stdAccount/byIndustry/{industryId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
List<StandardAccountDto> getStdAccountByIndustry(@PathVariable String industryId) { List<StandardAccountDto> getStdAccountByIndustry(@PathVariable String industryId) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateGroupController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -35,7 +34,7 @@ public class TemplateGroupController { ...@@ -35,7 +34,7 @@ public class TemplateGroupController {
@Autowired @Autowired
private HttpFileService httpFileService; private HttpFileService httpFileService;
@ApiOperation(value = "获取所有的模板分组") // @ApiOperation(value = "获取所有的模板分组")
@RequestMapping(value = "getall", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getall", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
List<TemplateGroupDto> get() { List<TemplateGroupDto> get() {
...@@ -43,7 +42,7 @@ public class TemplateGroupController { ...@@ -43,7 +42,7 @@ public class TemplateGroupController {
return templateGroupService.get(); return templateGroupService.get();
} }
@ApiOperation(value = "根据服务类型和行业获取模板分组") // @ApiOperation(value = "根据服务类型和行业获取模板分组")
@RequestMapping(value = "getByIndustry/{serviceTypeId}/{industryId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getByIndustry/{serviceTypeId}/{industryId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
List<TemplateGroupDto> getTemplateGroupByIndustry(@PathVariable int serviceTypeId, @RequestParam Integer taxPayType, @PathVariable String industryId) { List<TemplateGroupDto> getTemplateGroupByIndustry(@PathVariable int serviceTypeId, @RequestParam Integer taxPayType, @PathVariable String industryId) {
...@@ -76,7 +75,7 @@ public class TemplateGroupController { ...@@ -76,7 +75,7 @@ public class TemplateGroupController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "获取Sheet名称") // @ApiOperation(value = "获取Sheet名称")
@RequestMapping(value = "getSheetNameList", method = RequestMethod.POST) @RequestMapping(value = "getSheetNameList", method = RequestMethod.POST)
public OperationResultDto getSheetNameList(@RequestParam MultipartFile file, public OperationResultDto getSheetNameList(@RequestParam MultipartFile file,
@RequestParam String filename, @RequestParam String filename,
...@@ -93,7 +92,7 @@ public class TemplateGroupController { ...@@ -93,7 +92,7 @@ public class TemplateGroupController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "导入模板") // @ApiOperation(value = "导入模板")
@RequestMapping(value = "importTemplateGroupExcelFile", method = RequestMethod.POST) @RequestMapping(value = "importTemplateGroupExcelFile", method = RequestMethod.POST)
public OperationResultDto importTemplateGroupExcelFile(@RequestParam MultipartFile file, public OperationResultDto importTemplateGroupExcelFile(@RequestParam MultipartFile file,
@RequestParam String filename, @RequestParam String filename,
...@@ -121,7 +120,7 @@ public class TemplateGroupController { ...@@ -121,7 +120,7 @@ public class TemplateGroupController {
@ResponseBody @ResponseBody
@ApiOperation(value = "导入报表") // @ApiOperation(value = "导入报表")
@RequestMapping(value = "importTemplateExcelFile", method = RequestMethod.POST) @RequestMapping(value = "importTemplateExcelFile", method = RequestMethod.POST)
public OperationResultDto importTemplateExcelFile(@RequestParam MultipartFile file, public OperationResultDto importTemplateExcelFile(@RequestParam MultipartFile file,
@RequestParam Long templateGroupID, @RequestParam Long templateGroupID,
...@@ -143,7 +142,7 @@ public class TemplateGroupController { ...@@ -143,7 +142,7 @@ public class TemplateGroupController {
} }
@ResponseBody @ResponseBody
@ApiOperation(value = "模板另存为") // @ApiOperation(value = "模板另存为")
@RequestMapping(value = "addTemplateGroup", method = RequestMethod.POST) @RequestMapping(value = "addTemplateGroup", method = RequestMethod.POST)
public OperationResultDto addTemplateGroup(@RequestBody TemplateGroupDto templateGroupDto) { public OperationResultDto addTemplateGroup(@RequestBody TemplateGroupDto templateGroupDto) {
try { try {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/UserController.java
View file @ 54c83dc7
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -56,13 +55,13 @@ public class UserController { ...@@ -56,13 +55,13 @@ public class UserController {
return userService.getUser(id); return userService.getUser(id);
} }
@ApiOperation(value = "获取指定用户的权限", notes = "获取用户的权限级别，可访问的模块以及页面") // @ApiOperation(value = "获取指定用户的权限", notes = "获取用户的权限级别，可访问的模块以及页面")
@RequestMapping(value = "getUserPermission", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getUserPermission", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public UserPermissionDto getUserPermission(@RequestParam("userName") String userName) { public UserPermissionDto getUserPermission(@RequestParam("userName") String userName) {
return userService.getUserPermission(userName); return userService.getUserPermission(userName);
} }
@ApiOperation(value = "获取指定用户的权限（新接口）", notes = "获取用户的权限级别，可访问的模块以及页面") // @ApiOperation(value = "获取指定用户的权限（新接口）", notes = "获取用户的权限级别，可访问的模块以及页面")
@RequestMapping(value = "getUserPermissionKey", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getUserPermissionKey", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public UserPermissionKeyDto getUserPermissionKey(@RequestParam("userName") String userName) { public UserPermissionKeyDto getUserPermissionKey(@RequestParam("userName") String userName) {
return userService.getUserPermissionKey(userName); return userService.getUserPermissionKey(userName);
...@@ -75,44 +74,44 @@ public class UserController { ...@@ -75,44 +74,44 @@ public class UserController {
return result; return result;
} }
@ApiOperation(value = "获取所有的用户角色列表") // @ApiOperation(value = "获取所有的用户角色列表")
@RequestMapping(value = "getAllUserRoleList", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getAllUserRoleList", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<UserRoleDisplayInfo> getAllUserRoleList(@RequestParam("serviceTypeID") String serviceTypeId) { public List<UserRoleDisplayInfo> getAllUserRoleList(@RequestParam("serviceTypeID") String serviceTypeId) {
return userRoleService.getAllUserRoleList(serviceTypeId); return userRoleService.getAllUserRoleList(serviceTypeId);
} }
@ApiOperation(value = "根据传入的用户Id获取该用户以及所属机构的信息") // @ApiOperation(value = "根据传入的用户Id获取该用户以及所属机构的信息")
@RequestMapping(value = "getUser/{userId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getUser/{userId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public UserDto getUserById(@PathVariable("userId") String userId) { public UserDto getUserById(@PathVariable("userId") String userId) {
return userService.getUserById(userId); return userService.getUserById(userId);
} }
@ApiOperation(value = "通过传入的用户Id获取该用户所有的角色", notes = "通过用户获取可访问不可访问的所有机构,包括维度上继承下来的") // @ApiOperation(value = "通过传入的用户Id获取该用户所有的角色", notes = "通过用户获取可访问不可访问的所有机构,包括维度上继承下来的")
@RequestMapping(value = "getUserRoleByUserID", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getUserRoleByUserID", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public OrgRoleDtoList getUserRoleByUserId(@RequestParam("userID") String userId) { public OrgRoleDtoList getUserRoleByUserId(@RequestParam("userID") String userId) {
return userRoleService.getUserRoleByUserId(userId); return userRoleService.getUserRoleByUserId(userId);
} }
@ApiOperation(value = "根据传入的用户Id获取该用户的角色机构等信息") // @ApiOperation(value = "根据传入的用户Id获取该用户的角色机构等信息")
@RequestMapping(value = "displaySingle", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "displaySingle", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public UserAndUserRoleSaveDto getSingleUserByUserId(@RequestParam("userId") String userId) { public UserAndUserRoleSaveDto getSingleUserByUserId(@RequestParam("userId") String userId) {
return userRoleService.getSingleUserByUserId(userId); return userRoleService.getSingleUserByUserId(userId);
} }
@ApiOperation(value = "获取用户的默认角色") // @ApiOperation(value = "获取用户的默认角色")
@RequestMapping(value = "getUserRoleListByUserId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getUserRoleListByUserId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public UserRoleDisplayInfo getUserRoleListByUserId(@RequestParam("userId") String userId) { public UserRoleDisplayInfo getUserRoleListByUserId(@RequestParam("userId") String userId) {
return userRoleService.getUserRoleListByUserId(userId); return userRoleService.getUserRoleListByUserId(userId);
} }
@ApiOperation(value = "通过机构Id和用户Id获取该用户的默认角色") // @ApiOperation(value = "通过机构Id和用户Id获取该用户的默认角色")
@RequestMapping(value = "getUserRoleByOrgIdUserId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getUserRoleByOrgIdUserId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public UserOrganizationDto getUserRoleByOrgIdUserId(@RequestParam("userId") String userId, public UserOrganizationDto getUserRoleByOrgIdUserId(@RequestParam("userId") String userId,
@RequestParam("orgId") String orgId) { @RequestParam("orgId") String orgId) {
return userRoleService.getUserRoleByOrgId(userId, orgId); return userRoleService.getUserRoleByOrgId(userId, orgId);
} }
@ApiOperation(value = "为角色添加用户") // @ApiOperation(value = "为角色添加用户")
@RequestMapping(value = "addUsersToRole", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "addUsersToRole", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Secured("user:add") @Secured("user:add")
public @ResponseBody public @ResponseBody
...@@ -123,7 +122,7 @@ public class UserController { ...@@ -123,7 +122,7 @@ public class UserController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "为角色添加用户") // @ApiOperation(value = "为角色添加用户")
// todo 这里应该是错的 @ApiOperation(value = "启用或停用用户") // todo 这里应该是错的 @ApiOperation(value = "启用或停用用户")
@Secured("user:edit") @Secured("user:edit")
@RequestMapping(value = "enableordisableuser", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "enableordisableuser", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
...@@ -133,7 +132,7 @@ public class UserController { ...@@ -133,7 +132,7 @@ public class UserController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "为机构删除用户角色") // @ApiOperation(value = "为机构删除用户角色")
@RequestMapping(value = "deleteUserRoleForOrg", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "deleteUserRoleForOrg", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Secured("user:edit") @Secured("user:edit")
public @ResponseBody public @ResponseBody
...@@ -143,7 +142,7 @@ public class UserController { ...@@ -143,7 +142,7 @@ public class UserController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "机构删除，包括维度上的继承删除") // @ApiOperation(value = "机构删除，包括维度上的继承删除")
@RequestMapping(value = "deleteUserRoleOrg", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "deleteUserRoleOrg", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Secured("userRole:edit") @Secured("userRole:edit")
public @ResponseBody public @ResponseBody
...@@ -152,7 +151,7 @@ public class UserController { ...@@ -152,7 +151,7 @@ public class UserController {
return userRoleService.deleteUserRoleOrg(userRoleList); return userRoleService.deleteUserRoleOrg(userRoleList);
} }
@ApiOperation(value = "获取事业部，产品线的值下的所有机构的用户权限(维度权限)", notes = "展开事业部卡片>用户>权限设置") // @ApiOperation(value = "获取事业部，产品线的值下的所有机构的用户权限(维度权限)", notes = "展开事业部卡片>用户>权限设置")
@RequestMapping(value = "getUserRoleByDimensionValueId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getUserRoleByDimensionValueId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<UserRoleDisplayInfo> getUserRoleByDimensionValueId( public List<UserRoleDisplayInfo> getUserRoleByDimensionValueId(
@RequestParam("parentDimensionId") String parentDimensionId, @RequestParam("parentDimensionId") String parentDimensionId,
...@@ -160,7 +159,7 @@ public class UserController { ...@@ -160,7 +159,7 @@ public class UserController {
return userRoleService.getUserRoleByDimensionValueId(parentDimensionId, dimensionValueId); return userRoleService.getUserRoleByDimensionValueId(parentDimensionId, dimensionValueId);
} }
@ApiOperation(value = "获取在某个维度下的机构的特殊角色，用户单独跟机构设置角色", notes = "展开事业部卡片>用户>权限设置") // @ApiOperation(value = "获取在某个维度下的机构的特殊角色，用户单独跟机构设置角色", notes = "展开事业部卡片>用户>权限设置")
@RequestMapping(value = "getSpecialUserRoleByDimensionValueId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getSpecialUserRoleByDimensionValueId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<UserRoleDisplayInfo> getSpecialUserRoleByDimensionValueId( public List<UserRoleDisplayInfo> getSpecialUserRoleByDimensionValueId(
@RequestParam("parentDimensionId") String parentDimensionId, @RequestParam("parentDimensionId") String parentDimensionId,
...@@ -168,7 +167,7 @@ public class UserController { ...@@ -168,7 +167,7 @@ public class UserController {
return userRoleService.getSpecialUserRoleByDimensionValueId(parentDimensionId, dimensionValueId); return userRoleService.getSpecialUserRoleByDimensionValueId(parentDimensionId, dimensionValueId);
} }
@ApiOperation(value = "获取用户维度角色列表", notes = "展开事业部卡片>用户") // @ApiOperation(value = "获取用户维度角色列表", notes = "展开事业部卡片>用户")
@RequestMapping(value = "getDimensionUserRoleList", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getDimensionUserRoleList", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<UserOrgRoleDto> getDimensionUserRoleList(@RequestParam("parentDimensionId") String parentDimensionId, public List<UserOrgRoleDto> getDimensionUserRoleList(@RequestParam("parentDimensionId") String parentDimensionId,
@RequestParam("dimensionValueId") String dimensionValueId) { @RequestParam("dimensionValueId") String dimensionValueId) {
...@@ -176,13 +175,13 @@ public class UserController { ...@@ -176,13 +175,13 @@ public class UserController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "维度上权限用户删除") // @ApiOperation(value = "维度上权限用户删除")
@RequestMapping(value = "deleteUserRoleDimension", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "deleteUserRoleDimension", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public OperationResultDto deleteUserRoleDimension(@RequestBody List<UserRoleDimensionValueDto> userRoleList) { public OperationResultDto deleteUserRoleDimension(@RequestBody List<UserRoleDimensionValueDto> userRoleList) {
return userRoleService.deleteUserRoleDimension(userRoleList); return userRoleService.deleteUserRoleDimension(userRoleList);
} }
@ApiOperation(value = "为维度添加用户") // @ApiOperation(value = "为维度添加用户")
@RequestMapping(value = "updateUserRoleForDimension", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "updateUserRoleForDimension", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto<?> updateUserRoleForDimension( OperationResultDto<?> updateUserRoleForDimension(
...@@ -191,7 +190,7 @@ public class UserController { ...@@ -191,7 +190,7 @@ public class UserController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "添加事业部的值的权限") // @ApiOperation(value = "添加事业部的值的权限")
@RequestMapping(value = "updateUserRoleDimension", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "updateUserRoleDimension", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto updateUserRoleDimension( OperationResultDto updateUserRoleDimension(
...@@ -199,7 +198,7 @@ public class UserController { ...@@ -199,7 +198,7 @@ public class UserController {
return userRoleService.updateUserRoleDimension(userRoleList); return userRoleService.updateUserRoleDimension(userRoleList);
} }
@ApiOperation(value = "更新一个用户的信息") // @ApiOperation(value = "更新一个用户的信息")
@RequestMapping(value = "update", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "update", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
OperationResultDto<User> updateUser(@RequestBody UserAndUserRoleSaveDto userDto) { OperationResultDto<User> updateUser(@RequestBody UserAndUserRoleSaveDto userDto) {
...@@ -207,7 +206,7 @@ public class UserController { ...@@ -207,7 +206,7 @@ public class UserController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "机构用户权限编辑") // @ApiOperation(value = "机构用户权限编辑")
@RequestMapping(value = "updateUserRoleOrganization", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "updateUserRoleOrganization", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Secured("user:edit") @Secured("user:edit")
public @ResponseBody public @ResponseBody
...@@ -216,7 +215,7 @@ public class UserController { ...@@ -216,7 +215,7 @@ public class UserController {
return userRoleService.updateUserRoleOrganization(userRoleList); return userRoleService.updateUserRoleOrganization(userRoleList);
} }
@ApiOperation(value = "添加一个新的用户") // @ApiOperation(value = "添加一个新的用户")
@RequestMapping(value = "add", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "add", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Secured("user:add") @Secured("user:add")
public @ResponseBody public @ResponseBody
...@@ -225,7 +224,7 @@ public class UserController { ...@@ -225,7 +224,7 @@ public class UserController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "删除可继承权限", notes = "用户管理>点击用户卡片>点击各机构设置数据的修改按钮>点击角色>取消设置下的允许继承>确定") // @ApiOperation(value = "删除可继承权限", notes = "用户管理>点击用户卡片>点击各机构设置数据的修改按钮>点击角色>取消设置下的允许继承>确定")
@RequestMapping(value = "deleteUserOrg", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "deleteUserOrg", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Secured("user:edit") @Secured("user:edit")
public @ResponseBody public @ResponseBody
...@@ -234,7 +233,7 @@ public class UserController { ...@@ -234,7 +233,7 @@ public class UserController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "给机构添加用户", notes = "机构管理>点击机构>用户>添加用户>选中用户并提交") // @ApiOperation(value = "给机构添加用户", notes = "机构管理>点击机构>用户>添加用户>选中用户并提交")
@RequestMapping(value = "updateUserRoleForOrg", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "updateUserRoleForOrg", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Secured("user:edit") @Secured("user:edit")
public @ResponseBody public @ResponseBody
...@@ -244,7 +243,7 @@ public class UserController { ...@@ -244,7 +243,7 @@ public class UserController {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ApiOperation(value = "查询用户信息", notes = "税务运营管理平台>增值税申报") // @ApiOperation(value = "查询用户信息", notes = "税务运营管理平台>增值税申报")
@RequestMapping(value = "getUserByName", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getUserByName", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody public @ResponseBody
UserDto getUserByName( UserDto getUserByName(
......
atms-api/src/main/resources/applicationContext-datasource.xml
View file @ 54c83dc7
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
value="20" /> value="20" />
<!-- 配置监控统计拦截的filters --> <!-- 配置监控统计拦截的filters -->
<property name="filters" value="stat" /> <!--<property name="filters" value="stat" />-->
</bean> </bean>
<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate"> <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
<property name="dataSource" ref="dataSource"/> <property name="dataSource" ref="dataSource"/>
</bean> </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>
<bean id="druid-stat-pointcut" class="org.springframework.aop.support.JdkRegexpMethodPointcut" scope="prototype"> <bean id="druid-stat-pointcut" class="org.springframework.aop.support.JdkRegexpMethodPointcut" scope="prototype">
...@@ -59,5 +59,5 @@ ...@@ -59,5 +59,5 @@
<aop:config> <aop:config>
<aop:advisor advice-ref="druid-stat-interceptor" pointcut-ref="druid-stat-pointcut"/> <aop:advisor advice-ref="druid-stat-interceptor" pointcut-ref="druid-stat-pointcut"/>
</aop:config> </aop:config>-->
</beans> </beans>
\ No newline at end of file
atms-api/src/main/resources/applicationContext.xml
View file @ 54c83dc7
...@@ -26,11 +26,6 @@ ...@@ -26,11 +26,6 @@
</property> </property>
</bean> </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 --> <!-- 启用注解, 启用component-scan -->
<!-- **************************************************************** --> <!-- **************************************************************** -->
...@@ -40,12 +35,6 @@ ...@@ -40,12 +35,6 @@
<import resource="applicationContext-datasource.xml" /> <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"> <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
<property name="dataSource" ref="dataSource" /> <property name="dataSource" ref="dataSource" />
<property name="configLocation" value="classpath:sqlMapConfig.xml" /> <property name="configLocation" value="classpath:sqlMapConfig.xml" />
...@@ -60,15 +49,6 @@ ...@@ -60,15 +49,6 @@
<constructor-arg ref="sqlSessionFactory" /> <constructor-arg ref="sqlSessionFactory" />
</bean> </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"> <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource" /> <property name="dataSource" ref="dataSource" />
</bean> </bean>
......
atms-api/src/main/resources/conf/conf_profile_dev.properties
View file @ 54c83dc7
...@@ -4,11 +4,6 @@ jdbc_password=tax@Admin2018 ...@@ -4,11 +4,6 @@ jdbc_password=tax@Admin2018
#jdbc_password=111111 #jdbc_password=111111
jdbc_admin_db=tax@Admin2018 jdbc_admin_db=tax@Admin2018
jdbc2_url=jdbc:mysql://10.158.230.144:3306/tax_admin_didi?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;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 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 mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
......
atms-api/src/main/webapp/WEB-INF/web.xml
View file @ 54c83dc7
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<url-pattern>/</url-pattern> <url-pattern>/</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet> <!--<servlet>
<servlet-name>DruidStatView</servlet-name> <servlet-name>DruidStatView</servlet-name>
<servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class> <servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
<init-param> <init-param>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>DruidStatView</servlet-name> <servlet-name>DruidStatView</servlet-name>
<url-pattern>/druid/*</url-pattern> <url-pattern>/druid/*</url-pattern>
</servlet-mapping> </servlet-mapping>-->
<welcome-file-list> <welcome-file-list>
<welcome-file>index.jsp</welcome-file> <welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file> <welcome-file>index.html</welcome-file>
......
atms-api/src/main/webapp/index.html
View file @ 54c83dc7
<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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment