提交 a41aa6af 编辑于 作者: 夏东伟's avatar 夏东伟
浏览文件

AVI调试

上级 beba65cf

src/main/java/net/vtstar/zhongtong/avi/equipment/domain/PaintshopStation.java

+1 −1
原始行号 差异行号 差异行
@@ -27,7 +27,7 @@ import java.util.Date; 
@Data

@Search(code = "PAINTSHOP_STATION")

@Table(name = "paintshop_station")

public class PaintshopStation implements Serializable {

public class PaintshopStation {



    @Id

    private Long id;

src/main/java/net/vtstar/zhongtong/avi/equipment/domain/RuntimeRecord.java

+3 −0
原始行号 差异行号 差异行
@@ -54,4 +54,7 @@ public class RuntimeRecord { 
    @ApiModelProperty(notes = "创建时间")

    @Column(name = "create_time")

    private Date createTime;



    @Column(name = "group_code")

    private String groupCode;

}

src/main/java/net/vtstar/zhongtong/avi/equipment/job/StatisticsTimeJob.java

+3 −0
原始行号 差异行号 差异行
@@ -81,6 +81,9 @@ public class StatisticsTimeJob extends QuartzJobBean { 
                runtimeRecord.setTotalRuntime(total.add(hours));

                runtimeRecord.setMachineId(info.getId());

                runtimeRecord.setWorkshopCode(info.getWorkshopCode());

                if("POLISHING_ROOM".equals(info.getEquipType())){

                    runtimeRecord.setGroupCode("1");

                }

                runtimeRecordMapper.insert(runtimeRecord);

            }

        }

src/main/java/net/vtstar/zhongtong/avi/equipment/service/EquipmentService.java

+10 −2
原始行号 差异行号 差异行
@@ -66,13 +66,21 @@ public class EquipmentService { 


    public List<Map<String, Object>> findRealTimeData(JSONObject pageFilter) {

        PageHelper.startPage(pageFilter.getIntValue("pageNum"), pageFilter.getIntValue("pageSize"));

        Class searchCode = classNameCache.get(pageFilter.getString("searchCode"), Class.class);

        String searchCode = pageFilter.getString("searchCode");

        Class searchCodeClazz = classNameCache.get(searchCode, Class.class);

        if(searchCode == null){

            return new ArrayList<>();

        }

        if ("POLISHING_ROOM".equals(searchCode)){

            return dataMapper.findJoin(searchService.pageFilter2Filter(pageFilter, new WhereFilter(){{

                addFilter("status", Operation.IS, "null");

                addFilter("group_code", Operation.EQUAL, "1");

            }}), searchCodeClazz);



        }

        return dataMapper.findJoin(searchService.pageFilter2Filter(pageFilter, new WhereFilter(){{

            addFilter("status", Operation.EQUAL_GREATER_THAN, 1);

        }}), searchCode);

        }}), searchCodeClazz);

    }



    public void orderExport(JSONObject pageFilter, HttpServletResponse response) throws IOException {

src/main/java/net/vtstar/zhongtong/avi/equipment/service/RunRecordService.java

+4 −0
原始行号 差异行号 差异行
@@ -58,6 +58,7 @@ public class RunRecordService { 
        PageHelper.startPage(pageFilter.getIntValue("pageNum"), pageFilter.getIntValue("pageSize"));

        List<RuntimeRecord> list = runtimeRecordMapper.findList(searchService.pageFilter2Filter(pageFilter, new WhereFilter() {{

            addJoin(RuntimeRecord.class, "machine_id", EquipInfo.class, "id");

            addFilter(RuntimeRecord.class,"group_code", Operation.IS, "null");

        }}), RuntimeRecord.class);

        list.stream().forEach(runtimeRecord -> {

            switch (runtimeRecord.getWorkshopCode()){
@@ -173,6 +174,9 @@ public class RunRecordService { 
            if (null == warningMap.get(faultString)){

                faultRecord.setEndTime(new Date());

                faultRecordMapper.update(faultRecord);

            }else{

                faultRecord.setBeginTime(new Date());

                faultRecordMapper.update(faultRecord);

            }

        }

    }