art: 设备台账-分页查询修改

zhangherong

2025-03-25 c2dbde3d4826946e7a40fff6efeb08547e4ab75a

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -8,11 +8,15 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -36,25 +40,26 @@
    @Autowired
    private IEamEquipmentService eamEquipmentService;

    @Autowired
    private IMdcEquipmentService mdcEquipmentService;

    /**
     * 分页列表查询
     *
     * @param eamEquipment
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "设备台账-分页列表查询")
//    @AutoLog(value = "设备台账-分页列表查询")
    @ApiOperation(value = "设备台账-分页列表查询", notes = "设备台账-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamEquipment eamEquipment,
    public Result<?> queryPageList(EamEquipmentQuery eamEquipment,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamEquipment> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipment, req.getParameterMap());
        Page<EamEquipment> page = new Page<EamEquipment>(pageNo, pageSize);
        IPage<EamEquipment> pageList = eamEquipmentService.page(page, queryWrapper);
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
//        QueryWrapper<EamEquipment> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipment, req.getParameterMap());
        IPage<EamEquipment> page = new Page<>(pageNo, pageSize);
        IPage<EamEquipment> pageList = eamEquipmentService.queryPageList(page, eamEquipment);
        return Result.OK(pageList);
    }

@@ -64,13 +69,22 @@
     * @param eamEquipment
     * @return
     */
    @AutoLog(value = "设备台账-添加")
//    @AutoLog(value = "设备台账-添加")
    @ApiOperation(value = "设备台账-添加", notes = "设备台账-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamEquipment eamEquipment) {
        EamEquipment entity = eamEquipmentService.saveEquipment(eamEquipment);
        if (entity == null) {
            Result.OK("添加失败！");
            return Result.OK("添加失败！");
        }
        //调用mdcEquipment插入MDC设备
        if(CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
            //插入MDC设备
            MdcEquipment mdcEquipment = new MdcEquipment();
            mdcEquipment.setEquipmentId(entity.getEquipmentCode());
            mdcEquipment.setEquipmentType(entity.getDeviceType());
            mdcEquipment.setEquipmentName(entity.getEquipmentName());
            mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
        }
        return Result.OK("添加成功！");
    }
@@ -81,7 +95,6 @@
     * @param eamEquipment
     * @return
     */
    @AutoLog(value = "设备台账-编辑")
    @ApiOperation(value = "设备台账-编辑", notes = "设备台账-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamEquipment eamEquipment) {
@@ -95,7 +108,6 @@
     * @param id
     * @return
     */
    @AutoLog(value = "设备台账-通过id删除")
    @ApiOperation(value = "设备台账-通过id删除", notes = "设备台账-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
@@ -109,7 +121,6 @@
     * @param ids
     * @return
     */
    @AutoLog(value = "设备台账-批量删除")
    @ApiOperation(value = "设备台账-批量删除", notes = "设备台账-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
@@ -123,7 +134,6 @@
     * @param id
     * @return
     */
    @AutoLog(value = "设备台账-通过id查询")
    @ApiOperation(value = "设备台账-通过id查询", notes = "设备台账-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -154,7 +164,6 @@
        return super.importExcel(request, response, EamEquipment.class);
    }

    @AutoLog(value = "设备表-通过车间ids获取设备树")
    @ApiOperation(value = "设备表-通过车间ids获取设备树", notes = "设备表-通过车间ids获取设备树")
    @GetMapping(value = "/loadTreeListByProductionIds")
    public Result<List<EamEquipmentTree>> loadTreeListByProductionIds(@RequestParam(name = "ids", required = true) String ids) {