应急导入校验

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/controller/EsDeliveryEnterpriseController.java

@@ -150,25 +150,42 @@ public class EsDeliveryEnterpriseController {
             @ApiImplicitParam(name = "file", value = "文件对象集合")
     })
     @PostMapping(value= "/emergencySupport/esDeliveryEnterprise/importByEntity", headers= "content-type= multipart/form-data", consumes= "multipart/*")
-    public CommonResult<Map<String,Object>> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws IOException {
+    public CommonResult<Map<String,Object>> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws Exception {
 
         Map<String,Object> map = new HashMap<String,Object>();
-        if(file== null){
-            map.put("massage","无文件数据");
-            map.put("status","500");
-            return CommonResult.data(map);
-        }
-        //获得文件名
-        String fileName = file.getOriginalFilename();
-        //判断文件是否是excel文件
-        if (!fileName.endsWith("xls") && !fileName.endsWith("xlsx")) {
-            map.put("massage","请使用正确的导入模板");
-            map.put("status","500");
+
+        try {
+            // Check if file is null
+            if (file == null) {
+                map.put("message", "无文件数据"); // Note: corrected the typo from "massage" to "message"
+                map.put("status", "500");
+                return CommonResult.data(map);
+            }
+
+            // Get the file name
+            String fileName = file.getOriginalFilename();
+
+            // Check if the file is an Excel file
+            if (fileName == null || (!fileName.endsWith("xls") && !fileName.endsWith("xlsx"))) {
+                map.put("message", "请使用正确的导入模板"); // Note: corrected the typo from "massage" to "message"
+                map.put("status", "500");
+                return CommonResult.data(map);
+            }
+
+            // Process the file using the service
+            return CommonResult.data(esDeliveryEnterpriseService.importByEntityResult(file,map));
+        } catch (Exception e) {
+            // Handle exceptions
+            map.put("message", "文件处理失败: " + e.getMessage());
+            map.put("status", "500");
             return CommonResult.data(map);
         }
 
-        return CommonResult.data(esDeliveryEnterpriseService.importByEntityResult(file,map));
-
     }
 
+
+
+
+
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/service/EsDeliveryEnterpriseService.java

@@ -81,5 +81,5 @@ public interface EsDeliveryEnterpriseService extends IService<EsDeliveryEnterpri
 
     List<EsDeliveryEnterpriseCountVO> selectCount(EsDeliveryEnterpriseCountParam esDeliveryEnterpriseCountParam);
 
-    Map<String, Object> importByEntityResult(MultipartFile file, Map<String, Object> map) throws IOException;
+    Map<String, Object> importByEntityResult(MultipartFile file, Map<String, Object> map) throws Exception;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/service/impl/EsDeliveryEnterpriseServiceImpl.java

@@ -184,7 +184,7 @@ public class EsDeliveryEnterpriseServiceImpl extends ServiceImpl<EsDeliveryEnter
     }
 
     @Override
-    public Map<String, Object> importByEntityResult(MultipartFile file, Map<String, Object> map) throws IOException {
+    public Map<String, Object> importByEntityResult(MultipartFile file, Map<String, Object> map) throws Exception {
         BigDecimal quantity=new BigDecimal(0.00);
         Integer in =0;
         Integer index = 6;
@@ -741,32 +741,50 @@ public class EsDeliveryEnterpriseServiceImpl extends ServiceImpl<EsDeliveryEnter
         QueryWrapper<BizDict> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("DICT_LABEL",strings[1]);
         List<BizDict> list1 = BizDictServiceImpl.list(queryWrapper1);
+        if(list1.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[1]+"不是正确的");
+        }
         EsNetworkEntry.setManagementAreaProvince(list1.get(0).getId());//归口管理地区-省
 
         QueryWrapper<BizDict> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("DICT_LABEL",strings[2]);
         List<BizDict> list2 = BizDictServiceImpl.list(queryWrapper2);
+        if(list2.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[2]+"不是正确的");
+        }
         EsNetworkEntry.setManagementAreaCity(list2.get(0).getId());//归口管理地区-市
 
         QueryWrapper<BizDict> queryWrapper3 = new QueryWrapper<>();
         queryWrapper3.eq("DICT_LABEL",strings[3]);
         List<BizDict> list3 = BizDictServiceImpl.list(queryWrapper3);
+        if(list3.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[3]+"不是正确的");
+        }
         EsNetworkEntry.setManagementAreaCounty(list3.get(0).getId());//归口管理地区-县
 
-
-        QueryWrapper<BizDict> queryWrapper4 = new QueryWrapper<>();
+        ueryWrapper<BizDict> queryWrapper4 = new QueryWrapper<>();
         queryWrapper4.eq("DICT_LABEL",strings[4]);
         List<BizDict> list4 = BizDictServiceImpl.list(queryWrapper4);
+        if(list4.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[4]+"不是正确的")
+        Q;
+        }
         EsNetworkEntry.setActualAddressProvince(list4.get(0).getId());//实际经营地址-省
 
         QueryWrapper<BizDict> queryWrapper5 = new QueryWrapper<>();
         queryWrapper5.eq("DICT_LABEL",strings[5]);
         List<BizDict> list5 = BizDictServiceImpl.list(queryWrapper5);
+        if(list5.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[5]+"不是正确的");
+        }
         EsNetworkEntry.setActualAddressCity(list5.get(0).getId());//实际经营地址-市
 
         QueryWrapper<BizDict> queryWrapper6 = new QueryWrapper<>();
         queryWrapper6.eq("DICT_LABEL",strings[6]);
         List<BizDict> list6 = BizDictServiceImpl.list(queryWrapper6);
+        if(list6.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[6]+"不是正确的");
+        }
         EsNetworkEntry.setActualAddressCounty(list6.get(0).getId());//实际经营地址-县
 
 
@@ -808,9 +826,48 @@ public class EsDeliveryEnterpriseServiceImpl extends ServiceImpl<EsDeliveryEnter
         List<BizDict> list8 = BizDictServiceImpl.list(queryWrapper8);
         EsNetworkEntry.setEnterpriseType(strings[16]);//企业类型
 
-        EsNetworkEntry.setLongitude(new BigDecimal(strings[17]));//经度
+        if (strings[17] != null && !strings[17].isEmpty()) {
+            try {
+                BigDecimal longitude = new BigDecimal(strings[17]);
+                // 进行范围检查
+                if (longitude.compareTo(BigDecimal.valueOf(-180)) < 0 || longitude.compareTo(BigDecimal.valueOf(180)) > 0) {
+                    throw new IllegalArgumentException("经度超出有效范围");
+                }
+                // 进行精度和小数位数检查
+                if (longitude.scale() > 6) { // 假设精度不能超过6位小数
+                    throw new IllegalArgumentException("经度小数位数过多");
+                }
+                EsNetworkEntry.setLongitude(longitude);
+            } catch (NumberFormatException e) {
+                throw new NumberFormatException(strings[17] + " 经度格式不正确");
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException(strings[17] + " " + e.getMessage());
+            }
+        } else {
+            throw new NumberFormatException(strings[17] + " 经度格式不正确");
+        }
+
+        if (strings[18] != null && !strings[18].isEmpty()) {
+            try {
+                BigDecimal latitude = new BigDecimal(strings[18]);
+                // 进行范围检查
+                if (latitude.compareTo(BigDecimal.valueOf(-90)) < 0 || latitude.compareTo(BigDecimal.valueOf(90)) > 0) {
+                    throw new IllegalArgumentException("纬度超出有效范围");
+                }
+                // 进行精度和小数位数检查
+                if (latitude.scale() > 6) { // 假设精度不能超过6位小数
+                    throw new IllegalArgumentException("纬度小数位数过多");
+                }
+                EsNetworkEntry.setLatitude(latitude);
+            } catch (NumberFormatException e) {
+                throw new NumberFormatException(strings[18] + " 纬度格式不正确");
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException(strings[18] + " " + e.getMessage());
+            }
+        } else {
+            throw new NumberFormatException(strings[18] + " 纬度格式不正确");
+        }
 
-        EsNetworkEntry.setLatitude(new BigDecimal(strings[18]));//纬度
 
 
         EsNetworkEntry.setLegalRepresentative(strings[19]);//法人姓名

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/service/impl/EsNetworkEntryServiceImpl.java

@@ -590,32 +590,50 @@ public class EsNetworkEntryServiceImpl extends ServiceImpl<EsNetworkEntryMapper,
         QueryWrapper<BizDict> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("DICT_LABEL",strings[1]);
         List<BizDict> list1 = BizDictServiceImpl.list(queryWrapper1);
+        if(list1.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[1]+"不是正确的");
+        }
         EsNetworkEntry.setManagementAreaProvince(list1.get(0).getId());//归口管理地区-省
 
         QueryWrapper<BizDict> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("DICT_LABEL",strings[2]);
         List<BizDict> list2 = BizDictServiceImpl.list(queryWrapper2);
+        if(list2.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[2]+"不是正确的");
+        }
         EsNetworkEntry.setManagementAreaCity(list2.get(0).getId());//归口管理地区-市
 
         QueryWrapper<BizDict> queryWrapper3 = new QueryWrapper<>();
         queryWrapper3.eq("DICT_LABEL",strings[3]);
         List<BizDict> list3 = BizDictServiceImpl.list(queryWrapper3);
+        if(list3.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[3]+"不是正确的");
+        }
         EsNetworkEntry.setManagementAreaCounty(list3.get(0).getId());//归口管理地区-县
 
 
         QueryWrapper<BizDict> queryWrapper4 = new QueryWrapper<>();
         queryWrapper4.eq("DICT_LABEL",strings[4]);
         List<BizDict> list4 = BizDictServiceImpl.list(queryWrapper4);
+        if(list4.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[4]+"不是正确的");
+        }
         EsNetworkEntry.setActualAddressProvince(list4.get(0).getId());//实际经营地址-省
 
         QueryWrapper<BizDict> queryWrapper5 = new QueryWrapper<>();
         queryWrapper5.eq("DICT_LABEL",strings[5]);
         List<BizDict> list5 = BizDictServiceImpl.list(queryWrapper5);
+        if(list5.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[5]+"不是正确的");
+        }
         EsNetworkEntry.setActualAddressCity(list5.get(0).getId());//实际经营地址-市
 
         QueryWrapper<BizDict> queryWrapper6 = new QueryWrapper<>();
         queryWrapper6.eq("DICT_LABEL",strings[6]);
         List<BizDict> list6 = BizDictServiceImpl.list(queryWrapper6);
+        if(list6.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[6]+"不是正确的");
+        }
         EsNetworkEntry.setActualAddressCounty(list6.get(0).getId());//实际经营地址-县
 
 
@@ -657,9 +675,49 @@ public class EsNetworkEntryServiceImpl extends ServiceImpl<EsNetworkEntryMapper,
         List<BizDict> list8 = BizDictServiceImpl.list(queryWrapper8);
         EsNetworkEntry.setEnterpriseType(strings[16]);//企业类型
 
-        EsNetworkEntry.setLongitude(new BigDecimal(strings[17]));//经度
+        if (strings[17] != null && !strings[17].isEmpty()) {
+            try {
+                BigDecimal longitude = new BigDecimal(strings[17]);
+                // 进行范围检查
+                if (longitude.compareTo(BigDecimal.valueOf(-180)) < 0 || longitude.compareTo(BigDecimal.valueOf(180)) > 0) {
+                    throw new IllegalArgumentException("经度超出有效范围");
+                }
+                // 进行精度和小数位数检查
+                if (longitude.scale() > 6) { // 假设精度不能超过6位小数
+                    throw new IllegalArgumentException("经度小数位数过多");
+                }
+                EsNetworkEntry.setLongitude(longitude);
+            } catch (NumberFormatException e) {
+                throw new NumberFormatException(strings[17] + " 经度格式不正确");
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException(strings[17] + " " + e.getMessage());
+            }
+        } else {
+            throw new NumberFormatException(strings[17] + " 经度格式不正确");
+        }
+
+        if (strings[18] != null && !strings[18].isEmpty()) {
+            try {
+                BigDecimal latitude = new BigDecimal(strings[18]);
+                // 进行范围检查
+                if (latitude.compareTo(BigDecimal.valueOf(-90)) < 0 || latitude.compareTo(BigDecimal.valueOf(90)) > 0) {
+                    throw new IllegalArgumentException("纬度超出有效范围");
+                }
+                // 进行精度和小数位数检查
+                if (latitude.scale() > 6) { // 假设精度不能超过6位小数
+                    throw new IllegalArgumentException("纬度小数位数过多");
+                }
+                EsNetworkEntry.setLatitude(latitude);
+            } catch (NumberFormatException e) {
+                throw new NumberFormatException(strings[18] + " 纬度格式不正确");
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException(strings[18] + " " + e.getMessage());
+            }
+        } else {
+            throw new NumberFormatException(strings[18] + " 纬度格式不正确");
+        }
+
 
-        EsNetworkEntry.setLatitude(new BigDecimal(strings[18]));//纬度
 
 
         EsNetworkEntry.setLegalRepresentative(strings[19]);//法人姓名

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/service/impl/EsProcessEnterpriseServiceImpl.java

@@ -841,12 +841,6 @@ public class EsProcessEnterpriseServiceImpl extends ServiceImpl<EsProcessEnterpr
                             esProcessEnterpriseGrainService.save(EsProcessEnterpriseGrain);
                         }
 
-
-
-
-
-
-
                         res = 1;
                         if(res>0){
                             insertNum+= 1;
@@ -882,32 +876,50 @@ public class EsProcessEnterpriseServiceImpl extends ServiceImpl<EsProcessEnterpr
         QueryWrapper<BizDict> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("DICT_LABEL",strings[1]);
         List<BizDict> list1 = BizDictServiceImpl.list(queryWrapper1);
+        if(list1.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[1]+"不是正确的");
+        }
         EsProcessEnterprise.setManagementAreaProvince(list1.get(0).getId());//归口管理地区-省
 
         QueryWrapper<BizDict> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("DICT_LABEL",strings[2]);
         List<BizDict> list2 = BizDictServiceImpl.list(queryWrapper2);
+        if(list2.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[2]+"不是正确的");
+        }
         EsProcessEnterprise.setManagementAreaCity(list2.get(0).getId());//归口管理地区-市
 
         QueryWrapper<BizDict> queryWrapper3 = new QueryWrapper<>();
         queryWrapper3.eq("DICT_LABEL",strings[3]);
         List<BizDict> list3 = BizDictServiceImpl.list(queryWrapper3);
+        if(list3.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[3]+"不是正确的");
+        }
         EsProcessEnterprise.setManagementAreaCounty(list3.get(0).getId());//归口管理地区-县
 
 
         QueryWrapper<BizDict> queryWrapper4 = new QueryWrapper<>();
         queryWrapper4.eq("DICT_LABEL",strings[4]);
         List<BizDict> list4 = BizDictServiceImpl.list(queryWrapper4);
+        if(list4.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[4]+"不是正确的");
+        }
         EsProcessEnterprise.setActualAddressProvince(list4.get(0).getId());//实际经营地址-省
 
         QueryWrapper<BizDict> queryWrapper5 = new QueryWrapper<>();
         queryWrapper5.eq("DICT_LABEL",strings[5]);
         List<BizDict> list5 = BizDictServiceImpl.list(queryWrapper5);
+        if(list5.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[5]+"不是正确的");
+        }
         EsProcessEnterprise.setActualAddressCity(list5.get(0).getId());//实际经营地址-市
 
         QueryWrapper<BizDict> queryWrapper6 = new QueryWrapper<>();
         queryWrapper6.eq("DICT_LABEL",strings[6]);
         List<BizDict> list6 = BizDictServiceImpl.list(queryWrapper6);
+        if(list6.isEmpty()){
+            throw new IndexOutOfBoundsException(strings[6]+"不是正确的");
+        }
         EsProcessEnterprise.setActualAddressCounty(list6.get(0).getId());//实际经营地址-县
 
 
@@ -949,9 +961,48 @@ public class EsProcessEnterpriseServiceImpl extends ServiceImpl<EsProcessEnterpr
         List<BizDict> list8 = BizDictServiceImpl.list(queryWrapper8);
         EsProcessEnterprise.setEnterpriseType(strings[16]);//企业类型
 
-        EsProcessEnterprise.setLongitude(new BigDecimal(strings[17]));//经度
+        if (strings[17] != null && !strings[17].isEmpty()) {
+            try {
+                BigDecimal longitude = new BigDecimal(strings[17]);
+                // 进行范围检查
+                if (longitude.compareTo(BigDecimal.valueOf(-180)) < 0 || longitude.compareTo(BigDecimal.valueOf(180)) > 0) {
+                    throw new IllegalArgumentException("经度超出有效范围");
+                }
+                // 进行精度和小数位数检查
+                if (longitude.scale() > 6) { // 假设精度不能超过6位小数
+                    throw new IllegalArgumentException("经度小数位数过多");
+                }
+                EsProcessEnterprise.setLongitude(longitude);
+            } catch (NumberFormatException e) {
+                throw new NumberFormatException(strings[17] + " 经度格式不正确");
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException(strings[17] + " " + e.getMessage());
+            }
+        } else {
+            throw new NumberFormatException(strings[17] + " 经度格式不正确");
+        }
+
+        if (strings[18] != null && !strings[18].isEmpty()) {
+            try {
+                BigDecimal latitude = new BigDecimal(strings[18]);
+                // 进行范围检查
+                if (latitude.compareTo(BigDecimal.valueOf(-90)) < 0 || latitude.compareTo(BigDecimal.valueOf(90)) > 0) {
+                    throw new IllegalArgumentException("纬度超出有效范围");
+                }
+                // 进行精度和小数位数检查
+                if (latitude.scale() > 6) { // 假设精度不能超过6位小数
+                    throw new IllegalArgumentException("纬度小数位数过多");
+                }
+                EsProcessEnterprise.setLatitude(latitude);
+            } catch (NumberFormatException e) {
+                throw new NumberFormatException(strings[18] + " 纬度格式不正确");
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException(strings[18] + " " + e.getMessage());
+            }
+        } else {
+            throw new NumberFormatException(strings[18] + " 纬度格式不正确");
+        }
 
-        EsProcessEnterprise.setLatitude(new BigDecimal(strings[18]));//纬度
 
 
         EsProcessEnterprise.setLegalRepresentative(strings[19]);//法人姓名