Merge branch 'mdc_hyjs_master'

zhangherong

2025-06-25 23855599412c4d61b38d78f0f3abd3430a48b5b1

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,139 @@
package org.jeecg.modules.tms.controller;

import java.util.List;
import java.util.Map;

import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.tms.entity.OutStoreDetail;
import org.jeecg.modules.tms.entity.ToolLedger;
import org.jeecg.modules.tms.entity.ToolSharpening;
import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
import org.jeecg.modules.tms.entity.vo.ToolSharpeningVo;
import org.jeecg.modules.tms.service.IToolsSharpeningService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

import javax.servlet.http.HttpServletRequest;

/**
 * @Description: åˆ€å…·åˆƒç£¨è®°å½• æŽ§åˆ¶å™¨
 * @Author: houjie
 * @Date:   2025-05-10
 */
@RestController
@RequestMapping("/tms/toolSharpening")
@Api(tags = "刀具刃磨记录管理")
public class ToolSharpeningController {

    @Autowired
    private IToolsSharpeningService toolSharpeningService;




    @ApiOperation(value="报损申请单明细-通过主表ID查询", notes="报损申请单明细-通过主表ID查询")
    @GetMapping(value = "/listToolSharpening")
    public Result<IPage<ToolSharpeningVo>> listToolSharpening(ToolSharpeningVo toolSharpeningVo,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                              HttpServletRequest req) {
        Map<String, String[]> parameterMap = req.getParameterMap();
        QueryWrapper<ToolSharpeningVo> queryWrapper = QueryGenerator.initQueryWrapper(toolSharpeningVo, parameterMap);
        Page<ToolSharpeningVo> page = new Page<ToolSharpeningVo>(pageNo, pageSize);
        IPage<ToolSharpeningVo> pageList = toolSharpeningService.queryPageList(page, parameterMap);
        return Result.OK(pageList);
    }

    /**
     * æŸ¥è¯¢æ‰€æœ‰æ•°æ®
     */
    @GetMapping("/all")
    @ApiOperation(value = "查询所有数据", notes = "查询所有数据")
    public Result<List<ToolSharpening>> queryAll() {
        List<ToolSharpening> list = toolSharpeningService.list();
        return Result.OK(list);
    }

    /**
     * æ ¹æ®ID查询
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "根据ID查询", notes = "根据ID查询")
    public Result<ToolSharpening> queryById(@PathVariable String id) {
        ToolSharpening entity = toolSharpeningService.getById(id);
        return Result.OK(entity);
    }


    @AutoLog(value = "tms_tool_sharpening-添加")
    @ApiOperation(value="tms_tool_sharpening-添加", notes="tms_tool_sharpening-添加")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody ToolSharpening toolSharpening) {
        toolSharpening.setSharpeningStatus("1");
        toolSharpeningService.save(toolSharpening);
        return Result.OK("添加成功！");
    }
//    /**
//     * ä¿®æ”¹
//     */
//    @PutMapping
//    @ApiOperation(value = "修改", notes = "修改")
//    public Result<ToolSharpening> edit(@RequestBody ToolSharpening toolSharpening) {
//        toolSharpeningService.updateById(toolSharpening);
//        return Result.OK(toolSharpening);
//    }

    /**
     *  ç¼–辑
     *
     * @param toolSharpening
     * @return
     */
    @AutoLog(value = "tms_tool_sharpening-编辑")
    @ApiOperation(value="tms_tool_sharpening-编辑", notes="tms_tool_sharpening-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody ToolSharpening toolSharpening) {
        toolSharpeningService.updateById(toolSharpening);
        return Result.OK("编辑成功!");
    }


    /**
     * åˆ é™¤
     */

    @AutoLog(value = "tms_tool_sharpening-通过id删除")
    @ApiOperation(value="tms_tool_sharpening-通过id删除", notes="tms_tool_sharpening-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        toolSharpeningService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * å·¥å…·å°è´¦-刃磨子页面列表查询
     *
     * @param toolSharpening
     * @param pageNo
     * @param pageSize
     * @param query
     * @return
     */
    @ApiOperation(value="工具台账-刃磨子页面列表查询", notes="工具台账-刃磨子页面列表查询")
    @GetMapping(value = "/toolSharpeningList")
    public Result<?> toolSharpeningList(ToolSharpening toolSharpening,
                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                        @RequestParam Map<String, String> query) {
        IPage<Map<String, Object>> pageList = toolSharpeningService.toolSharpeningList(pageNo,pageSize, query);
        return Result.OK(pageList);
    }
}