焦化总图-指标分析新增analy_date,analy_class判断

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java

@@ -88,25 +88,27 @@
    @GetMapping("/analy-ind/list")
    @Operation(summary = "焦化总图-指标分析")
    public CommonResult<List<CokingAnalyIndDTO>> getCokingAnalyIndList(@RequestParam Map<String, Object> params) {
        String clock = (String) params.get("clock");
        if (StringUtils.isBlank(clock)) {
        String analyDate = (String) params.get("analyDate");
        if (StringUtils.isBlank(analyDate)) {
            Calendar calendar = Calendar.getInstance();
            calendar.set(Calendar.MILLISECOND, 0);
            calendar.set(Calendar.SECOND, 0);
            calendar.set(Calendar.MINUTE, 0);
            int hour = calendar.get(Calendar.HOUR_OF_DAY);
            String analyClass = "";
            if (hour >= 8 && hour < 16) {
                calendar.set(Calendar.HOUR_OF_DAY, 0);
                clock = DateUtils.format(calendar.getTime()).concat("-").concat("A");
                analyDate = DateUtils.format(calendar.getTime());
                analyClass = "甲班";
            } else if (hour >= 16 && hour < 24) {
                calendar.set(Calendar.HOUR_OF_DAY, 8);
                clock = DateUtils.format(calendar.getTime()).concat("-").concat("B");
                analyDate = DateUtils.format(calendar.getTime());
                analyClass = "甲班";
            } else if (hour >= 0 && hour < 8) {
                calendar.add(Calendar.DAY_OF_YEAR, -1);
                calendar.set(Calendar.HOUR_OF_DAY, 16);
                clock = DateUtils.format(calendar.getTime()).concat("-").concat("B");
                analyDate = DateUtils.format(calendar.getTime());
                analyClass = "甲班";
            }
            params.put("clock", clock);
            params.put("analyDate", analyDate);
            params.put("analyClass", analyClass);
        }
        List<CokingAnalyIndEntity> list = cokingAnalyIndService.list(params);
        return success(ConvertUtils.sourceToTarget(list, CokingAnalyIndDTO.class));

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

@@ -5,6 +5,7 @@
import com.iailab.module.ansteel.coking.entity.CokingAnalyIndEntity;
import com.iailab.module.ansteel.coking.service.CokingAnalyIndService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -25,8 +26,12 @@

    @Override
    public List<CokingAnalyIndEntity> list(Map<String, Object> params) {
        String analyDate = (String) params.get("analyDate");
        String analyClass = (String) params.get("analyClass");
        QueryWrapper<CokingAnalyIndEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.orderByAsc("sort");
        queryWrapper.eq(StringUtils.isNotBlank(analyDate),"analy_date", analyDate)
                .eq(StringUtils.isNotBlank(analyClass),"analy_class", analyClass)
                .orderByAsc("sort");
        return cokingAnalyIndDao.selectList(queryWrapper);
    }


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

@@ -5,7 +5,6 @@
import com.iailab.module.ansteel.coking.entity.CokingAnalyTrendEntity;
import com.iailab.module.ansteel.coking.service.CokingAnalyTrendService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -26,10 +25,8 @@

    @Override
    public List<CokingAnalyTrendEntity> list(Map<String, Object> params) {
        String clock = (String) params.get("clock");
        QueryWrapper<CokingAnalyTrendEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq(StringUtils.isNotBlank(clock),"clock", clock)
                .orderByAsc("sort");
        queryWrapper.orderByAsc("sort");
        return cokingAnalyTrendDao.selectList(queryWrapper);
    }
}