Merge branch 'master' of http://dlindusit.com:53929/r/ansteel

 ansteel-biz/db/mysql.sql

@@ -572,11 +572,15 @@
                                     `sub_process_type` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '子工序类型',
                                     `clock` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '查询时间',
                                     `steam_p` decimal(10,4) DEFAULT NULL COMMENT '蒸汽发生',
                                     `dj_steam_p` decimal(10,4) DEFAULT NULL COMMENT '吨焦产蒸汽',
                                     `steam_c` decimal(10,4) DEFAULT NULL COMMENT '蒸汽消耗',
                                     `steam_only_c` decimal(10,4) DEFAULT NULL COMMENT '蒸汽单耗',
                                     `steam_v` decimal(10,4) DEFAULT NULL COMMENT '蒸汽量',
                                     `gas_p` decimal(10,4) DEFAULT NULL COMMENT '煤气发生',
                                     `gas_c` decimal(10,4) DEFAULT NULL COMMENT '煤气消耗',
                                     `power_c` decimal(10,4) DEFAULT NULL COMMENT '电力消耗',
                                     `power_only_c` decimal(10,4) DEFAULT NULL COMMENT '电力单耗',
                                     `power_c_standard` decimal(10,4) DEFAULT NULL COMMENT '电耗基准',
                                     `idle_time` decimal(10,4) DEFAULT NULL COMMENT '空转时间',
                                     `bfg_c` decimal(10,4) DEFAULT NULL COMMENT 'BFG消耗',
                                     `cog_p` decimal(10,4) DEFAULT NULL COMMENT 'COG回收',

 ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java

@@ -15,69 +15,85 @@
public class CokingOverviewDTO {

    @TableId(type = IdType.ASSIGN_UUID)
    private String id;
    private String id;
    /**
     * 关联ID
     */
    private String relId;
    private String relId;
    /**
     * 工序类型
     */
    private String processType;
    private String processType;
    /**
     * 工序类型名称
     */
    private String processTypeName;
    private String processTypeName;
    /**
     * 子工序类型
     */
    private String subProcessType;
    private String subProcessType;
    /**
     * 子工序类型名称
     */
    private String subProcessTypeName;
    private String subProcessTypeName;
    /**
     * 查询时间
     */
    private String clock;
    private String clock;
    /**
     * 蒸汽发生
     * 蒸汽发生/总产生
     */
    private BigDecimal steamP;
    private BigDecimal steamP;
    /**
     * 蒸汽消耗
     * 吨焦产蒸汽
     */
    private BigDecimal steamC;
    private BigDecimal djSteamP;
    /**
     * 蒸汽消耗/总耗
     */
    private BigDecimal steamC;
    /**
     * 蒸汽单耗
     */
    private BigDecimal steamOnlyC;
    /**
     * 蒸汽量
     */
    private BigDecimal steamV;
    private BigDecimal steamV;
    /**
     * 煤气发生
     */
    private BigDecimal gasP;
    private BigDecimal gasP;
    /**
     * 煤气消耗
     */
    private BigDecimal gasC;
    private BigDecimal gasC;
    /**
     * 电力消耗
     * 电力消耗/总耗
     */
    private BigDecimal powerC;
    private BigDecimal powerC;
    /**
     * 电力单耗
     */
    private BigDecimal powerOnlyC;
    /**
     * 电耗基准
     */
    private BigDecimal powerCStandard;
    /**
     * 空转时间
     */
    private BigDecimal idleTime;
    private BigDecimal idleTime;
    /**
     * BFG消耗
     * BFG消耗/总耗
     */
    private BigDecimal bfgC;
    /**
     * cog回收
     * COG回收
     */
    private BigDecimal cogP;
    /**
     * cog消耗
     * COG消耗/总耗
     */
    private BigDecimal cogC;


 ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingOverviewServiceImpl.java

@@ -60,7 +60,7 @@
        QueryWrapper<CokingOverviewEntity> queryWrapperMonth = new QueryWrapper<>();
        queryWrapperMonth.eq("process_type", processType);
        queryWrapperMonth.like("clock", month);
        queryWrapperMonth.select("sub_process_type","SUM(steam_p) as steam_p","SUM(steam_c) as steam_c","SUM(steam_v) as steam_v","SUM(gas_p) as gas_p","SUM(gas_c) as gas_c","SUM(power_c) as power_c","SUM(idle_time) as idle_time","SUM(bfg_c) as bfg_c","SUM(cog_p) as cog_p","SUM(cog_c) as cog_c","SUM(bfg_only_c) as bfg_only_c","SUM(cog_only_c) as cog_only_c")
        queryWrapperMonth.select("sub_process_type","SUM(steam_p) as steam_p","SUM(dj_steam_p) as dj_steam_p","SUM(steam_c) as steam_c","SUM(steam_only_c) as steam_only_c","SUM(steam_v) as steam_v","SUM(gas_p) as gas_p","SUM(gas_c) as gas_c","SUM(power_c) as power_c","SUM(power_only_c) as power_only_c","SUM(power_c_standard) as power_c_standard","SUM(idle_time) as idle_time","SUM(bfg_c) as bfg_c","SUM(cog_p) as cog_p","SUM(cog_c) as cog_c","SUM(bfg_only_c) as bfg_only_c","SUM(cog_only_c) as cog_only_c")
                .groupBy("sub_process_type");

        List<CokingOverviewEntity> monthList = cokingOverviewDao.selectList(queryWrapperMonth);

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java

@@ -146,13 +146,14 @@
                    cokingTraceChartEntity.setDataNo(e.getPointNo());
                    cokingTraceChartEntity.setDataType(e.getDataType());

                    cokingTraceChartEntity.setEndTime(calendar.getTime());
                    Calendar clone = (Calendar) calendar.clone();
                    cokingTraceChartEntity.setEndTime(clone.getTime());
                    if (e.getExt2().equals("month")) {
                        calendar.add(Calendar.MONTH,-1 * Integer.parseInt(e.getExt1()));
                        clone.add(Calendar.MONTH,-1 * Integer.parseInt(e.getExt1()));
                    } else if (e.getExt2().equals("day")) {
                        calendar.add(Calendar.DAY_OF_YEAR,-1 * Integer.parseInt(e.getExt1()));
                        clone.add(Calendar.DAY_OF_YEAR,-1 * Integer.parseInt(e.getExt1()));
                    }
                    cokingTraceChartEntity.setStartTime(calendar.getTime());
                    cokingTraceChartEntity.setStartTime(clone.getTime());
                    cokingTraceChartEntity.setCreateDate(new Date());
                    cokingTraceChartEntityList.add(cokingTraceChartEntity);
                });

 doc/鞍钢数据接口文档_dev_deng.doc

Binary files differ