接口调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemReportInfoController.java

@@ -8,10 +8,7 @@ import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.domain.DemReportInfo;
 import com.usky.fire.service.DemReportInfoService;
-import com.usky.fire.service.vo.CompanyAddVO;
-import com.usky.fire.service.vo.CompanyDataVo;
-import com.usky.fire.service.vo.DemReportInfoIdVo;
-import com.usky.fire.service.vo.DemReportInfoVo;
+import com.usky.fire.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -86,13 +83,12 @@ public class DemReportInfoController {
     /**
      * 报告读取状态更新
      *
-     * @param id  主键ID
      * @return
      */
     @Log(title = "报告读取状态更新", businessType = BusinessType.UPDATE)
-    @PostMapping("/updateReadStatus")
-    public ApiResult<Void> updateReadStatus(@RequestParam(value = "id") String id) {
-        demReportInfoService.updateReadStatus(id);
+    @PutMapping("/updateReadStatus")
+    public ApiResult<Void> updateReadStatus(@RequestBody DemReportInfoRequestVO vo) {
+        demReportInfoService.updateReadStatus(vo.getId());
         return ApiResult.success();
     }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/ReportResult.java

@@ -94,4 +94,10 @@ public class ReportResult implements Serializable {
      */
     @TableField(exist = false)
     private LocalDateTime readTime;
+
+    /**
+     * 是否已读
+     */
+    @TableField(exist = false)
+    private Integer isRead;
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemReportInfoService.java

@@ -56,5 +56,5 @@ public interface DemReportInfoService extends CrudService<DemReportInfo> {
      * 批量更新已读状态
      * @param id 主键ID
      */
-    void updateReadStatus(String id);
+    void updateReadStatus(Integer id);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemReportInfoServiceImpl.java

@@ -141,7 +141,7 @@ public class DemReportInfoServiceImpl extends AbstractCrudService<DemReportInfoM
     }
 
     @Override
-    public void updateReadStatus(String id) {
+    public void updateReadStatus(Integer id) {
         String remark = null;
         try {
             remark = SecurityUtils.getLoginUser().getSysUser().getRemark();

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReportResultServiceImpl.java

@@ -73,7 +73,7 @@ public class ReportResultServiceImpl extends AbstractCrudService<ReportResultMap
         }
 
         LambdaQueryWrapper<DemReportInfo> demReportQuery = Wrappers.lambdaQuery();
-        demReportQuery.select(DemReportInfo::getIsRead, DemReportInfo::getReadTime, DemReportInfo::getCompanyId)
+        demReportQuery.select(DemReportInfo::getIsRead, DemReportInfo::getReadTime, DemReportInfo::getCompanyId, DemReportInfo::getReportStatus)
                 .in(DemReportInfo::getCompanyId, companyIdList);
         List<DemReportInfo> demReportInfoList = demReportInfoMapper.selectList(demReportQuery);
 
@@ -90,8 +90,9 @@ public class ReportResultServiceImpl extends AbstractCrudService<ReportResultMap
             if (relatedCompanyId != null) {
                 DemReportInfo demReportInfo = demReportMap.get(relatedCompanyId);
                 if (demReportInfo != null) {
-                    reportResult.setReportStatus(demReportInfo.getIsRead());
+                    reportResult.setReportStatus(demReportInfo.getReportStatus());
                     reportResult.setReadTime(demReportInfo.getReadTime());
+                    reportResult.setIsRead(demReportInfo.getIsRead());
                 }
             }
         }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemReportInfoRequestVO.java

@@ -0,0 +1,17 @@
+package com.usky.fire.service.vo;
+
+import lombok.Data;
+
+/**
+ *
+ * @author fyc
+ * @email yuchuan.fu@chinausky.com
+ * @date 2025/9/25
+ */
+@Data
+public class DemReportInfoRequestVO {
+    /**
+     * company表主键ID
+     */
+    private Integer id;
+}