Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

zenglf

2023-10-24 4f52dfe47a6e5f825f98e537b5cd90b006bde4bb

Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

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

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


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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.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;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcWorkshopEquipmentService;
import org.jeecg.modules.mdc.service.IMdcWorkshopInfoService;
import org.jeecg.modules.mdc.vo.MdcWorkshopEquipmentVo;
import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: å¤§å±è½¦é—´ä¿¡æ¯
 * @Author: Lius
 * @Date: 2023-10-11
 * @Version: V1.0
 */
@Slf4j
@Api(tags = "大屏车间信息")
@RestController
@RequestMapping("/mdc/mdcWorkshopInfo")
public class MdcWorkshopInfoController extends JeecgController<MdcWorkshopInfo, IMdcWorkshopInfoService> {
    @Resource
    private IMdcWorkshopInfoService mdcWorkshopInfoService;

    @Resource
    private IMdcEquipmentService mdcEquipmentService;

    @Resource
    private IMdcWorkshopEquipmentService mdcWorkshopEquipmentService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param mdcWorkshopInfo
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "大屏车间信息-分页列表查询")
    @ApiOperation(value = "大屏车间信息-分页列表查询", notes = "大屏车间信息-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcWorkshopInfo mdcWorkshopInfo,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<MdcWorkshopInfo> queryWrapper = QueryGenerator.initQueryWrapper(mdcWorkshopInfo, req.getParameterMap());
        Page<MdcWorkshopInfo> page = new Page<MdcWorkshopInfo>(pageNo, pageSize);
        IPage<MdcWorkshopInfo> pageList = mdcWorkshopInfoService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param mdcWorkshopInfo
     * @return
     */
    @AutoLog(value = "大屏车间信息-添加")
    @ApiOperation(value = "大屏车间信息-添加", notes = "大屏车间信息-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcWorkshopInfo mdcWorkshopInfo) {
        mdcWorkshopInfoService.save(mdcWorkshopInfo);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param mdcWorkshopInfo
     * @return
     */
    @AutoLog(value = "大屏车间信息-编辑")
    @ApiOperation(value = "大屏车间信息-编辑", notes = "大屏车间信息-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody MdcWorkshopInfo mdcWorkshopInfo) {
        mdcWorkshopInfoService.updateById(mdcWorkshopInfo);
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "大屏车间信息-通过id删除")
    @ApiOperation(value = "大屏车间信息-通过id删除", notes = "大屏车间信息-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        mdcWorkshopInfoService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "大屏车间信息-批量删除")
    @ApiOperation(value = "大屏车间信息-批量删除", notes = "大屏车间信息-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.mdcWorkshopInfoService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "大屏车间信息-通过id查询")
    @ApiOperation(value = "大屏车间信息-通过id查询", notes = "大屏车间信息-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        MdcWorkshopInfo mdcWorkshopInfo = mdcWorkshopInfoService.getById(id);
        return Result.OK(mdcWorkshopInfo);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param mdcWorkshopInfo
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MdcWorkshopInfo mdcWorkshopInfo) {
        return super.exportXls(request, mdcWorkshopInfo, MdcWorkshopInfo.class, "大屏车间信息");
    }

    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, MdcWorkshopInfo.class);
    }

    /**
     * èŽ·å–设备列表
     *
     * @return
     */
    @AutoLog(value = "大屏车间信息-根据大屏车间id查询设备列表")
    @ApiOperation(value = "大屏车间信息-根据大屏车间id查询设备列表", notes = "大屏车间信息-根据大屏车间id查询设备列表")
    @GetMapping(value = "/workshopEquipmentList")
    public Result<IPage<MdcEquipment>> workshopEquipmentList(WorkshopEquipmentVo workshopEquipmentVo,
                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                             HttpServletRequest req) {
        Page<MdcEquipment> page = new Page<>(pageNo, pageSize);
        IPage<MdcEquipment> pageList = mdcEquipmentService.getEquipmentByWorkshopId(page, workshopEquipmentVo);
        return Result.OK(pageList);
    }

    /**
     * åˆ é™¤æŒ‡å®šå¤§å±è½¦é—´å’Œè®¾å¤‡å…³ç³»
     */
    @AutoLog(value = "大屏车间信息-删除指定大屏车间和设备关系")
    @ApiOperation(value = "大屏车间信息-删除指定大屏车间和设备关系", notes = "大屏车间信息-删除指定大屏车间和设备关系")
    @DeleteMapping(value = "/deleteWorkshopEquipment")
    public Result deleteWorkshopEquipment(@RequestParam(name = "workshopId") String workshopId,
                                          @RequestParam(name = "equipmentId", required = true) String equipmentId) {
        try {
            LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).eq(MdcWorkshopEquipment::getEquipmentId, equipmentId);
            mdcWorkshopEquipmentService.remove(queryWrapper);
            return Result.OK("删除成功！");
        } catch (Exception e) {
            return Result.error("删除失败！");
        }
    }

    /**
     * æ‰¹é‡åˆ é™¤æŒ‡å®šå¤§å±è½¦é—´å’Œè®¾å¤‡å…³ç³»
     */
    @AutoLog(value = "大屏车间信息-批量删除指定大屏车间和设备关系")
    @ApiOperation(value = "大屏车间信息-批量删除指定大屏车间和设备关系", notes = "大屏车间信息-批量删除指定大屏车间和设备关系")
    @DeleteMapping(value = "/deleteWorkshopEquipmentBatch")
    public Result deleteWorkshopEquipmentBatch(@RequestParam(name = "workshopId") String workshopId,
                                               @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(",")));
            mdcWorkshopEquipmentService.remove(queryWrapper);
            return Result.OK("删除成功！");
        } catch (Exception e) {
            return Result.error("删除失败！");
        }
    }

    /**
     * æ–°å¢žå¤§å±è½¦é—´ä¸Žè®¾å¤‡å…³ç³»
     */
    @AutoLog(value = "大屏车间信息-新增大屏车间与设备关系")
    @ApiOperation(value = "大屏车间信息-新增大屏车间与设备关系", notes = "大屏车间信息-新增大屏车间与设备关系")
    @PostMapping(value = "/addWorkshopEquipment")
    public Result addWorkshopEquipment(@RequestBody MdcWorkshopEquipmentVo mdcWorkshopEquipmentVo) {
        try {
            String workshopId = mdcWorkshopEquipmentVo.getWorkshopId();
            for (String equipmentId : mdcWorkshopEquipmentVo.getEquipmentIdList()) {
                MdcWorkshopEquipment mdcWorkshopEquipment = new MdcWorkshopEquipment();
                mdcWorkshopEquipment.setWorkshopId(workshopId);
                mdcWorkshopEquipment.setEquipmentId(equipmentId);
                mdcWorkshopEquipment.setCoordinateLeft(0);
                mdcWorkshopEquipment.setCoordinateTop(0);
                mdcWorkshopEquipment.setVw(100);
                mdcWorkshopEquipment.setVh(100);
                LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
                queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).eq(MdcWorkshopEquipment::getEquipmentId, equipmentId);
                MdcWorkshopEquipment one = mdcWorkshopEquipmentService.getOne(queryWrapper);
                if (one == null) {
                    mdcWorkshopEquipmentService.save(mdcWorkshopEquipment);
                }
            }
            return Result.OK("添加成功！");
        } catch (Exception e) {
            return Result.error("新增失败！");
        }
    }

    /**
     * æ–°å¢žå¤§å±è½¦é—´ä¸Žè®¾å¤‡å…³ç³»
     */
    @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,43 @@
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 equipmentName;

    private String equipmentType;

    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/dto/MdcEquipmentDto.java

@@ -199,8 +199,8 @@
    private String equipmentNormalTime;

    //    è®¾å¤‡ID
    @JSONField(name = "EquipmentID")
    private String EquipmentID;
//    @JSONField(name = "EquipmentID")
//    private String EquipmentID;
    //    KI1状态
    @JSONField(name = "P1001")
    private String P1001;

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

@@ -121,6 +121,16 @@
    @Excel(name = "设备功率", width = 15)
    @ApiModelProperty(value = "设备功率")
    private String devicePower;
    /**
     * åæ ‡-å·¦
     */
    @ApiModelProperty(value = "坐标-å·¦")
    private Integer coordinateLeft;
    /**
     * åæ ‡-上
     */
    @ApiModelProperty(value = "坐标-上")
    private Integer coordinateTop;

    /**部门名称*/
    private transient String orgCodeTxt;

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

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

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.system.base.entity.JeecgEntity;

import java.io.Serializable;

/**
 * @Description: å¤§å±è½¦é—´è®¾å¤‡å…³ç³»è¡¨
 * @Author: Lius
 * @Date: 2023-10-11
 * @Version: V1.0
 */
@Data
@TableName("mdc_workshop_equipment")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_workshop_equipment对象", description = "大屏车间设备关系表")
public class MdcWorkshopEquipment extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = -7123561842190776830L;

    /**
     * è½¦é—´id
     */
    @ApiModelProperty(value = "车间id")
    private String workshopId;

    /**
     * è®¾å¤‡ç¼–码
     */
    @ApiModelProperty(value = "设备编码")
    private String equipmentId;

    /**
     * åæ ‡-å·¦
     */
    @ApiModelProperty(value = "坐标-å·¦")
    private Integer coordinateLeft;

    /**
     * åæ ‡-å·¦
     */
    @ApiModelProperty(value = "坐标-上")
    private Integer coordinateTop;

    /**
     * å¤§å°-宽
     */
    @ApiModelProperty(value = "大小-宽")
    private Integer vw;

    /**
     * å¤§å°-高
     */
    @ApiModelProperty(value = "大小-高")
    private Integer vh;
}

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

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


import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;

/**
 * @Description: å¤§å±è½¦é—´ä¿¡æ¯
 * @Author: Lius
 * @Date: 2023-10-11
 * @Version: V1.0
 */
@Data
@TableName("mdc_workshop_info")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_workshop_info对象", description = "大屏车间信息")
public class MdcWorkshopInfo extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = 8254003853088493834L;

    /**
     * è½¦é—´åç§°
     */
    @Excel(name = "车间名称", width = 15)
    @ApiModelProperty(value = "车间名称")
    private String workshopName;
    /**
     * èƒŒæ™¯å›¾
     */
    @Excel(name = "背景图", width = 15)
    @ApiModelProperty(value = "背景图")
    private String backgroundImage;

}

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

@@ -10,6 +10,7 @@
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.vo.MdcEquipmentDepVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentProVo;
import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;

import java.util.List;

@@ -81,4 +82,9 @@
     * @return
     */
    List<MdcEquProDto> findEquProList(@Param("equipmentIdList") List<String> equipmentIdList);

    /**
     * æ ¹æ®å¤§å±è½¦é—´id查询设备列表
     */
    IPage<MdcEquipment> getEquipmentByWorkshopId(Page<MdcEquipment> page, @Param("workshopEquipmentVo") WorkshopEquipmentVo workshopEquipmentVo);
}

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

@@ -10,4 +10,5 @@
 */

public interface MdcEquipmentTypeMapper extends BaseMapper<MdcEquipmentType> {

}

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;

/**
 * @Description: å¤§å±è½¦é—´è®¾å¤‡
 * @Author: Lius
 * @Date: 2023-10-11
 * @Version: V1.0
 */
public interface MdcWorkshopEquipmentMapper extends BaseMapper<MdcWorkshopEquipment> {
}

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

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


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: å¤§å±è½¦é—´ä¿¡æ¯
 * @Author: Lius
 * @Date: 2023-10-11
 * @Version: V1.0
 */
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/MdcEquipmentMapper.xml

@@ -58,6 +58,7 @@
        WHERE
            med.equipment_id = me.id
            AND med.dep_id = #{ departId }
        ORDER BY me.equipment_id
    </select>

    <!--根据产线id查询设备-->
@@ -70,6 +71,7 @@
        WHERE
            mpe.equipment_id = me.id
            AND mpe.production_id = #{ productionId }
        ORDER BY me.equipment_id
    </select>

    <!--根据产线id查询设备id集合-->
@@ -129,7 +131,7 @@
            k.equipment_type,
            k.equipment_type_pictures
        ORDER BY
            equipmentName
            EquipmentID
    </select>

    <!--根据部门id查询设备id集合-->
@@ -166,6 +168,7 @@
                #{id}
            </foreach>
        </where>
        ORDER BY me.equipment_id
    </select>

    <!--根据设备编号查询设备信息和产线信息-->
@@ -188,6 +191,23 @@
                #{id}
            </foreach>
        </where>
        ORDER BY me.equipment_id
    </select>

    <!--根据大屏车间id查询设备列表-->
    <select id="getEquipmentByWorkshopId" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
        SELECT
            me.*
        FROM
            mdc_workshop_equipment mwe
            LEFT JOIN mdc_equipment me ON me.equipment_id = mwe.equipment_id
        <where>
            AND mwe.workshop_id = #{ workshopEquipmentVo.workshopId }
            <if test="workshopEquipmentVo.equipmentId != null and workshopEquipmentVo.equipmentId != ''">
                AND mwe.equipment_id = #{ workshopEquipmentVo.equipmentId }
            </if>
        </where>
        ORDER BY me.equipment_id
    </select>



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

@@ -5,30 +5,29 @@
    <!-- æ ¹æ®è½¦é—´å±‚级查询设备维修列表 -->
    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentRepair">
        SELECT
        mer.*
            *
        FROM
        MDC_EQUIPMENT_REPAIR mer
        LEFT JOIN MDC_EQUIPMENT me ON mer.EQUIPMENT_ID = me.EQUIPMENT_ID
            mdc_equipment_repair
        WHERE 1=1
        <if test="repair.equipmentName != null and repair.equipmentName != '' ">
            AND mer.EQUIPMENT_NAME LIKE CONCAT(CONCAT('%',#{repair.equipmentName}),'%')
            AND equipment_name LIKE CONCAT(CONCAT('%',#{repair.equipmentName}),'%')
        </if>
        <if test="repair.equipmentId != null and repair.equipmentId != '' ">
            AND mer.EQUIPMENT_ID LIKE CONCAT(CONCAT('%',#{repair.equipmentId}),'%')
            AND equipment_id LIKE CONCAT(CONCAT('%',#{repair.equipmentId}),'%')
        </if>
        <if test="repair.startTime != null ">
            AND mer.END_TIME &gt;= #{ repair.startTime }
            AND end_time &gt;= #{ repair.startTime }
        </if>
        <if test="repair.endTime != null ">
            AND mer.START_TIME &lt;= #{ repair.endTime }
            AND start_time &lt;= #{ repair.endTime }
        </if>
        <if test="repair.mdcSectionIds != null and repair.mdcSectionIds.size() > 0 ">
            AND mer.EQUIPMENT_ID IN
            AND equipment_id IN
            <foreach collection="repair.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
                #{ id }
            </foreach>
        </if>
        ORDER BY START_TIME ASC
        ORDER BY start_time ASC,equipment_id ASC
    </select>

    <!--查询某段时间内是否有维修休班数据-->

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

@@ -86,6 +86,7 @@
            </if>
            AND (start_time &lt;= #{ vo.endDate } AND end_time &gt;= #{ vo.startDate })
            AND status = '22'
            AND alarm != ''
        </where>
        ORDER BY
            start_time

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.MdcWorkshopEquipmentMapper">

</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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,
            me.equipment_name equipmentName,
            me.equipment_type equipmentType,
            met.equipment_type_pictures equipmentImage,
            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
            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>
</mapper>

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

@@ -10,6 +10,7 @@
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;

import java.util.List;
import java.util.Map;
@@ -162,4 +163,10 @@
     * æ ¹æ®éƒ¨é—¨å±‚级查询设备单个
     */
    MdcEquipment getEquipmentByDepPid(String pid, String userId);

    /**
     * æ ¹æ®å¤§å±è½¦é—´id查询设备列表
     */
    IPage<MdcEquipment> getEquipmentByWorkshopId(Page<MdcEquipment> page, WorkshopEquipmentVo workshopEquipmentVo);

}

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

@@ -65,4 +65,5 @@
     * @return
     */
    boolean deleteBatchEquipmentType(String ids);

}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;

/**
 * @Description: å¤§å±è½¦é—´è®¾å¤‡å…³ç³»
 * @Author: Lius
 * @Date: 2023-10-11
 * @Version: V1.0
 */
public interface IMdcWorkshopEquipmentService extends IService<MdcWorkshopEquipment> {
}

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

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


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: å¤§å±è½¦é—´ä¿¡æ¯
 * @Author: Lius
 * @Date: 2023-10-11
 * @Version: V1.0
 */
public interface IMdcWorkshopInfoService extends IService<MdcWorkshopInfo> {

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

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

@@ -1,9 +1,7 @@
package org.jeecg.modules.mdc.service.impl;

import com.alipay.api.domain.NewsfeedMediaGiftInfo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.mdc.dto.*;
@@ -11,8 +9,8 @@
import org.jeecg.modules.mdc.mapper.MdcEfficiencyReportMapper;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.mdc.vo.MdcUtilizationRateDto;
import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.IMdcProductionService;
@@ -21,8 +19,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.text.Collator;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
@@ -230,7 +227,7 @@
                    listDtos.add(mdcEfficiencyListDto);
                }
            }

            listDtos.sort(((o1, o2) -> Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLevel3(), o2.getLevel3())));
            result.setMdcEfficiencyList(listDtos);
        }

@@ -410,7 +407,7 @@
                    listDtos.add(mdcEfficiencyListDto);
                }
            }

            listDtos.sort(((o1, o2) -> Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLevel3(), o2.getLevel3())));
            result.setMdcEfficiencyList(listDtos);
        }

@@ -633,6 +630,7 @@
                    listDtos.add(mdcEfficiencyShiftListDto);
                }
            }
            listDtos.sort(((o1, o2) -> Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLevel3(), o2.getLevel3())));
            result.setMdcEfficiencyList(listDtos);
        }
        return result;

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

@@ -125,7 +125,9 @@
                mdcAlarmDto.setKey(equipmentId);
                Integer count = mdcEquipmentRunningSectionService.findAlarmCount(equipmentId, startDate, endDate, vo.getAlarmCode());
                mdcAlarmDto.setCount(count);
                equipmentCountList.add(mdcAlarmDto);
                if (count != 0) {
                    equipmentCountList.add(mdcAlarmDto);
                }
            }
            result.setEquipmentCountList(equipmentCountList);
        }

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

@@ -5,25 +5,29 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.CaseFormat;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.mdc.dto.EquipmentTemperatureDto;
import org.jeecg.modules.mdc.dto.MdcEquDepDto;
import org.jeecg.modules.mdc.dto.MdcEquProDto;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.entity.ControlSystem;
import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.mapper.MdcEquipmentMapper;
import org.jeecg.modules.mdc.mapper.XYZAliasesMapper;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.service.IControlSystemService;
import org.jeecg.modules.mdc.service.IEquipmentWorkLineService;
import org.jeecg.modules.mdc.service.IMdcDriveTypeParamConfigService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.FindsEquipmentDepartUtil;
import org.jeecg.modules.mdc.util.FindsEquipmentProductionUtil;
import org.jeecg.modules.mdc.vo.MdcEquipmentDepVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentProVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
import org.jeecg.modules.system.entity.MdcEquipmentDepart;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.MdcProductionEquipment;
@@ -70,14 +74,14 @@
    private IEquipmentWorkLineService equipmentWorkLineService;
    @Resource
    private IMdcDriveTypeParamConfigService mdcDriveTypeParamConfigService;
    @Resource
    private XYZAliasesMapper xyzAliasesMapper;
    @Resource
    private IEquipmentXYZService equipmentXYZService;
    @Resource
    private IEquipmentBaseInfoService equipmentBaseInfoService;
    @Resource
    private IEquipmentTemperatureService equipmentTemperatureService;
//    @Resource
//    private XYZAliasesMapper xyzAliasesMapper;
//    @Resource
//    private IEquipmentXYZService equipmentXYZService;
//    @Resource
//    private IEquipmentBaseInfoService equipmentBaseInfoService;
//    @Resource
//    private IEquipmentTemperatureService equipmentTemperatureService;

    @Override
    public Map<String, String> getDepNamesByEquipmentIds(List<String> equipmentIds) {
@@ -349,10 +353,12 @@
        mdcEquipmentDto.setDevicePower(mdcEquipment.getDevicePower());
        mdcEquipmentDto.setDeviceType(mdcEquipment.getDriveType());
        mdcEquipmentDto.setRemark(mdcEquipment.getRemark());
        mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());//设备编号
        //设备编号
        mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());
        mdcEquipmentDto.setEquipmentName(mdcEquipment.getEquipmentName());
        mdcEquipmentDto.setEquipmentIP(mdcEquipment.getEquipmentIp());
        mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());//设备型号
        //设备型号
        mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());
        mdcEquipmentDto.setDriveType(mdcEquipment.getDriveType());
        mdcEquipmentDto.setDataPort(mdcEquipment.getDataPort());
        mdcEquipmentDto.setDataFlag(Integer.parseInt(CommonConstant.STATUS_1));
@@ -694,4 +700,12 @@
        return null;
    }

    /**
     * æ ¹æ®å¤§å±è½¦é—´id查询设备列表
     */
    @Override
    public IPage<MdcEquipment> getEquipmentByWorkshopId(Page<MdcEquipment> page, WorkshopEquipmentVo workshopEquipmentVo) {
        return this.baseMapper.getEquipmentByWorkshopId(page, workshopEquipmentVo);
    }

}

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

@@ -69,4 +69,5 @@
    public boolean deleteBatchEquipmentType(String ids) {
        return this.removeByIds(Arrays.asList(ids.split(",")));
    }

}

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;
import org.jeecg.modules.mdc.mapper.MdcWorkshopEquipmentMapper;
import org.jeecg.modules.mdc.service.IMdcWorkshopEquipmentService;
import org.springframework.stereotype.Service;

/**
 * @Description: å¤§å±è½¦é—´è®¾å¤‡å…³ç³»
 * @Author: Lius
 * @Date: 2023-10-11
 * @Version: V1.0
 */
@Service
public class MdcWorkshopEquipmentServiceImpl extends ServiceImpl<MdcWorkshopEquipmentMapper, MdcWorkshopEquipment> implements IMdcWorkshopEquipmentService {
}

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

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


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: å¤§å±è½¦é—´ä¿¡æ¯
 * @Author: Lius
 * @Date: 2023-10-11
 * @Version: V1.0
 */
@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);
    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcWorkshopEquipmentVo.java

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

import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * @Description: è½¦é—´è®¾å¤‡vo
 * @author: lius
 */
@Data
public class MdcWorkshopEquipmentVo implements Serializable {

    private static final long serialVersionUID = 3911516861920572440L;

    /**
     * è½¦é—´id
     */
    private String workshopId;
    /**
     * è®¾å¤‡id集合
     */
    private List<String> equipmentIdList;
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/WorkshopEquipmentVo.java

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

import lombok.Data;

/**
 * @author: LiuS
 * @create: 2023-10-11 14:33
 */
@Data
public class WorkshopEquipmentVo {

    private String workshopId;

    private String equipmentId;

}