1.问题生成数据量大检验超期检验不合格数据量大修改

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/mapper/CylinderInfoMapper.java

 package com.yeejoin.amos.boot.module.cylinder.flc.api.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInfoDto;
@@ -116,9 +115,9 @@ public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
 
     Map<String, Object> countFillingTimesAndQuantityByCompany(@Param("companyId") String companyId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<CylinderInfoDto> queryCylinderOfInspectionOverdue();
+    List<CylinderInfoDto> queryCylinderOfInspectionOverdue(@Param("questionType") String questionType);
 
-    List<CylinderInfoDto> queryCylinderOfUnqualifiedQuestion();
+    List<CylinderInfoDto> queryCylinderOfUnqualifiedQuestion(@Param("questionType") String questionType);
 
     List<Map<String, Object>> countFillingTimesAndQuantityByCity();
 

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -481,6 +481,7 @@
             u.app_id = a.app_id
             and a.last_inspection_id = b.sequence_nbr
             and date_gt(CURRENT_DATE, cast(b.next_inspection_date as date))
+            and not EXISTS (select 1 from tz_cylinder_question_info q where q.question_object_id =  a.sequence_nbr and q.question_type  = #{questionType})
     </select>
     <select id="queryCylinderOfUnqualifiedQuestion" resultType="com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInfoDto">
         SELECT
@@ -499,7 +500,7 @@
             and u.app_id = a.app_id
             and a.last_inspection_id = b.sequence_nbr
             and b.inspection_result = '3124'
-            and (b.is_deal_question = false or b.is_deal_question is null)
+            and not EXISTS (select 1 from tz_cylinder_question_info q where q.question_object_id =  a.sequence_nbr and q.question_type  = #{questionType} )
     </select>
 
     <update id="updateEsCylinderInfoStatus">

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/job/InspectionQuestionJob.java

 package com.yeejoin.amos.boot.module.cylinder.biz.job;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderQuestionInfo;
 import com.yeejoin.amos.boot.module.cylinder.api.enums.QuestionTypeEnum;
 import com.yeejoin.amos.boot.module.cylinder.biz.service.impl.CylinderQuestionInfoServiceImpl;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInfoDto;
-import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInspection;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderInfoMapper;
-import com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl.CylinderInspectionServiceImpl;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -33,16 +26,12 @@ public class InspectionQuestionJob {
 
     private CylinderInfoMapper cylinderInfoMapper;
 
-    private CylinderInspectionServiceImpl cylinderInspectionService;
-
     private CylinderQuestionInfoServiceImpl questionInfoService;
 
     public InspectionQuestionJob(CylinderInfoMapper cylinderInfoMapper,
-                                 CylinderInspectionServiceImpl cylinderInspectionService,
                                  CylinderQuestionInfoServiceImpl questionInfoService) {
         this.cylinderInfoMapper = cylinderInfoMapper;
         this.questionInfoService = questionInfoService;
-        this.cylinderInspectionService = cylinderInspectionService;
     }
 
 
@@ -57,7 +46,7 @@ public class InspectionQuestionJob {
     }
 
     public void genOverdueQuestionImpl() {
-        List<CylinderInfoDto> cylinderList = cylinderInfoMapper.queryCylinderOfInspectionOverdue();
+        List<CylinderInfoDto> cylinderList = cylinderInfoMapper.queryCylinderOfInspectionOverdue(QuestionTypeEnum.JYCQ.getCode());
         List<CylinderQuestionInfo> cylinderQuestionInfos = cylinderList.stream().map(cylinderInfoDto -> {
             CylinderQuestionInfo cylinderQuestionInfo = new CylinderQuestionInfo();
             cylinderQuestionInfo.setQuestionType(QuestionTypeEnum.JYCQ.getCode());
@@ -65,23 +54,9 @@ public class InspectionQuestionJob {
             return fillCommonField(cylinderInfoDto, cylinderQuestionInfo);
         }).collect(Collectors.toList());
         // 已经生成的数据不再重复生成
-        List<CylinderQuestionInfo> needToDbQuestionInfos = this.removeRepeatData(cylinderQuestionInfos);
-        if (needToDbQuestionInfos.size() > 0) {
-            questionInfoService.saveBatch(needToDbQuestionInfos);
-        }
-    }
-
-    private List<CylinderQuestionInfo> removeRepeatData(List<CylinderQuestionInfo> cylinderQuestionInfos) {
         if (cylinderQuestionInfos.size() > 0) {
-            Set<String> questionObjectIds = cylinderQuestionInfos.stream().map(CylinderQuestionInfo::getQuestionObjectId).collect(Collectors.toSet());
-            // 已经生成问题的气瓶
-            List<CylinderQuestionInfo> haveCreateQuestionInfos = questionInfoService.list(new LambdaQueryWrapper<CylinderQuestionInfo>()
-                    .in(CylinderQuestionInfo::getQuestionObjectId, questionObjectIds)
-                    .eq(CylinderQuestionInfo::getQuestionType, QuestionTypeEnum.JYCQ.getCode()));
-            // 去掉已经生成的气瓶问题，不在重复生成问题
-            return cylinderQuestionInfos.stream().filter(c -> haveCreateQuestionInfos.stream().noneMatch(d -> d.getQuestionObjectId().equals(c.getQuestionObjectId()))).collect(Collectors.toList());
+            questionInfoService.saveBatch(cylinderQuestionInfos);
         }
-        return new ArrayList<>();
     }
 
 
@@ -96,7 +71,7 @@ public class InspectionQuestionJob {
     }
 
     public void genInspectionUnqualifiedQuestionImpl() {
-        List<CylinderInfoDto> cylinderList = cylinderInfoMapper.queryCylinderOfUnqualifiedQuestion();
+        List<CylinderInfoDto> cylinderList = cylinderInfoMapper.queryCylinderOfUnqualifiedQuestion(QuestionTypeEnum.JYBHG.getCode());
         List<CylinderQuestionInfo> cylinderQuestionInfos = cylinderList.stream().map(cylinderInfoDto -> {
             CylinderQuestionInfo cylinderQuestionInfo = new CylinderQuestionInfo();
             cylinderQuestionInfo.setQuestionType(QuestionTypeEnum.JYBHG.getCode());
@@ -105,18 +80,9 @@ public class InspectionQuestionJob {
         }).collect(Collectors.toList());
         if (cylinderQuestionInfos.size() > 0) {
             questionInfoService.saveBatch(cylinderQuestionInfos);
-            updateDealStatusAfterJobDeal(cylinderList);
         }
     }
 
-    private void updateDealStatusAfterJobDeal(List<CylinderInfoDto> cylinderList) {
-        cylinderList.forEach(cylinder -> {
-            LambdaUpdateWrapper<CylinderInspection> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(BaseEntity::getSequenceNbr, cylinder.getLastInspectionId());
-            updateWrapper.set(CylinderInspection::getIsDealQuestion, true);
-            cylinderInspectionService.update(updateWrapper);
-        });
-    }
 
     @NotNull
     private CylinderQuestionInfo fillCommonField(CylinderInfoDto cylinderInfoDto, CylinderQuestionInfo cylinderQuestionInfo) {