1、fixbug:笼内玻璃错乱问题解决 2、中空问题修复：避免多个线程拿到的空格相同 3、swagger名称显示

zhoushihao

2024-12-06 8a9b0adc7fe0f72c4de8c8e5d14e282f5913d63d

1、fixbug:笼内玻璃错乱问题解决
2、中空问题修复：避免多个线程拿到的空格相同
3、swagger名称显示

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java

@@ -21,7 +21,7 @@
 * @author wu
 * @since 2024-06-25
 */
@Api(description = "报工信息")
@Api(tags = "报工信息")
@RestController
@RequestMapping("/damage")
@ResponseBody
@@ -29,6 +29,7 @@

    @Autowired(required=true)
    private DamageService damageService;

    @ApiOperation("报工数据查询")
    @PostMapping("/selectDamage")
    public Result selectDamage(@RequestBody Map map) {

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java

@@ -1,6 +1,7 @@
package com.mes.glassinfo.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
@@ -13,6 +14,7 @@
 * @author wu
 * @since 2024-04-29
 */
@Api(tags = "玻璃小片信息")
@RestController
@RequestMapping("/glassinfo/glass-info")
public class GlassInfoController {

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java

@@ -1,5 +1,7 @@
package com.mes.opctask.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.util.Date;
@@ -16,6 +18,7 @@
    /**
     * 历史任务id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * 任务请求 0无任务 1上片

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java

@@ -3,6 +3,7 @@
import com.mes.order.entity.Orders;
import com.mes.order.service.OrdersService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@
 * @author wu
 * @since 2024-06-17
 */
@Api(tags = "订单信息")
@RestController
@RequestMapping("/order/order")
@Slf4j

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/BasicDataProduceController.java

@@ -20,7 +20,7 @@
 * @author wu
 * @since 2024-07-25
 */
@Api(description = "生产基础数据")
@Api(tags = "生产基础数据")
@RestController
@RequestMapping("/basic_data_produce")
public class BasicDataProduceController {

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/DamageDetailsController.java

@@ -22,6 +22,7 @@
 * @author wu
 * @since 2024-07-26
 */
@Api(tags = "破损详情信息")
@RestController
@RequestMapping("/damage_details")
public class DamageDetailsController {

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java

@@ -5,6 +5,7 @@
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,10 +21,10 @@
 * @author zhoush
 * @since 2024-04-16
 */
@Api(tags = "工程信息")
@RestController
@RequestMapping("/optimizeProject")
@Slf4j

public class OptimizeProjectController {
    @Autowired
    //获取待选择的工程号

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java

@@ -5,6 +5,7 @@
import com.mes.pp.entity.request.Reportingdamage;
import com.mes.pp.service.ReportingWorkService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@
 * @author wu
 * @since 2024-06-26
 */
@Api(tags = "工程选择信息")
@RestController
@RequestMapping("/reporting_work/reporting-work")
@Slf4j

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java

@@ -20,7 +20,7 @@
 * @author wu
 * @since 2024-07-01
 */
@Api(description = "值班信息")
@Api(tags = "值班信息")
@RestController
@RequestMapping("/work_assignment")
public class WorkAssignmentController {

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java

@@ -17,7 +17,7 @@
 * @author zhoush
 * @since 2024-04-11
 */
@Api(description = "菜单管理")
@Api(tags = "菜单管理")
@RestController
@RequestMapping("/sys/menu")
public class SysMenuController {

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java

@@ -22,7 +22,7 @@
 * @author zhoush
 * @since 2024-04-11
 */
@Api(description = "角色管理")
@Api(tags = "角色管理")
@RestController
@RequestMapping("/sys/role")
public class SysRoleController {

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java

@@ -27,7 +27,7 @@
 * @author zhoush
 * @since 2024-04-11
 */
@Api(description = "用户管理")
@Api(tags = "用户管理")
@RestController
@RequestMapping("/sys/user")
public class SysUserController {

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java

@@ -4,6 +4,7 @@
import com.mes.edgglasstask.entity.request.EdgGlassInfoRequest;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +20,7 @@
 * @author wu
 * @since 2024-05-11
 */
@Api(tags = "磨边队列信息")
@RestController
@RequestMapping("/edgGlassTaskInfo")
public class EdgGlassTaskInfoController {

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java

@@ -68,7 +68,7 @@
    public List<EdgGlassTaskInfo> selectTaskCacheIsRun() {
        QueryWrapper<EdgGlassTaskInfo> wrapper = new QueryWrapper<EdgGlassTaskInfo>()
                .select("line")
                .eq("status", 1)
                .eq("state", 1)
                .groupBy("line");

        return this.list(wrapper);

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java

@@ -6,6 +6,7 @@
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -18,6 +19,7 @@
 * @author makejava
 * @since 2024-10-27 21:04:29
 */
@Api(tags = "卧理历史任务")
@RestController
@RequestMapping("edgStorageDeviceTaskHistory")
public class EdgStorageDeviceTaskHistoryController {

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java

@@ -21,7 +21,7 @@
 * @author zhoush
 * @since 2024-04-07
 */
@Api(description = "识别显示")
@Api(tags = "识别显示")
@RestController
@RequestMapping("/taskCache")
public class TaskCacheController {

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java

@@ -18,7 +18,7 @@
 * @author zhoush
 * @since 2024-03-27
 */
@Api(description = "理片笼信息")
@Api(tags = "理片笼信息")
@RestController
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java

@@ -29,7 +29,7 @@
 * @author zhoush
 * @since 2024-03-27
 */
@Api(description = "理片笼详情")
@Api(tags = "理片笼详情")
@RestController
@RequestMapping("/bigStorageCageDetails")
public class BigStorageCageDetailsController {

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassInfo.java

@@ -1,5 +1,7 @@
package com.mes.bigstorage.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

/**
@@ -13,6 +15,7 @@
    /**
     * /*大理片笼信息表id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * /*玻璃id

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassRelationInfo.java

@@ -1,5 +1,7 @@
package com.mes.bigstorage.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

/**
@@ -13,6 +15,7 @@
    /**
     * /*钢化玻璃关系表id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    private String engineerId;

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java

@@ -20,7 +20,7 @@
 * @author zhoush
 * @since 2024-04-16
 */
@Api(description = "进片任务信息")
@Api(tags = "进片任务信息")
@RestController
@RequestMapping("/big-storage-cage-feed-task")
public class BigStorageCageFeedTaskController {

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java

@@ -20,7 +20,7 @@
 * @author zhoush
 * @since 2024-04-16
 */
@Api(description = "出片任务信息")
@Api(tags = "出片任务信息")
@RestController
@RequestMapping("/big-storage-cage-out-task")
public class BigStorageCageOutTaskController {

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java

@@ -1,6 +1,7 @@
package com.mes.edgglasstask.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -12,6 +13,7 @@
 * @author wu
 * @since 2024-05-11
 */
@Api(tags = "磨边队列")
@RestController
@RequestMapping("/edgGlassTaskInfo")
public class EdgGlassTaskInfoController {

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java

@@ -298,21 +298,22 @@
                    continue;
                }
                int sequence = -1;
                int startSlot = -1;
                int targetSlot = -1;
                for (BigStorageSequenceDTO item : sequenceDTOList) {
                    if (item.getMaxSequence() == sequence - 1) {
                        //生成调度任务
                        int targetSlot = item.getSlot();
                        int startSlot = item.getSlot();
                        list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
                                .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN).eq(BigStorageCageDetails::getSlot, startSlot));
                        computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task", targetSlot, Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
                        computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task",
                                targetSlot, Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
                        List<Integer> slotList = new ArrayList<>();
                        slotList.add(targetSlot);
                        updateSlotRemainBySlots(slotList);
                        break loop;
                    }
                    sequence = item.getMinSequence();
                    startSlot = item.getSlot();
                    targetSlot = item.getSlot();
                }
            }
        }

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java

@@ -22,7 +22,7 @@
 * @author zhoush
 * @since 2024-03-27
 */
@Api(description = "钢化小片表信息")
@Api(tags = "钢化小片表信息")
@RestController
@RequestMapping("/temperingGlassInfo")
public class TemperingGlassInfoController {

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java

@@ -106,9 +106,9 @@
        String engineerId = upPattenUsage.get(0).getEngineeringId();
        int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
        if (count <=0){
            //保存原片使用详情表
            this.saveBatch(upPattenUsage);
        }
        //保存原片使用详情表
    }

    @Override

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java

@@ -13,7 +13,7 @@

import java.util.List;
import java.util.Map;
@Api(description = "缓存")
@Api(tags = "缓存")
@RestController
@RequestMapping("/downStorage")
public class DownStorageCageDetailsController {

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java

@@ -26,7 +26,7 @@
 */

@RestController
@Api(description = "工位")
@Api(tags = "工位")
@RequestMapping("/downWorkStation")
public class DownWorkstationController {


 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java

@@ -19,6 +19,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -81,6 +82,8 @@
            BeanUtils.copyProperties(queue, queueInfo);
            queueInfo.setState(Const.TEMPERING_NEW);
            queueInfo.setCell(cell);
            queueInfo.setCreateTime(new Date());
            queueInfo.setUpdateTime(new Date());
            hollowQueues.add(queueInfo);
            if (queue.getIsPair() == 1){
                isPairCount -=1;

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java

@@ -567,7 +567,7 @@
                List<HollowGlassQueueInfo> list = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>()
                        .eq(HollowGlassQueueInfo::getFlowCardId, hollowGlassQueueInfo.getFlowCardId())
                        .eq(HollowGlassQueueInfo::getCell, hollowGlassQueueInfo.getCell())
                        .eq(HollowGlassQueueInfo::getIsPair, 1)
//                        .eq(HollowGlassQueueInfo::getIsPair, 1)
                        .eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
                );
                if (CollectionUtil.isEmpty(list)){

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java

@@ -36,22 +36,23 @@
    public void hollowGlassTask() {
        List<HollowGlassOutRelationInfo> taskList = hollowGlassOutRelationInfoService.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
                .in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START, Const.HOLLOW_FLOW_CARD_PAUSE));
        if (CollectionUtil.isEmpty(taskList)){
        if (CollectionUtil.isEmpty(taskList)) {
            return;
        }
        JSONObject jsonObject = new JSONObject();
        List<String> flowCardIdList = taskList.stream().map(HollowGlassOutRelationInfo::getFlowCardId).collect(Collectors.toList());
        List<HollowGlassQueueInfo> list = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>().in(HollowGlassQueueInfo::getFlowCardId, flowCardIdList));
        Map<Integer, List<HollowGlassQueueInfo>> listMap = list.stream().collect(Collectors.groupingBy(HollowGlassQueueInfo::getCell));
        jsonObject.append("930",listMap.get(930));
        jsonObject.append("931",listMap.get(931));
        jsonObject.append("932",listMap.get(932));
        jsonObject.append("930", listMap.get(930));
        jsonObject.append("931", listMap.get(931));
        jsonObject.append("932", listMap.get(932));
        List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("HollowGlass");
        if (CollectionUtil.isNotEmpty(sendwServer)) {
                WebSocketServer socketServer = sendwServer.get(0);
            for (WebSocketServer socketServer : sendwServer) {
                if (socketServer != null && socketServer.session.isOpen()) {
                    socketServer.sendMessage(jsonObject.toString());
                }
            }
        }
    }
}

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-yw.yml

@@ -22,7 +22,7 @@
  cloud:
    nacos:
      discovery:
        server-addr: 192.168.2.100:8848
        server-addr: 127.0.0.1:8848
  redis:
    database: 0
    host: 192.168.2.100

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml

@@ -3,16 +3,16 @@

spring:
  profiles:
    active: dev
    active: yw
  application:
    name: hollowGlass
  liquibase:
    enabled: false
  task:
    scheduling:
      pool:
        size: 10
      thread-name-prefix: task-hollowGlass
#  task:
#    scheduling:
#      pool:
#        size: 10
#      thread-name-prefix: task-hollowGlass
mybatis-plus:
  mapper-locations: classpath*:mapper/*.xml
  configuration:
@@ -29,13 +29,9 @@
  xMaxSize: 2800
  temperingOutTargetPosition: 930
  artificialOutTargetPosition: 931

  scan:
    ip: 192.168.30.199
    port: 5000
kangaroohy:
  milo:
    enabled: false
    enabled: true
    primary: default
    config:
      default: