接口更新

whyczh

2022-01-05 76d23db6d954a7bcdacb37643ff24e35170c0b5b

接口更新

 src/main/java/com/whyc/controller/BattInfController.java

@@ -10,7 +10,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

@RequestMapping("battInf")
@@ -180,4 +179,10 @@
        return service.findBattInfoByStationId(stationId);
    }

    @GetMapping("/searchByMonNum")
    @ApiOperation(value = "根据电池组id查询不重复的单体编号")
    public Response searchByMonNum(int battGroupId){
        return service.searchByMonNum(battGroupId);
    }

}

 src/main/java/com/whyc/controller/BattMaintDealarmController.java

@@ -46,11 +46,10 @@
    /**
     * 蓄电池组后评估
     */
    @PostMapping("searchByCondition")
    @ApiOperation(notes = "TODO ", value = "蓄电池组后评估/searchByCondition")
    public Response<List<AllModel>> searchByCondition(@RequestBody BattMaintDealarm bmd) {

        //return battMaintDealarmService.searchByCondition(bmd);
        return null;
    @PostMapping("searchGroupAssess")
    @ApiOperation(notes = "searchByCondition ", value = "蓄电池组后评估")
    public Response<List<AllModel>> searchByCondition(@RequestBody ReportBattDTO tinf) {
        UserInf userInf = ActionUtil.getUser();
        return battMaintDealarmService.searchGroupAssess(tinf,userInf.getUId().intValue());
    }
}

 src/main/java/com/whyc/mapper/BattInfMapper.java

@@ -64,6 +64,8 @@

    //报表统计-电池组评估
    List<Battinf> searchGroupAssess();
    //根据蓄电池组查不重复的MonCount(monNum)（单体编号）(但实际sql语句通过battGroupId查询)
    List<Battinf> searchByMonNum(@Param("battGroupId") int battGroupId);

    List<Battinf> getStationList8059(Long uId);
}

 src/main/java/com/whyc/mapper/BattMaintDealarmMapper.java

@@ -12,4 +12,7 @@
    List<Battinf> searchLow(BattMaintDealarm bmd);

    List<BatttestdataInf> searchByTestType(@Param("tinf") BatttestdataInf tinf);

    List searchByBattGroupIdCondition();

}

 src/main/java/com/whyc/service/BattInfService.java

@@ -254,6 +254,14 @@
        List<Battinf> list = battInfMapper.selectList(queryWrapper);
        return new Response().set(1,list,"查询成功");
    }
    //-----------根据蓄电池组查不重复的MonCount(monNum)（单体编号）
    public Response searchByMonNum(int battGroupId){
        List<Battinf> list = battInfMapper.searchByMonNum(battGroupId);
        for (Battinf inf:list) {
            inf.setMonNum(Integer.parseInt(inf.getSignalName().split("#")[0]));
        }
        return new Response().set(1,list,"查询成功");
    }

    public List<Battinf> getStationList8059(Long uId) {
        return battInfMapper.getStationList8059(uId);

 src/main/java/com/whyc/service/BattMaintDealarmService.java

@@ -53,7 +53,7 @@
    }

    //1.4电池性能评估
    public List searchGroupAssess(ReportBattDTO tinf, int userId){
    public Response searchGroupAssess(ReportBattDTO tinf, int userId){
        List<Battinf> battinfList = battInfMapper.searchByTestType(tinf, userId);
        List<Map> result = new ArrayList<>();
        if (battinfList!=null && battinfList.size()>0){
@@ -66,11 +66,14 @@
                btdinf.setBattGroupId(binf.getBattGroupId());
                btdinf.setGroupVol(binf.getMonVolStd());
                btdinf.setTestCap(binf.getMonCapStd());
                Map map = new HashMap();
                map.put("battinf",binf);
                List<BatttestdataInf> batttestdataInfList = batttestdataInfService.searchDischargeTest(btdinf);

                map.put("battTestDataInf",batttestdataInfList);
                result.add(map);
            }
        }
        return null;
        return new Response().set(1,result,"查询成功");
    }



 src/main/resources/mapper/BattInfMapper.xml

@@ -425,6 +425,9 @@
        </where>
        order by db_battinf.tb_battinf.battgroupid asc
    </select>
    <select id="searchByMonNum" resultType="com.whyc.pojo.Battinf">
        select battGroupName,moncount,monnum,signalname from db_battinf.tb_battinf where battgroupid=#{battGroupId} order by signalname
    </select>
    <select id="getStationList8059" resultType="com.whyc.pojo.Battinf">
        select DISTINCT StationId as stationId ,StationName as stationName, FBSDeviceId as deviceId from db_battinf.tb_battinf where fBSDeviceId like '%8059%' and StationId in (<include
            refid="com.whyc.mapper.BattGroupStationUserMapper.sql_stationListOfUser" />)

 src/main/resources/mapper/BattMaintDealarmMapper.xml

@@ -78,4 +78,102 @@
        </where>
            order by test_starttime desc
    </select>
    <select id="searchByBattGroupIdCondition" resultType="java.util.List" parameterType="com.whyc.pojo.Battinf">
        select distinct(db_battinf.tb_batt_maint_inf.battgroupid),StationName,BattGroupName
        ,db_battinf.tb_batt_maint_inf.num,usr_id,fault_type_id,fault_level,fault_caption,db_battinf.tb_batt_maint_inf.record_time,maint_time_limit,maint_type_id
        ,maint_result,maint_done,maint_done_time,maint_close,master_id,master_audit
        ,copy_uids,appoint_uid
        from db_battinf.tb_batt_maint_inf
        left outer join db_battinf.tb_battinf on db_battinf.tb_battinf.BattgroupId=db_battinf.tb_batt_maint_inf.BattGroupId
        left outer join db_batt_testdata.tb_batttestdata_inf on db_battinf.tb_batt_maint_inf.BattGroupId=db_batt_testdata.tb_batttestdata_inf.BattGroupId
        left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.battgroupid=db_battinf.tb_batt_maint_inf.BattGroupId
        left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id= db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id
        left outer join db_user.tb_user_inf on db_user.tb_user_inf.uId=db_user.tb_user_battgroup_baojigroup_usr.uid
        <where>
            <if test="binf.battProductDate!=null and binf.battProductDate1!=null">
                to_days(battproductdate)>=to_days(#{binf.battProductDate}) and to_days(battproductdate)&lt;=to_days(#{binf.battProductDate1})
            </if>
            <if test="binf.battInUseDate!=null and binf.battInuseDate1!=null">
                and to_days(battinusedate)>=to_days(#{binf.battInUseDate}) and to_days(battinusedate)&lt;=to_days(#{binf.battInUseDate1})
            </if>
            <if test="binf.stationName1!=null and binf.stationName1!=''">
                and stationName1=#{binf.stationName1}
            </if>
            <if test="binf.battProducer!=null and binf.battProducer!=''">
                and battProducer=#{binf.battProducer}
            </if>
            <if test="binf.getTestType==2 or binf.getTestType==3 or binf.getTestType==9 ">
                and db_battinf.tb_batt_maint_inf.BattGroupId in
                (select distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId ) from db_batt_testdata.tb_batttestdata_inf
                where db_batt_testdata.tb_batttestdata_inf.test_type=?
                and to_days(record_time)>=to_days(?) and to_days(record_time)&lt;=to_days(?))
            </if>
            <if test="testtype==5">  <!--tb_battresdata_inf表，不是testdata表-->
                and db_battinf.tb_batt_maint_inf.BattGroupId in
                (select distinct(db_batt_testdata.tb_battresdata_inf.BattGroupId ) from db_batt_testdata.tb_battresdata_inf
                where db_batt_testdata.tb_battresdata_inf.test_type=?
                and to_days(record_time)>=to_days(?) and to_days(record_time)&lt;=to_days(?))
            </if>
            <if test="testType==3000">
                and db_battinf.tb_batt_maint_inf.BattGroupId in(
                select distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId ) from db_batt_testdata.tb_batttestdata_inf
                where db_batt_testdata.tb_batttestdata_inf.test_type in(?,2,3)
                and to_days(record_time)>=to_days(?) and to_days(record_time)&lt;=to_days(?))
            </if>
            <if test="testType==4000">
                and db_battinf.tb_batt_maint_inf.BattGroupId not in(
                select distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId ) from db_batt_testdata.tb_batttestdata_inf
                where db_batt_testdata.tb_batttestdata_inf.test_type in(?,2,3)
                and to_days(record_time)>=to_days(?) and to_days(record_time)&lt;=to_days(?))
            </if>
            <if test="testType==0">
                and db_battinf.tb_batt_maint_inf.BattGroupId!=(
                select count(distinct(db_batt_testdata.tb_batttestdata_inf.BattGroupId )) from db_batt_testdata.tb_batttestdata_inf
                where db_batt_testdata.tb_batttestdata_inf.test_type in(?,2,3)
                and to_days(record_time)>=to_days(?) and to_days(record_time)&lt;=to_days(?))
            </if>

            <if test="binf.battGroupId">
                and db_battinf.tb_battinf.battgroupid=?
            </if>

            <if test="binf.battGroupName=='其他'">
                and BattGroupName1 not like '%开关电源系统%' and BattGroupName1 not like '%UPS系统%' and BattGroupName1 not like ?
            </if>
            <if test="binf.battGroupName!=null and binf.battGroupName!='其他'">
                and BattGroupName1 like ?
            </if>
            <if test="binf.monVolStd!=0">
                and monVolStd=?
            </if>
            <if test="binf.monCapStd!=0">
                and monCapStd=?
            </if>
            <if test="uName!=0 and uName!=null and uName!=''">
                and db_user.tb_user_inf.uname=? and db_user.tb_user_inf.ubaojiusr=1
            </if>
            <if test="testStartType==1">
                and test_starttype&lt;5 and test_type not in(2,9) and  test_starttype!=2
            </if>
            <if test="testStartType==2">
                and test_starttype>=5 or (test_type not in(2,9)  and  test_starttype=2)
            </if>
            <if test="remark==0">
                and  db_battinf.tb_battinf.BattGroupId not in(
                select db_battinf.tb_batt_maint_inf.battgroupid from db_battinf.tb_batt_maint_inf
                where to_days(maint_done_time)>=to_days(?) and to_days(maint_done_time)&lt;=to_days(?) )
            </if>
            <if test="remark==1">
                and  db_battinf.tb_battinf.BattGroupId in(
                select db_battinf.tb_batt_maint_inf.battgroupid from db_battinf.tb_batt_maint_inf·
                where to_days(maint_done_time)>=to_days(?) and to_days(maint_done_time)&lt;=to_days(?) )
            </if>
            <if test="remark==100">
                and  db_battinf.tb_battinf.BattGroupId!=(
                select count(distinct(db_battinf.tb_batt_maint_inf.battgroupid )) from db_battinf.tb_batt_maint_inf
                where to_days(maint_done_time)>=to_days(?) and to_days(maint_done_time)&lt;=to_days(?))
            </if>
        </where>
        order by StationName1 asc,db_battinf.tb_battinf.BattgroupId asc,test_starttime asc
    </select>
</mapper>