Lius
2024-01-15 e87017017b42d5b63ced3be743e2cf57c5bf0280
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
@@ -1,6 +1,6 @@
package org.jeecg.modules.mdc.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -11,7 +11,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
@@ -67,13 +66,13 @@
    @AutoLog(value = "设备表-分页列表查询")
    @ApiOperation(value = "设备表-分页列表查询", notes = "设备表-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<MdcEquipment>> queryPageList(MdcEquipment mdcEquipment,
    public Result<IPage<MdcEquipment>> queryPageList(MdcEquipmentVo mdcEquipment,
                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                     HttpServletRequest req) {
        QueryWrapper<MdcEquipment> queryWrapper = QueryGenerator.initQueryWrapper(mdcEquipment, req.getParameterMap());
        //QueryWrapper<MdcEquipment> queryWrapper = QueryGenerator.initQueryWrapper(mdcEquipment, req.getParameterMap());
        Page<MdcEquipment> page = new Page<MdcEquipment>(pageNo, pageSize);
        IPage<MdcEquipment> pageList = mdcEquipmentService.page(page, queryWrapper);
        IPage<MdcEquipment> pageList = mdcEquipmentService.pageList(page, mdcEquipment, req);
        //批量查询设备的所属部门和产线
        //step.1 先拿到全部的 equipmentIds
@@ -469,4 +468,32 @@
        MdcEquipment mdcEquipment = mdcEquipmentService.getEquipmentByDepPid(pid, userId);
        return Result.OK(mdcEquipment);
    }
    /**
     * 手动上报设备异常及说明
     * @return
     */
    @AutoLog(value = "设备表-手动上报设备异常及说明")
    @ApiOperation(value = "设备表-手动上报设备异常及说明", notes = "设备表-手动上报设备异常及说明")
    @PostMapping("/updateEquipmentStatus")
    public Result<?> updateEquipmentStatus(@RequestBody MdcEquipmentMonitor mdcEquipmentMonitor) {
        Result result = new Result<>();
        try {
            MdcEquipment mdcEquipment1 = mdcEquipmentService.getById(mdcEquipmentMonitor.getId());
            if (mdcEquipment1 == null) {
                result.error500("未找到对应实体");
            } else {
                LambdaUpdateWrapper<MdcEquipment> updateWrapper = new LambdaUpdateWrapper<MdcEquipment>();
                updateWrapper.eq(MdcEquipment::getId, mdcEquipmentMonitor.getId());
                updateWrapper.set(MdcEquipment::getEquipmentStatus, mdcEquipmentMonitor.getEquipmentStatus());
                updateWrapper.set(MdcEquipment::getEquipmentStatusRemark, mdcEquipmentMonitor.getEquipmentStatusRemark());
                mdcEquipmentService.update(updateWrapper);
                result.success("反馈成功!");
            }
        } catch (Exception e) {
            log.error(e.getMessage(), e);
            result.error500("操作失败");
        }
        return Result.OK("反馈成功!");
    }
}