feat(dry): 添加租户设备查询功能并优化代码

bsw215583320

2024-11-22 bdfce3674b99e3bb494f1a8a479834f842968ef2

feat(dry): 添加租户设备查询功能并优化代码

- 在 MybatisPlusSaasConfig 中添加新的租户表
- 重构 DryEquipmentController 中的设备查询逻辑
- 新增 listTenantEqp 接口用于查询租户所有干燥机
- 优化代码结构，提高可维护性

 jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java

@@ -75,6 +75,10 @@
        TENANT_TABLE.add("dry_herb_type");
        TENANT_TABLE.add("dry_order");
        TENANT_TABLE.add("dry_shop");
        TENANT_TABLE.add("dry_herb_formula");
        TENANT_TABLE.add("dry_herb_formula_his");
        TENANT_TABLE.add("dry_fault_record");

    }



 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java

@@ -36,6 +36,7 @@
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -106,6 +107,12 @@
        //------------------------------------------------------------------------------------------------
        QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());

         List<DryEquipmentVo> equipmentVos = getDryEquipmentVos(queryWrapper);
         return Result.OK(equipmentVos);
    }

     @NotNull
     private List<DryEquipmentVo> getDryEquipmentVos(QueryWrapper<DryEquipment> queryWrapper) {
        queryWrapper.orderByAsc("code");
        List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
        List<DryEquipmentVo> equipmentVos = new ArrayList<>();
@@ -118,6 +125,18 @@
            dryEquipmentVo.setPowerConsumption(dryEqpType.getPowerConsumption());
            equipmentVos.add(dryEquipmentVo);
        });
         return equipmentVos;
     }


     @ApiOperation(value="查询租户所有干燥机", notes="查询租户所有干燥机")
     @GetMapping(value = "/listTenantEqp")
     public Result<List<DryEquipmentVo>> queryTenantAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) {
        TenantContext.setTenant(dryEquipment.getTenantId()+"");

         QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());

         List<DryEquipmentVo> equipmentVos = getDryEquipmentVos(queryWrapper);
        return Result.OK(equipmentVos);
    }


 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.java

@@ -178,6 +178,14 @@
//            return Result.error("AI识别服务异常");
//        }
//    }

    /**
     * 根据设备和租户查询该设备类型的干燥配方，将配方转成xml格式，以字符串方式返回
     * @param tenantId
     * @param eqpCode
     * @return
     * @throws JAXBException
     */
    @ApiOperation(value="干燥配方获取", notes="干燥配方下发")
    @GetMapping(value = "/queryFormula")
    public Result<String> queryFormulaByEqpType(Integer tenantId, String eqpCode) throws JAXBException {