大屏设备图片处理

Lius

2023-10-12 2e5763aa24bf3cadb48ec70d49669c997da26994

大屏设备图片处理

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopEquipment.java

@@ -38,12 +38,6 @@
    private String equipmentId;

    /**
     * 设备图片
     */
    @ApiModelProperty(value = "设备图片")
    private String equipmentImage;

    /**
     * 坐标-左
     */
    @ApiModelProperty(value = "坐标-左")

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

@@ -1,7 +1,6 @@
package org.jeecg.modules.mdc.mapper;

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

/**
@@ -12,10 +11,4 @@

public interface MdcEquipmentTypeMapper extends BaseMapper<MdcEquipmentType> {

    /**
     * 根据设备类型名称查询设备类型图片
     * @param equipmentType
     * @return
     */
    String findEquipmentTypeImage(@Param("equipmentType") String equipmentType);
}

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

@@ -2,13 +2,4 @@
<!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.MdcEquipmentTypeMapper">

    <!--根据设备类型名称查询设备类型图片-->
    <select id="findEquipmentTypeImage" resultType="java.lang.String">
        SELECT
            equipment_type_pictures
        FROM
            mdc_equipment_type
        WHERE
            equipment_type_name = #{ equipmentType } AND equipment_type_states = 'Y'
    </select>
</mapper>

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

@@ -9,7 +9,7 @@
            a.EquipmentID equipmentId,
            me.equipment_name equipmentName,
            me.equipment_type equipmentType,
            mew.equipment_image equipmentImage,
            met.equipment_type_pictures equipmentImage,
            a.Oporation equipmentStatus,
            mew.coordinate_left coordinateLeft,
            mew.coordinate_top coordinateTop,
@@ -20,6 +20,7 @@
            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
            INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
            INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
            AND a.CollectTime= b.maxgdtime
            AND mew.workshop_id = #{ workshopId }
    </select>

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

@@ -66,10 +66,4 @@
     */
    boolean deleteBatchEquipmentType(String ids);

    /**
     * 根据设备类型名称查询设备类型图片
     * @param equipmentType
     * @return
     */
    String findEquipmentTypeImage(String equipmentType);
}

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

@@ -70,13 +70,4 @@
        return this.removeByIds(Arrays.asList(ids.split(",")));
    }

    /**
     * 根据设备类型名称查询设备类型图片
     * @param equipmentType
     * @return
     */
    @Override
    public String findEquipmentTypeImage(String equipmentType) {
        return this.baseMapper.findEquipmentTypeImage(equipmentType);
    }
}

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

@@ -2,15 +2,12 @@


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
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.IMdcEquipmentTypeService;
import org.jeecg.modules.mdc.service.IMdcWorkshopInfoService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
@@ -22,9 +19,6 @@
@Service
public class MdcWorkshopInfoServiceImpl extends ServiceImpl<MdcWorkshopInfoMapper, MdcWorkshopInfo> implements IMdcWorkshopInfoService {

    @Resource
    private IMdcEquipmentTypeService mdcEquipmentTypeService;

    /**
     * 大屏信息
     * @param workshopId
@@ -32,12 +26,6 @@
     */
    @Override
    public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId) {
        List<MdcBigScreenEquipmentDto> list = this.baseMapper.getBigScreenInfo(workshopId);
        for (MdcBigScreenEquipmentDto mdcBigScreenEquipmentDto : list) {
            if (StringUtils.isEmpty(mdcBigScreenEquipmentDto.getEquipmentImage())) {
                mdcBigScreenEquipmentDto.setEquipmentImage(mdcEquipmentTypeService.findEquipmentTypeImage(mdcBigScreenEquipmentDto.getEquipmentType()));
            }
        }
        return list;
        return this.baseMapper.getBigScreenInfo(workshopId);
    }
}