diff --git a/wm-production/pom.xml b/wm-production/pom.xml
index d1a8893a..f81b1a8b 100644
--- a/wm-production/pom.xml
+++ b/wm-production/pom.xml
@@ -14,6 +14,5 @@
org.postgresqlpostgresql
com.alibabaeasyexcel
com.github.xiaoyminknife4j-openapi3-jakarta-spring-boot-starter
- org.springframework.bootspring-boot-starter-testtest
\ No newline at end of file
diff --git a/wm-production/src/main/java/com/water/production/controller/QualityLedgerController.java b/wm-production/src/main/java/com/water/production/controller/QualityLedgerController.java
index 1b69115e..af5049f5 100644
--- a/wm-production/src/main/java/com/water/production/controller/QualityLedgerController.java
+++ b/wm-production/src/main/java/com/water/production/controller/QualityLedgerController.java
@@ -1,5 +1,6 @@
package com.water.production.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.water.common.core.result.R;
import com.water.production.dto.QualityQueryRequest;
import com.water.production.dto.QualityStatVO;
@@ -11,21 +12,14 @@ import com.water.production.service.QualityStandardService;
import com.water.production.service.QualityTestPlanService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
-/**
- * 水质检测台账 Controller
- * 提供检测记录 CRUD、标准管理、检测计划、统计分析、数据导出等接口
- */
@Tag(name = "水质检测台账管理")
@RestController
@RequestMapping("/api/production/quality")
@@ -36,209 +30,173 @@ public class QualityLedgerController {
private final QualityStandardService standardService;
private final QualityTestPlanService planService;
- // ==================== 检测记录 CRUD ====================
+ // ==================== 记录 CRUD ====================
- // 1. 分页查询台账
- @Operation(summary = "分页查询水质检测台账")
+ @Operation(summary = "查询检测记录（分页）")
@GetMapping("/records")
- public R> listRecords(QualityQueryRequest request) {
+ public R> queryRecords(QualityQueryRequest request) {
return R.ok(ledgerService.queryRecords(request));
}
- // 2. 获取记录详情
@Operation(summary = "获取检测记录详情")
@GetMapping("/records/{id}")
public R getRecord(@PathVariable Long id) {
- QualityTestRecord record = ledgerService.getById(id);
- if (record == null) return R.fail(404, "记录不存在");
- return R.ok(record);
+ return R.ok(ledgerService.getById(id));
}
- // 3. 创建检测记录
- @Operation(summary = "创建水质检测记录 (自动合格判定)")
+ @Operation(summary = "创建检测记录")
@PostMapping("/records")
public R createRecord(@RequestBody QualityTestRecord record) {
return R.ok(ledgerService.create(record));
}
- // 4. 更新检测记录
- @Operation(summary = "更新检测记录 (重新合格判定)")
+ @Operation(summary = "更新检测记录")
@PutMapping("/records/{id}")
- public R updateRecord(@PathVariable Long id, @RequestBody QualityTestRecord record) {
- record.setId(id);
- ledgerService.update(record);
- return R.ok("更新成功");
+ public R updateRecord(@PathVariable Long id, @RequestBody QualityTestRecord record) {
+ return R.ok(ledgerService.update(id, record));
}
- // 5. 删除检测记录
@Operation(summary = "删除检测记录")
@DeleteMapping("/records/{id}")
- public R deleteRecord(@PathVariable Long id) {
+ public R deleteRecord(@PathVariable Long id) {
ledgerService.delete(id);
- return R.ok("删除成功");
+ return R.ok();
}
- // 6. 批量删除
@Operation(summary = "批量删除检测记录")
@DeleteMapping("/records/batch")
- public R batchDeleteRecords(@RequestBody List ids) {
+ public R batchDeleteRecords(@RequestBody List ids) {
ledgerService.batchDelete(ids);
- return R.ok("批量删除成功");
+ return R.ok();
}
- // 7. 重新判定合格状态
- @Operation(summary = "重新判定所有记录合格状态")
+ @Operation(summary = "重新判定所有记录")
@PostMapping("/records/reevaluate")
- public R> reevaluateRecords() {
+ public R> reevaluateAll() {
int count = ledgerService.reevaluateAll();
- return R.ok(Map.of("processed", count));
+ return R.ok(Map.of("updatedCount", count));
}
- // 8. 获取区域列表
- @Operation(summary = "获取所有检测区域")
+ // ==================== 辅助 ====================
+
+ @Operation(summary = "获取区域列表")
@GetMapping("/areas")
public R> getAreas() {
return R.ok(ledgerService.getAreaList());
}
- // 9. 获取采样点列表
- @Operation(summary = "获取所有采样点")
+ @Operation(summary = "获取采样点列表")
@GetMapping("/sampling-points")
public R> getSamplingPoints() {
return R.ok(ledgerService.getSamplingPointList());
}
- // ==================== 水质标准管理 ====================
+ // ==================== 标准 ====================
- // 10. 获取所有启用的标准
- @Operation(summary = "获取启用中的水质标准列表")
+ @Operation(summary = "获取启用的标准列表")
@GetMapping("/standards")
public R> listStandards() {
return R.ok(standardService.listEnabled());
}
- // 11. 获取全部标准 (含停用)
- @Operation(summary = "获取所有水质标准 (含停用)")
+ @Operation(summary = "获取全部标准")
@GetMapping("/standards/all")
public R> listAllStandards() {
return R.ok(standardService.listAll());
}
- // 12. 按水样类型获取标准
- @Operation(summary = "按水样类型获取水质标准")
+ @Operation(summary = "按水质类型获取标准")
@GetMapping("/standards/water-type/{waterType}")
public R> listStandardsByWaterType(@PathVariable String waterType) {
return R.ok(standardService.listByWaterType(waterType));
}
- // 13. 获取标准详情
- @Operation(summary = "获取水质标准详情")
+ @Operation(summary = "获取标准详情")
@GetMapping("/standards/{id}")
public R getStandard(@PathVariable Long id) {
- QualityStandard standard = standardService.getById(id);
- if (standard == null) return R.fail(404, "标准不存在");
- return R.ok(standard);
+ return R.ok(standardService.getById(id));
}
- // 14. 创建标准
- @Operation(summary = "创建水质标准")
+ @Operation(summary = "创建标准")
@PostMapping("/standards")
public R createStandard(@RequestBody QualityStandard standard) {
return R.ok(standardService.create(standard));
}
- // 15. 更新标准
- @Operation(summary = "更新水质标准")
+ @Operation(summary = "更新标准")
@PutMapping("/standards/{id}")
- public R updateStandard(@PathVariable Long id, @RequestBody QualityStandard standard) {
- standard.setId(id);
- standardService.update(standard);
- return R.ok("更新成功");
+ public R updateStandard(@PathVariable Long id, @RequestBody QualityStandard standard) {
+ return R.ok(standardService.update(id, standard));
}
- // 16. 删除标准
- @Operation(summary = "删除水质标准")
+ @Operation(summary = "删除标准")
@DeleteMapping("/standards/{id}")
- public R deleteStandard(@PathVariable Long id) {
+ public R deleteStandard(@PathVariable Long id) {
standardService.delete(id);
- return R.ok("删除成功");
+ return R.ok();
}
- // ==================== 检测计划管理 ====================
+ // ==================== 计划 ====================
- // 17. 分页查询检测计划
- @Operation(summary = "分页查询检测计划")
+ @Operation(summary = "查询检测计划（分页）")
@GetMapping("/plans")
- public R> listPlans(
- @RequestParam(required = false) String status,
- @RequestParam(required = false) String frequency,
- @RequestParam(required = false) String waterType,
- @RequestParam(required = false) String keyword,
+ public R> queryPlans(
@RequestParam(defaultValue = "1") int pageNum,
- @RequestParam(defaultValue = "20") int pageSize) {
- return R.ok(planService.queryPlans(status, frequency, waterType, keyword, pageNum, pageSize));
+ @RequestParam(defaultValue = "10") int pageSize,
+ @RequestParam(required = false) String testType,
+ @RequestParam(required = false) String waterType,
+ @RequestParam(required = false) String area,
+ @RequestParam(required = false) String status,
+ @RequestParam(required = false) String keyword) {
+ return R.ok(planService.queryPlans(pageNum, pageSize, testType, waterType, area, status, keyword));
}
- // 18. 获取计划详情
- @Operation(summary = "获取检测计划详情")
+ @Operation(summary = "获取计划详情")
@GetMapping("/plans/{id}")
public R getPlan(@PathVariable Long id) {
- QualityTestPlan plan = planService.getById(id);
- if (plan == null) return R.fail(404, "计划不存在");
- return R.ok(plan);
+ return R.ok(planService.getById(id));
}
- // 19. 创建检测计划
- @Operation(summary = "创建检测计划")
+ @Operation(summary = "创建计划")
@PostMapping("/plans")
public R createPlan(@RequestBody QualityTestPlan plan) {
return R.ok(planService.create(plan));
}
- // 20. 更新检测计划
- @Operation(summary = "更新检测计划")
+ @Operation(summary = "更新计划")
@PutMapping("/plans/{id}")
- public R updatePlan(@PathVariable Long id, @RequestBody QualityTestPlan plan) {
- plan.setId(id);
- planService.update(plan);
- return R.ok("更新成功");
+ public R updatePlan(@PathVariable Long id, @RequestBody QualityTestPlan plan) {
+ return R.ok(planService.update(id, plan));
}
- // 21. 删除检测计划
- @Operation(summary = "删除检测计划")
+ @Operation(summary = "删除计划")
@DeleteMapping("/plans/{id}")
- public R deletePlan(@PathVariable Long id) {
+ public R deletePlan(@PathVariable Long id) {
planService.delete(id);
- return R.ok("删除成功");
+ return R.ok();
}
- // 22. 暂停/恢复计划
- @Operation(summary = "切换检测计划状态 (active/paused/completed)")
+ @Operation(summary = "切换计划状态")
@PutMapping("/plans/{id}/status")
- public R togglePlanStatus(@PathVariable Long id, @RequestParam String status) {
- planService.toggleStatus(id, status);
- return R.ok("状态已更新");
+ public R togglePlanStatus(@PathVariable Long id) {
+ return R.ok(planService.toggleStatus(id));
}
- // 23. 获取到期计划
- @Operation(summary = "获取当前到期的检测计划")
+ @Operation(summary = "获取到期计划")
@GetMapping("/plans/due")
public R> getDuePlans() {
return R.ok(planService.getDuePlans());
}
- // 24. 标记计划已执行
- @Operation(summary = "标记检测计划已执行 (更新下次检测日期)")
+ @Operation(summary = "标记计划已执行")
@PostMapping("/plans/{id}/execute")
- public R markPlanExecuted(@PathVariable Long id) {
- planService.markExecuted(id);
- return R.ok("已标记执行");
+ public R markPlanExecuted(@PathVariable Long id) {
+ return R.ok(planService.markExecuted(id));
}
- // ==================== 统计分析 ====================
+ // ==================== 统计 ====================
- // 25. 综合统计
- @Operation(summary = "水质检测统计分析 (合格率/趋势/指标分布)")
+ @Operation(summary = "获取统计数据")
@GetMapping("/statistics")
public R getStatistics(
@RequestParam(required = false) String startDate,
@@ -246,18 +204,11 @@ public class QualityLedgerController {
return R.ok(ledgerService.getStatistics(startDate, endDate));
}
- // ==================== 数据导出 ====================
+ // ==================== 导出 ====================
- // 26. 导出 Excel
- @Operation(summary = "导出质检台账 Excel")
+ @Operation(summary = "导出Excel")
@PostMapping("/export/excel")
- public ResponseEntity exportExcel(@RequestBody QualityQueryRequest request) {
- byte[] data = ledgerService.exportExcel(request);
- String filename = URLEncoder.encode("水质检测台账.xlsx", StandardCharsets.UTF_8);
- return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + filename)
- .contentType(MediaType.parseMediaType(
- "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"))
- .body(data);
+ public void exportExcel(QualityQueryRequest request, HttpServletResponse response) throws IOException {
+ ledgerService.exportExcel(request, response);
}
}
diff --git a/wm-production/src/main/java/com/water/production/dto/QualityQueryRequest.java b/wm-production/src/main/java/com/water/production/dto/QualityQueryRequest.java
index ddb46aae..b342e236 100644
--- a/wm-production/src/main/java/com/water/production/dto/QualityQueryRequest.java
+++ b/wm-production/src/main/java/com/water/production/dto/QualityQueryRequest.java
@@ -3,47 +3,47 @@ package com.water.production.dto;
import lombok.Data;
/**
- * 水质检测台账查询请求
+ * 水质检测查询请求
*/
@Data
public class QualityQueryRequest {
- /** 检测类型: routine/special/complaint */
+ /** 检测类型 */
private String testType;
- /** 水样类型: raw/treated/network */
+ /** 水质类型 */
private String waterType;
- /** 所属区域 */
+ /** 区域 */
private String area;
- /** 采样点 (模糊搜索) */
+ /** 采样点 */
private String samplingPoint;
- /** 检测人 (模糊搜索) */
+ /** 检测人 */
private String tester;
- /** 合格状态: qualified/unqualified/pending */
+ /** 合格状态 */
private String complianceStatus;
- /** 开始日期 (yyyy-MM-dd) */
+ /** 开始日期 */
private String startDate;
- /** 结束日期 (yyyy-MM-dd) */
+ /** 结束日期 */
private String endDate;
- /** 关键词搜索 */
+ /** 关键字 */
private String keyword;
/** 排序字段 */
private String sortField;
- /** 排序方向: asc/desc */
+ /** 排序方向 */
private String sortOrder;
- /** 页码 (默认1) */
+ /** 页码 */
private Integer pageNum = 1;
- /** 每页条数 (默认20) */
- private Integer pageSize = 20;
+ /** 每页大小 */
+ private Integer pageSize = 10;
}
diff --git a/wm-production/src/main/java/com/water/production/dto/QualityStatVO.java b/wm-production/src/main/java/com/water/production/dto/QualityStatVO.java
index c0c3c3d9..4e3b19e8 100644
--- a/wm-production/src/main/java/com/water/production/dto/QualityStatVO.java
+++ b/wm-production/src/main/java/com/water/production/dto/QualityStatVO.java
@@ -2,18 +2,17 @@ package com.water.production.dto;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
- * 水质检测统计 VO
+ * 水质检测统计VO
*/
@Data
public class QualityStatVO {
- /** 总检测记录数 */
- private Long totalCount;
+ /** 总记录数 */
+ private Long totalRecords;
/** 合格数 */
private Long qualifiedCount;
@@ -24,21 +23,30 @@ public class QualityStatVO {
/** 待判定数 */
private Long pendingCount;
- /** 综合合格率 (%) */
- private BigDecimal qualifiedRate;
+ /** 合格率 */
+ private Double qualifiedRate;
- /** 各水样类型合格率 */
- private Map rateByWaterType;
+ /** 按水质类型统计 */
+ private List> byWaterType;
- /** 各区域合格率 */
- private Map rateByArea;
+ /** 按区域统计 */
+ private List> byArea;
- /** 各指标不合格次数 */
- private Map unqualifiedByParam;
+ /** 按检测类型统计 */
+ private List> byTestType;
- /** 月度合格率趋势 [{month, rate}] */
- private List> monthlyTrend;
+ /** 按日期趋势 */
+ private List> trendByDate;
- /** 各指标均值统计 */
- private Map> paramAvgStats;
+ /** 不合格项目统计 */
+ private List> unqualifiedItems;
+
+ /** 平均浊度 */
+ private Double avgTurbidity;
+
+ /** 平均pH */
+ private Double avgPh;
+
+ /** 平均余氯 */
+ private Double avgResidualChlorine;
}
diff --git a/wm-production/src/main/java/com/water/production/entity/QualityStandard.java b/wm-production/src/main/java/com/water/production/entity/QualityStandard.java
index 0cface9f..2a2202a4 100644
--- a/wm-production/src/main/java/com/water/production/entity/QualityStandard.java
+++ b/wm-production/src/main/java/com/water/production/entity/QualityStandard.java
@@ -3,11 +3,10 @@ package com.water.production.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
-import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
- * 水质标准实体 (基于 GB5749-2022)
+ * 水质标准
*/
@Data
@TableName("prod_quality_standard")
@@ -19,39 +18,36 @@ public class QualityStandard {
/** 标准名称 */
private String standardName;
- /** 标准编码 (如 GB5749-2022) */
+ /** 标准编号 */
private String standardCode;
- /** 参数名称: turbidity/ph/residual_chlorine/color/odor/ecoli/colony_count */
+ /** 参数名 */
private String paramName;
- /** 参数显示名称 */
+ /** 参数标签 */
private String paramLabel;
/** 参数单位 */
private String paramUnit;
- /** 最小值 (null 表示无下限) */
- private BigDecimal minValue;
+ /** 最小值 */
+ private Double minValue;
- /** 最大值 (null 表示无上限) */
- private BigDecimal maxValue;
+ /** 最大值 */
+ private Double maxValue;
- /** 适用水样类型: raw/treated/network/all */
+ /** 水质类型 */
private String waterType;
/** 是否启用 */
- private Integer enabled;
+ private Boolean enabled;
- /** 逻辑删除 */
@TableLogic
private Integer deleted;
- /** 创建时间 */
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createdAt;
- /** 更新时间 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updatedAt;
}
diff --git a/wm-production/src/main/java/com/water/production/entity/QualityTestPlan.java b/wm-production/src/main/java/com/water/production/entity/QualityTestPlan.java
index 07b52e04..8b2ab190 100644
--- a/wm-production/src/main/java/com/water/production/entity/QualityTestPlan.java
+++ b/wm-production/src/main/java/com/water/production/entity/QualityTestPlan.java
@@ -7,7 +7,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
/**
- * 水质检测计划实体
+ * 水质检测计划
*/
@Data
@TableName("prod_quality_test_plan")
@@ -19,34 +19,34 @@ public class QualityTestPlan {
/** 计划名称 */
private String planName;
- /** 检测类型: routine/special */
+ /** 检测类型 */
private String testType;
- /** 水样类型: raw/treated/network */
+ /** 水质类型 */
private String waterType;
/** 采样点 */
private String samplingPoint;
- /** 所属区域 */
+ /** 区域 */
private String area;
- /** 检测频率: daily/weekly/monthly */
+ /** 频率: daily/weekly/monthly */
private String frequency;
- /** 检测参数 (逗号分隔: turbidity,ph,residual_chlorine) */
+ /** 检测参数 (JSON数组) */
private String testParams;
- /** 计划开始日期 */
+ /** 开始日期 */
private LocalDate startDate;
- /** 计划结束日期 (null=长期) */
+ /** 结束日期 */
private LocalDate endDate;
/** 下次检测日期 */
private LocalDate nextTestDate;
- /** 计划状态: active/paused/completed */
+ /** 状态: active/paused/expired */
private String status;
/** 执行次数 */
@@ -55,15 +55,12 @@ public class QualityTestPlan {
/** 备注 */
private String remark;
- /** 逻辑删除 */
@TableLogic
private Integer deleted;
- /** 创建时间 */
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createdAt;
- /** 更新时间 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updatedAt;
}
diff --git a/wm-production/src/main/java/com/water/production/entity/QualityTestRecord.java b/wm-production/src/main/java/com/water/production/entity/QualityTestRecord.java
index 33357004..a6d2dd92 100644
--- a/wm-production/src/main/java/com/water/production/entity/QualityTestRecord.java
+++ b/wm-production/src/main/java/com/water/production/entity/QualityTestRecord.java
@@ -2,11 +2,14 @@ package com.water.production.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
-import java.math.BigDecimal;
+
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
+/**
+ * 水质检测记录
+ */
@Data
@TableName("prod_quality_test_record")
public class QualityTestRecord {
@@ -14,30 +17,63 @@ public class QualityTestRecord {
@TableId(type = IdType.AUTO)
private Long id;
- private String testType; // routine/special/complaint
- private String waterType; // raw/treated/network
+ /** 检测类型: routine/emergency/special */
+ private String testType;
+
+ /** 水质类型: rawWater/factoryWater/pipeNetworkWater/endUserWater */
+ private String waterType;
+
+ /** 采样点 */
private String samplingPoint;
+
+ /** 所属区域 */
private String area;
+
+ /** 检测日期 */
private LocalDate testDate;
+
+ /** 检测时间 */
private LocalTime testTime;
+
+ /** 检测人 */
private String tester;
- private BigDecimal turbidity;
- private BigDecimal ph;
- private BigDecimal residualChlorine;
- private BigDecimal color;
- private BigDecimal odor;
- private BigDecimal ecoli;
- private BigDecimal colonyCount;
- private String complianceStatus; // qualified/unqualified/pending
+
+ /** 浊度 (NTU) */
+ private Double turbidity;
+
+ /** pH值 */
+ private Double ph;
+
+ /** 余氯 (mg/L) */
+ private Double residualChlorine;
+
+ /** 色度 (度) */
+ private Double color;
+
+ /** 嗅味 */
+ private String odor;
+
+ /** 大肠杆菌 (CFU/100mL) */
+ private Double ecoli;
+
+ /** 菌落总数 (CFU/mL) */
+ private Double colonyCount;
+
+ /** 合格状态: qualified/unqualified/pending */
+ private String complianceStatus;
+
+ /** 不合格项目 (JSON) */
private String unqualifiedItems;
+
+ /** 备注 */
private String remark;
@TableLogic
private Integer deleted;
- @TableField("created_at")
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createdAt;
- @TableField("updated_at")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updatedAt;
}
diff --git a/wm-production/src/main/java/com/water/production/mapper/QualityTestRecordMapper.java b/wm-production/src/main/java/com/water/production/mapper/QualityTestRecordMapper.java
index c371d286..a8a01cf2 100644
--- a/wm-production/src/main/java/com/water/production/mapper/QualityTestRecordMapper.java
+++ b/wm-production/src/main/java/com/water/production/mapper/QualityTestRecordMapper.java
@@ -11,52 +11,58 @@ import java.util.Map;
@Mapper
public interface QualityTestRecordMapper extends BaseMapper {
- /** 分页查询台账 (支持多维度筛选) */
- List> selectRecordPage(@Param("testType") String testType,
- @Param("waterType") String waterType,
- @Param("area") String area,
- @Param("samplingPoint") String samplingPoint,
- @Param("tester") String tester,
- @Param("complianceStatus") String complianceStatus,
- @Param("startDate") String startDate,
- @Param("endDate") String endDate,
- @Param("keyword") String keyword,
- @Param("sortField") String sortField,
- @Param("sortOrder") String sortOrder,
- @Param("offset") int offset,
- @Param("limit") int limit);
+ List> selectRecordPage(
+ @Param("testType") String testType,
+ @Param("waterType") String waterType,
+ @Param("area") String area,
+ @Param("samplingPoint") String samplingPoint,
+ @Param("tester") String tester,
+ @Param("complianceStatus") String complianceStatus,
+ @Param("startDate") String startDate,
+ @Param("endDate") String endDate,
+ @Param("keyword") String keyword,
+ @Param("sortField") String sortField,
+ @Param("sortOrder") String sortOrder,
+ @Param("offset") int offset,
+ @Param("limit") int limit
+ );
- /** 统计符合条件的总数 */
- Long countRecords(@Param("testType") String testType,
- @Param("waterType") String waterType,
- @Param("area") String area,
- @Param("samplingPoint") String samplingPoint,
- @Param("tester") String tester,
- @Param("complianceStatus") String complianceStatus,
- @Param("startDate") String startDate,
- @Param("endDate") String endDate,
- @Param("keyword") String keyword);
+ Long countRecords(
+ @Param("testType") String testType,
+ @Param("waterType") String waterType,
+ @Param("area") String area,
+ @Param("samplingPoint") String samplingPoint,
+ @Param("tester") String tester,
+ @Param("complianceStatus") String complianceStatus,
+ @Param("startDate") String startDate,
+ @Param("endDate") String endDate,
+ @Param("keyword") String keyword
+ );
- /** 按合格状态统计数量 */
- List> statByComplianceStatus(@Param("startDate") String startDate,
- @Param("endDate") String endDate);
+ List> statByComplianceStatus(
+ @Param("startDate") String startDate,
+ @Param("endDate") String endDate
+ );
- /** 按水样类型统计合格率 */
- List> statRateByWaterType(@Param("startDate") String startDate,
- @Param("endDate") String endDate);
+ List> statRateByWaterType(
+ @Param("startDate") String startDate,
+ @Param("endDate") String endDate
+ );
- /** 按区域统计合格率 */
- List> statRateByArea(@Param("startDate") String startDate,
- @Param("endDate") String endDate);
+ List> statRateByArea(
+ @Param("startDate") String startDate,
+ @Param("endDate") String endDate
+ );
- /** 按指标统计不合格次数 */
- List> statUnqualifiedByParam(@Param("startDate") String startDate,
- @Param("endDate") String endDate);
+ List> statUnqualifiedByParam(
+ @Param("startDate") String startDate,
+ @Param("endDate") String endDate
+ );
- /** 月度合格率趋势 */
- List> statMonthlyTrend(@Param("startDate") String startDate,
- @Param("endDate") String endDate);
+ List> statMonthlyTrend(
+ @Param("startDate") String startDate,
+ @Param("endDate") String endDate
+ );
- /** 各指标均值统计 */
- List> statParamAvg();
+ Map statParamAvg();
}
diff --git a/wm-production/src/main/java/com/water/production/service/QualityLedgerService.java b/wm-production/src/main/java/com/water/production/service/QualityLedgerService.java
index 24b44eef..803af132 100644
--- a/wm-production/src/main/java/com/water/production/service/QualityLedgerService.java
+++ b/wm-production/src/main/java/com/water/production/service/QualityLedgerService.java
@@ -2,26 +2,25 @@ package com.water.production.service;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.common.core.exception.BusinessException;
import com.water.production.dto.QualityQueryRequest;
import com.water.production.dto.QualityStatVO;
import com.water.production.entity.QualityStandard;
import com.water.production.entity.QualityTestRecord;
import com.water.production.mapper.QualityTestRecordMapper;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
-/**
- * 水质检测台账管理服务
- * 包含：CRUD、合格判定、多维度查询、统计分析、数据导出
- */
@Slf4j
@Service
@RequiredArgsConstructor
@@ -30,10 +29,8 @@ public class QualityLedgerService {
private final QualityTestRecordMapper recordMapper;
private final QualityStandardService standardService;
- // ========== CRUD ==========
-
/**
- * 分页查询台账
+ * 分页查询检测记录
*/
public Map queryRecords(QualityQueryRequest request) {
int offset = (request.getPageNum() - 1) * request.getPageSize();
@@ -41,8 +38,7 @@ public class QualityLedgerService {
request.getTestType(), request.getWaterType(), request.getArea(),
request.getSamplingPoint(), request.getTester(), request.getComplianceStatus(),
request.getStartDate(), request.getEndDate(), request.getKeyword(),
- request.getSortField(), request.getSortOrder(),
- offset, request.getPageSize()
+ request.getSortField(), request.getSortOrder(), offset, request.getPageSize()
);
Long total = recordMapper.countRecords(
request.getTestType(), request.getWaterType(), request.getArea(),
@@ -50,366 +46,266 @@ public class QualityLedgerService {
request.getStartDate(), request.getEndDate(), request.getKeyword()
);
- int pages = (int) Math.ceil((double) total / request.getPageSize());
- return Map.of(
- "records", records,
- "total", total,
- "pageNum", request.getPageNum(),
- "pageSize", request.getPageSize(),
- "pages", pages
- );
+ Map result = new LinkedHashMap<>();
+ result.put("records", records);
+ result.put("total", total);
+ result.put("pageNum", request.getPageNum());
+ result.put("pageSize", request.getPageSize());
+ result.put("totalPages", (total + request.getPageSize() - 1) / request.getPageSize());
+ return result;
}
/**
* 获取记录详情
*/
public QualityTestRecord getById(Long id) {
- return recordMapper.selectById(id);
- }
-
- /**
- * 创建检测记录 (含自动合格判定)
- */
- public QualityTestRecord create(QualityTestRecord record) {
- record.setDeleted(0);
- // 自动合格判定
- evaluateCompliance(record);
- recordMapper.insert(record);
+ QualityTestRecord record = recordMapper.selectById(id);
+ if (record == null) {
+ throw new BusinessException("检测记录不存在");
+ }
return record;
}
/**
- * 更新检测记录 (重新判定)
+ * 创建检测记录（自动合格判定）
*/
- public void update(QualityTestRecord record) {
+ @Transactional
+ public QualityTestRecord create(QualityTestRecord record) {
+ if (record.getTestDate() == null) record.setTestDate(LocalDate.now());
evaluateCompliance(record);
- recordMapper.updateById(record);
+ recordMapper.insert(record);
+ log.info("创建水质检测记录: {}/{}", record.getWaterType(), record.getSamplingPoint());
+ return record;
}
/**
- * 删除检测记录 (逻辑删除)
+ * 更新检测记录
*/
+ @Transactional
+ public QualityTestRecord update(Long id, QualityTestRecord record) {
+ QualityTestRecord existing = getById(id);
+ record.setId(existing.getId());
+ evaluateCompliance(record);
+ recordMapper.updateById(record);
+ log.info("更新水质检测记录: {}", id);
+ return recordMapper.selectById(id);
+ }
+
+ /**
+ * 删除检测记录
+ */
+ @Transactional
public void delete(Long id) {
+ getById(id);
recordMapper.deleteById(id);
+ log.info("删除水质检测记录: {}", id);
}
/**
* 批量删除
*/
+ @Transactional
public void batchDelete(List ids) {
+ if (ids == null || ids.isEmpty()) return;
recordMapper.deleteBatchIds(ids);
+ log.info("批量删除水质检测记录: {} 条", ids.size());
}
- // ========== 合格判定 ==========
-
/**
- * 根据 GB5749-2022 自动判定水质是否合格
- * 比对所有检测参数与标准值，任何一项超标即为不合格
+ * 对记录执行合格判定
*/
public void evaluateCompliance(QualityTestRecord record) {
- String waterType = record.getWaterType();
- if (waterType == null) waterType = "treated";
+ if (record.getWaterType() == null) {
+ record.setComplianceStatus("pending");
+ return;
+ }
- List unqualifiedItems = new ArrayList<>();
+ List unqualified = new ArrayList<>();
- checkParam("turbidity", "浊度", record.getTurbidity(), waterType, unqualifiedItems);
- checkParam("ph", "pH", record.getPh(), waterType, unqualifiedItems);
- checkParam("residual_chlorine", "余氯", record.getResidualChlorine(), waterType, unqualifiedItems);
- checkParam("color", "色度", record.getColor(), waterType, unqualifiedItems);
- checkParam("odor", "嗅味", record.getOdor(), waterType, unqualifiedItems);
- checkParam("ecoli", "大肠杆菌", record.getEcoli(), waterType, unqualifiedItems);
- checkParam("colony_count", "菌落总数", record.getColonyCount(), waterType, unqualifiedItems);
+ checkParam(record.getWaterType(), "turbidity", record.getTurbidity(), "浊度", unqualified);
+ checkParam(record.getWaterType(), "ph", record.getPh(), "pH", unqualified);
+ checkParam(record.getWaterType(), "residualChlorine", record.getResidualChlorine(), "余氯", unqualified);
+ checkParam(record.getWaterType(), "color", record.getColor(), "色度", unqualified);
+ checkParam(record.getWaterType(), "ecoli", record.getEcoli(), "大肠杆菌", unqualified);
+ checkParam(record.getWaterType(), "colonyCount", record.getColonyCount(), "菌落总数", unqualified);
- if (unqualifiedItems.isEmpty()) {
+ if (unqualified.isEmpty()) {
record.setComplianceStatus("qualified");
record.setUnqualifiedItems(null);
} else {
record.setComplianceStatus("unqualified");
- // 构建不合格项JSON
- record.setUnqualifiedItems(buildUnqualifiedJson(unqualifiedItems));
+ record.setUnqualifiedItems("[\"" + String.join("\",\"", unqualified) + "\"]");
}
}
- private void checkParam(String paramName, String paramLabel, BigDecimal value,
- String waterType, List unqualifiedItems) {
+ private void checkParam(String waterType, String paramName, Double value, String label,
+ List unqualified) {
if (value == null) return;
-
QualityStandard standard = standardService.getStandard(waterType, paramName);
- if (standard == null) return; // 无标准则不判定
-
- boolean isUnqualified = false;
- if (standard.getMinValue() != null && value.compareTo(standard.getMinValue()) < 0) {
- isUnqualified = true;
+ if (standard == null) return;
+ if (standard.getMinValue() != null && value < standard.getMinValue()) {
+ unqualified.add(label + "(偏低)");
}
- if (standard.getMaxValue() != null && value.compareTo(standard.getMaxValue()) > 0) {
- isUnqualified = true;
+ if (standard.getMaxValue() != null && value > standard.getMaxValue()) {
+ unqualified.add(label + "(偏高)");
}
-
- if (isUnqualified) {
- String range = buildRangeDesc(standard);
- unqualifiedItems.add(String.format(
- "{\"param\":\"%s\",\"label\":\"%s\",\"value\":%s,\"range\":\"%s\",\"unit\":\"%s\"}",
- paramName, paramLabel, value.toPlainString(), range,
- standard.getParamUnit() != null ? standard.getParamUnit() : ""
- ));
- }
- }
-
- private String buildRangeDesc(QualityStandard std) {
- if (std.getMinValue() != null && std.getMaxValue() != null) {
- return std.getMinValue().toPlainString() + "~" + std.getMaxValue().toPlainString();
- } else if (std.getMinValue() != null) {
- return "≥" + std.getMinValue().toPlainString();
- } else if (std.getMaxValue() != null) {
- return "≤" + std.getMaxValue().toPlainString();
- }
- return "无限制";
- }
-
- private String buildUnqualifiedJson(List items) {
- return "[" + String.join(",", items) + "]";
}
/**
- * 手动重新判定所有记录
+ * 重新判定所有记录
*/
+ @Transactional
public int reevaluateAll() {
- List records = recordMapper.selectList(
- new LambdaQueryWrapper().eq(QualityTestRecord::getDeleted, 0)
- );
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.in(QualityTestRecord::getComplianceStatus, "pending", "qualified", "unqualified");
+ List records = recordMapper.selectList(wrapper);
int count = 0;
for (QualityTestRecord record : records) {
+ String oldStatus = record.getComplianceStatus();
evaluateCompliance(record);
- recordMapper.updateById(record);
- count++;
+ if (!oldStatus.equals(record.getComplianceStatus())) {
+ recordMapper.updateById(record);
+ count++;
+ }
}
+ log.info("重新判定完成，共 {} 条记录状态变更", count);
return count;
}
- // ========== 统计分析 ==========
-
/**
- * 综合统计
+ * 获取统计数据
*/
public QualityStatVO getStatistics(String startDate, String endDate) {
- QualityStatVO stat = new QualityStatVO();
+ QualityStatVO vo = new QualityStatVO();
// 按合格状态统计
List> statusStats = recordMapper.statByComplianceStatus(startDate, endDate);
long total = 0, qualified = 0, unqualified = 0, pending = 0;
for (Map row : statusStats) {
- long count = ((Number) row.get("count")).longValue();
- total += count;
- String status = (String) row.get("status");
- if ("qualified".equals(status)) qualified = count;
- else if ("unqualified".equals(status)) unqualified = count;
- else if ("pending".equals(status)) pending = count;
+ String status = String.valueOf(row.get("status"));
+ long cnt = ((Number) row.get("count")).longValue();
+ total += cnt;
+ switch (status) {
+ case "qualified" -> qualified = cnt;
+ case "unqualified" -> unqualified = cnt;
+ case "pending" -> pending = cnt;
+ }
}
- stat.setTotalCount(total);
- stat.setQualifiedCount(qualified);
- stat.setUnqualifiedCount(unqualified);
- stat.setPendingCount(pending);
- stat.setQualifiedRate(total > 0
- ? BigDecimal.valueOf(qualified * 100.0 / total).setScale(1, RoundingMode.HALF_UP)
- : BigDecimal.ZERO);
+ vo.setTotalRecords(total);
+ vo.setQualifiedCount(qualified);
+ vo.setUnqualifiedCount(unqualified);
+ vo.setPendingCount(pending);
+ vo.setQualifiedRate(total > 0 ? Math.round(qualified * 10000.0 / total) / 100.0 : 0.0);
- // 按水样类型合格率
- List> waterTypeStats = recordMapper.statRateByWaterType(startDate, endDate);
- Map rateByWaterType = new LinkedHashMap<>();
- for (Map row : waterTypeStats) {
- String wt = (String) row.get("waterType");
- long t = ((Number) row.get("total")).longValue();
- long q = ((Number) row.get("qualified")).longValue();
- rateByWaterType.put(wt, t > 0
- ? BigDecimal.valueOf(q * 100.0 / t).setScale(1, RoundingMode.HALF_UP)
- : BigDecimal.ZERO);
- }
- stat.setRateByWaterType(rateByWaterType);
+ // 按水质类型
+ vo.setByWaterType(recordMapper.statRateByWaterType(startDate, endDate));
- // 按区域合格率
- List> areaStats = recordMapper.statRateByArea(startDate, endDate);
- Map rateByArea = new LinkedHashMap<>();
- for (Map row : areaStats) {
- String area = (String) row.get("area");
- long t = ((Number) row.get("total")).longValue();
- long q = ((Number) row.get("qualified")).longValue();
- rateByArea.put(area, t > 0
- ? BigDecimal.valueOf(q * 100.0 / t).setScale(1, RoundingMode.HALF_UP)
- : BigDecimal.ZERO);
- }
- stat.setRateByArea(rateByArea);
+ // 按区域
+ vo.setByArea(recordMapper.statRateByArea(startDate, endDate));
- // 不合格项统计
- List> unqStats = recordMapper.statUnqualifiedByParam(startDate, endDate);
- Map unqByParam = new LinkedHashMap<>();
- for (Map row : unqStats) {
- unqByParam.put((String) row.get("paramName"), ((Number) row.get("count")).longValue());
- }
- stat.setUnqualifiedByParam(unqByParam);
+ // 按检测类型
+ vo.setByTestType(recordMapper.statByComplianceStatus(startDate, endDate));
// 月度趋势
- List> trend = recordMapper.statMonthlyTrend(startDate, endDate);
- stat.setMonthlyTrend(trend);
+ vo.setTrendByDate(recordMapper.statMonthlyTrend(startDate, endDate));
- // 各指标均值
- List> avgStats = recordMapper.statParamAvg();
- if (!avgStats.isEmpty()) {
- stat.setParamAvgStats(avgStats.get(0).entrySet().stream()
- .collect(Collectors.toMap(Map.Entry::getKey,
- e -> Map.of("avg", e.getValue() != null ? e.getValue() : 0))));
+ // 不合格项
+ vo.setUnqualifiedItems(recordMapper.statUnqualifiedByParam(startDate, endDate));
+
+ // 参数均值
+ Map avgMap = recordMapper.statParamAvg();
+ if (avgMap != null) {
+ vo.setAvgTurbidity(toDouble(avgMap.get("avgTurbidity")));
+ vo.setAvgPh(toDouble(avgMap.get("avgPh")));
+ vo.setAvgResidualChlorine(toDouble(avgMap.get("avgResidualChlorine")));
}
- return stat;
+ return vo;
}
- // ========== 数据导出 ==========
+ private Double toDouble(Object val) {
+ if (val == null) return null;
+ if (val instanceof Number) return ((Number) val).doubleValue();
+ return null;
+ }
/**
- * 导出 Excel
+ * 导出Excel
*/
- public byte[] exportExcel(QualityQueryRequest request) {
- // 获取全部数据 (最多10000条)
- int offset = 0;
- List> records = recordMapper.selectRecordPage(
- request.getTestType(), request.getWaterType(), request.getArea(),
- request.getSamplingPoint(), request.getTester(), request.getComplianceStatus(),
- request.getStartDate(), request.getEndDate(), request.getKeyword(),
- "testDate", "desc", offset, 10000
+ public void exportExcel(QualityQueryRequest request, HttpServletResponse response) throws IOException {
+ request.setPageNum(1);
+ request.setPageSize(100000);
+ Map result = queryRecords(request);
+ @SuppressWarnings("unchecked")
+ List> records = (List>) result.get("records");
+
+ List> excelData = records.stream().map(r -> {
+ List row = new ArrayList<>();
+ row.add(String.valueOf(r.getOrDefault("testType", "")));
+ row.add(String.valueOf(r.getOrDefault("waterType", "")));
+ row.add(String.valueOf(r.getOrDefault("samplingPoint", "")));
+ row.add(String.valueOf(r.getOrDefault("area", "")));
+ row.add(String.valueOf(r.getOrDefault("testDate", "")));
+ row.add(String.valueOf(r.getOrDefault("tester", "")));
+ row.add(String.valueOf(r.getOrDefault("turbidity", "")));
+ row.add(String.valueOf(r.getOrDefault("ph", "")));
+ row.add(String.valueOf(r.getOrDefault("residualChlorine", "")));
+ row.add(String.valueOf(r.getOrDefault("color", "")));
+ row.add(String.valueOf(r.getOrDefault("odor", "")));
+ row.add(String.valueOf(r.getOrDefault("ecoli", "")));
+ row.add(String.valueOf(r.getOrDefault("colonyCount", "")));
+ row.add(String.valueOf(r.getOrDefault("complianceStatus", "")));
+ row.add(String.valueOf(r.getOrDefault("unqualifiedItems", "")));
+ row.add(String.valueOf(r.getOrDefault("remark", "")));
+ return row;
+ }).collect(Collectors.toList());
+
+ List> head = List.of(
+ List.of("检测类型"), List.of("水质类型"), List.of("采样点"), List.of("区域"),
+ List.of("检测日期"), List.of("检测人"), List.of("浊度"), List.of("pH"),
+ List.of("余氯"), List.of("色度"), List.of("嗅味"), List.of("大肠杆菌"),
+ List.of("菌落总数"), List.of("合格状态"), List.of("不合格项"), List.of("备注")
);
- if (records.isEmpty()) return new byte[0];
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setHeader("Content-Disposition",
+ "attachment;filename=" + URLEncoder.encode("水质检测报告.xlsx", StandardCharsets.UTF_8));
- List> head = buildExportHead();
- List> data = buildExportData(records);
-
- try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
- EasyExcel.write(bos)
- .sheet("水质检测台账")
- .head(head)
- .doWrite(data);
- return bos.toByteArray();
- } catch (IOException e) {
- log.error("Excel 导出失败", e);
- throw new RuntimeException("Excel 导出失败: " + e.getMessage());
- }
+ EasyExcel.write(response.getOutputStream())
+ .head(head)
+ .sheet("检测记录")
+ .doWrite(excelData.stream().map(row -> (List