xiangsong
/
xs-service
关注 3
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

feats"

张延森 4 年前
父节点
5492453635
当前提交
eaf67f0b3d
共有 2 个文件被更改，包括 10 次插入 和 10 次删除
分列视图 显示文件统计
  1. 7
    7
      src/main/java/com/huiju/estateagents/property/controller/BillController.java
  2. 3
    3
      src/main/java/com/huiju/estateagents/property/controller/BillStatementController.java

+ 7
- 7
src/main/java/com/huiju/estateagents/property/controller/BillController.java 查看文件 

@@ -51,7 +51,7 @@ public class BillController extends BaseController {
51 51 
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
52 52 
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
53 53 
     })
54 
-    @RequestMapping(value = "/bills",method = RequestMethod.GET)
54 
+    @RequestMapping(value = "/admin/bills",method = RequestMethod.GET)
55 55 
     public ResponseBean getList(@RequestParam(value = "billId", required = false) Integer billId,
56 56 
                                 @RequestParam(value = "billName", required = false) String billName,
57 57 
                                 @RequestParam(value = "billExplain", required = false) String billExplain,
 
@@ -72,7 +72,7 @@ public class BillController extends BaseController {
72 72 
     @ApiImplicitParams({
73 73 
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "id编号")
74 74 
     })
75 
-    @RequestMapping(value = "/bill/{id}", method = RequestMethod.GET)
75 
+    @RequestMapping(value = "/admin/bill/{id}", method = RequestMethod.GET)
76 76 
     public ResponseBean getByBillId(HttpServletRequest request, @PathVariable("id") Integer id) {
77 77 
         ResponseBean responseBean = new ResponseBean();
78 78 
         responseBean = iBillService.getByBillId(id);
 
@@ -80,7 +80,7 @@ public class BillController extends BaseController {
80 80 
     }
81 81
82 82 
     // @ApiOperation(value = "上传缴费项接口, 预览", notes = "上传缴费项接口, 预览")
83 
-    @PostMapping(value = "/bill/uploadExcel/get", consumes = "multipart/*", headers = "content-type=multipart/form-data")
83 
+    @PostMapping(value = "/admin/bill/uploadExcel/get", consumes = "multipart/*", headers = "content-type=multipart/form-data")
84 84 
     public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
85 85 
         ResponseBean responseBean = new ResponseBean();
86 86 
         TaUser userElement = getTaUser(request);
 
@@ -89,7 +89,7 @@ public class BillController extends BaseController {
89 89 
     }
90 90
91 91 
     // @ApiOperation(value = "上传缴费项接口, 保存/修改", notes = "上传缴费项接口, 保存/修改")
92 
-    @PostMapping(value = "/bill/uploadExcel/add", consumes = "multipart/*", headers = "content-type=multipart/form-data")
92 
+    @PostMapping(value = "/admin/bill/uploadExcel/add", consumes = "multipart/*", headers = "content-type=multipart/form-data")
93 93 
     public ResponseBean addUploadExcel(HttpServletRequest request,
94 94 
                                        @RequestParam(value = "billId", required = false) Integer billId,
95 95 
                                        @RequestParam(value = "file", required = false) MultipartFile file,
 
@@ -117,7 +117,7 @@ public class BillController extends BaseController {
117 117 
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "id编号"),
118 118 
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "billStatus", value = "状态 0：正在收费  2： 草稿")
119 119 
     })
120 
-    @RequestMapping(value = "/bill/updateBillStatus/{id}", method = RequestMethod.PUT)
120 
+    @RequestMapping(value = "/admin/bill/updateBillStatus/{id}", method = RequestMethod.PUT)
121 121 
     public ResponseBean updateBillStatus(HttpServletRequest request,
122 122 
                                          @RequestParam("billStatus") Integer billStatus,
123 123 
                                          @PathVariable("id") Integer id) {
 
@@ -133,7 +133,7 @@ public class BillController extends BaseController {
133 133 
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id编号集合"),
134 134
135 135 
     })
136 
-    @RequestMapping(value = "/bill/deleteBillBeach", method = RequestMethod.POST)
136 
+    @RequestMapping(value = "/admin/bill/deleteBillBeach", method = RequestMethod.POST)
137 137 
     public ResponseBean deleteBillBeach(HttpServletRequest request,
138 138 
                                         @RequestBody List<Integer> ids) {
139 139 
 
@@ -148,7 +148,7 @@ public class BillController extends BaseController {
148 148 
 //            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billExplain收费组说明"),
149 149
150 150 
     })
151 
-    @RequestMapping(value = "/bill/downloadExcel", method = RequestMethod.GET)
151 
+    @RequestMapping(value = "/admin/bill/downloadExcel", method = RequestMethod.GET)
152 152 
     public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
153 153 
         TaUser userElement = getTaUser(request);
154 154 
         HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement).getData();

+ 3
- 3
src/main/java/com/huiju/estateagents/property/controller/BillStatementController.java 查看文件 

@@ -31,7 +31,7 @@ import java.io.OutputStream;
31 31 
  * @since 2019-02-13
32 32 
  */
33 33 
 @RestController
34 
-@RequestMapping("/")
34 
+@RequestMapping("/api")
35 35
36 36 
 @Api(value = "流水/订单 信息 API", description = "流水/订单 信息 API")
37 37 
 public class BillStatementController extends BaseController {
 
@@ -45,7 +45,7 @@ public class BillStatementController extends BaseController {
45 45 
                     "billId缴费项编号,billName缴费项名称,billInvoiceId缴费单编号,payName缴费人"),
46 46 
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
47 47 
     })
48 
-    @RequestMapping(value = "/bill/statement/all", method = RequestMethod.POST)
48 
+    @RequestMapping(value = "/admin/bill/statement/all", method = RequestMethod.POST)
49 49 
     public ResponseBean getBillStatement(HttpServletRequest request, @RequestBody String parameter) {
50 50 
         ResponseBean responseBean = new ResponseBean();
51 51 
         TaUser userElement = getTaUser(request);
 
@@ -57,7 +57,7 @@ public class BillStatementController extends BaseController {
57 57 
     @ApiImplicitParams({
58 58
59 59 
     })
60 
-    @RequestMapping(value = "/bill/statement/exportExcel", method = RequestMethod.GET)
60 
+    @RequestMapping(value = "/admin/bill/statement/exportExcel", method = RequestMethod.GET)
61 61 
     public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
62 62 
         ResponseBean responseBean = new ResponseBean();
63 63 
         TaUser userElement = getTaUser(request);