Merge remote-tracking branch 'origin/master'

zhangherong

13 小时以前 8b746e482fea845bd6d044d609acc2763783d0bd

Merge remote-tracking branch 'origin/master'

 src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java

@@ -148,10 +148,10 @@
     * @param response
     * @return
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, EamPrecisionParameters.class);
    }
        @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
        public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
            return super.importExcel(request, response, EamPrecisionParameters.class);
        }

    @ApiOperation(value = "精度参数维护-查询所有", notes = "精度参数维护-查询所有")
    @GetMapping(value = "/listAll")

 src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java

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

import cn.hutool.core.util.StrUtil;
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.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
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.vo.LoginUser;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamRepairOrder;
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 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 javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

/**
 * @Description: ç»´ä¿®å·¥å•
 * @Author: Lius
 * @Date: 2025-04-03
 */
@Slf4j
@Api(tags = "维修工单")
@RestController
@RequestMapping("/eam/eamRepairOrder")
public class EamRepairOrderController extends JeecgController<EamRepairOrder, IEamRepairOrderService> {

    @Resource
    private IEamRepairOrderService eamRepairOrderService;

    @Resource
    private ObjectMapper objectMapper;

    @Resource
    private TranslateDictTextUtils translateDictTextUtils;

    @Resource
    private ISysUserService sysUserService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamRepairOrderQuery
     * @param pageNo
     * @param pageSize
     * @return
     */
    @ApiOperation(value = "维修工单-分页列表查询", notes = "维修工单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamRepairOrderQuery eamRepairOrderQuery,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        Page<EamRepairOrder> page = new Page<EamRepairOrder>(pageNo, pageSize);
        IPage<EamRepairOrder> pageList = eamRepairOrderService.pageList(page, eamRepairOrderQuery);
        return Result.OK(pageList);
    }

    /**
     * é¢†å–
     *
     * @param eamRepairOrder
     * @return
     */
    @AutoLog(value = "维修工单-领取")
    @ApiOperation(value = "维修工单-领取", notes = "维修工单-领取")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamRepairOrder eamRepairOrder) {
        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
     * @return
     */
    @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);

        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("操作成功!");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "维修工单-通过id查询")
    @ApiOperation(value = "维修工单-通过id查询", notes = "维修工单-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        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,id,equipment_code");
            translateDictTextUtils.translateField("repairStatus", eamRepairOrder.getRepairStatus(), item, "report_repair_status");
            translateDictTextUtils.translateField("repairer", eamRepairOrder.getRepairer(), item, "sys_user,username,realname");
            return Result.OK(item);
        } catch (Exception e) {
            return Result.error("数据转译失败！");
        }
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param eamRepairOrder
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamRepairOrder eamRepairOrder) {
        return super.exportXls(request, eamRepairOrder, EamRepairOrder.class, "维修工单");
    }

}

 src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java

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

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.ReportRepairEnum;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

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

/**
 * @Description: æ•…障报修
 * @Author: Lius
 * @Date: 2025-04-01
 */
@Slf4j
@Api(tags = "故障报修")
@RestController
@RequestMapping("/eam/eamReportRepair")
public class EamReportRepairController extends JeecgController<EamReportRepair, IEamReportRepairService> {

    @Resource
    private IEamReportRepairService eamReportRepairService;

    @Resource
    private ObjectMapper objectMapper;

    @Resource
    private TranslateDictTextUtils translateDictTextUtils;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamReportRepairQuery
     * @param pageNo
     * @param pageSize
     * @return
     */
    @AutoLog(value = "故障报修-分页列表查询")
    @ApiOperation(value = "故障报修-分页列表查询", notes = "故障报修-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamReportRepairQuery eamReportRepairQuery,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        Page<EamReportRepair> page = new Page<EamReportRepair>(pageNo, pageSize);
        IPage<EamReportRepair> pageList = eamReportRepairService.pageList(page, eamReportRepairQuery);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param eamReportRepair
     * @return
     */
    @AutoLog(value = "故障报修-添加")
    @ApiOperation(value = "故障报修-添加", notes = "故障报修-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody EamReportRepair eamReportRepair) {
        EamReportRepair b = eamReportRepairService.add(eamReportRepair);
        if(b == null) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param eamReportRepair
     * @return
     */
    @AutoLog(value = "故障报修-编辑")
    @ApiOperation(value = "故障报修-编辑", notes = "故障报修-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamReportRepair eamReportRepair) {
        boolean b = eamReportRepairService.edit(eamReportRepair);
        if(!b) {
            return Result.error("编辑失败！");
        }
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id作废
     *
     * @param id
     * @return
     */
    @AutoLog(value = "故障报修-作废")
    @ApiOperation(value = "故障报修-作废", notes = "故障报修-作废")
    @DeleteMapping(value = "/abolish")
    public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
        eamReportRepairService.update(new LambdaUpdateWrapper<EamReportRepair>().set(EamReportRepair::getReportStatus, ReportRepairEnum.ABOLISH.name()).eq(EamReportRepair::getId, id).eq(EamReportRepair::getReportStatus, ReportRepairEnum.WAIT_REPAIR.name()));
        return Result.OK("作废成功!");
    }

    /**
     * æ‰¹é‡ä½œåºŸ
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "故障报修-批量作废")
    @ApiOperation(value = "故障报修-批量作废", notes = "故障报修-批量作废")
    @DeleteMapping(value = "/abolishBatch")
    public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
        List<EamReportRepair> eamReportRepairs = eamReportRepairService.listByIds(Arrays.asList(ids.split(",")));
        eamReportRepairs.forEach(eamReportRepair -> {
            if(ReportRepairEnum.ABOLISH.name().equals(eamReportRepair.getReportStatus())) {
                eamReportRepair.setReportStatus(ReportRepairEnum.ABOLISH.name());
            }
        });
        this.eamReportRepairService.updateBatchById(eamReportRepairs);
        return Result.OK("批量作废成功！");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "故障报修-通过id查询")
    @ApiOperation(value = "故障报修-通过id查询", notes = "故障报修-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamReportRepair eamReportRepair = eamReportRepairService.getById(id);
        if (eamReportRepair == null) {
            return Result.error("未找到对应数据！");
        }
        try {
            String json = objectMapper.writeValueAsString(eamReportRepair);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("createBy", eamReportRepair.getCreateBy(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("breakdownFlag", eamReportRepair.getBreakdownFlag(), item, "breakdown_flag");
            translateDictTextUtils.translateField("faultType", eamReportRepair.getFaultType(), item, "fault_reason_category");
            translateDictTextUtils.translateField("reportStatus", eamReportRepair.getReportStatus(), item, "report_repair_status");
            translateDictTextUtils.translateField("equipmentId", eamReportRepair.getEquipmentId(), item, "eam_equipment,id,equipment_code");
            return Result.OK(item);
        } catch (Exception e) {
            return Result.error("数据转译失败！");
        }
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param eamReportRepair
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamReportRepair eamReportRepair) {
        return super.exportXls(request, eamReportRepair, EamReportRepair.class, "故障报修");
    }

}