Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-common/src/main/java/com/sundot/airport/common/enums/EquipmentColorTypeEnum.java

@@ -0,0 +1,30 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备台账颜色类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum EquipmentColorTypeEnum {
+
+    COLORLESS("COLORLESS", "无色"),
+    RED("RED", "红色"),
+    ORANGE("ORANGE", "橙色"),
+    YELLOW("YELLOW", "黄色");
+
+    private final String code;
+    private final String desc;
+
+    public static EquipmentColorTypeEnum getByCode(String code) {
+        for (EquipmentColorTypeEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

airport-common/src/main/java/com/sundot/airport/common/enums/EquipmentUsageStatusEnum.java

@@ -0,0 +1,32 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备台账使用状态枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum EquipmentUsageStatusEnum {
+
+    IN_USE("IN_USE", "在用"),
+    SEND_FOR_REPAIR("SEND_FOR_REPAIR", "寄修"),
+    LEND("LEND", "借出"),
+    DEACTIVATE("DEACTIVATE", "停用"),
+    NOT_ENABLED("NOT_ENABLED", "未启用"),
+    SUSPEND_USE("SUSPEND_USE", "暂停使用");
+
+    private final String code;
+    private final String desc;
+
+    public static EquipmentUsageStatusEnum getByCode(String code) {
+        for (EquipmentUsageStatusEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

airport-common/src/main/java/com/sundot/airport/common/utils/EquipmentDateUtils.java

@@ -0,0 +1,73 @@
+package com.sundot.airport.common.utils;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+
+/**
+ * 设备台账时间工具类
+ *
+ * @author ruoyi
+ */
+public class EquipmentDateUtils extends org.apache.commons.lang3.time.DateUtils {
+    // 定义时区，通常取系统默认或UTC
+    private static final ZoneId ZONE_ID = ZoneId.systemDefault();
+
+    /**
+     * 判断输入日期是否早于当前日期 (昨天及以前)
+     */
+    public static boolean isBeforeToday(Date inputDate) {
+        if (inputDate == null) return false;
+
+        LocalDate inputLocalDate = convertToLocalDate(inputDate);
+        LocalDate today = LocalDate.now(ZONE_ID);
+
+        // 严格早于今天 (昨天及以前)
+        return inputLocalDate.isBefore(today);
+    }
+
+    /**
+     * 判断输入日期是否晚于当前日期，且在两周(14天)以内
+     * 逻辑：输入日期 > 今天 且 输入日期 <= 今天+14天
+     */
+    public static boolean isWithinTwoWeeks(Date inputDate) {
+        if (inputDate == null) return false;
+
+        LocalDate inputLocalDate = convertToLocalDate(inputDate);
+        LocalDate today = LocalDate.now(ZONE_ID);
+        LocalDate twoWeeksLater = today.plusDays(14);
+
+        // isAfter 不包含等于，所以如果今天不算"晚于"，用 isAfter
+        // 如果包含今天之后的第一天，逻辑如下：
+        boolean isAfterToday = inputLocalDate.isAfter(today);
+        boolean isWithinRange = !inputLocalDate.isAfter(twoWeeksLater); // 小于等于两周后
+
+        return isAfterToday && isWithinRange;
+    }
+
+    /**
+     * 判断输入日期是否晚于当前日期，且在一个月(30天)以内
+     * 逻辑：输入日期 > 今天 且 输入日期 <= 今天+30天
+     */
+    public static boolean isWithinOneMonth(Date inputDate) {
+        if (inputDate == null) return false;
+
+        LocalDate inputLocalDate = convertToLocalDate(inputDate);
+        LocalDate today = LocalDate.now(ZONE_ID);
+        LocalDate oneMonthLater = today.plusDays(30); // 或者 plusMonths(1)，视业务需求定
+
+        boolean isAfterToday = inputLocalDate.isAfter(today);
+        boolean isWithinRange = !inputLocalDate.isAfter(oneMonthLater);
+
+        return isAfterToday && isWithinRange;
+    }
+
+    /**
+     * 辅助方法：将 java.util.Date 转换为 LocalDate
+     */
+    private static LocalDate convertToLocalDate(Date date) {
+        return date.toInstant()
+                .atZone(ZONE_ID)
+                .toLocalDate();
+    }
+}

airport-equipment/src/main/java/com/sundot/airport/equipment/domain/EquipmentLedger.java

@@ -159,6 +159,10 @@ public class EquipmentLedger extends BaseEntity {
     @TableField(exist = false)
     private String inspectionTeamUserName;
 
+    /** 颜色*/
+    @TableField(exist = false)
+    private String colorType;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -407,6 +411,14 @@ public class EquipmentLedger extends BaseEntity {
         this.inspectionTeamUserName = inspectionTeamUserName;
     }
 
+    public String getColorType() {
+        return colorType;
+    }
+
+    public void setColorType(String colorType) {
+        this.colorType = colorType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -444,6 +456,7 @@ public class EquipmentLedger extends BaseEntity {
                 .append("inspectionTeamMember2Name", getInspectionTeamMember2Name())
                 .append("equipmentInspectionRecordList", getEquipmentInspectionRecordList())
                 .append("baseAttachmentList", getBaseAttachmentList())
+                .append("colorType", getColorType())
                 .toString();
     }
 }

airport-equipment/src/main/java/com/sundot/airport/equipment/service/impl/EquipmentLedgerServiceImpl.java

@@ -4,13 +4,17 @@ import java.util.List;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.common.domain.BaseAttachment;
 import com.sundot.airport.common.enums.BaseAttachmentSourceTypeEnum;
+import com.sundot.airport.common.enums.EquipmentColorTypeEnum;
+import com.sundot.airport.common.enums.EquipmentUsageStatusEnum;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.service.IBaseAttachmentService;
 import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.EquipmentDateUtils;
 import com.sundot.airport.equipment.domain.EquipmentInspectionRecord;
 import com.sundot.airport.equipment.service.IEquipmentInspectionRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +71,22 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      */
     @Override
     public List<EquipmentLedger> selectEquipmentLedgerList(EquipmentLedger equipmentLedger) {
-        return equipmentLedgerMapper.selectEquipmentLedgerList(equipmentLedger);
+        List<EquipmentLedger> result = equipmentLedgerMapper.selectEquipmentLedgerList(equipmentLedger);
+        result.forEach(item -> {
+            item.setColorType(EquipmentColorTypeEnum.COLORLESS.getCode());
+            if (StrUtil.equals(EquipmentUsageStatusEnum.IN_USE.getCode(), item.getUsageStatus())) {
+                if (EquipmentDateUtils.isBeforeToday(item.getNextInspectionDueDate())) {
+                    item.setColorType(EquipmentColorTypeEnum.RED.getCode());
+                } else if (EquipmentDateUtils.isWithinTwoWeeks(item.getNextInspectionDueDate())) {
+                    item.setColorType(EquipmentColorTypeEnum.ORANGE.getCode());
+                } else if (EquipmentDateUtils.isWithinOneMonth(item.getNextInspectionDueDate())) {
+                    item.setColorType(EquipmentColorTypeEnum.YELLOW.getCode());
+                } else {
+                    item.setColorType(EquipmentColorTypeEnum.COLORLESS.getCode());
+                }
+            }
+        });
+        return result;
     }
 
     /**

airport-equipment/src/main/resources/mapper/equipment/EquipmentLedgerMapper.xml

@@ -134,7 +134,12 @@
                 )
             </if>
         </where>
-        order by create_time desc
+        order by
+        case usage_status
+        when 'IN_USE' then 1
+        else 2
+        end,
+        next_inspection_due_date asc
     </select>
 
     <select id="selectEquipmentLedgerById" parameterType="Long" resultMap="EquipmentLedgerResult">