k94314517
2025-07-24 37c26c912cf99adde8351a95daad00f0efaeaefc
代码初始化
已修改3个文件
24 ■■■■■ 文件已修改
server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
@@ -42,11 +42,11 @@
         * 已入库
         */
        ddsc(0,"订单生成",new Integer[]{ChildStatusLevel.create.getOrderStatus()
                ,ChildStatusLevel.kcbz.getOrderStatus()}),
                }),
        ydpzz (1,"运输任务生成",new Integer[]{ChildStatusLevel.ysdxc.getOrderStatus()
                ,ChildStatusLevel.ysdcx.getOrderStatus()
                ,ChildStatusLevel.shtg.getOrderStatus()
                ,ChildStatusLevel.shwtg.getOrderStatus()}),
                ,ChildStatusLevel.shwtg.getOrderStatus(),ChildStatusLevel.kcbz.getOrderStatus()}),
        ckckz (2,"仓库出库",new Integer[]{ChildStatusLevel.ddzhddzs.getOrderStatus()
                ,ChildStatusLevel.sqzyzwc.getOrderStatus()
                ,ChildStatusLevel.clqddzs.getOrderStatus()}),
@@ -140,7 +140,7 @@
        ddzhddzs(6,3,2,"到达装货地-电子锁汽运","车辆已到达装货地" ),
        clqddzs(7, 4,2,"车辆启运-电子锁汽运","车辆已启运" ),
        clqdapp(8, 7,3,"车辆启运-APP","车辆运输中" ),
        kcbz(11, 9,0,"待生产","当前订单库存不足,待生产" ),
        kcbz(11, 9,1,"待生产","当前订单库存不足,待生产" ),
        ddzhd(9, 8,4,"到达卸货地-APP","车辆已到达卸货地" ),
        ddxhd(10, 5,5,"到达卸货地-电子锁汽运","电子锁已解锁,运输任务已完成" ),
        ;
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1917,6 +1917,8 @@
                visitVO.setName(days);
                weekVisitList.add(visitVO);
                InterestedListVO carVO = new InterestedListVO();
                carVO.setNum(Constants.ZERO);
                carVO.setName(days);
@@ -1928,7 +1930,7 @@
                    List<String> carCodeList  = inoutRecordList.stream().filter(i->
                                    Objects.nonNull(i.getCarCode())
                                            && Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
                                            && Objects.isNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                                            &&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                            )
                            .map(i->i.getCarCode())
                            .collect(Collectors.toList());
@@ -1937,9 +1939,8 @@
                    }
                }
                if(Objects.isNull(carVO.getNum())){
                    visitVO.setNum(Constants.ZERO);
                    carVO.setNum(Constants.ZERO);
                }
                weekVisitList.add(visitVO);
                weekCarList.add(carVO);
            }
            pcWorkPlatformDataVO.setWeekVisitList(weekVisitList );
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -503,12 +503,15 @@
        request.setFetchImg(true);
        RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
        file.setFieldName("event_type");
        file.setFieldValue("131588,131593");//安防告警和人员告警
        //安防事件划分方式:
        //重点区域:重点人员-1644175361、区域入侵-1644175361、陌生人-1644171265、车辆违停-1644171265
        //危险行为:人员倒地-1644171265、未带安全帽-422000002、抽烟-422000000、打电话-422000001、睡岗-422400001、离岗-422400000
        file.setFieldValue("131588,131593,1644171265,422000002,422000000,422000001,422400001,422400000,1644175361,1644175361,1644171265,1644171265");//安防告警和人员告警
        file.setType("in");
        if(type == 1){
            file.setFieldValue("131588");//安防告警 区域入侵
            file.setFieldValue("131588,1644175361,1644175361,1644171265,1644171265");//安防告警 区域入侵
        }else  if(type == 2){
            file.setFieldValue("131593");//人员告警 危险行为
            file.setFieldValue("131593,1644171265,422000002,422000000,422000001,422400001,422400000");//人员告警 危险行为
        }
        request.getFiledOptions().add(file);
@@ -525,7 +528,7 @@
        request.getFiledOptions().add(fileGte);
        RuleEventFiledOptionsRequest fileStatus = new RuleEventFiledOptionsRequest();
        fileStatus.setFieldName("happen_time");
        fileStatus.setFieldName("handle_status");
        fileStatus.setFieldValue("99");
        fileStatus.setType("neq");
        request.getFiledOptions().add(fileStatus);