大屏车间管理

Lius

2024-01-26 d29ac80ff9cc861a61bfad83e1985c90706eff2c

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java

@@ -8,11 +8,12 @@
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.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;
@@ -229,7 +230,8 @@
        try {
            String workshopId = mdcWorkshopEquipmentVo.getWorkshopId();
            for (String equipmentId : mdcWorkshopEquipmentVo.getEquipmentIdList()) {
                if (!StringUtils.isEmpty(equipmentId) && !"null".equals(equipmentId)) {
                List<MdcEquipment> list = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
                if (list != null && !list.isEmpty()) {
                    MdcWorkshopEquipment mdcWorkshopEquipment = new MdcWorkshopEquipment();
                    mdcWorkshopEquipment.setWorkshopId(workshopId);
                    mdcWorkshopEquipment.setEquipmentId(equipmentId);
@@ -258,7 +260,9 @@
    @ApiOperation(value = "大屏车间信息-首页获取大屏入口列表", notes = "大屏车间信息-首页获取大屏入口列表")
    @GetMapping(value = "/getWorkshopList")
    public Result<List<MdcWorkshopInfo>> getWorkshopList() {
        List<MdcWorkshopInfo> list = mdcWorkshopInfoService.list();
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        List<MdcWorkshopInfo> list = mdcWorkshopInfoService.listByUser(userId);
        return Result.OK(list);
    }