YiWuProject.git

			@@ -1,16 +1,26 @@
			package com.mes.temperingglass.service.impl;

			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.kangaroohy.milo.model.ReadWriteEntity;
			import com.kangaroohy.milo.service.MiloService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.entity.LoadGlassInfo;
			import com.mes.glassinfo.mapper.GlassInfoMapper;
			import com.mes.largenscreen.entity.PieChartVO;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import com.github.yulichang.base.MPJBaseServiceImpl;

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

			/**
			@@ -22,10 +32,41 @@
			* @since 2024-04-07
			*/
			@Service
			@DS("salve_hangzhoumes")
			@DS("north_glass_mes")
			@Slf4j
			public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
			@Resource
			TemperingGlassInfoMapper temperingMapper;

			@Resource
			private GlassInfoMapper glassInfoMapper;

			@Autowired(required = false)
			MiloService miloService;

			@Override
			public List<TemperingGlassInfo> selectWaitingGlassByOpc() {
			//获取等待进炉中的玻璃信息
			try {
			ReadWriteEntity engineerEntity = miloService.readFromOpcUa("GH2S7.GH2S7.F09_ENGINEER_ID");
			ReadWriteEntity temperingLayoutIdEntity = miloService.readFromOpcUa("GH2S7.GH2S7.F09_TEMPERING_LAYOUT_ID");

			if (null == engineerEntity \|\| null == temperingLayoutIdEntity) {
			engineerEntity = miloService.readFromOpcUa("GH2S7.GH2S7.F08_ENGINEER_ID");
			temperingLayoutIdEntity = miloService.readFromOpcUa("GH2S7.GH2S7.F08_TEMPERING_LAYOUT_ID");
			if (null == engineerEntity \|\| null == temperingLayoutIdEntity) {
			log.info("获取参数异常，结束本次任务");
			return new ArrayList<>();
			}
			}
			return this.list(new LambdaQueryWrapper<TemperingGlassInfo>()
			.eq(TemperingGlassInfo::getEngineerId, engineerEntity.getValue() + "")
			.eq(TemperingGlassInfo::getTemperingLayoutId, temperingLayoutIdEntity.getValue() + ""));
			} catch (Exception e) {
			log.info("获取钢化参数异常：{}", e);
			return new ArrayList<>();
			}
			}

			@Override
			public List<TemperingGlassInfo> selectWaitingGlass() {
			@@ -65,7 +106,8 @@
			public List<TemperingGlassInfo> selectOutGlass() {
			//获取出炉中的玻璃信息
			QueryWrapper<TemperingGlassInfo> wrap = new QueryWrapper<>();
			wrap.select("Top 1 *").eq("state", 3);
			wrap.select("Top 1 *").eq("state", 4)
			.orderByDesc("id");
			TemperingGlassInfo glass = temperingMapper.selectOne(wrap);
			//根据工程号和版图获取数据
			if (glass != null) {
			@@ -79,7 +121,7 @@
			//获取过旋转台最大的钢化版图id
			QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
			wapper.select("Top 1 *").eq("state", 4)
			.orderByDesc("tempering_layout_id,engineer_id");
			.orderByDesc("id");
			//根据最大的版图id显示钢化后的版图信息
			TemperingGlassInfo glassinfo = temperingMapper.selectOne(wapper);
			if (glassinfo == null) {
			@@ -133,4 +175,36 @@
			}
			return result;
			}

			@Override
			public GlassInfo selectTempering(GlassInfo glassInfo) {

			QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
			wrapper.select("max(tempering_layout_id)as id")
			.eq("engineer_id", glassInfo.getEngineerId());

			return glassInfoMapper.selectOne(wrapper);
			}

			@Override
			public List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
			List<LoadGlassInfo> glassInfos = null;
			glassInfos = glassInfoMapper.selectJoinList(LoadGlassInfo.class, new MPJQueryWrapper<GlassInfo>()
			.select("IFNULL(b.state, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")
			.leftJoin("(SELECT glass_id, MAX(type) AS state FROM damage GROUP BY glass_id) b\n" +
			"ON t.glass_id = b.glass_id")
			.eq("engineer_id", glassInfo.getEngineerId())
			.eq("tempering_layout_id", glassInfo.getTemperingLayoutId()));
			return glassInfos;
			// QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
			// wrapper.eq("engineer_id", glassInfo.getEngineerId())
			// .eq("tempering_layout_id", glassInfo.getTemperingLayoutId())
			// .select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");
			// return glassInfoMapper.selectList(wrapper);
			}

			@Override
			public List<PieChartVO> queryPieChart() {
			return baseMapper.queryPieChart();
			}
			}