art: 设备管理-设备处置 借用归还 代码优化

zhangherong

2025-05-19 7ed9bc6d11e9134d563ebafff071b5ebb65910e3

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

@@ -1,14 +1,19 @@
package org.jeecg.modules.eam.controller;

import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
@@ -17,11 +22,10 @@
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: 设备借出归还
@@ -38,6 +42,10 @@
    private IEamEquipmentLeanOutService eamEquipmentLeanOutService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;

    /**
     * 分页列表查询
@@ -75,6 +83,7 @@
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.LEAN_OUT_CODE_RULE);
        request.setCode(codeSeq);
        request.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name());
        request.setDelFlag(CommonConstant.DEL_FLAG_0);
        boolean b = eamEquipmentLeanOutService.addLeanOut(request);
        if (!b) {
            return Result.error("添加失败！");
@@ -93,7 +102,7 @@
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamEquipmentLeanOut request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
            return Result.error("编辑的对象不能为空！");
        }
        boolean b = eamEquipmentLeanOutService.editLeanOut(request);
        if (!b) {
@@ -112,7 +121,11 @@
    @ApiOperation(value = "设备借出归还-通过id删除", notes = "设备借出归还-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        eamEquipmentLeanOutService.removeById(id);
        EamEquipmentLeanOut entity = eamEquipmentLeanOutService.getById(id);
        if (entity != null) {
            entity.setDelFlag(CommonConstant.DEL_FLAG_1);
            eamEquipmentLeanOutService.updateById(entity);
        }
        return Result.OK("删除成功!");
    }

@@ -126,7 +139,14 @@
    @ApiOperation(value = "设备借出归还-批量删除", notes = "设备借出归还-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.eamEquipmentLeanOutService.removeByIds(Arrays.asList(ids.split(",")));
        List<String> list = Arrays.asList(ids.split(","));
        list.forEach(id -> {
            EamEquipmentLeanOut entity = eamEquipmentLeanOutService.getById(id);
            if (entity != null) {
                entity.setDelFlag(CommonConstant.DEL_FLAG_1);
                eamEquipmentLeanOutService.updateById(entity);
            }
        });
        return Result.OK("批量删除成功！");
    }

@@ -141,7 +161,18 @@
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamEquipmentLeanOut eamEquipmentLeanOut = eamEquipmentLeanOutService.getById(id);
        return Result.OK(eamEquipmentLeanOut);
        if (eamEquipmentLeanOut == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamEquipmentLeanOut);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("leanDepartId", eamEquipmentLeanOut.getLeanDepartId(), item, "mdc_production,production_name,id");
            translateDictTextUtils.translateField("leanPerson", eamEquipmentLeanOut.getLeanPerson(), item, "sys_user,realname,username");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }

    /**
@@ -156,9 +187,29 @@
    public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
        boolean b = eamEquipmentLeanOutService.submit(id);
        if (!b) {
            return Result.error("编辑失败！");
            return Result.error("操作失败！");
        }
        return Result.OK("删除成功!");
        return Result.OK("操作成功!");
    }

    /**
     * 编辑
     *
     * @param request
     * @return
     */
    @AutoLog(value = "设备借出归还-审批流")
    @ApiOperation(value = "设备借出归还-审批流", notes = "设备借出归还-审批流")
    @RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> approval(@RequestBody EamEquipmentLeanOut request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        EamEquipmentLeanOut entity = eamEquipmentLeanOutService.approval(request);
        if (entity == null) {
            return Result.error("操作失败！");
        }
        return Result.OK("操作成功!");
    }

}