浏览代码

导入带图像

suntianwu 3 年之前
父节点
当前提交
5f7bc9cdd5

+ 3 - 3
src/main/java/com/iden/bms/controller/CameraController.java

@@ -43,7 +43,7 @@ public class CameraController {
     @GetMapping("/countCamera")
     @ApiOperation(value = "当前摄像头个数查询")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备"),
+            @ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备",required = true),
             @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
             @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
             @ApiImplicitParam(paramType = "query", name = "cameraId", value = "摄像头ID"),
@@ -74,7 +74,7 @@ public class CameraController {
     @GetMapping("/listCamera")
     @ApiOperation(value = "摄像头列表分页 ")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备"),
+            @ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备",required = true),
             @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
             @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
             @ApiImplicitParam(paramType = "query", name = "cameraId", value = "摄像头ID"),
@@ -160,7 +160,7 @@ public class CameraController {
      */
     @ApiOperation(value = "导出Excel")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备"),
+            @ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备",required = true),
             @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
             @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
             @ApiImplicitParam(paramType = "query", name = "cameraId", value = "摄像头ID"),

+ 3 - 3
src/main/java/com/iden/bms/controller/PersonController.java

@@ -42,7 +42,7 @@ public class PersonController {
     @GetMapping("/getPersonStaVO")
     @ApiOperation(value = "查询人员统计值 ")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "type", value = "类型:2、重点人员,3、小区人员"),
+            @ApiImplicitParam(paramType = "query", name = "type", value = "类型:2、重点人员,3、小区人员", required = true),
             @ApiImplicitParam(paramType = "query", name = "nameOrCred", value = "名称/身份证"),
             @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
             @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
@@ -79,7 +79,7 @@ public class PersonController {
     @GetMapping("/listPerson")
     @ApiOperation(value = "人员列表分页 ")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "type", value = "类型:2、重点人员,3、小区人员"),
+            @ApiImplicitParam(paramType = "query", name = "type", value = "类型:2、重点人员,3、小区人员", required = true),
             @ApiImplicitParam(paramType = "query", name = "nameOrCred", value = "名称/身份证"),
             @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
             @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
@@ -120,7 +120,7 @@ public class PersonController {
      */
     @ApiOperation(value = "导出Excel")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "type", value = "类型:2、重点人员,3、小区人员"),
+            @ApiImplicitParam(paramType = "query", name = "type", value = "类型:2、重点人员,3、小区人员",required = true),
             @ApiImplicitParam(paramType = "query", name = "nameOrCred", value = "名称/身份证"),
             @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
             @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),

+ 2 - 3
src/main/java/com/iden/bms/service/PersonService.java

@@ -272,9 +272,8 @@ public class PersonService {
     public List<Long> importWithExcel(MultipartFile file) throws BDException {
         List<Long> personIdList = new ArrayList<>();
             try {
-
-                //图片对应的行和图片数据
-               // Map<Integer, PictureData> sheetIndexPicMap = new HashMap<>();
+                System.out.println("file.getName()==" + file.getName());
+                System.out.println("file.getName()2==" + file.getName().substring(file.getName().length() - 4));
                 if (!file.getName().substring(file.getName().length() - 4).equals("xlsx")) {
                     throw new BDException("导入Excel只支持xlsx格式");
                 }