update baojiGroupBattGroup# processSurvey#

whycrzg

2021-02-02 97f311765131c187eff2288625e8453851e0d0f3

update baojiGroupBattGroup# processSurvey#

 src/main/java/com/fgkj/controller/Process_surveyController.java

@@ -22,8 +22,6 @@

    @Resource
    private Process_surveyService service;
    @Resource
    private User_logService uservice;

    //查询所有进程的运行情况
    @GetMapping("all")
@@ -44,14 +42,11 @@
     //界面修改进程同服务对应的标识位
    @PutMapping("flag")
    @ApiOperation(notes = "",value="界面修改进程同服务对应的标识位")
    public ServiceModel updateFlag(@RequestBody Process_survey process) {
        // Process_survey process = getGson().fromJson(json, Process_survey.class);
    public ServiceModel updateFlag(@RequestParam String serverName,@RequestParam Integer serverFlag) {
        Process_survey process = new Process_survey();
        process.setServerName(serverName);
        process.setServerFlag(serverFlag);
        ServiceModel model = service.updateFlag(process);
//        {
//            String msg="重启"+process.getServerName()+"服务";
//            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
//            uservice.add(ulog);//将用户的操作记录下来
//        }

        return model;
    }

 src/main/java/com/fgkj/controller/User_battgroup_baojigroup_battgroupController.java

@@ -25,12 +25,11 @@
    private User_battgroup_baojigroup_battgroupService service;

    //根据用户UId查询对应的机房以及电池组
    @GetMapping("byCondition")
    @PostMapping("byCondition")
    @ApiOperation(notes = "",value="用户UId查询对应的机房以及电池组")
    public ServiceModel serchByCondition(@RequestBody User_inf userInf) {
//        userInf.setuId(1003);
//        User_inf user_inf = new User_inf();
        System.out.println("userInf.getuId() = " + userInf.getuId());
    public ServiceModel serchByCondition(@RequestParam Integer uId) {
        User_inf userInf = new User_inf();
        userInf.setuId(uId);
        ServiceModel model = service.serchByCondition(userInf);

        return model;
@@ -61,33 +60,40 @@
        
        return model;
    }*/


    //5.3删除选取的电池组(根据baoji_group_id，battgroupid，stationid)
    @DeleteMapping("/")
    @ApiOperation(notes = "",value="删除选取的电池组(根据baoji_group_id，battgroupid，stationid)")
    @ApiOperation(notes = "[{ \"baoji_group_id\": 1, \"baoji_group_name\": \"\", \"stationId\": 2, \"battGroupId\": 3, \"note\": \"\" }]",value="删除选取的电池组(根据baoji_group_id，battgroupid，stationid)")
    public ServiceModel delete(@RequestBody List<User_battgroup_baojigroup_battgroup> list) {
        ServiceModel model=service.delPro(list);
		
        ServiceModel model = service.delPro(list);

        return model;
    }

    //5.3包机组重做（穿梭框）删除
    @DeleteMapping("proCs")
    @ApiOperation(notes = "",value="包机组重做（穿梭框）删除")
    @ApiOperation(notes = "[{ \"baoji_group_id\": 1, \"baoji_group_name\": \"\", \"stationId\": 2, \"note\": \"\" }]",value="包机组重做（穿梭框）删除")
    public ServiceModel delPro_CS(@RequestBody List<User_battgroup_baojigroup_battgroup> list) {
        ServiceModel model=service.delPro_CS(list);
		
        ServiceModel model = service.delPro_CS(list);

        return model;
    }


    //5.3添加选取电池组或者机房或者维护区(点击应用)
    @PostMapping("/")
    @ApiOperation(notes = "",value="添加选取电池组或者机房或者维护区(点击应用)")
    @ApiOperation(notes = "[{ \"baoji_group_id\": 1, \"baoji_group_name\": \"\", \"stationId\": 2, \"battGroupId\": 3, \"note\": \"\" }]",value="添加选取电池组或者机房或者维护区(点击应用)")
    public ServiceModel add(@RequestBody List<User_battgroup_baojigroup_battgroup> list){
        ServiceModel model=service.add(list);
        
        return model;
    }


    //包机组重做（穿梭框）查询所有的用户
    @PostMapping("proCs")
    @ApiOperation(notes = "",value="包机组重做（穿梭框）查询所有的用户")
    @ApiOperation(notes = "[{ \"baoji_group_id\": 100011, \"baoji_group_name\": \"\", \"stationId\": 42010007, \"battGroupId\": 0, \"dev_id\": 0, \"note\": \"tt\" }]",value="包机组重做（穿梭框）查询所有的用户(查询后添加)")
    public ServiceModel addPro_CS(@RequestBody List<User_battgroup_baojigroup_battgroup> list){
        ServiceModel model=service.addPro_CS(list);
        return model;
@@ -118,11 +124,13 @@
    } 
    //放电测试(查询用户管理的维护区对应的机房)
    @PostMapping("stationNameInGroup")
    @ApiOperation(notes = "",value="放电测试(查询用户管理的维护区对应的机房)")
    public ServiceModel serchStationNameInGroup(@RequestBody User_inf user){
    @ApiOperation(notes = "session 获取uId",value="放电测试(查询用户管理的维护区对应的机房)")
    public ServiceModel serchStationNameInGroup(@RequestParam String uNote){
        //System.out.println(json+"***********");
        User_inf user = new User_inf();
        User_inf u = (User_inf) ActionUtil.getUser();
        user.setuId(u.getuId());
        user.setuNote(uNote);
        //System.out.println(user);
        ServiceModel model = service.serchStationNameInGroup(user);
        
@@ -131,9 +139,12 @@
    //放电测试(查询用户管理的维护区对应的机房对应的battgroupid)
    @PostMapping("battGroupIdInGroup")
    @ApiOperation(notes = "",value="放电测试(查询用户管理的维护区对应的机房对应的battgroupid)")
    public ServiceModel serchBattgroupidInGroup(@RequestBody User_inf user){
    public ServiceModel serchBattgroupidInGroup(@RequestParam String uName,@RequestParam String uNote){
        User_inf user = new User_inf();
        User_inf u = (User_inf) ActionUtil.getUser();
        user.setuId(u.getuId());
        user.setuName(uName);
        user.setuNote(uNote);
        ServiceModel model = service.serchBattgroupidInGroup(user);
        
        return model;
@@ -151,9 +162,11 @@
    //首页(查询用户管理的维护区对应的机房和机房ID以及设备id)
    @PostMapping("stationByStationName1")
    @ApiOperation(notes = "",value="首页(查询用户管理的维护区对应的机房和机房ID以及设备id)")
    public ServiceModel serchStationByStationName1(@RequestBody User_inf user){
    public ServiceModel serchStationByStationName1(@RequestParam String uNote){
        User_inf user = new User_inf();
        User_inf u = (User_inf) ActionUtil.getUser();
        user.setuId(u.getuId());
        user.setuNote(uNote);
        ServiceModel model = service.serchStationByStationName1(user);
        
        return model;
@@ -162,16 +175,20 @@
    //首页(查询用户管理的维护区对应的机房信息)   ->首页左侧的导航显示
    @PostMapping("stationInfoByStationName1")
    @ApiOperation(notes = "首页左侧的导航显示",value="首页(查询用户管理的维护区对应的机房信息)")
    public ServiceModel serchStationInfoByStationName1(@RequestBody User_inf user){
    public ServiceModel serchStationInfoByStationName1(@RequestParam String uNote){
        User_inf user = new User_inf();
        User_inf u = (User_inf) ActionUtil.getUser();
        user.setuId(u.getuId());
        user.setuNote(uNote);
        ServiceModel model = service.serchStationInfoByStationName1(user);
        
        return model;
    }


    //首页左侧的导航实时刷新
    @PostMapping("stationInfoNow")
    @ApiOperation(notes = "",value="首页左侧的导航实时刷新")
    @ApiOperation(notes = "[{ \"fbsDeviceId\": 0 }]",value="首页左侧的导航实时刷新")
    public ServiceModel serchStationInfoNow(@RequestBody List<BattInf> list){
        ServiceModel model = service.serchStationInfoNow(list);
        

 src/main/java/com/fgkj/mapper/impl/Ld9/Ld9testdata_infMapper.java

@@ -11,14 +11,14 @@
    @Select("select num,BattGroupId,test_record_count,test_record_count_ex,test_type,record_time_interval," +
            "record_num,test_starttime,test_starttime_ex,record_time,test_timelong,test_stoptype," +
            "test_stopreason,group_vol,test_curr,test_cap,mon_num,mon_vol,max_monvol,min_monvol " +
            "from db_ld9_testdata.tb_ld9testdata_inf where BattGroupId=#{BattGroupId} " +
            "from db_ld9_testdata.tb_ld9testdata_inf where BattGroupId=#{battGroupId} " +
            "order by test_starttime desc ")
    public List<Ld9testdata_inf> serchByCondition(Ld9testdata_inf ld9_inf);

    //历史数据查询(根据电池组id查询所有的放电单体)
    @Select("select distinct BattGroupId,mon_num,count(test_record_count) as nums " +
            "from db_ld9_testdata.tb_ld9testdata_inf " +
            "where BattGroupId=#{BattGroupId} " +
            "where BattGroupId=#{battGroupId} " +
            "group BY mon_num " +
            "order by mon_num asc  ")
    public List<Ld9testdata_inf> serchByInfo(Ld9testdata_inf ld9_inf);

 src/main/java/com/fgkj/mapper/impl/User_battgroup_baojigroup_battgroupMapper.java

@@ -15,16 +15,16 @@
    //5.3添加选取电池组或者机房或者维护区
    public boolean add(Object obj);
    //5.3添加选取电池组或者机房或者维护区(多笔数据)
    @Insert("insert into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) values(#{baoji_group_id},#{StationId},#{BattGroupId})")
    @Insert("insert into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) values(#{baoji_group_id},#{stationId},#{battGroupId})")
    public int addPro(User_battgroup_baojigroup_battgroup obj);
    
    //包机组重做（穿梭框）添加
    @Insert("REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) "
            +"SELECT #{baoji_group_id},StationId,BattGroupId from db_battinf.tb_battinf where StationId=#{StationId} union Select #{baoji_group_id},StationId,0 from db_pwrdev_inf.tb_pwrdev_inf where StationId=#{StationId}")
            +"SELECT #{baoji_group_id},StationId,BattGroupId from db_battinf.tb_battinf where StationId=#{stationId} union Select #{baoji_group_id},StationId,0 from db_pwrdev_inf.tb_pwrdev_inf where StationId=#{stationId}")
    public int addPro_CS(User_battgroup_baojigroup_battgroup obj);
    //包机组重做（穿梭框）添加
    @Insert("REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) "
            + " SELECT #{baoji_group_id},StationId,BattGroupId from db_battinf.tb_battinf where StationId=#{StationId}")
            + " SELECT #{baoji_group_id},StationId,BattGroupId from db_battinf.tb_battinf where StationId=#{stationId}")
    public int addPro_CSNO(User_battgroup_baojigroup_battgroup obj);


@@ -36,10 +36,10 @@
    //5.3删除选取的电池组
    public boolean del(Object obj);
    //5.3删除选取的电池组(多笔数据)
    @Delete("delete from db_user.tb_user_battgroup_baojigroup_battgroup where baoji_group_id=#{baoji_group_id} and battgroupid=#{BattGroupId} and stationid=#{StationId}")
    @Delete("delete from db_user.tb_user_battgroup_baojigroup_battgroup where baoji_group_id=#{baoji_group_id} and battgroupid=#{battGroupId} and stationid=#{stationId}")
    public int delPro(User_battgroup_baojigroup_battgroup obj);
    //5.3包机组重做（穿梭框）删除
    @Delete("delete from db_user.tb_user_battgroup_baojigroup_battgroup where baoji_group_id=#{baoji_group_id} and stationid= #{StationId}")
    @Delete("delete from db_user.tb_user_battgroup_baojigroup_battgroup where baoji_group_id=#{baoji_group_id} and stationid= #{stationId}")
    public int delPro_CS(User_battgroup_baojigroup_battgroup obj) ;
    //5.3删除(删除指定包机组下所有用户)
    @Delete("delete from db_user.tb_user_battgroup_baojigroup_battgroup where baoji_group_id=#{baoji_group_id}")

 src/main/java/com/fgkj/mapper/impl/rt/Batt_rtdataRtMapper.java

@@ -12,7 +12,7 @@
            " ,batt_count,rec_datetime,group_vol,online_vol,group_curr,batt_state," +
            " batt_test_type,batt_test_starttime,batt_test_recordtime,batt_test_tlong," +
            " batt_test_cap,batt_real_cap,batt_rest_cap,batt_rest_power1_time,batt_rest_power2_time  " +
            " from db_ram_batt_rt.tb_batt_rtdata_#{BattGroupId}")
            " from db_ram_batt_rt.tb_batt_rtdata_#{battGroupId}")
    public List serchByCondition(Batt_rtdataRt rt);

}

 src/main/java/com/fgkj/services/Process_surveyService.java

@@ -2,7 +2,9 @@

import com.fgkj.dto.Process_survey;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_log;
import com.fgkj.mapper.ProcessServerDao;
import com.fgkj.mapper.UinfDaoFactory;
import com.fgkj.mapper.impl.Process_surveyMapper;
import com.fgkj.util.ActionUtil;
import org.springframework.stereotype.Service;
@@ -15,6 +17,8 @@

    @Resource
    private Process_surveyMapper mapper;
    @Resource
    private User_logService uservice;

    //根据进程名字,将服务是否开启的标识符改为0
    public ServiceModel update(Process_survey survey){
@@ -47,13 +51,24 @@
    }
    //界面修改进程同服务对应的标识位
    @Transactional
    public ServiceModel updateFlag(Process_survey obj){
    public ServiceModel updateFlag(Process_survey process) {
        ServiceModel model = new ServiceModel();
        boolean bl=mapper.updateFlag(obj)>0;
        if(bl){
        boolean bl = true;
        try {
            bl = mapper.updateFlag(process) > 0;
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("修改失败!");
            return model;
        }
        if (bl) {
            String msg = "重启" + process.getServerName() + "服务";
            User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
            uservice.add(ulog);//将用户的操作记录下来
            model.setCode(1);
            model.setMsg("修改成功!");
        }else{
        } else {
            model.setCode(0);
            model.setMsg("修改失败!");
        }

 src/main/java/com/fgkj/services/User_battgroup_baojigroup_battgroupService.java

@@ -60,28 +60,30 @@
    public ServiceModel add(List<User_battgroup_baojigroup_battgroup> list) {
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        ServiceModel model = new ServiceModel();
        Boolean bl=true;

        if(list!=null&&list.size()>0){
        Boolean bl = true;
        if (list != null && list.size() > 0) {
            for (User_battgroup_baojigroup_battgroup ugroup : list) {
                if (mapper.addPro(ugroup)>0){
                }else{
                    bl=false;
                }
                {
                    String msg="添加"+ugroup.getNote()+"至"+ugroup.getBaoji_group_name()+"包机组中";
                    User_log ulog= UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                    uservice.add(ulog);
                try {
                    bl = mapper.addPro(ugroup) > 0;
                    {
                        String msg = "添加" + ugroup.getNote() + "至" + ugroup.getBaoji_group_name() + "包机组中";
                        User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                        uservice.add(ulog);
                    }
                } catch (Exception e) {
                    e.printStackTrace();
                    dataSourceTransactionManager.rollback(transactionStatus);
                    model.setMsg("添加失败!");
                    return model;
                }
            }
        }

        if(bl){
        if (bl) {
            dataSourceTransactionManager.commit(transactionStatus);
            model.setCode(1);
            model.setMsg("添加成功!");
        }
        else{
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            model.setMsg("添加失败!");
        }
@@ -93,35 +95,28 @@
        //查询是否存在电源信息表 >0存在
        int existNum = mapper.checkexist();
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        Boolean bl=true;
        Boolean bl = true;
        System.out.println("existNum = " + existNum);// !=0情况未测试
        if(list!=null&&list.size()>0){
        if (list != null && list.size() > 0) {
            for (User_battgroup_baojigroup_battgroup ugroup : list) {
                if(existNum>0){
                    if (mapper.addPro_CS(ugroup)>0){
                    }else{
                        bl=false;
                    }
                }else {
                    if (mapper.addPro_CSNO(ugroup)>0){
                    }else{
                        bl=false;
                    }
                if (existNum > 0) {
                    bl = mapper.addPro_CS(ugroup) > 0;
                } else {
                    bl = mapper.addPro_CSNO(ugroup) > 0;
                }
                System.out.println("bl = " + bl);
                {
                    String msg="添加"+ugroup.getNote()+"至"+ugroup.getBaoji_group_name()+"包机组中";
                    User_log ulog= UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                    String msg = "添加" + ugroup.getNote() + "至" + ugroup.getBaoji_group_name() + "包机组中";
                    User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
                    uservice.add(ulog);
                }
            }
        }
        if(bl){
        if (bl) {
            dataSourceTransactionManager.commit(transactionStatus);
            model.setCode(1);
            model.setMsg("添加成功!");
        }
        else{
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            model.setMsg("添加失败!");
        }
@@ -158,62 +153,67 @@
    public ServiceModel delPro(List<User_battgroup_baojigroup_battgroup> list) {
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        ServiceModel model = new ServiceModel();
        Boolean bl=true;
        if(list!=null&&list.size()>0){
            for (User_battgroup_baojigroup_battgroup ugroup : list) {
                if (mapper.delPro(ugroup)>0){
                }else{
                    bl=false;
        Boolean bl = true;
        if (list != null && list.size() > 0) {
            try {
                for (User_battgroup_baojigroup_battgroup ugroup : list) {
                    bl = mapper.delPro(ugroup) > 0;
                    {
                        String msg = "删除" + ugroup.getBaoji_group_name() + "包机组中" + ugroup.getNote() + "电池组";
                        User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                        uservice.add(ulog);
                    }
                }
                {
                    String msg="删除"+ugroup.getBaoji_group_name()+"包机组中"+ugroup.getNote()+"电池组";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    uservice.add(ulog);
                }
            } catch (Exception e) {
                e.printStackTrace();
                dataSourceTransactionManager.rollback(transactionStatus);
                model.setMsg("删除失败!");
                return model;
            }
        }


        if(bl){
        if (bl) {
            dataSourceTransactionManager.commit(transactionStatus);
            model.setCode(1);
            model.setMsg("删除成功!");
        }
        else{
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            model.setMsg("删除失败!");
        }
        return model;	
        return model;
    } 
    //5.3包机组重做（穿梭框）删除
    public ServiceModel delPro_CS(List<User_battgroup_baojigroup_battgroup> list) {
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        ServiceModel model = new ServiceModel();
//        Boolean bl=mapper.delPro_CS(obj);
        Boolean bl=true;
        if(list!=null&&list.size()>0){
            for (User_battgroup_baojigroup_battgroup ugroup : list) {
                if (mapper.delPro_CS(ugroup)>0){
                }else{
                    bl=false;
        Boolean bl = true;
        if (list != null && list.size() > 0) {
            try {
                for (User_battgroup_baojigroup_battgroup ugroup : list) {
                    bl = mapper.delPro_CS(ugroup) > 0;
                    {
                        String msg = "删除" + ugroup.getBaoji_group_name() + "包机组中" + ugroup.getNote() + "机房";
                        User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                        uservice.add(ulog);
                    }
                }
                {
                    String msg="删除"+ugroup.getBaoji_group_name()+"包机组中"+ugroup.getNote()+"机房";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    uservice.add(ulog);
                }
            } catch (Exception e) {
                e.printStackTrace();
                dataSourceTransactionManager.rollback(transactionStatus);
                model.setMsg("删除失败!");
                return model;
            }
        }
        if(bl){
        if (bl) {
            dataSourceTransactionManager.commit(transactionStatus);
            model.setCode(1);
            model.setMsg("删除成功!");
        }
        else{
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            model.setMsg("删除失败!");
        }
        return model;	
        return model;
    }     
        
    //5.1根据员工uid查电池组和机房信息

 src/main/resources/mapper/ld9/LD9SetParamMapper.xml

@@ -6,7 +6,7 @@
        <association property="binf" javaType="BattInf">
            <result column ="battgroupid" property="battGroupId" />
            <result column ="StationName" property="stationName" />
            <result column ="FBSDeviceId" property="FBSDeviceId" />
            <result column ="FBSDeviceId" property="fbsDeviceId" />
            <result column ="FBSDeviceIp" property="fbsDeviceIp" />
            <result column ="BattGroupName" property="battGroupName" />
            <result column ="MonCount" property="monCount" />
@@ -42,7 +42,7 @@
        <association property="binf" javaType="BattInf">
            <result column ="battgroupid" property="battGroupId" />
            <result column ="StationName" property="stationName" />
            <result column ="FBSDeviceId" property="FBSDeviceId" />
            <result column ="FBSDeviceId" property="fbsDeviceId" />
            <result column ="FBSDeviceIp" property="fbsDeviceIp" />
            <result column ="BattGroupName" property="battGroupName" />
            <result column ="MonCount" property="monCount" />
@@ -126,9 +126,9 @@
        LEFT OUTER JOIN db_ram_db.tb_LD9_setparam on db_ram_db.tb_LD9_setparam.dev_id=db_battinf.tb_battinf.FBSDeviceId
        LEFT OUTER JOIN db_ram_db.tb_LD9_state  on db_ram_db.tb_LD9_state.dev_id=db_battinf.tb_battinf.FBSDeviceId
        where
            db_battinf.tb_battinf.StationName1 like #{StationName1}
        and db_battinf.tb_battinf.StationName LIKE #{StationName}
        and db_battinf.tb_battinf.battgroupid=#{BattGroupId}
            db_battinf.tb_battinf.StationName1 like '%${stationName1}%'
        and db_battinf.tb_battinf.StationName LIKE '%${stationName}%'
        and db_battinf.tb_battinf.battgroupid='%${battGroupId}%'
    </select>
    <select id="sendCmdToLd9Dev" resultType="java.lang.Boolean"></select>
    <select id="serchbyDev_id" resultMap="ResultMap2">