feat(重要提醒)：业务新增提醒开发联调

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/vehicleInformation/VehicleInformationReminderAdapter.java

@@ -13,14 +13,11 @@ import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.core.DefaultReminder;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.service.CommonReminderService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
-import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -50,7 +47,7 @@ public class VehicleInformationReminderAdapter extends DefaultReminder {
         lambda.select(JgVehicleInformationEq::getEquId);
         List<String> records = vehicleInformationReminderParse.getVehicleInformationEqMapper().selectList(lambda).stream().map(JgVehicleInformationEq::getEquId).collect(Collectors.toList());
         Page<ReminderItemDto> mapPage = vehicleInformationReminderParse.getVehicleInformationMapper().queryForUnitVehiclePageForReminder(page, records);
-        mapPage.getRecords().forEach(item -> item.setDetailData(this.buildSetUseDataByStatus(vehicleInformation, item.getEquipId())));
+        mapPage.getRecords().forEach(item -> item.setDetailData(this.buildCompareData(vehicleInformation, item.getEquipId())));
         return page;
     }
 
@@ -61,24 +58,19 @@ public class VehicleInformationReminderAdapter extends DefaultReminder {
         return Collections.emptyList();
     }
 
-    private Map<String, Object> buildSetUseDataByStatus(JgVehicleInformation vehicleInformation, String record) {
-        Map<String, Object> re = getValuesFromHistory(vehicleInformation);
-        if (re != null) return re;
-        return vehicleInformationReminderParse.getEquipDetailByRecord(record);
+    private Map<String, Object> buildCompareData(JgVehicleInformation vehicleInformation, String record) {
+        Map<String, Object> re = BeanUtil.beanToMap(vehicleInformation);
+        re.putAll(vehicleInformationReminderParse.getEquipDetailByRecord(record));
+        return re;
     }
 
-
-    private Map<String, Object> getValuesFromHistory(JgVehicleInformation vehicleInformation) {
-        if (!vehicleInformation.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) {
-            JSONObject his = vehicleInformationReminderParse.getJgCommonService().queryHistoryData(vehicleInformation.getSequenceNbr());
-            Map<String, Object> re = new HashMap<>();
-            re.putAll(his);
-            re.putAll(BeanUtil.beanToMap(vehicleInformation));
-            return re;
-        }
-        return null;
+    private Map<String, Object> buildCompareData(Map<String, Object> vehicleInformation, String record) {
+        Map<String, Object> re = BeanUtil.beanToMap(vehicleInformation);
+        re.putAll(vehicleInformationReminderParse.getEquipDetailByRecord(record));
+        return re;
     }
 
+
     @Override
     public IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
         // 气瓶--气瓶分页
@@ -86,7 +78,7 @@ public class VehicleInformationReminderAdapter extends DefaultReminder {
         List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) data.get("equipmentLists");
         List<String> records = equipmentLists.stream().map(item -> item.get("record").toString()).collect(Collectors.toList());
         Page<ReminderItemDto> mapPage = vehicleInformationReminderParse.getVehicleInformationMapper().queryForUnitVehiclePageForReminder(page, records);
-        mapPage.getRecords().forEach(item -> item.setDetailData(data));
+        mapPage.getRecords().forEach(item -> item.setDetailData(this.buildCompareData(data, item.getEquipId())));
         return page;
     }
 
@@ -140,6 +132,6 @@ public class VehicleInformationReminderAdapter extends DefaultReminder {
 
     @Override
     public String supportBizType() {
-        return BusinessTypeEnum.JG_VEHICLE_GAS_CYLINDER_CHANGE.name();
+        return BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.name();
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/vehicleInformation/VehicleInformationReminderParse.java

 package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.vehicleInformation;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.service.CommonReminderService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgFactoryInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Component
@@ -29,8 +34,15 @@ public class VehicleInformationReminderParse {
 
     private final CommonServiceImpl jgCommonService;
 
+    private final IdxBizJgFactoryInfoMapper jgFactoryInfoMapper;
+
     public Map<String, Object> getEquipDetailByRecord(String record) {
-        return commonReminderService.getEquipDetailByRecord(record);
+        IdxBizJgFactoryInfo factoryInfo = jgFactoryInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgFactoryInfo>().eq(IdxBizJgFactoryInfo::getRecord, record));
+        IdxBizJgUseInfo useInfo = idxBizJgUseInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getRecord, record));
+        Map<String, Object> result = new HashMap<>();
+        result.put("USE_INNER_CODE", useInfo.getUseInnerCode());
+        result.put("FACTORY_NUM", factoryInfo.getFactoryNum());
+        return result;
     }
 
 }

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.ReminderField;
 import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.TzsJgColumnReminderRuleServiceImpl;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -68,6 +69,6 @@ public class ReminderFieldDiffImpl implements ReminderFieldDiff {
     }
 
     private boolean containKeyAndValue(Map<String, Object> detailData, String columnKey) {
-        return Arrays.stream(columnKey.split(",")).anyMatch(k -> detailData.containsKey(k) && Objects.nonNull(detailData.get(k)));
+        return Arrays.stream(columnKey.split(",")).anyMatch(k -> detailData.containsKey(k) && ObjectUtils.isNotEmpty(detailData.get(k)));
     }
 }