refactor: 按需求表收敛范围，撤销非需求模块，补齐售后回访闭环

xiaoyi

4 天以前 883f5e73fbe7458fd760dbe8560dd5d8757e04cd

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/em/record/MesEmRecordController.java

@@ -29,21 +29,25 @@
@Validated
public class MesEmRecordController {

    /**
     * 注意：字段名不能叫 recordService，否则 @Resource 会优先按名称匹配到
     * mzt-log 的 recordService（DefaultLogRecordServiceImpl），导致启动失败。
     */
    @Resource
    private MesEmRecordService recordService;
    private MesEmRecordService mesEmRecordService;

    @PostMapping("/create")
    @Operation(summary = "创建能耗抄表记录")
    @PreAuthorize("@ss.hasPermission('mes:em-record:create')")
    public CommonResult<Long> createRecord(@Valid @RequestBody MesEmRecordSaveReqVO createReqVO) {
        return success(recordService.createRecord(createReqVO));
        return success(mesEmRecordService.createRecord(createReqVO));
    }

    @PutMapping("/update")
    @Operation(summary = "更新能耗抄表记录")
    @PreAuthorize("@ss.hasPermission('mes:em-record:update')")
    public CommonResult<Boolean> updateRecord(@Valid @RequestBody MesEmRecordSaveReqVO updateReqVO) {
        recordService.updateRecord(updateReqVO);
        mesEmRecordService.updateRecord(updateReqVO);
        return success(true);
    }

@@ -52,39 +56,36 @@
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:em-record:delete')")
    public CommonResult<Boolean> deleteRecord(@RequestParam("id") Long id) {
        recordService.deleteRecord(id);
        mesEmRecordService.deleteRecord(id);
        return success(true);
    }

    @GetMapping("/get")
    @Operation(summary = "获得能耗抄表记录")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:em-record:query')")
    public CommonResult<MesEmRecordRespVO> getRecord(@RequestParam("id") Long id) {
        MesEmRecordDO record = recordService.getRecord(id);
        MesEmRecordDO record = mesEmRecordService.getRecord(id);
        if (record == null) {
            return success(null);
        }
        return success(recordService.getRecordRespVOList(Collections.singletonList(record)).get(0));
        return success(mesEmRecordService.getRecordRespVOList(Collections.singletonList(record)).get(0));
    }

    @GetMapping("/page")
    @Operation(summary = "获得能耗抄表记录分页")
    @PreAuthorize("@ss.hasPermission('mes:em-record:query')")
    public CommonResult<PageResult<MesEmRecordRespVO>> getRecordPage(@Valid MesEmRecordPageReqVO pageReqVO) {
        PageResult<MesEmRecordDO> pageResult = recordService.getRecordPage(pageReqVO);
        return success(new PageResult<>(recordService.getRecordRespVOList(pageResult.getList()),
        PageResult<MesEmRecordDO> pageResult = mesEmRecordService.getRecordPage(pageReqVO);
        return success(new PageResult<>(mesEmRecordService.getRecordRespVOList(pageResult.getList()),
                pageResult.getTotal()));
    }

    @GetMapping("/last-reading")
    @Operation(summary = "获得计量点上期读数", description = "用于新增抄表记录时自动带入期初读数")
    @PreAuthorize("@ss.hasPermission('mes:em-record:query')")
    public CommonResult<MesEmLastReadingRespVO> getLastReading(
            @RequestParam("meterId") Long meterId,
            @RequestParam("recordDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate recordDate,
            @RequestParam(value = "excludeId", required = false) Long excludeId) {
        return success(recordService.getLastReading(meterId, recordDate, excludeId));
        return success(mesEmRecordService.getLastReading(meterId, recordDate, excludeId));
    }

}