Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

昨天 dbd7fd484b5c7ed00cb895f227645848c3677c08

 src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java

@@ -14,14 +14,14 @@
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;

@@ -30,22 +30,18 @@
 * @date : 2025/8/5 9:27
 */
@RestController
@Api(tags = "计量器具台账")
@Tag(name = "计量器具台账")
@RequestMapping("/measuringInstrumentLedger")
@AllArgsConstructor
public class MeasuringInstrumentLedgerController extends BaseController {

    @Autowired
    private MeasuringInstrumentLedgerService measuringInstrumentLedgerService;

    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
    private final MeasuringInstrumentLedgerService measuringInstrumentLedgerService;
    private final SysUserMapper sysUserMapper;
    private final MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;


    @GetMapping("/listPage")
    @ApiOperation("计量器具台账-分页查询")
    @Operation(summary = "计量器具台账-分页查询")
    @Log(title = "计量器具台账-分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
        IPage<MeasuringInstrumentLedger> listPage = measuringInstrumentLedgerService.listPage(page, measuringInstrumentLedger);
@@ -54,7 +50,7 @@


    @PostMapping("/add")
    @ApiOperation("计量器具台账-新增")
    @Operation(summary = "计量器具台账-新增")
    @Log(title = "计量器具台账-新增", businessType = BusinessType.INSERT)
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
@@ -66,7 +62,7 @@
    }

    @PostMapping("/update")
    @ApiOperation("计量器具台账-修改")
    @Operation(summary = "计量器具台账-修改")
    @Log(title = "计量器具台账-修改", businessType = BusinessType.UPDATE)
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
@@ -83,7 +79,7 @@
    }

    @DeleteMapping("/delete")
    @ApiOperation("计量器具台账-删除")
    @Operation(summary = "计量器具台账-删除")
    @Log(title = "计量器具台账-删除", businessType = BusinessType.DELETE)
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult delete(@RequestBody List<Long> ids) {
@@ -104,7 +100,7 @@
    }

    @PostMapping("/verifying")
    @ApiOperation("计量器具台账-检定")
    @Operation(summary = "计量器具台账-检定")
    @Log(title = "计量器具台账-检定", businessType = BusinessType.UPDATE)
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
@@ -117,7 +113,7 @@
     */
    @Log(title = "导出计量器具台账", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation("导出计量器具台账")
    @Operation(summary = "导出计量器具台账")
    public void export(HttpServletResponse response) {
        measuringInstrumentLedgerService.export( response);
    }