Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/DPMapStatisticsItemEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.Getter;
+
+/**
+ * @author Administrator
+ */
+@Getter
+public enum DPMapStatisticsItemEnum {
+    /**
+     * 大屏统计项
+     */
+
+    TOTAL("特种设备总量 (台)", "total"),
+    GAS("气瓶 (台)", "gas"),
+    ELEVATORS("电梯 (台)", "elevators"),
+    PRESSURE_VESSELS("压力容器 (台)", "pressureVessels"),
+    ON_SITE_MOTOR_VEHICLES("场（厂）内机动车 (台)", "onSiteMotorVehicles"),
+    BOILERS("锅炉 (台)", "boilers"),
+    LIFTING_MACHINERY("起重机械 (台)", "liftingMachinery"),
+    LARGE_AMUSEMENT_FACILITIES("大型游乐设施 (台)", "largeAmusementFacilities"),
+    PRESSURE_PIPELINES("压力管道 (千米)", "pressurePipelines"),
+    PASSENGER_ROPEWAYS("客运索道 (台)", "passengerRopeways"),
+    MANUFACTURING_UNITS("制造单位 (家)", "manufacturingUnits"),
+    CONSTRUCTION_UNITS("安改维单位 (家)", "constructionUnits"),
+    USERS_UNITS("使用单位 (家)", "usersUnits"),
+    GAS_UNITS("充装单位 (家)", "gasUnits"),
+    OPERATORS("作业人员 (人)", "operators");
+    private String label;
+    private String code;
+
+    DPMapStatisticsItemEnum(String label, String code) {
+        this.label = label;
+        this.code = code;
+    }
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/EquipSourceEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public enum EquipSourceEnum {
+    jg_his("历史设备", "jg_his"),
+
+    jg("新设备", "jg");
+
+    private final String name;
+
+    private final String code;
+
+
+    public static String getMessage(String code) {
+        for (EquipSourceEnum constants : values()) {
+            if (constants.getCode().equals(code)) {
+                return constants.getName();
+            }
+        }
+        return null;
+    }
+
+    public static Map<Integer,String> getName=new HashMap<>();
+    public static Map<String,Integer> getCode=new HashMap<>();
+
+    static {
+        for (ConstructionEnum e : ConstructionEnum.values()){
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/PressureVesselListener.java

@@ -204,7 +204,7 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
         String equListCode = (String) paramMap.get("EQU_LIST");
         String equCategoryCode = (String) paramMap.get("EQU_CATEGORY");
         String equDefineCode = (String) paramMap.get("EQU_DEFINE");
-        String equipSource = (String) paramMap.get("EQUIP_SOURCE");
+        String dataSource = (String) paramMap.get("DATA_SOURCE");
 
         Date date = new Date();
         String record = UUID.randomUUID().toString();
@@ -215,9 +215,9 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
         BeanUtils.copyProperties(data, useInfo);
         useInfo.setRecord(record);
         useInfo.setRecDate(date);
-        useInfo.setDataSource(equipSource != null ? equipSource : "jg");//区分历史设备和新增设备
+        useInfo.setDataSource(dataSource != null ? dataSource : "jg");//区分历史设备和新增设备
         useInfo.setEquState(null);
-        useInfo.setIsIntoManagement(equipSource != null);//历史气瓶导入为已纳管设备
+        useInfo.setIsIntoManagement(dataSource != null);//历史气瓶导入为已纳管设备
         // 使用单位信息
         if("个人主体".equals(company.getCompanyType())){
             useInfo.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DPStatisticsController.java

@@ -50,6 +50,17 @@ public class DPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏总览中间-地图左右两侧8大类、单位、人员数量全局统计", notes = "大屏总览中间-地图左右两侧8大类、单位、人员数量全局统计")
+    @PostMapping(value = "/zl/center-map/global/count")
+    public ResponseModel<Map<String, Object>> centerMapCountForGlobal(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.getCenterMapCountDataForGlobal(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏八大类左侧-使用登记统计", notes = "大屏八大类左侧-使用登记统计")
     @PostMapping(value = "/useRegisterCount")
     public ResponseModel<Map<String, Object>> useRegisterCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jg.api.dto.EquipInfoCylinderExcelDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 设备注册
@@ -151,10 +156,39 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @PostMapping("/importPressureVesselData")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "压力容器设备批量导入")
-    public ResponseModel<String> importPressureVesselData(@RequestBody Map<String, Object> paramMap) {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.importPressureVesselData(paramMap));
+    public ResponseModel<?> importPressureVesselData(@RequestBody Map<String, Object> paramMap,@RequestPart MultipartFile multipartFile) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.importPressureVesselData(paramMap, multipartFile));
     }
 
+    /**
+     *
+     * 气瓶批量导入
+     * **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/importData")
+    @ApiOperation(httpMethod = "POST", value = "气瓶批量导入", notes = "气瓶批量导入")
+    public List<EquipInfoCylinderExcelDto> ImportData (@RequestPart MultipartFile multipartFile) throws Exception {
+        List<EquipInfoCylinderExcelDto> aircraftList = new ArrayList<>();
+        try {
+            EasyExcel.read(multipartFile.getInputStream(), EquipInfoCylinderExcelDto.class, new AnalysisEventListener<EquipInfoCylinderExcelDto>() {
+                // 每读取一行就调用该方法
+                @Override
+                public void invoke(EquipInfoCylinderExcelDto data, AnalysisContext context) {
+                    EquipInfoCylinderExcelDto fireExperts = new EquipInfoCylinderExcelDto();
+                    BeanUtils.copyProperties(data,fireExperts);
+                    aircraftList.add(fireExperts);
+                }
+                // 全部读取完成就调用该方法
+                @Override
+                public void doAfterAllAnalysed(AnalysisContext context) {
+                    System.out.println("读取完成");
+                }
+            }).headRowNumber(4).sheet().doRead();
+            return aircraftList;
+        } catch (Exception e) {
+            throw new Exception("系统异常");
+        }
+    }
 
     /**
      * 压力容器设备模版下载

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgRegisterInfoService.java

@@ -36,5 +36,5 @@ public interface IIdxBizJgRegisterInfoService {
 
     Page<JSONObject> queryEquipCanUsedByVesselPage(JSONObject jsonObject);
 
-    String importPressureVesselData(Map<String, Object> paramMap);
+    Object importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DPStatisticsServiceImpl.java

@@ -4,12 +4,26 @@ import cn.hutool.core.date.DateUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LegendDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipBizCountDto;
+import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEnableDisableMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.core.CountRequest;
+import org.elasticsearch.client.core.CountResponse;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.stereotype.Service;
 
 import java.sql.Date;
@@ -18,6 +32,8 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
+import javax.annotation.PostConstruct;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +46,7 @@ import java.util.stream.Collectors;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class DPStatisticsServiceImpl {
 
     /**
@@ -50,12 +67,23 @@ public class DPStatisticsServiceImpl {
 
     private JgScrapCancelMapper scrapCancelMapper;
 
+    private RestHighLevelClient restHighLevelClient;
 
-    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JgUseRegistrationMapper useRegistrationMapper, JgEnableDisableMapper enableDisableMapper, JgScrapCancelMapper scrapCancelMapper) {
+    private static List<EquipmentCategoryDto> equipmentCategoryDtos;
+
+
+    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JgUseRegistrationMapper useRegistrationMapper, JgEnableDisableMapper enableDisableMapper, JgScrapCancelMapper scrapCancelMapper, RestHighLevelClient restHighLevelClient) {
         this.equipmentCategoryMapper = equipmentCategoryMapper;
         this.useRegistrationMapper = useRegistrationMapper;
         this.enableDisableMapper = enableDisableMapper;
         this.scrapCancelMapper = scrapCancelMapper;
+        this.restHighLevelClient = restHighLevelClient;
+    }
+
+    @PostConstruct
+    public void init() {
+        // 数据不变所以放到内存，提高响应时间
+        equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
     }
 
 
@@ -67,8 +95,6 @@ public class DPStatisticsServiceImpl {
         List<LegendDataDto> legendDataDtos = this.buildLegendDataList();
         //2.1 图列数据构造
         result.put("legendData", legendDataDtos);
-        // 8大类设备种类
-        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
         //2.2 x轴数据构造
         result.put("xdata", this.getXData(equipmentCategoryDtos));
         //2.3 y轴数据构造
@@ -146,6 +172,69 @@ public class DPStatisticsServiceImpl {
         }
     }
 
+    public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) {
+        Map<String, Object> result = new HashMap<>();
+        //1.8大类设备数量统计
+        this.staticsCenterMapCountDataForEquip(result, dpFilterParamDto);
+        //2.压力管道长度统计
+        this.staticsCenterMapCountDataForPipeline(result, dpFilterParamDto);
+        //3.单位数量统计
+        this.staticsCenterMapCountDataForCompany(result, dpFilterParamDto);
+        //4.人员数量统计
+        this.staticsCenterMapCountDataForPerson(result, dpFilterParamDto);
+        return null;
+    }
+
+    private void staticsCenterMapCountDataForPerson(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
+    }
+
+    private void staticsCenterMapCountDataForCompany(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
+    }
+
+    private void staticsCenterMapCountDataForPipeline(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
+        CountRequest request = new CountRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
+        // 设备类别精确查询气瓶
+        boolMust.must(QueryBuilders.termsQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
+        // 纳管状态为已纳管
+        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        try {
+            CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
+            result.put(DPMapStatisticsItemEnum.GAS.getCode(), response.getCount());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    private void staticsCenterMapCountDataForEquip(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
+        SearchRequest request = new SearchRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
+        // 纳管状态为已纳管
+        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.query(boolMust);
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");
+        builder.aggregation(aggregationBuilder);
+        request.source(builder);
+        try {
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+            Terms terms = response.getAggregations().get("count_by_equ_list_code");
+            for (Terms.Bucket bucket : terms.getBuckets()) {
+                log.info(bucket.getKeyAsString());
+                log.info(String.valueOf(bucket.getDocCount()));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public Map<String, Object> useRegisterCount(DPFilterParamDto dpFilterParamDto) {
         // 2.按照前端约定格式返回数据
         Map<String, Object> result = new HashMap<>();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipInfoCylinderExcelDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.config.PressureVesselListener;
@@ -37,8 +38,6 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
-import io.minio.GetObjectArgs;
-import io.minio.MinioClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
@@ -56,6 +55,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -63,14 +63,11 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.sql.Timestamp;
 import java.util.*;
 import java.util.stream.Collectors;
-
 import static com.alibaba.fastjson.JSON.toJSONString;
 
 
@@ -125,10 +122,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String INSPECTION_AND_TESTING_INSTITUTIONS = "检验检测机构";
     // 设备纳管  纳管：true 未纳管：false
     public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
-    /**
-     * 设备来源 new：新设备录入  his：历史数据录入
-     */
-    public static final String EQUIP_SOURCE = "EQUIP_SOURCE";
+
+    // 设备来源 jg：新设备录入  jg_his：历史数据录入
+    public static final String DATA_SOURCE = "DATA_SOURCE";
     /**
      * 业务类型 0：单个新增 1:批量导入
      */
@@ -196,15 +192,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     @Value("${add.equip.dict.code.suffix:CATEGORY_LIST_ADD}")
     private String equipAddDictCodeSuffix;
 
-    @Value("${minio.endpoint}")
-    private String minioEndpoint;
-
-    @Value("${minio.accessKey}")
-    private String accessKey;
-
-    @Value("${minio.secretKey}")
-    private String secretKey;
-
     @Autowired
     private IdxBizJgDesignInfoServiceImpl idxBizJgDesignInfoService;
     @Autowired
@@ -1488,6 +1475,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     String status = EquimentEnum.getName.get(integer);
                     dto2.put(EQUSTATE, status);
                 }
+                if (!ValidationUtil.isEmpty(dto2.get(DATA_SOURCE))) {
+                    String s = dto2.get(DATA_SOURCE).toString();
+                    String equipSource = s.startsWith(EquipSourceEnum.jg.getCode()) ? EquipSourceEnum.jg.getName() : EquipSourceEnum.jg_his.getName();
+                    dto2.put(DATA_SOURCE, equipSource);
+                }
                 dto2.put("record", dto2.get(SEQUENCE_NBR));
                 list.add(dto2);
             }
@@ -1609,7 +1601,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 业务场景
         String businessScenarios = String.valueOf(equipmentClassForm.get(BUSINESS_SCENARIOS));
         // 数据来源 历史数据his 新数据new
-        String equipSource = String.valueOf(equipmentClassForm.get(EQUIP_SOURCE));
+        String equipSource = String.valueOf(equipmentClassForm.get(DATA_SOURCE));
 
         // 操作类型
         String operateType = ValidationUtil.isEmpty(equipmentInfoForm.get(SEQUENCE_NBR)) ? OPERATESAVE : OPERATEEDIT;
@@ -2001,37 +1993,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public String importPressureVesselData(Map<String, Object> paramMap) {
+    public String importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile) {
         try {
             PressureVesselListener pressureVesselListener = new PressureVesselListener();
             LinkedHashMap equipmentInfoForm = (LinkedHashMap) checkAndCast(paramMap.get(EQUIP_INFO_FORM_ID));
             injectDependencies(pressureVesselListener, equipmentInfoForm);
-
-            // 初始化MinioClient对象
-            MinioClient minioClient = MinioClient.builder()
-                    .endpoint(minioEndpoint)
-                    .credentials(accessKey, secretKey)
-                    .build();
-
-            ArrayList<?> file = (ArrayList<?>) equipmentInfoForm.get("file");
-            HashMap<?, ?> fileMap = (HashMap<?, ?>) file.get(0);
-            String url = String.valueOf(fileMap.get("url")).replaceFirst("/", "");
-            // /upload/tzs/amos_studio/9137475/xxx.xlsx
-            // 中的upload为bucket，tzs/amos_studio/9137475/xxx.xlsx为objectName
-            int index = url.indexOf("/");
-            String bucket = url.substring(0, index);
-            String objectName = url.substring(index + 1);
-
-            // 入参
-            GetObjectArgs args = GetObjectArgs.builder().bucket(bucket).object(objectName).build();
-            // 获取文件对象的InputStream
-            InputStream inputStream = minioClient.getObject(args);
-
-            EasyExcel.read(inputStream, EquipInfoCylinderExcelDto.class, pressureVesselListener)
+            EasyExcel.read(multipartFile.getInputStream(), EquipInfoCylinderExcelDto.class, pressureVesselListener)
                     .headRowNumber(4)
                     .sheet()
                     .doRead();
-            inputStream.close();
             return pressureVesselListener.getResult();
         } catch (Exception e) {
             String err = (e.getCause() instanceof BadRequest) ? "模版数据填写有误：" + e.getCause().getMessage() : "导入时出现异常：请联系管理员！" ;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -1212,7 +1212,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         map1.put("SUPERVISORY_CODE", tzsJgOtherInfo.getSupervisoryCode());
         map1.put("USE_UNIT_CREDIT_CODE", jgInstallationNotice.getUseUnitCreditCode());
         map1.put("USE_UNIT_NAME", jgInstallationNotice.getUseUnitName());
-        map1.put("IS_INTO_MANAGEMENT ", true);
+        map1.put("IS_INTO_MANAGEMENT", true);
         map1.put("USC_UNIT_CREDIT_CODE", jgInstallationNotice.getInstallUnitCreditCode());
         map1.put("USC_UNIT_NAME", jgInstallationNotice.getInstallUnitName());
         map1.put("USE_PLACE", String.format("%s/%s/%s/%s", jgInstallationNotice.getProvinceName(), jgInstallationNotice.getCityName(), jgInstallationNotice.getCountyName(), jgInstallationNotice.getStreetName()));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -1257,7 +1257,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         param.put("USE_PLACE", usePlace);
         param.put("STATUS", "已认领");
         param.put("EQU_STATE", 1);
-        param.put("IS_INTO_MANAGEMENT ", true);
+        param.put("IS_INTO_MANAGEMENT", true);
         param.put("ORG_BRANCH_CODE", split[0]);
         param.put("ORG_BRANCH_NAME", split[1]);
         param.put("EQU_CODE", dataMap.get("equCode"));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -836,7 +836,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         param.put("USE_PLACE", jgVehicleInformation.getUseUnitAddress());
         param.put("STATUS", "已认领");
         param.put("EQU_STATE", 1);
-        param.put("IS_INTO_MANAGEMENT ", true);
+        param.put("IS_INTO_MANAGEMENT", true);
         param.put("ORG_BRANCH_CODE", jgVehicleInformation.getOrgBranchCode());
         param.put("ORG_BRANCH_NAME", jgVehicleInformation.getOrgBranchName());
         param.put("EQU_CODE", dataMap.get("equCode"));