Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

pom.xml

@@ -170,35 +170,55 @@
 			</properties>
 		</profile>
 	</profiles>
+<!--	<build>-->
+<!--		<plugins>-->
+<!--			<plugin>-->
+<!--				<groupId>org.springframework.boot</groupId>-->
+<!--				<artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--			</plugin>-->
+<!--		</plugins>-->
+<!--		<resources>-->
+<!--				<resource>-->
+<!--					<directory>${basedir}/src/main/resources/lib</directory>-->
+<!--					<targetPath>BOOT-INF/lib/</targetPath>-->
+<!--					<includes>-->
+<!--						<include>**/*.jar</include>-->
+<!--					</includes>-->
+<!--				</resource>-->
+<!--                <resource>-->
+<!--                    <directory>src/main/resources</directory>-->
+<!--                    <filtering>true</filtering>-->
+<!--                    <includes>-->
+<!--                        <include>application.yml</include>-->
+<!--                        <include>application-${profiles.active}.yml</include>-->
+<!--                        <include>mapper/**/*.xml</include>-->
+<!--						<include>*.xlsx</include>-->
+<!--						<include>*.xls</include>-->
+<!--                        <include>log/*.xml</include>-->
+<!--                        <include>lib/*.jar</include>-->
+<!--                    </includes>-->
+<!--                </resource>-->
+<!--            </resources>-->
+<!--        </build>-->
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<nonFilteredFileExtensions>
+						<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+						<nonFilteredFileExtension>xls</nonFilteredFileExtension>
+					</nonFilteredFileExtensions>
+				</configuration>
 			</plugin>
 		</plugins>
 		<resources>
-				<resource>
-					<directory>${basedir}/src/main/resources/lib</directory>
-					<targetPath>BOOT-INF/lib/</targetPath>
-					<includes>
-						<include>**/*.jar</include>
-					</includes>
-				</resource>
-                <resource>
-                    <directory>src/main/resources</directory>
-                    <filtering>true</filtering>
-                    <includes>
-                        <include>application.yml</include>
-                        <include>application-${profiles.active}.yml</include>
-                        <include>mapper/**/*.xml</include>
-						<include>*.xlsx</include>
-						<include>*.xls</include>
-                        <include>log/*.xml</include>
-                        <include>lib/*.jar</include>
-                    </includes>
-                </resource>
-            </resources>
-        </build>
-
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+	</build>
     </project>

src/main/java/com/huiju/estateagents/property/controller/BillController.java

@@ -152,7 +152,10 @@ public class BillController extends BaseController {
     public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
         TaUser userElement = getTaUser(request);
         HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement).getData();
-        this.setResponseHeader(response, "缴费单模板.xls");
+//        this.setResponseHeader(response, "缴费单模板.xls");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=缴费单模板.xls");
         //响应到客户端
         try {
             OutputStream os = response.getOutputStream();

src/main/java/com/huiju/estateagents/property/controller/BillInvoiceController.java

@@ -33,7 +33,7 @@ import java.util.List;
  * @since 2019-02-13
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 
 @Api(value = "缴费单 API", description = "缴费单 API")
 public class BillInvoiceController extends BaseController {
@@ -50,7 +50,7 @@ public class BillInvoiceController extends BaseController {
                     "phase: 期,building: 栋,unit: 单元,roomNo: 户号,ownerName: 业主姓名," +
                     "billStatus: 缴费状态,payName: 缴费人,pageSize: 一页多少行,pageNum: 第几页"),
     })
-    @RequestMapping(value = "/bill/invoice/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/bill/invoice/list", method = RequestMethod.POST)
     public ResponseBean getBillList(HttpServletRequest request, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -63,7 +63,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billName收费项名称,billExplain缴费项说明,endDate截止时间"),
 
     })
-    @RequestMapping(value = "/bill/invoice/updateBill", method = RequestMethod.PUT)
+    @RequestMapping(value = "/admin/bill/invoice/updateBill", method = RequestMethod.PUT)
     public ResponseBean updateBill(HttpServletRequest request, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
 
@@ -77,7 +77,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id集合"),
 
     })
-    @RequestMapping(value = "/bill/invoice/delete", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/bill/invoice/delete", method = RequestMethod.POST)
     public ResponseBean delete(HttpServletRequest request, @RequestBody List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -91,7 +91,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id集合"),
 
     })
-    @RequestMapping(value = "/bill/invoice/offlinePayment", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/bill/invoice/offlinePayment", method = RequestMethod.POST)
     public ResponseBean offlinePayment(HttpServletRequest request, @RequestBody List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
 
@@ -105,7 +105,7 @@ public class BillInvoiceController extends BaseController {
                     "building栋,unit单元,roomNo户号,worthOf截止时间(催缴日期),billInvoiceExplain收费单说明,payPrice收费金额"),
 
     })
-    @RequestMapping(value = "/bill/invoice/addTempBillInvoice", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/bill/invoice/addTempBillInvoice", method = RequestMethod.POST)
     public ResponseBean addTempBillInvoice(HttpServletRequest request, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -118,7 +118,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id集合"),
 
     })
-    @RequestMapping(value = "/bill/invoice/updateBillInvoiceStatus", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/bill/invoice/updateBillInvoiceStatus", method = RequestMethod.POST)
     public ResponseBean updateBillInvoiceStatus(HttpServletRequest request, @RequestBody List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -131,7 +131,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
 
     })
-    @RequestMapping(value = "/bill/invoice/getTempBillInvoice/{billId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/bill/invoice/getTempBillInvoice/{billId}", method = RequestMethod.GET)
     public ResponseBean getTempBillInvoice(HttpServletRequest request, @PathVariable("billId") Integer billId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -144,7 +144,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
 
     })
-    @RequestMapping(value = "/bill/invoice/deleteTempBillInvoice/{billId}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/admin/bill/invoice/deleteTempBillInvoice/{billId}", method = RequestMethod.DELETE)
     public ResponseBean deleteTempBillInvoice(HttpServletRequest request, @PathVariable("billId") Integer billId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -158,7 +158,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "payPrice金额"),
 
     })
-    @RequestMapping(value = "/bill/invoice/updateBillInvoiceIdPayPrice/{billId}", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/bill/invoice/updateBillInvoiceIdPayPrice/{billId}", method = RequestMethod.POST)
     public ResponseBean updateBillInvoiceIdPayPrice(HttpServletRequest request, @PathVariable Integer billId, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -173,7 +173,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billInvoiceExplain收费说明"),
 
     })
-    @RequestMapping(value = "/bill/invoice/updateBillInvoiceIdBillInvoiceExplain/{billId}", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/bill/invoice/updateBillInvoiceIdBillInvoiceExplain/{billId}", method = RequestMethod.POST)
     public ResponseBean updateBillInvoiceIdBillInvoiceExplain(HttpServletRequest request, @PathVariable Integer billId, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -199,7 +199,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
 
     })
-    @RequestMapping(value = "/bill/invoice/exportExcel/{billId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/bill/invoice/exportExcel/{billId}", method = RequestMethod.GET)
     public void exportExcel(HttpServletResponse response, HttpServletRequest request, @PathVariable("billId") Integer billId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -223,7 +223,7 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "billId缴费项id,pageNum当前页,pageSize一页多少行"),
 
     })
-    @RequestMapping(value = "/bill/invoice/getInvoiceInvalid", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/bill/invoice/getInvoiceInvalid", method = RequestMethod.POST)
     public ResponseBean getInvoiceInvalid(HttpServletRequest request, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);

src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java

@@ -442,9 +442,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             roomNoQueryWrapper.eq("org_id", orgId);
             roomNoQueryWrapper.eq("id", roomId);
             TpRoomNo tpRoomNo = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
-//            if (null == tpRoomNo) {
-//                throw new WisdomException("编号: " + roomId + " 不是本小区的房产");
-//            }
+            if (null == tpRoomNo) {
+                throw new WisdomException("编号: " + roomId + " 不是本小区的房产");
+            }
             cell = getCell(row.getCell(1));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 期/区 不能为空");