whycxzp
2023-06-12 98d750f9d9bcfa70b82b2c80d91a1c85adb706b6
增加校验,被关注电池是否核容过
1个文件已修改
16 ■■■■ 已修改文件
src/main/java/com/whyc/service/BattAttentionService.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattAttentionService.java
@@ -13,10 +13,12 @@
import com.whyc.mapper.BattAttentionMapper;
import com.whyc.mapper.BattInfMapper;
import com.whyc.mapper.BattTestDataStopMapper;
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.BattAttention;
import com.whyc.pojo.BattTestDataStop;
import com.whyc.pojo.Battinf;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -30,6 +32,9 @@
    @Resource
    private BattTestDataStopMapper stopMapper;
    @Resource
    private CommonMapper commonMapper;
    public Response searchByCondition(int pageNum,int pageSize,Battinf battinf,int userId){
        PageHelper.startPage(pageNum,pageSize);
@@ -37,8 +42,15 @@
        for (int i = 0; i < list.size(); i++) {
            Battinf binf = list.get(i);
            //最近一笔的实际容量
            double realcap = getRealCapByMonNum(binf);
            binf.setMonSerStd((float) realcap);//实际容量
            //增加校验,被关注的电池组 是否核容过(检查是否存在db_batt_testdata.tb_batttestdatastop_${battGroupId}表)
            String tableName = commonMapper.existTable("db_batt_testdata", "tb_batttestdatastop_"+binf.getBattGroupId());
            double realCap;
            if(tableName !=null) {
                realCap = getRealCapByMonNum(binf);
            }else{
                realCap = -1;
            }
            binf.setMonSerStd((float) realCap);//实际容量
        }
        PageInfo<Battinf> pageInfo = new PageInfo<>(list);
        return new Response().set(1,pageInfo,"查询成功");