fix(jg):【现场问题】压力管道-压力容器导入优化

amos-boot-biz-common/pom.xml

@@ -128,7 +128,7 @@
         <dependency>
             <groupId>cn.com.vastdata</groupId>
             <artifactId>vastbase-jdbc</artifactId>
-            <version>2.10p</version>
+            <version>2.12p</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/CustomBaseMapper.java

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * @author LiuLin
+ */
+public interface CustomBaseMapper<T> extends BaseMapper<T> {
+    Integer insertBatchSomeColumn(List<T> entityList);
+    /**
+     * 分批批量插入
+     * @param entityList 数据集合
+     * @param batchSize 每批数量
+     * @return 插入总条数
+     */
+    default int insertBatchSomeColumn(List<T> entityList, int batchSize) {
+        if (entityList == null || entityList.isEmpty()) {
+            return 0;
+        }
+        int total = 0;
+        for (int i = 0; i < entityList.size(); i += batchSize) {
+            int endIndex = Math.min(i + batchSize, entityList.size());
+            List<T> subList = entityList.subList(i, endIndex);
+            total += insertBatchSomeColumn(subList);
+        }
+        return total;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.jg.api.converter.*;
 import io.swagger.annotations.ApiModel;
@@ -284,5 +285,5 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     private String informationManageCode;
 
     @ExcelIgnore
-    private List fileData;
+    private List<?> fileData;
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CustomBaseMapper.java

-package com.yeejoin.amos.boot.module.jg.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author DELL
- */
-public interface CustomBaseMapper<T> extends BaseMapper<T> {
-    Integer insertBatchSomeColumn(List<T> entityList);
-}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationUnitEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnitEq;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationUnitMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgEquipTransferEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
 
 /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgEquipTransferMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgInstallationNoticeEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeEqDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.PieLineEquipContraptionDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgInstallationNoticeMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgNoticeToBeSubmitDto;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintainNoticeEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 
 /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintainNoticeMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 import org.apache.ibatis.annotations.Param;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgReformNoticeEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNoticeEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgReformNoticeMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgTransferNoticeEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 
 /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgTransferNoticeMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/pom.xml

@@ -53,7 +53,7 @@
         <dependency>
             <groupId>cn.com.vastdata</groupId>
             <artifactId>vastbase-jdbc</artifactId>
-            <version>2.10p</version>
+            <version>2.12p</version>
         </dependency>
         <dependency>
             <groupId>io.seata</groupId>

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

@@ -285,7 +285,6 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/importData")
     @ApiOperation(httpMethod = "POST", value = "气瓶批量导入", notes = "气瓶批量导入")
-    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<?> importPressureData(@RequestPart("file") MultipartFile multipartFile) throws Exception {
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.importPressureData(multipartFile));
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgConstructionInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 施工信息表 Mapper 接口
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgConstructionInfoMapper extends BaseMapper<IdxBizJgConstructionInfo> {
+public interface IdxBizJgConstructionInfoMapper extends CustomBaseMapper<IdxBizJgConstructionInfo> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgDesignInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 安全追溯-设计信息表 Mapper 接口
@@ -9,6 +9,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgDesignInfoMapper extends BaseMapper<IdxBizJgDesignInfo> {
-
+public interface IdxBizJgDesignInfoMapper extends CustomBaseMapper<IdxBizJgDesignInfo> {
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgFactoryInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 安全追溯-制造信息 Mapper 接口
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgFactoryInfoMapper extends BaseMapper<IdxBizJgFactoryInfo> {
+public interface IdxBizJgFactoryInfoMapper extends CustomBaseMapper<IdxBizJgFactoryInfo> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgInspectionDetectionInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgInspectionDetectionInfoMapper extends BaseMapper<IdxBizJgInspectionDetectionInfo> {
+public interface IdxBizJgInspectionDetectionInfoMapper extends CustomBaseMapper<IdxBizJgInspectionDetectionInfo> {
 
     List<IdxBizJgInspectionDetectionInfo> selectLastedGroupByInspectType(@Param("record") String record);
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgOtherInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Select;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgOtherInfoMapper extends BaseMapper<IdxBizJgOtherInfo> {
+public interface IdxBizJgOtherInfoMapper extends CustomBaseMapper<IdxBizJgOtherInfo> {
     @Select("select SUPERVISORY_CODE from idx_biz_jg_other_info where record = #{equipmentCode}")
     String getSupervisoryCodeByEquipmentCode(@Param("equipmentCode") String equipmentCode);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import java.util.List;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterInfo> {
+public interface IdxBizJgRegisterInfoMapper extends CustomBaseMapper<IdxBizJgRegisterInfo> {
 
     @Select("select \"USE_ORG_CODE\" from idx_biz_jg_register_info where \"RECORD\" = #{equipCode}")
     String getUseOrgCodeByEquip(@Param("equipCode") String equipCode);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgSupervisionInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
 
 /**
@@ -9,6 +9,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgSupervisionInfoMapper extends BaseMapper<IdxBizJgSupervisionInfo> {
+public interface IdxBizJgSupervisionInfoMapper extends CustomBaseMapper<IdxBizJgSupervisionInfo> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgTechParamsPipelineMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 安全追溯-压力管道 Mapper 接口
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgTechParamsPipelineMapper extends BaseMapper<IdxBizJgTechParamsPipeline> {
+public interface IdxBizJgTechParamsPipelineMapper extends CustomBaseMapper<IdxBizJgTechParamsPipeline> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgTechParamsVesselMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 安全追溯-压力容器 Mapper 接口
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IdxBizJgTechParamsVesselMapper extends BaseMapper<IdxBizJgTechParamsVessel> {
+public interface IdxBizJgTechParamsVesselMapper extends CustomBaseMapper<IdxBizJgTechParamsVessel> {
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgUseInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipWaitRefreshDataQualityScore;
 import com.yeejoin.amos.boot.module.ymt.api.dto.RefreshDataDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 import java.util.Map;
 
@@ -16,7 +15,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2023-08-16
  */
-public interface IdxBizJgUseInfoMapper extends BaseMapper<IdxBizJgUseInfo> {
+public interface IdxBizJgUseInfoMapper extends CustomBaseMapper<IdxBizJgUseInfo> {
     void batchUpdateUseInfo(@Param("records") List<String> records, Integer code);
 
     List<IdxBizJgUseInfo> selectXAList();