feats

pom.xml

@@ -192,6 +192,8 @@
                         <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>

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

@@ -58,7 +58,7 @@ public class BuildingOwnerInfoController extends BaseController {
                     "ownerName业主姓名;" +"ownerTel业主手机号;" +"idCard身份证;" +
                     "pageNum第几页;pageSize 一页多少行;")
     })
-    @RequestMapping(value = "/building/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/buildingInfo/list", method = RequestMethod.POST)
     public ResponseBean getList(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -70,7 +70,7 @@ public class BuildingOwnerInfoController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "userVerifyId",value = "审核Id")
     })
-    @RequestMapping(value = "/building/verify/{userVerifyId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/buildingInfo//verify/{userVerifyId}", method = RequestMethod.GET)
     public ResponseBean getById(@PathVariable(value = "userVerifyId") Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
 
@@ -122,7 +122,7 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "userVerifyId审核编号;roleId角色编号;verifyStatus审核 true通过；false不通过;remark备注"),
 
     })
-    @RequestMapping(value = "/building/update", method = RequestMethod.PUT)
+    @RequestMapping(value = "/admin/buildingInfo/update", method = RequestMethod.PUT)
     public ResponseBean update(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -138,7 +138,7 @@ public class BuildingOwnerInfoController extends BaseController {
                     "ownerTel业主手机号;roleId角色id;gender性别 1：男   2：女;"),
 
     })
-    @RequestMapping(value = "/building/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/buildingInfo/add", method = RequestMethod.POST)
     public ResponseBean add(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -151,7 +151,7 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids",value = "id集合"),
 
     })
-    @RequestMapping(value = "/building/delete", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/admin/buildingInfo/delete", method = RequestMethod.DELETE)
     public ResponseBean delete(@RequestBody List<Integer> ids, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
@@ -219,7 +219,7 @@ public class BuildingOwnerInfoController extends BaseController {
     }
     
     // @ApiOperation(value = "上传楼栋信息接口", notes = "上传楼栋信息接口")
-    @PostMapping(value = "/building/uploadExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    @PostMapping(value = "/admin/buildingInfo/uploadExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public ResponseBean uploadExcel(@RequestParam("file") MultipartFile file) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iBuildingOwnerInfoService.getExcelData(file);
@@ -227,7 +227,7 @@ public class BuildingOwnerInfoController extends BaseController {
     }
  
     // @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
-    @PostMapping(value = "/building/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    @PostMapping(value = "/admin/buildingInfo/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);

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

@@ -21,6 +21,7 @@ import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.*;
 import org.slf4j.Logger;