art: 设备管理-执行维修详情接口修改

zhangherong

2025-06-02 4aea11bda27aa35b09972ef1bd370a1bee82ed9a

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

@@ -1,32 +1,31 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.ReportRepairEnum;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.request.EamRepairOrderRequest;
import org.jeecg.modules.eam.request.EamRepairOrderResponse;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
import org.jeecg.modules.eam.service.IEamRepairOrderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -45,6 +44,15 @@

    @Resource
    private IEamRepairOrderService eamRepairOrderService;

    @Resource
    private ObjectMapper objectMapper;

    @Resource
    private TranslateDictTextUtils translateDictTextUtils;

    @Resource
    private ISysUserService sysUserService;

    /**
     * 分页列表查询
@@ -77,23 +85,68 @@
        if (StringUtils.isBlank(eamRepairOrder.getReportId())) {
            return Result.error("领取失败,请选择维修记录！");
        }
        // 校验领取权限
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (!BusinessCodeConst.PCR0002.equals(user.getPost())) {
            return Result.error("领取失败,没有领取权限！");
        }
        eamRepairOrderService.saveRepairOrder(eamRepairOrder);
        return Result.OK("添加成功！");
    }

    /**
     * 执行维修
     * 指派
     *
     * @param eamRepairOrder
     * @param
     * @return
     */
    @AutoLog(value = "维修工单-执行")
    @ApiOperation(value = "维修工单-执行", notes = "维修工单-执行")
    @PostMapping(value = "/perform")
    public Result<?> perform(@RequestBody EamRepairOrder eamRepairOrder) {
    @AutoLog(value = "故障报修-指派")
    @ApiOperation(value = "故障报修-指派", notes = "故障报修-指派")
    @PostMapping(value = "/assign")
    public Result<?> assign(@RequestBody EamReportRepairQuery eamReportRepairQuery) {
        if (StringUtils.isBlank(eamReportRepairQuery.getRepairer())) {
            return Result.error("指派失败,请选择维修工！");
        }
        // 校验指派权限
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (!BusinessCodeConst.PCR0004.equals(user.getPost())) {
            return Result.error("指派失败,没有指派权限！");
        }
        // 校验维修工权限
        SysUser sysUser = sysUserService.getUserByName(eamReportRepairQuery.getRepairer());
        if (sysUser == null) {
            return Result.error("指派失败,未找到此维修工用户！");
        }
        if (!BusinessCodeConst.PCR0002.equals(sysUser.getPost())) {
            return Result.error("指派失败,此用户不是维修工！");
        }
        eamRepairOrderService.assign(eamReportRepairQuery);

//        eamRepairOrderService.updateById(eamRepairOrder);
        return Result.OK("执行成功!");
        return Result.OK("指派成功！");
    }

    /**
     * 我的待办 执行/审批
     *
     * @param request
     * @return
     */
    @AutoLog(value = "维修工单-执行/审批")
    @ApiOperation(value = "维修工单-执行/审批", notes = "维修工单-执行/审批")
    @PostMapping(value = "/perform")
    public Result<?> perform(@RequestBody EamRepairOrderRequest request) {
        if (request == null) {
            return Result.error("审批的对象不能为空！");
        }
        // 检查请求参数
        if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
            return Result.error("审批任务错误或不存在！");
        }
        EamRepairOrder b = eamRepairOrderService.perform(request);
        if(b == null) {
            return Result.error("操作失败！");
        }
        return Result.OK("操作成功!");
    }

    /**
@@ -106,8 +159,28 @@
    @ApiOperation(value = "维修工单-通过id查询", notes = "维修工单-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamRepairOrder eamRepairOrder = eamRepairOrderService.getById(id);
        return Result.OK(eamRepairOrder);
        EamRepairOrderResponse eamRepairOrder = eamRepairOrderService.findById(id);
        if (eamRepairOrder == null) {
            return Result.error("未找到对应数据！");
        }
        try {
            String json = objectMapper.writeValueAsString(eamRepairOrder);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("createBy", eamRepairOrder.getCreateBy(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("breakdownFlag", eamRepairOrder.getBreakdownFlag(), item, "breakdown_flag");
            translateDictTextUtils.translateField("faultType", eamRepairOrder.getFaultType(), item, "fault_reason_category");
            translateDictTextUtils.translateField("reportStatus", eamRepairOrder.getReportStatus(), item, "report_repair_status");
            translateDictTextUtils.translateField("equipmentId", eamRepairOrder.getEquipmentId(), item, "eam_equipment,equipment_code,id");
            translateDictTextUtils.translateField("installationPosition", eamRepairOrder.getEquipmentId(), item, "eam_equipment,installation_position,id");
            translateDictTextUtils.translateField("repairStatus", eamRepairOrder.getRepairStatus(), item, "report_repair_status");
            translateDictTextUtils.translateField("repairer", eamRepairOrder.getRepairer(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("repairerPhone", eamRepairOrder.getRepairer(), item, "sys_user,phone,username");
            translateDictTextUtils.translateField("reporter", eamRepairOrder.getReporter(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("reporterPhone", eamRepairOrder.getReporter(), item, "sys_user,phone,username");
            return Result.OK(item);
        } catch (Exception e) {
            return Result.error("数据转译失败！");
        }
    }

    /**