whycxzp
2022-09-19 e3fe141d743f6c647d0637c94d2b085d36ea1af1
更新分析
1个文件已删除
4个文件已添加
3个文件已修改
109 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/BattGroupDataController.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattGroupDataMapper.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattgroupDataMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/BattgroupData.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattGroupDataService.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/StationInfoService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/0Mapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattgroupDataMapper.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/BattGroupDataController.java
New file
@@ -0,0 +1,38 @@
package com.whyc.controller;
import com.whyc.dto.Response;
import com.whyc.pojo.BattgroupData;
import com.whyc.service.BattGroupDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@Api(tags = "电池组数据")
@RestController
@RequestMapping("battGroupData")
public class BattGroupDataController {
    @Autowired
    private BattGroupDataService service;
    @ApiOperation("单数据分析-单体数据列表")
    @GetMapping("list")
    public Response getList(@RequestParam int battGroupId){
        List<BattgroupData> monList = service.getListWithTestTime(battGroupId);
        return new Response().set(1,monList);
    }
    @ApiOperation("对比分析-两组数据列表")
    @GetMapping("compareList")
    public Response getComparedList(@RequestParam int baseBattGroupId,@RequestParam int battGroupId){
        return service.getComparedList(baseBattGroupId,battGroupId);
    }
}
src/main/java/com/whyc/mapper/BattGroupDataMapper.java
New file
@@ -0,0 +1,11 @@
package com.whyc.mapper;
import com.whyc.pojo.BattgroupData;
import java.util.List;
public interface BattGroupDataMapper extends CustomMapper<BattgroupData>{
    List<BattgroupData> getListWithTestTime(int battGroupId);
}
src/main/java/com/whyc/mapper/BattgroupDataMapper.java
File was deleted
src/main/java/com/whyc/pojo/BattgroupData.java
@@ -10,6 +10,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
 * <p>
@@ -54,5 +55,8 @@
    @ApiModelProperty(value = "异常标记 0:无异常 1:鼓包 2:漏液 4:开裂 8:内阻超标")
    private int er;
    @TableField(exist = false)
    private Date testTime;
}
src/main/java/com/whyc/service/BattGroupDataService.java
New file
@@ -0,0 +1,35 @@
package com.whyc.service;
import com.whyc.dto.Response;
import com.whyc.mapper.BattGroupDataMapper;
import com.whyc.pojo.BattgroupData;
import com.whyc.pojo.FileInfo;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.LinkedList;
import java.util.List;
@Service
public class BattGroupDataService {
    @Resource
    private BattGroupDataMapper mapper;
    public List<BattgroupData> getListWithTestTime(int battGroupId) {
        return mapper.getListWithTestTime(battGroupId);
    }
    public Response getComparedList(int baseBattGroupId, int battGroupId) {
        List<BattgroupData> baseDataList = getListWithTestTime(baseBattGroupId);
        List<BattgroupData> dataList = getListWithTestTime(battGroupId);
        //内阻变化率,均一性;电压变化率,均一性 TODO 均一性
        List<Float> resChangeRate = new LinkedList<>();
        List<Float> volChangeRate = new LinkedList<>();
        List<Float> resBalanceRate = new LinkedList<>();
        List<Float> volBalanceRate = new LinkedList<>();
        return new Response().setII(1,baseDataList,dataList,null);
    }
}
src/main/java/com/whyc/service/StationInfoService.java
@@ -27,7 +27,7 @@
    private BattgroupInfoMapper groupInfoMapper;
    @Autowired(required = false)
    private BattgroupDataMapper dataMapper;
    private BattGroupDataMapper dataMapper;
    @Autowired(required = false)
    private FileParamMapper paramMapper;
src/main/resources/mapper/0Mapper.xml
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper" >
</mapper>
src/main/resources/mapper/BattgroupDataMapper.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.BattgroupDataMapper">
<mapper namespace="com.whyc.mapper.BattGroupDataMapper">
    <select id="getListWithTestTime" resultType="com.whyc.pojo.BattgroupData">
        SELECT data.*,info.test_time FROM db_res_meter.tb_battgroup_data data,db_res_meter.tb_battgroup_info info
        where data.battGroup_id = info.battGroup_id and data.battGroup_id = #{battGroupId}
    </select>
</mapper>