fix(jg)：车用气瓶历史平台登记功能开发

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderAreaDataServiceImpl.java

 package com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessageModel;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.KeyValueDto;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
 import com.yeejoin.amos.boot.module.cylinder.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.cylinder.biz.dao.ESCylinderFillingRecordRepository;
-import com.yeejoin.amos.boot.module.cylinder.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CityCylinderInfoDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderAreaDataDto;
-import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInfoStatisticsDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderAreaData;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderAreaDataMapper;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ICylinderAreaDataService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 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.RegionModel;
 import joptsimple.internal.Strings;
-import org.apache.lucene.search.comparators.DoubleComparator;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -34,7 +26,6 @@ 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.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoCylinderExcelDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import cn.hutool.json.JSONArray;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
@@ -11,6 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 /**
  * @author LiuLin
@@ -267,4 +269,7 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     @ExcelProperty(value = "热处理温度(℃)", index = 52)
     @ApiModelProperty(value = "热处理温度(℃)")
     private String qpHeatTreatmentTemperature;
+
+    @ExcelIgnore
+    private List fileData;
 }

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

@@ -165,27 +165,18 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/importData")
     @ApiOperation(httpMethod = "POST", value = "气瓶批量导入", notes = "气瓶批量导入")
-    public ResponseModel<List<EquipInfoCylinderExcelDto>> ImportData (@RequestPart("file") 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 ResponseHelper.buildResponse(aircraftList);
-        } catch (Exception e) {
-            throw new Exception("系统异常");
-        }
+    public ResponseModel<?> importPressureData (@RequestPart("file") MultipartFile multipartFile) throws Exception {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.importPressureData(multipartFile));
+    }
+
+    /**
+     * 气瓶批量保存
+     * **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/savePressureVesselData")
+    @ApiOperation(httpMethod = "POST", value = "气瓶批量保存", notes = "气瓶批量保存")
+    public ResponseModel<?> savePressureVesselData(@RequestBody Map<String, Object> paramMap) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.savePressureVesselData(paramMap));
     }
 
     /**

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

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -37,4 +36,8 @@ public interface IIdxBizJgRegisterInfoService {
     Page<JSONObject> queryEquipCanUsedByVesselPage(JSONObject jsonObject);
 
     Object importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile);
+
+    Object importPressureData(MultipartFile multipartFile) throws Exception;
+
+    Object savePressureVesselData(Map<String, Object> paramMap);
 }

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/JgMaintenanceContractServiceImpl.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -24,14 +23,10 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
-import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
-import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;