Lius
2024-01-26 d29ac80ff9cc861a61bfad83e1985c90706eff2c
大屏车间管理
已修改6个文件
51 ■■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
@@ -8,10 +8,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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;
@@ -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);
    }
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java
@@ -45,5 +45,11 @@
    @ApiModelProperty(value = "设备编号颜色")
    private String equipmentIdColor;
    /**
     * 菜单权限编码,例如:“sys:schedule:list,sys:schedule:info”,多个逗号隔开
     */
    @ApiModelProperty(value = "菜单权限编码")
    private String perms;
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
@@ -18,8 +18,17 @@
    /**
     * 大屏信息
     *
     * @param workshopId
     * @return
     */
    List<MdcBigScreenEquipmentDto> getBigScreenInfo(@Param("workshopId") String workshopId);
    /**
     * 大屏车间列表
     *
     * @param userId
     * @return
     */
    List<MdcWorkshopInfo> listByUser(@Param("userId") String userId);
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -25,4 +25,17 @@
            AND a.CollectTime= b.maxgdtime
            AND mew.workshop_id = #{ workshopId }
    </select>
    <select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">
        SELECT
            DISTINCT t1.*
        FROM
            mdc_workshop_info t1
                LEFT JOIN sys_permission t2 ON t1.perms = t2.perms
                LEFT JOIN sys_role_permission t3 ON t2.id = t3.permission_id
                LEFT JOIN sys_role t4 ON t4.id = t3.role_id
                LEFT JOIN sys_user_role t5 ON t5.role_id = t4.id
        WHERE
            t5.user_id = #{ userId }
    </select>
</mapper>
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
@@ -19,4 +19,11 @@
     * 大屏信息
     */
    List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId);
    /**
     * 车间大屏列表
     * @param userId
     * @return
     */
    List<MdcWorkshopInfo> listByUser(String userId);
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
@@ -28,4 +28,14 @@
    public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId) {
        return this.baseMapper.getBigScreenInfo(workshopId);
    }
    /**
     * 大屏车间列表
     * @param userId
     * @return
     */
    @Override
    public List<MdcWorkshopInfo> listByUser(String userId) {
        return this.baseMapper.listByUser(userId);
    }
}