#

18516761980

2022-08-13 45638cc0028dd89a90767be7e1d2648baf813b87

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

@@ -1,20 +1,26 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.PackStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.CrnThread;
@@ -105,6 +111,21 @@
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            vos.add(vo);
        }
        return R.ok().add(vos);
    }

    @PostMapping("/latest/data/loc")
    @ManagerAuth(memo = "库位实时数据")
    public R locLatestData(){
        List<LocLatestDataVo> vos = new ArrayList<>();
        List<LocMast> locMasts = locMastMapper.selectList(new EntityWrapper<LocMast>());
        for(LocMast locMast : locMasts){
            LocLatestDataVo vo = new LocLatestDataVo();
            vo.setLocNo(locMast.getLocNo());
            vo.setLocSts(locMast.getLocSts());
            vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus()));
            vos.add(vo);
        }
        return R.ok().add(vos);
@@ -292,15 +313,16 @@

    @GetMapping("/barcode/output/site")
    public R crnOutput(){
//        StringBuilder str = new StringBuilder();
//        String s;
//        int i = 0;
//        while((s = OutputQueue.CRN.poll()) != null && i <=32) {
//            str.append("\n").append(s);
//            i++;
//        }
//        return R.ok().add(str.toString());
        return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE)));
        ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.BARCODE);
        jsonObjects.sort(new Comparator<JSONObject>() {
            @Override
            public int compare(JSONObject o1, JSONObject o2) {
                Date o1Time = DateUtils.convert(o1.getString("time"), DateUtils.yyyyMMddHHmmss_F);
                Date o2Time = DateUtils.convert(o2.getString("time"), DateUtils.yyyyMMddHHmmss_F);
                return (int) (o2Time.getTime() - o1Time.getTime());
            }
        });
        return R.ok().add(JSON.toJSONString(jsonObjects));
    }

}