whycxzp
2020-12-07 19780d1040ef208f316d0a1f22f4fefb98abf2b2
update
5个文件已修改
104 ■■■■■ 已修改文件
src/main/java/com/fgkj/mapper/impl/Batt_attentionMapper.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/mapper/impl/BatttestdatastopMapper.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/Batt_attentionService.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattAttentionMapper.xml 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattTestDataStopMapper.xml 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/mapper/impl/Batt_attentionMapper.java
@@ -4,6 +4,7 @@
import com.fgkj.dto.Batt_attention;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -21,25 +22,7 @@
    public List serchByCondition(Batt_Maint_Dealarm bmd);
    //关注之前识别是否关注过
    public int judgeInOrNot(Object obj);
    /*public static void main(String[] args) {
        Batt_attentionImpl bimpl=new Batt_attentionImpl();
        BattInf binf=new BattInf();
        binf.setStationName("");
        binf.setStationName1("");
        binf.setBattGroupId(0);
        binf.setMonNum(0);
        binf.setNum(1002);
        Page page=new Page();
        page.setPageCurr(1);
        page.setPageSize(10);
        Batt_Maint_Dealarm bmd=new Batt_Maint_Dealarm();
        bmd.setBinf(binf);
        bmd.setPage(page);
        List list=bimpl.serchByCondition(bmd);
        System.out.println(list);
    }*/
    @Select("select count(num) as nums from web_site.tb_batt_attention where battgroupid=#{BattGroupId} and monnum=#{MonNum}  and uid=#{Uid} limit 1")
    public int judgeInOrNot(Batt_attention attention);
}
src/main/java/com/fgkj/mapper/impl/BatttestdatastopMapper.java
@@ -1,8 +1,8 @@
package com.fgkj.mapper.impl;
import java.util.List;
import com.fgkj.dto.BattInf;
import org.springframework.stereotype.Repository;
import java.util.List;
public interface BatttestdatastopMapper{
@@ -40,7 +40,7 @@
     public List serchBadBatt(Object obj);
      //查询指定电池组指定单体的实际容量
    public double serchRealCapByMon_num(Object obj);
    public double serchRealCapByMon_num(BattInf binf);
    /*public static void main(String[] args) {
        Batttestdatastop btds=new Batttestdatastop();
src/main/java/com/fgkj/services/Batt_attentionService.java
@@ -64,22 +64,22 @@
                double realcap=battTestDataStopmapper.serchRealCapByMon_num(binf);
                binf.setMonSerStd((float) realcap);//实际容量
            }
            model.setCode(1);
            model.setData(pageInfo);
        }
        model.setCode(1);
        return model;
    }
     //关注之前识别是否关注过
    public ServiceModel judgeInOrNot(Object obj) {
    public ServiceModel judgeInOrNot(Batt_attention attention) {
        ServiceModel model = new ServiceModel();
        int flag = mapper.judgeInOrNot(obj);
        int flag = mapper.judgeInOrNot(attention);
        if (flag==1) {
            model.setCode(1);
            model.setMsg("该信息已经被关注!");
        }else{
            model.setCode(0);
            model.setMsg("该信息未被关注!");
        }
        model.setCode(1);
        return model;
    }
src/main/resources/mapper/BattAttentionMapper.xml
@@ -3,12 +3,48 @@
<mapper namespace="com.fgkj.mapper.impl.Batt_attentionMapper" >
    <resultMap id="Map_BattInf" type="BattInf">
        <result property="battGroupId" column="battGroupId"/>
        <result property="stationId" column="stationId"/>
        <result property="stationName" column="stationName"/>
        <result property="stationName1" column="stationName1"/>
        <result property="battGroupName" column="battGroupName"/>
        <result property="monCapStd" column="monCapStd"/>
        <result property="monVolStd" column="monVolStd"/>
        <result property="monVolLowToAvg" column="monVolStd"/>
        <result property="monNum" column="monNum"/>
    </resultMap>
    <delete id="del"></delete>
    <select id="serchByCondition" resultMap="Map_BattInf">
        select
            web_site.tb_batt_attention.battgroupid,
            web_site.tb_batt_attention.monnum ,
            db_battinf.tb_battinf.battgroupid,
            db_battinf.tb_battinf.stationid,
            db_battinf.tb_battinf.stationname,
            db_battinf.tb_battinf.stationname1,
            db_battinf.tb_battinf.battgroupname,
            db_battinf.tb_battinf.moncapstd,
            db_battinf.tb_battinf.monvolstd,
            db_ram_db.tb_batt_rtdata.mon_vol
        from
          web_site.tb_batt_attention,db_battinf.tb_battinf,db_ram_db.tb_batt_rtdata
        where
            web_site.tb_batt_attention.battgroupid=db_battinf.tb_battinf.battgroupid
            and web_site.tb_batt_attention.battgroupid=db_ram_db.tb_batt_rtdata.battgroupid
            and web_site.tb_batt_attention.monnum=db_ram_db.tb_batt_rtdata.mon_num
            and web_site.tb_batt_attention.uid=#{binf.num}
        <if test="binf.stationName1!=''">
            and stationname1=#{binf.stationName1}
        </if>
        <if test="binf.stationName!=''">
            and stationname=#{binf.stationName}
        </if>
        <if test="binf.battGroupId!=0">
            and db_battinf.tb_battinf.BattGroupId=#{binf.battGroupId}
        </if>
        <if test="binf.monNum!=0">
            and web_site.tb_batt_attention.monnum=#{binf.monNum}
        </if>
        order by web_site.tb_batt_attention.battgroupid
    </select>
    <select id="judgeInOrNot" resultType="java.lang.Integer"></select>
</mapper>
src/main/resources/mapper/BattTestDataStopMapper.xml
@@ -477,5 +477,24 @@
    <select id="serch" resultType="java.util.List"></select>
    <select id="serchByCap" resultType="java.util.List"></select>
    <select id="serchBadBatt" resultType="java.util.List"></select>
    <select id="serchRealCapByMon_num" resultType="java.lang.Double"></select>
    <select id="serchRealCapByMon_num" resultType="java.lang.Double">
        select
            db_batt_testdata.tb_batttestdatastop_#{battGroupId}.battgroupid,
            db_batt_testdata.tb_batttestdatastop_#{battGroupId}.test_curr,
            db_batt_testdata.tb_batttestdatastop_#{battGroupId}.test_cap,
            db_batt_testdata.tb_batttestdatastop_#{battGroupId}.mon_vol,
            db_batt_testdata.tb_batttestdatastop_#{battGroupId}.test_record_count ,
            db_batt_testdata.tb_batttestdatastop_#{battGroupId}.mon_num,
            db_batt_testdata.tb_batttestdata_inf.max_monvol
        from
            db_batt_testdata.tb_batttestdatastop_#{battGroupId},db_batt_testdata.tb_batttestdata_inf
        where
            db_batt_testdata.tb_batttestdatastop_#{battGroupId}.BattGroupId=db_batt_testdata.tb_batttestdata_inf.BattGroupId
            and db_batt_testdata.tb_batttestdatastop_#{battGroupId}.test_starttime=db_batt_testdata.tb_batttestdata_inf.test_starttime
            and db_batt_testdata.tb_batttestdatastop_#{battGroupId}.mon_num=#{monNum}
            and db_batt_testdata.tb_batttestdatastop_#{battGroupId}.data_available=1
            and db_batt_testdata.tb_batttestdata_inf.test_type=3
        order by db_batt_testdata.tb_batttestdatastop_#{battGroupId}.test_starttime desc
        limit 1
    </select>
</mapper>