Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-03 c82b14f3a882698cbca62ef168615d31711320ca

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java

ÎļþÃû´Ó lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java ÐÞ¸Ä
@@ -43,7 +43,7 @@
public class EamBaseRepairDepartController extends JeecgController<EamBaseRepairDepart, IEamBaseRepairDepartService> {

    @Resource
    private IEamBaseRepairDepartService sysMaintainDepartService;
    private IEamBaseRepairDepartService eamBaseRepairDepartService;

    /**
     * åˆ†é¡µåˆ—表查询
@@ -63,7 +63,7 @@
                                   HttpServletRequest req) {
        QueryWrapper<EamBaseRepairDepart> queryWrapper = QueryGenerator.initQueryWrapper(eamBaseRepairDepart, req.getParameterMap());
        Page<EamBaseRepairDepart> page = new Page<EamBaseRepairDepart>(pageNo, pageSize);
        IPage<EamBaseRepairDepart> pageList = sysMaintainDepartService.page(page, queryWrapper);
        IPage<EamBaseRepairDepart> pageList = eamBaseRepairDepartService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

@@ -74,10 +74,10 @@
        Result<List<EamBaseRepairDepartTreeModel>> result = new Result<>();
        try {
            if (oConvertUtils.isNotEmpty(ids)) {
                List<EamBaseRepairDepartTreeModel> maintainDepartList = sysMaintainDepartService.queryTreeList(ids);
                result.setResult(maintainDepartList);
                List<EamBaseRepairDepartTreeModel> repairDepartList = eamBaseRepairDepartService.queryTreeList(ids);
                result.setResult(repairDepartList);
            } else {
                List<EamBaseRepairDepartTreeModel> list = sysMaintainDepartService.queryTreeList();
                List<EamBaseRepairDepartTreeModel> list = eamBaseRepairDepartService.queryTreeList();
                result.setResult(list);
            }
            result.setSuccess(true);
@@ -87,22 +87,22 @@
        return result;
    }

    @AutoLog(value = "维修部门班组-根据用户id获取产线下拉树选项")
    @ApiOperation(value = "维修部门班组-根据用户id获取产线下拉树选项", notes = "维修部门班组-根据用户id获取产线下拉树选项")
    @GetMapping(value = "/loadMaintainDepartTreeOptions")
    public Result<List<RepairDepartIdModel>> loadMaintainDepartTreeOptions() {
        Result<List<RepairDepartIdModel>> result = new Result<>();
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        try {
            List<RepairDepartIdModel> list = sysMaintainDepartService.loadMaintainDepartTreeOptions(userId);
            result.setSuccess(true);
            result.setResult(list);
        } catch (Exception e) {
            log.error(e.getMessage(), e);
        }
        return result;
    }
//    @AutoLog(value = "维修部门班组-根据用户id获取产线下拉树选项")
//    @ApiOperation(value = "维修部门班组-根据用户id获取产线下拉树选项", notes = "维修部门班组-根据用户id获取产线下拉树选项")
//    @GetMapping(value = "/loadMaintainDepartTreeOptions")
//    public Result<List<RepairDepartIdModel>> loadMaintainDepartTreeOptions() {
//        Result<List<RepairDepartIdModel>> result = new Result<>();
//        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//        String userId = user.getId();
//        try {
//            List<RepairDepartIdModel> list = eamBaseRepairDepartService.loadMaintainDepartTreeOptions(userId);
//            result.setSuccess(true);
//            result.setResult(list);
//        } catch (Exception e) {
//            log.error(e.getMessage(), e);
//        }
//        return result;
//    }

    @AutoLog(value = "维修部门班组-id集合")
    @ApiOperation(value = "维修部门班组-id集合", notes = "维修部门班组-id集合")
@@ -110,8 +110,8 @@
    public Result<List<String>> queryTreeIdList() {
        Result<List<String>> result = new Result<>();
        try {
            List<EamBaseRepairDepart> maintainDepartList = sysMaintainDepartService.list(new LambdaQueryWrapper<EamBaseRepairDepart>().eq(EamBaseRepairDepart::getDelFlag, CommonConstant.DEL_FLAG_0).orderByAsc(EamBaseRepairDepart::getDepartOrder));
            List<String> ids = maintainDepartList.stream().map(EamBaseRepairDepart::getId).collect(Collectors.toList());
            List<EamBaseRepairDepart> repairDepartList = eamBaseRepairDepartService.list(new LambdaQueryWrapper<EamBaseRepairDepart>().eq(EamBaseRepairDepart::getDelFlag, CommonConstant.DEL_FLAG_0).orderByAsc(EamBaseRepairDepart::getDepartOrder));
            List<String> ids = repairDepartList.stream().map(EamBaseRepairDepart::getId).collect(Collectors.toList());
            result.setSuccess(true);
            result.setResult(ids);
        } catch (Exception e) {
@@ -129,11 +129,11 @@
    @AutoLog(value = "维修部门班组-添加")
    @ApiOperation(value = "维修部门班组-添加", notes = "维修部门班组-添加")
    @PostMapping(value = "/add")
    @CacheEvict(value = {"sys:cache:maintainDepart:alldata", "sys:cache:maintainDepart:allids"}, allEntries = true)
    @CacheEvict(value = {"eam:cache:repairDepart:alldata", "eam:cache:repairDepart:allids"}, allEntries = true)
    public Result<EamBaseRepairDepart> add(@RequestBody EamBaseRepairDepart eamBaseRepairDepart) {
        Result<EamBaseRepairDepart> result = new Result<>();
        try {
            sysMaintainDepartService.saveMaintainDepartData(eamBaseRepairDepart);
            eamBaseRepairDepartService.saveMaintainDepartData(eamBaseRepairDepart);
            result.success("添加成功！");
        } catch (Exception e) {
            log.error(e.getMessage(), e);
@@ -151,14 +151,14 @@
    @AutoLog(value = "维修部门班组-编辑")
    @ApiOperation(value = "维修部门班组-编辑", notes = "维修部门班组-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    @CacheEvict(value = {"sys:cache:maintainDepart:alldata", "sys:cache:maintainDepart:allids"}, allEntries = true)
    @CacheEvict(value = {"eam:cache:repairDepart:alldata", "eam:cache:repairDepart:allids"}, allEntries = true)
    public Result<EamBaseRepairDepart> edit(@RequestBody EamBaseRepairDepart eamBaseRepairDepart) {
        Result<EamBaseRepairDepart> result = new Result<>();
        EamBaseRepairDepart eamBaseRepairDepartEntity = sysMaintainDepartService.getById(eamBaseRepairDepart.getId());
        EamBaseRepairDepart eamBaseRepairDepartEntity = eamBaseRepairDepartService.getById(eamBaseRepairDepart.getId());
        if (eamBaseRepairDepartEntity == null) {
            result.error500("未找到对应实体");
        } else {
            boolean ok = sysMaintainDepartService.updateMaintainDepartDataById(eamBaseRepairDepart);
            boolean ok = eamBaseRepairDepartService.updateMaintainDepartDataById(eamBaseRepairDepart);
            if (ok) {
                result.success("修改成功!");
            }
@@ -175,14 +175,14 @@
    @AutoLog(value = "维修部门班组-通过id删除")
    @ApiOperation(value = "维修部门班组-通过id删除", notes = "维修部门班组-通过id删除")
    @DeleteMapping(value = "/delete")
    @CacheEvict(value = {"sys:cache:maintainDepart:alldata", "sys:cache:maintainDepart:allids"}, allEntries = true)
    @CacheEvict(value = {"eam:cache:repairDepart:alldata", "eam:cache:repairDepart:allids"}, allEntries = true)
    public Result<EamBaseRepairDepart> delete(@RequestParam(name = "id", required = true) String id) {
        Result<EamBaseRepairDepart> result = new Result<>();
        EamBaseRepairDepart eamBaseRepairDepart = sysMaintainDepartService.getById(id);
        EamBaseRepairDepart eamBaseRepairDepart = eamBaseRepairDepartService.getById(id);
        if (eamBaseRepairDepart == null) {
            result.error500("未找到对应实体");
        } else {
            boolean ok = sysMaintainDepartService.delete(id);
            boolean ok = eamBaseRepairDepartService.delete(id);
            if (ok) {
                result.success("删除成功!");
            }
@@ -199,13 +199,13 @@
    @AutoLog(value = "维修部门班组-批量删除")
    @ApiOperation(value = "维修部门班组-批量删除", notes = "维修部门班组-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    @CacheEvict(value = {"sys:cache:maintainDepart:alldata", "sys:cache:maintainDepart:allids"}, allEntries = true)
    @CacheEvict(value = {"eam:cache:repairDepart:alldata", "eam:cache:repairDepart:allids"}, allEntries = true)
    public Result<EamBaseRepairDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        Result<EamBaseRepairDepart> result = new Result<>();
        if (ids == null || "".equals(ids.trim())) {
            result.error500("参数不识别！");
        } else {
            this.sysMaintainDepartService.deleteBatchWithChildren(Arrays.asList(ids.split(",")));
            this.eamBaseRepairDepartService.deleteBatchWithChildren(Arrays.asList(ids.split(",")));
            result.success("删除成功!");
        }
        return result;
@@ -217,7 +217,7 @@
    public Result<List<RepairDepartIdModel>> queryIdTree() {
        Result<List<RepairDepartIdModel>> result = new Result<>();
        try {
            List<RepairDepartIdModel> list = sysMaintainDepartService.queryMaintainDepartIdTreeList();
            List<RepairDepartIdModel> list = eamBaseRepairDepartService.queryMaintainDepartIdTreeList();
            result.setResult(list);
            result.setSuccess(true);
        } catch (Exception e) {
@@ -231,7 +231,7 @@
    @GetMapping(value = "/searchBy")
    public Result<List<EamBaseRepairDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord) {
        Result<List<EamBaseRepairDepartTreeModel>> result = new Result<>();
        List<EamBaseRepairDepartTreeModel> treeList = sysMaintainDepartService.searchByKeyWord(keyWord);
        List<EamBaseRepairDepartTreeModel> treeList = eamBaseRepairDepartService.searchByKeyWord(keyWord);
        if (treeList == null || treeList.isEmpty()) {
            result.setSuccess(false);
            result.setMessage("未查询匹配数据！");
@@ -251,7 +251,7 @@
    @ApiOperation(value = "维修部门班组-通过id查询", notes = "维修部门班组-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamBaseRepairDepart eamBaseRepairDepart = sysMaintainDepartService.getById(id);
        EamBaseRepairDepart eamBaseRepairDepart = eamBaseRepairDepartService.getById(id);
        return Result.OK(eamBaseRepairDepart);
    }

@@ -278,7 +278,7 @@
    @AutoLog(value = "维修部门班组-通过excel导入数据")
    @ApiOperation(value = "维修部门班组-通过excel导入数据", notes = "维修部门班组-通过excel导入数据")
    @PostMapping(value = "/importExcel")
    @CacheEvict(value = {"sys:cache:maintainDepart:alldata", "sys:cache:maintainDepart:allids"}, allEntries = true)
    @CacheEvict(value = {"eam:cache:repairDepart:alldata", "eam:cache:repairDepart:allids"}, allEntries = true)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, EamBaseRepairDepart.class);
    }