*

lsh

2025-07-29 a44f20b702bd4b9df09e7f8f01d5e47c9c3fe17e

 src/main/java/com/zy/asrs/controller/MonitorController.java

@@ -1,12 +1,17 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.common.model.MatDto;
import com.zy.common.service.CommonService;
@@ -43,6 +48,10 @@
    private SlaveProperties slaveProperties;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WaitPakinMapper waitPakinMapper;
    @Autowired
    private ApiLogService apiLogService;

    /**
     * 获取当前时间
@@ -65,6 +74,19 @@
                    }

                    if (!staProtocolPall.isAutoing() || !staProtocolPall.isLoading() || staProtocolPall.getWorkNo() != 0 || !staProtocolPall.isPakMk()){
                        try{
                            // 保存接口日志
                            apiLogService.save(
                                    "中控申请获取"+palletizingNo+"站点当前条码信息",
                                    "/monitor/barcode/two",
                                    null,
                                    null,
                                    JSON.toJSONString(palletizingNo),
                                    "未就绪！！！",
                                    false
                            );
                        }catch (Exception e){
                        }
                        return R.error("未就绪！！！");
                    }

@@ -89,11 +111,52 @@
//        Calendar calendar = Calendar.getInstance();
//        calendar.setTime(now);
        if (Cools.isEmpty(barcode) || barcode.equals("")){
            try{
                // 保存接口日志
                apiLogService.save(
                        "中控申请获取"+palletizingNo+"站点当前条码信息",
                        "/monitor/barcode/two",
                        null,
                        null,
                        JSON.toJSONString(palletizingNo),
                        "未就绪！！！托盘条码为空！！！请检查！！！",
                        false
                );
            }catch (Exception e){
            }
            return R.error("未就绪！！！托盘条码为空！！！请检查！！！");
        }
        return R.ok(
                Cools.add("barcode", barcode).add("Date",now)
        );
        if (waitPakinMapper.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", barcode))!=0){
            try{
                // 保存接口日志
                apiLogService.save(
                        "中控申请获取"+palletizingNo+"站点当前条码信息",
                        "/monitor/barcode/two",
                        null,
                        null,
                        JSON.toJSONString(palletizingNo),
                        "未就绪！！！托盘条码不为空但是已存在数据，不可重复使用！！！请检查！！！",
                        false
                );
            }catch (Exception e){
            }
            return R.error("未就绪！！！托盘条码不为空但是已存在数据，不可重复使用！！！请检查！！！");
        }
        Cools.CoolMap coolMap = Cools.add("barcode", barcode).add("Date", now);
        try{
            // 保存接口日志
            apiLogService.save(
                    "中控申请获取"+palletizingNo+"站点当前条码信息",
                    "/monitor/barcode/two",
                    null,
                    null,
                    JSON.toJSONString(palletizingNo),
                    JSON.toJSONString(coolMap),
                    true
            );
        }catch (Exception e){
        }
        return R.ok(coolMap);
    }

    /**
@@ -359,9 +422,10 @@
    @GetMapping("/led/useInfo")
    public R monitorLedUseInfo(@RequestParam("ledId") Integer ledId) {
        Integer count1 = wrkDetlService.count1();
        Integer count11 = wrkDetlService.count11();
        Integer count3 = wrkDetlService.count3();
        Map<String, Object> map = new HashMap<>();
        map.put("count1", count1);
        map.put("count1", count1+count11);
        map.put("count2", count3);
        return R.ok().add(map);
    }