Lius
2025-04-22 561313b5a3b1b6b3c0214eb5d16795ce36ab07de
Merge remote-tracking branch 'origin/master'
已修改3个文件
437 ■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java 406 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -187,6 +187,8 @@
            params.setTitleRows(0);
            params.setHeadRows(1);
            params.setNeedSave(true);
            params.setStartSheetIndex(0);
            params.setSheetNum(1);
            try {
                List<EamEquipment> list = ExcelImportUtil.importExcel(file.getInputStream(), EamEquipment.class, params);
                //update-begin-author:taoyan date:20190528 for:批量插入数据
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -31,209 +31,213 @@
/**
 * @Description: 点检工单
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Date: 2025-04-02
 * @Version: V1.0
 */
@Api(tags="点检工单")
@Api(tags = "点检工单")
@RestController
@RequestMapping("/eam/eamInspectionOrder")
@Slf4j
public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
     @Autowired
     private IEamInspectionOrderService eamInspectionOrderService;
     @Autowired
     private ISysBusinessCodeRuleService businessCodeRuleService;
     @Autowired
     private ObjectMapper objectMapper;
     @Autowired
     private TranslateDictTextUtils translateDictTextUtils;
    /**
     * 分页列表查询
     *
     * @param query
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "点检工单-分页列表查询")
    @ApiOperation(value="点检工单-分页列表查询", notes="点检工单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,
                                                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                           HttpServletRequest req) {
//        QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
        Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
        IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query);
        return Result.OK(pageList);
    }
     /**
      * 查询点检工单基本信息
      * @param id
      * @return
      */
     @ApiOperation(value = "查询点检工单基本信息", notes = "查询点检工单基本信息")
     @GetMapping(value = "/selectVoById")
     public Result<?> selectVoById(@RequestParam(name="id") String id){
         return eamInspectionOrderService.selectVoById(id);
     }
    /**
     *   添加
     *
     * @param eamInspectionOrderRequest
     * @return
     */
    @AutoLog(value = "点检工单-添加")
    @ApiOperation(value="点检工单-添加", notes="点检工单-添加")
    //@RequiresPermissions("org.jeecg.modules:点检工单:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
        eamInspectionOrderRequest.setOrderNum(codeSeq);
        eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));
        eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
        return Result.OK("添加成功!");
    }
    /**
     *  编辑
     *
     * @param eamInspectionOrderRequest
     * @return
     */
    @AutoLog(value = "点检工单-编辑")
    @ApiOperation(value="点检工单-编辑", notes="点检工单-编辑")
    //@RequiresPermissions("org.jeecg.modules:点检工单:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
        eamInspectionOrderService.editInspectionOrder(eamInspectionOrderRequest);
        return Result.OK("编辑成功!");
    }
     /**
      * 领取点检工单
      * @param id
      * @return
      */
     @AutoLog(value = "点检工单-领取点检工单")
     @ApiOperation(value="点检工单-领取点检工单", notes="点检工单-领取点检工单")
     @GetMapping(value = "/receiveInspectionOrder")
     public Result<String> receiveInspectionOrder(@RequestParam(name="id") String id) {
         eamInspectionOrderService.takeInspectionOrder(id);
         return Result.OK("领取成功");
     }
     /**
      * 作废点检工单
      * @param id
      * @return
      */
     @AutoLog(value = "点检工单-作废点检工单")
     @ApiOperation(value="点检工单-作废点检工单", notes="点检工单-作废点检工单")
     @GetMapping(value = "/cancelInspectionOrder")
     public Result<String> cancelInspectionOrder(@RequestParam(name="id") String id) {
         eamInspectionOrderService.cancelInspectionOrder(id);
         return Result.OK("作废成功");
     }
     /**
      * 批量作废与领取
      * @param ids
      * @param type
      * @return
      */
     @AutoLog(value = "点检工单-批量作废与领取")
     @ApiOperation(value="点检工单-批量作废与领取", notes="点检工单-批量作废与领取")
     @GetMapping(value = "/cancelOrReceive")
     public Result<?> cancelOrReceive(@RequestParam(name="ids") String ids, @RequestParam(name="type") String type) {
         return eamInspectionOrderService.batchCancelOrTakeInspectionOrder(ids, type);
     }
     /**
      * 点检流程
      * @param eamInspectionOrderRequest
      * @return
      */
     @AutoLog(value = "点检流程")
     @ApiOperation(value="点检工单-点检流程", notes="点检工单-点检流程")
     @PostMapping("/approval")
     public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
         eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
         return Result.OK("操作成功");
     }
    /**
     *   通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "点检工单-通过id删除")
    @ApiOperation(value="点检工单-通过id删除", notes="点检工单-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:点检工单:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        eamInspectionOrderService.removeById(id);
        return Result.OK("删除成功!");
    }
    /**
     *  批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "点检工单-批量删除")
    @ApiOperation(value="点检工单-批量删除", notes="点检工单-批量删除")
    //@RequiresPermissions("org.jeecg.modules:点检工单:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamInspectionOrderService.removeByIds(Arrays.asList(ids.split(",")));
        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) {
        EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id);
        if(eamInspectionOrder==null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamInspectionOrder);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("createBy", eamInspectionOrder.getCreateBy(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("standardId", eamInspectionOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
            translateDictTextUtils.translateField("operator", eamInspectionOrder.getOperator(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("creationMethod", eamInspectionOrder.getCreationMethod(), item, "order_creation_method");
            translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
            translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败!");
        }
    }
    @Autowired
    private IEamInspectionOrderService eamInspectionOrderService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;
    /**
    * 导出excel
    *
    * @param request
    * @param eamInspectionOrder
    */
     * 分页列表查询
     *
     * @param query
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "点检工单-分页列表查询")
    @ApiOperation(value = "点检工单-分页列表查询", notes = "点检工单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,
                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                           HttpServletRequest req) {
//        QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
        Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
        IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query);
        return Result.OK(pageList);
    }
    /**
     * 查询点检工单基本信息
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "查询点检工单基本信息", notes = "查询点检工单基本信息")
    @GetMapping(value = "/selectVoById")
    public Result<?> selectVoById(@RequestParam(name = "id") String id) {
        return eamInspectionOrderService.selectVoById(id);
    }
    /**
     * 添加
     *
     * @param eamInspectionOrderRequest
     * @return
     */
    @AutoLog(value = "点检工单-添加")
    @ApiOperation(value = "点检工单-添加", notes = "点检工单-添加")
    //@RequiresPermissions("org.jeecg.modules:点检工单:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
        eamInspectionOrderRequest.setOrderNum(codeSeq);
        eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));
        eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
        return Result.OK("添加成功!");
    }
    /**
     * 编辑
     *
     * @param eamInspectionOrderRequest
     * @return
     */
    @AutoLog(value = "点检工单-编辑")
    @ApiOperation(value = "点检工单-编辑", notes = "点检工单-编辑")
    //@RequiresPermissions("org.jeecg.modules:点检工单:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
        eamInspectionOrderService.editInspectionOrder(eamInspectionOrderRequest);
        return Result.OK("编辑成功!");
    }
    /**
     * 领取点检工单
     *
     * @param id
     * @return
     */
    @AutoLog(value = "点检工单-领取点检工单")
    @ApiOperation(value = "点检工单-领取点检工单", notes = "点检工单-领取点检工单")
    @GetMapping(value = "/receiveInspectionOrder")
    public Result<String> receiveInspectionOrder(@RequestParam(name = "id") String id) {
        eamInspectionOrderService.takeInspectionOrder(id);
        return Result.OK("领取成功");
    }
    /**
     * 作废点检工单
     *
     * @param id
     * @return
     */
    @AutoLog(value = "点检工单-作废点检工单")
    @ApiOperation(value = "点检工单-作废点检工单", notes = "点检工单-作废点检工单")
    @GetMapping(value = "/cancelInspectionOrder")
    public Result<String> cancelInspectionOrder(@RequestParam(name = "id") String id) {
        eamInspectionOrderService.cancelInspectionOrder(id);
        return Result.OK("作废成功");
    }
    /**
     * 批量作废与领取
     *
     * @param ids
     * @param type
     * @return
     */
    @AutoLog(value = "点检工单-批量作废与领取")
    @ApiOperation(value = "点检工单-批量作废与领取", notes = "点检工单-批量作废与领取")
    @GetMapping(value = "/cancelOrReceive")
    public Result<?> cancelOrReceive(@RequestParam(name = "ids") String ids, @RequestParam(name = "type") String type) {
        return eamInspectionOrderService.batchCancelOrTakeInspectionOrder(ids, type);
    }
    /**
     * 点检流程
     *
     * @param eamInspectionOrderRequest
     * @return
     */
    @AutoLog(value = "点检流程")
    @ApiOperation(value = "点检工单-点检流程", notes = "点检工单-点检流程")
    @PostMapping("/approval")
    public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
        eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
        return Result.OK("操作成功");
    }
    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "点检工单-通过id删除")
    @ApiOperation(value = "点检工单-通过id删除", notes = "点检工单-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:点检工单:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        eamInspectionOrderService.removeById(id);
        return Result.OK("删除成功!");
    }
    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "点检工单-批量删除")
    @ApiOperation(value = "点检工单-批量删除", notes = "点检工单-批量删除")
    //@RequiresPermissions("org.jeecg.modules:点检工单:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.eamInspectionOrderService.removeByIds(Arrays.asList(ids.split(",")));
        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) {
        EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id);
        if (eamInspectionOrder == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamInspectionOrder);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("createBy", eamInspectionOrder.getCreateBy(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("standardId", eamInspectionOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
            translateDictTextUtils.translateField("operator", eamInspectionOrder.getOperator(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("creationMethod", eamInspectionOrder.getCreationMethod(), item, "order_creation_method");
            translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
            translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败!");
        }
    }
    /**
     * 导出excel
     *
     * @param request
     * @param eamInspectionOrder
     */
    //@RequiresPermissions("org.jeecg.modules:点检工单:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) {
@@ -241,12 +245,12 @@
    }
    /**
      * 通过excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
     * 通过excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("点检工单:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -2,14 +2,19 @@
import cn.hutool.core.collection.CollectionUtil;
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.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.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
@@ -40,6 +45,10 @@
    private IEamWeekMaintenanceOrderService eamWeekMaintenanceOrderService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;
    /**
     * 分页列表查询
@@ -209,7 +218,25 @@
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamWeekMaintenanceOrder eamWeekMaintenanceOrder = eamWeekMaintenanceOrderService.getById(id);
        return Result.OK(eamWeekMaintenanceOrder);
        if (eamWeekMaintenanceOrder == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamWeekMaintenanceOrder);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("equipmentId", eamWeekMaintenanceOrder.getEquipmentId(), item, "eam_equipment,equipment_code,id");
            translateDictTextUtils.translateField("standardId", eamWeekMaintenanceOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
            translateDictTextUtils.translateField("operator", eamWeekMaintenanceOrder.getOperator(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("creationMethod", eamWeekMaintenanceOrder.getCreationMethod(), item, "order_creation_method");
            translateDictTextUtils.translateField("maintenanceStatus", eamWeekMaintenanceOrder.getMaintenanceStatus(), item, "week_maintenance_status");
            translateDictTextUtils.translateField("confirmUser", eamWeekMaintenanceOrder.getConfirmUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("confirmDealType", eamWeekMaintenanceOrder.getConfirmDealType(), item, "approved_rejected");
            translateDictTextUtils.translateField("initialAcceptanceUser", eamWeekMaintenanceOrder.getInitialAcceptanceUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("finalAcceptanceUser", eamWeekMaintenanceOrder.getFinalAcceptanceUser(), item, "sys_user,realname,username");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败!");
        }
    }
    /**