大屏信息接口

Lius

2023-10-11 f2b44fbe8d4194a5195085b9685be934d251ebc6

大屏信息接口

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

@@ -12,6 +12,7 @@
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.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;
@@ -27,6 +28,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: å¤§å±è½¦é—´ä¿¡æ¯
@@ -165,6 +167,7 @@

    /**
     * èŽ·å–设备列表
     *
     * @return
     */
    @AutoLog(value = "大屏车间信息-根据大屏车间id查询设备列表")
@@ -204,7 +207,7 @@
    @ApiOperation(value = "大屏车间信息-批量删除指定大屏车间和设备关系", notes = "大屏车间信息-批量删除指定大屏车间和设备关系")
    @DeleteMapping(value = "/deleteWorkshopEquipmentBatch")
    public Result deleteWorkshopEquipmentBatch(@RequestParam(name = "workshopId") String workshopId,
                                          @RequestParam(name = "equipmentIds", required = true) String equipmentIds) {
                                               @RequestParam(name = "equipmentIds", required = true) String equipmentIds) {
        try {
            LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).in(MdcWorkshopEquipment::getEquipmentId, Arrays.asList(equipmentIds.split(",")));
@@ -245,4 +248,41 @@
        }
    }

    /**
     * æ–°å¢žå¤§å±è½¦é—´ä¸Žè®¾å¤‡å…³ç³»
     */
    @AutoLog(value = "大屏车间信息-首页获取大屏入口列表")
    @ApiOperation(value = "大屏车间信息-首页获取大屏入口列表", notes = "大屏车间信息-首页获取大屏入口列表")
    @GetMapping(value = "/getWorkshopList")
    public Result<List<MdcWorkshopInfo>> getWorkshopList() {
        List<MdcWorkshopInfo> list = mdcWorkshopInfoService.list();
        return Result.OK(list);
    }

    /**
     * å¤§å±
     */
    @AutoLog(value = "大屏车间信息-大屏信息")
    @ApiOperation(value = "大屏车间信息-大屏信息", notes = "大屏车间信息-大屏信息")
    @GetMapping(value = "/getBigScreenInfo")
    public Result getBigScreenInfo(@RequestParam(name = "workshopId", required = true) String workshopId) {
        List<MdcBigScreenEquipmentDto> result = mdcWorkshopInfoService.getBigScreenInfo(workshopId);
        return Result.OK(result);
    }

    /**
     * å¤§å±
     */
    @AutoLog(value = "大屏车间信息-保存设备坐标大小信息")
    @ApiOperation(value = "大屏车间信息-保存设备坐标大小信息", notes = "大屏车间信息-保存设备坐标大小信息")
    @PutMapping(value = "/saveEquipmentCoordinate")
    public Result saveEquipmentCoordinate(@RequestBody List<MdcWorkshopEquipment> workshopEquipmentList) {
        try {
            mdcWorkshopEquipmentService.updateBatchById(workshopEquipmentList);
            return Result.OK("保存成功！");
        } catch (Exception e) {
            return Result.error("保存失败！");
        }
    }

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcBigScreenEquipmentDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package org.jeecg.modules.mdc.dto;

import lombok.Data;

/**
 * @author: LiuS
 * @create: 2023-10-11 13:47
 */
@Data
public class MdcBigScreenEquipmentDto {

    private String id;

    private String equipmentId;

    private String equipmentImage;

    private Integer equipmentStatus;

    /**
     * åæ ‡-å·¦
     */
    private Integer coordinateLeft;

    /**
     * åæ ‡-å·¦
     */
    private Integer coordinateTop;

    /**
     * å¤§å°-宽
     */
    private Integer vw;

    /**
     * å¤§å°-高
     */
    private Integer vh;
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java

@@ -2,7 +2,11 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;

import java.util.List;

/**
 * @Description: å¤§å±è½¦é—´ä¿¡æ¯
@@ -12,4 +16,10 @@
 */
public interface MdcWorkshopInfoMapper extends BaseMapper<MdcWorkshopInfo> {

    /**
     * å¤§å±ä¿¡æ¯
     * @param workshopId
     * @return
     */
    List<MdcBigScreenEquipmentDto> getBigScreenInfo(@Param("workshopId") String workshopId);
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml

@@ -2,4 +2,22 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcWorkshopInfoMapper">


    <select id="getBigScreenInfo" resultType="org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto">
        SELECT
            mew.id id,
            a.EquipmentID equipmentId,
            a.EquipmentName equipmentName,
            a.Oporation equipmentStatus,
            mew.coordinate_left coordinateLeft,
            mew.coordinate_top coordinateTop,
            mew.vw vw,
            mew.vh vh
        FROM
            EquipmentLog a
                INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
                INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
                AND a.CollectTime= b.maxgdtime
                AND mew.workshop_id = #{ workshopId }
    </select>
</mapper>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java

@@ -2,7 +2,10 @@


import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;

import java.util.List;

/**
 * @Description: å¤§å±è½¦é—´ä¿¡æ¯
@@ -12,4 +15,8 @@
 */
public interface IMdcWorkshopInfoService extends IService<MdcWorkshopInfo> {

    /**
     * å¤§å±ä¿¡æ¯
     */
    List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId);
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java

@@ -2,10 +2,13 @@


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;
import org.jeecg.modules.mdc.mapper.MdcWorkshopInfoMapper;
import org.jeecg.modules.mdc.service.IMdcWorkshopInfoService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * @Description: å¤§å±è½¦é—´ä¿¡æ¯
@@ -16,4 +19,13 @@
@Service
public class MdcWorkshopInfoServiceImpl extends ServiceImpl<MdcWorkshopInfoMapper, MdcWorkshopInfo> implements IMdcWorkshopInfoService {

    /**
     * å¤§å±ä¿¡æ¯
     * @param workshopId
     * @return
     */
    @Override
    public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId) {
        return this.baseMapper.getBigScreenInfo(workshopId);
    }
}