恢复点(restore point)。别人改崩后可 git reset --hard 回到此提交。 == 此快照内容 == - 后端 oa-backend: 734 控制器 / 711 实体 (Spring Boot 3.2.5 + SQLite, 端口8091) - 前端 modern-ui/app: Vue3+Vite, 约700页 (构建产物已在 oa-backend/src/main/resources/static) - 数据库 oa-backend/data/oa.db: 含全部演示数据 (强制入库, 6.6MB) - 交接文档 go.md + go-code-reference/endpoints/entities/database.md - 多代理建设脚本 .claude/wf-*.js == 状态 == - 对 凯迪科技ERP_20260507.xlsx 合规 MET ~73.3% (PARTIAL 75: 34可建+6种子/bug+35外部硬天花板) - 安全: 5轮红队+5轮复检, default-deny分级鉴权, 连续零可利用 - W3~W7 累计补完436缺口; W8末轮(40缺口)为半成品(源码树可编译但未集成) - 运行: cd oa-backend; java -jar build/libs/oa-backend-0.1.0.jar --server.port=8091; admin/123456 == 排除(gitignore, 可再生) == node_modules / oa-backend/build / .jdks / *.log / Backup-ERP-* / 弃用的OFBiz核心(只保留modern-ui) 完整文件夹备份见同目录 Backup-ERP-20260615-191517/ (含上述全部, 仅缺 node_modules) 时间戳: 20260615-191517 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
117 lines
5.0 KiB
Java
117 lines
5.0 KiB
Java
package com.kaidi.oa.web;
|
|
|
|
import com.kaidi.oa.common.ApiException;
|
|
import com.kaidi.oa.common.ApiResp;
|
|
import com.kaidi.oa.common.NotFoundException;
|
|
import com.kaidi.oa.domain.LabInstrument;
|
|
import com.kaidi.oa.repository.LabInstrumentRepository;
|
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PutMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
import java.time.Instant;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Laboratory center (实验室) instruments and devices. status is one of 在用 /
|
|
* 维修 / 停用 / 待校准, defaulting to 在用 on create. calibrationDate and
|
|
* nextCalibration record the last and next calibration dates.
|
|
*/
|
|
@RestController
|
|
@RequestMapping("/api/oa/lab-instruments")
|
|
public class LabInstrumentController {
|
|
|
|
private final LabInstrumentRepository instrumentRepo;
|
|
|
|
public LabInstrumentController(LabInstrumentRepository instrumentRepo) {
|
|
this.instrumentRepo = instrumentRepo;
|
|
}
|
|
|
|
@GetMapping
|
|
public ApiResp<List<LabInstrument>> list(@RequestParam(required = false) String status) {
|
|
List<LabInstrument> list;
|
|
if (status != null && !status.isBlank()) {
|
|
list = instrumentRepo.findByStatus(status);
|
|
} else {
|
|
list = instrumentRepo.findAll();
|
|
}
|
|
return ApiResp.ok(list);
|
|
}
|
|
|
|
@GetMapping("/{id}")
|
|
public ApiResp<LabInstrument> get(@PathVariable Long id) {
|
|
return ApiResp.ok(instrumentRepo.findById(id)
|
|
.orElseThrow(() -> new NotFoundException("lab instrument not found: " + id)));
|
|
}
|
|
|
|
public record CreateLabInstrumentRequest(
|
|
String name, String model, String assetNo, String calibrationDate,
|
|
String nextCalibration, String status, String location, String manager,
|
|
String supplier, String commissionDate,
|
|
Integer calibrationCycleDays, Integer maintenanceCycleDays) {
|
|
}
|
|
|
|
@PostMapping
|
|
public ApiResp<LabInstrument> create(@RequestBody CreateLabInstrumentRequest req) {
|
|
if (req.name() == null || req.name().isBlank()) {
|
|
throw new ApiException(400, "name is required");
|
|
}
|
|
LabInstrument i = new LabInstrument();
|
|
i.setName(req.name());
|
|
i.setModel(req.model());
|
|
i.setAssetNo(req.assetNo());
|
|
i.setCalibrationDate(req.calibrationDate());
|
|
i.setNextCalibration(req.nextCalibration());
|
|
i.setStatus(req.status() == null || req.status().isBlank() ? "在用" : req.status());
|
|
i.setLocation(req.location());
|
|
i.setManager(req.manager());
|
|
i.setSupplier(req.supplier());
|
|
i.setCommissionDate(req.commissionDate());
|
|
i.setCalibrationCycleDays(req.calibrationCycleDays());
|
|
i.setMaintenanceCycleDays(req.maintenanceCycleDays());
|
|
i.setCreatedAt(Instant.now());
|
|
return ApiResp.ok(instrumentRepo.save(i));
|
|
}
|
|
|
|
/** PUT /{id} -> 编辑实验室仪器; 只覆盖请求体里给出的字段。 */
|
|
@PutMapping("/{id}")
|
|
public ApiResp<LabInstrument> update(@PathVariable Long id, @RequestBody CreateLabInstrumentRequest req) {
|
|
LabInstrument i = instrumentRepo.findById(id)
|
|
.orElseThrow(() -> new NotFoundException("lab instrument not found: " + id));
|
|
if (req.name() != null) {
|
|
if (req.name().isBlank()) {
|
|
throw new ApiException(400, "name is required");
|
|
}
|
|
i.setName(req.name());
|
|
}
|
|
if (req.model() != null) i.setModel(req.model());
|
|
if (req.assetNo() != null) i.setAssetNo(req.assetNo());
|
|
if (req.calibrationDate() != null) i.setCalibrationDate(req.calibrationDate());
|
|
if (req.nextCalibration() != null) i.setNextCalibration(req.nextCalibration());
|
|
if (req.status() != null && !req.status().isBlank()) i.setStatus(req.status());
|
|
if (req.location() != null) i.setLocation(req.location());
|
|
if (req.manager() != null) i.setManager(req.manager());
|
|
if (req.supplier() != null) i.setSupplier(req.supplier());
|
|
if (req.commissionDate() != null) i.setCommissionDate(req.commissionDate());
|
|
if (req.calibrationCycleDays() != null) i.setCalibrationCycleDays(req.calibrationCycleDays());
|
|
if (req.maintenanceCycleDays() != null) i.setMaintenanceCycleDays(req.maintenanceCycleDays());
|
|
return ApiResp.ok(instrumentRepo.save(i));
|
|
}
|
|
|
|
/** DELETE /{id} -> 删除实验室仪器。 */
|
|
@DeleteMapping("/{id}")
|
|
public ApiResp<Void> delete(@PathVariable Long id) {
|
|
if (!instrumentRepo.existsById(id)) {
|
|
throw new NotFoundException("lab instrument not found: " + id);
|
|
}
|
|
instrumentRepo.deleteById(id);
|
|
return ApiResp.ok(null);
|
|
}
|
|
}
|