update

whycrzg

2021-02-03 f628be11a131a262855908b7815c3027d6bafb4c

update

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

@@ -36,7 +36,7 @@
    //发布新公告
    @PostMapping("/")
    @ApiOperation(notes = "KEY announce_time VALUE 2018/7/7 11:11:00",value="发布新公告")
       public ServiceModel add(@ApiParam(value = "时间" ,required = true)@RequestParam Date announce_time, @ApiParam(value = "消息" ,required = true)@RequestParam String message, @ApiParam(value = "备注" ,required = true)@RequestParam String note) {
       public ServiceModel add(@ApiParam(value = "时间 格式 2018/7/7 11:11:00" ,required = true)@RequestParam Date announce_time, @ApiParam(value = "消息" ,required = true)@RequestParam String message, @ApiParam(value = "备注" ,required = true)@RequestParam String note) {
        Announce a= new Announce();
        a.setAnnounce_time(announce_time);
        a.setMessage(message);

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

@@ -2,6 +2,7 @@

import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.ServiceModelOnce;
import com.fgkj.dto.User_inf;
import com.fgkj.services.BadBatt_monService;
import com.fgkj.util.ActionUtil;
@@ -23,11 +24,11 @@
    //查询落后单体总数
    @GetMapping("nums")
    @ApiOperation(notes = "获取当前session 中的 uName",value="查询落后单体总数")
    public ServiceModel searchNums() {
    public ServiceModelOnce searchNums() {
         User_inf userInf=(User_inf) ActionUtil.getUser();
//        User_inf userInf=new User_inf();
//        userInf.setuId(1001);
        ServiceModel model = service.searchNums(userInf);
        ServiceModelOnce model = service.searchNums(userInf);

        return model;
    }

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

@@ -27,7 +27,7 @@
    //添加关注
    @PostMapping("/")
    @ApiOperation(notes = "",value="添加关注")
    public ServiceModel add(@RequestParam Integer battGroupId,@RequestParam Integer monNum,@ApiParam(value = "ID")@RequestParam Integer uid) {
    public ServiceModel add(@RequestParam Integer battGroupId,@RequestParam Integer monNum) {
        Batt_attention attention = new Batt_attention();
        User_inf uinf = (User_inf)ActionUtil.getUser();
//        User_inf uinf = new User_inf();
@@ -35,9 +35,8 @@
        attention.setUid(uinf.getuId());
        attention.setBattGroupId(battGroupId);
        attention.setMonNum(monNum);
        attention.setUid(uid);
        ServiceModel model = service.add(attention);
        {
        if (model.getCode().equals(1)){
            String msg="添加对"+attention.getBattGroupId()+"电池组的"+attention.getMonNum()+"单体的关注";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
            uservice.add(ulog);//将用户的操作记录下来
@@ -58,15 +57,14 @@
    //取消关注
    @DeleteMapping("/")
    @ApiOperation(notes = "",value="取消关注")
    public ServiceModel delete(@RequestParam Integer battGroupId,@RequestParam Integer monNum,@ApiParam(value = "ID",required = true)@RequestParam Integer uid) {
    public ServiceModel delete(@RequestParam Integer battGroupId,@RequestParam Integer monNum) {
        Batt_attention attention = new Batt_attention();
        User_inf uinf = (User_inf)ActionUtil.getUser();
        attention.setUid(uinf.getuId());
        attention.setBattGroupId(battGroupId);
        attention.setMonNum(monNum);
        attention.setUid(uid);
        ServiceModel model = service.delete(attention);
        {
        if (model.getCode().equals(1)){
            String msg="取消对"+attention.getBattGroupId()+"电池组的"+attention.getMonNum()+"号单体的关注";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
            uservice.add(ulog);//将用户的操作记录下来
@@ -89,13 +87,12 @@
     //关注之前识别是否关注过
    @GetMapping("judge")
    @ApiOperation(notes = "",value="关注之前识别是否关注过")
    public ServiceModel judgeInOrNot(@RequestParam Integer battGroupId,@RequestParam Integer monNum,@ApiParam(value = "ID",required = true)@RequestParam Integer uid) {
    public ServiceModel judgeInOrNot(@RequestParam Integer battGroupId,@RequestParam Integer monNum) {
        Batt_attention attention = new Batt_attention();
        User_inf uinf = (User_inf)ActionUtil.getUser();
        attention.setUid(uinf.getuId());
        attention.setBattGroupId(battGroupId);
        attention.setMonNum(monNum);
        attention.setUid(uid);
        ServiceModel model = service.judgeInOrNot(attention);

        return model;

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

@@ -84,7 +84,7 @@
    }
    
    //点击项目下方的滚动，查询该设备告警的实时信息
    @GetMapping("devAlarm")
    @PostMapping("devAlarm")
    @ApiOperation(notes = "",value="点击项目下方的滚动，查询该设备告警的实时信息")
    public ServiceModel serchDev_alarm(@ApiParam(value = "ID" ,required = true)@RequestParam Integer dev_id, @ApiParam(value = "类型" ,required = true)@RequestParam Integer alm_type, @ApiParam(value = "开始时间段格式 2021/01/28 08:22:34" ,required = true)@RequestParam Date alm_start_time) {
        Batt_devalarm_data ddata= new Batt_devalarm_data();
@@ -97,8 +97,8 @@
    }
        
    //根据设备id查询设备是否存在设备告警
    @GetMapping("levelDevAlarmOrBattAlarm_ky")
    @ApiOperation(notes = "",value="设备id查询设备是否存在设备告警")
    @PostMapping("levelDevAlarmOrBattAlarm_ky")
    @ApiOperation(notes = "-1级为battGroupId未查询到数据",value="设备id查询设备是否存在设备告警")
    public ServiceModel serchlevelDev_alarmOrBatt_alarm_ky(@ApiParam(value = "电池组ID",required = true)@RequestParam Integer battGroupId,@ApiParam(value = "设备id" ,required = true)@RequestParam Integer fbsDeviceId){
        BattInf binf= new BattInf();
        binf.setBattGroupId(battGroupId);
@@ -157,7 +157,7 @@
    }
    //紫晶山西根据设备id和电池组id查询机房告警信息
    //TODO 暂不需要
    @GetMapping("stationAlarm")
    @PostMapping("stationAlarm")
    @ApiOperation(notes = "TODO 暂不需要",value="紫晶山西根据设备id和电池组id查询机房告警信息")
    public ServiceModel seachStationAlarm(@RequestBody BattInf binf) {
        // BattInf binf = getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json,BattInf.class);

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

@@ -1,9 +1,6 @@
package com.fgkj.services;

import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.PageBean;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_inf;
import com.fgkj.dto.*;
import com.fgkj.mapper.AlarmDaoFactory;
import com.fgkj.mapper.impl.BadBatt_monMapper;
import com.github.pagehelper.PageHelper;
@@ -19,11 +16,11 @@
    private BadBatt_monMapper mapper;

    //查询落后单体总数
    public ServiceModel searchNums(User_inf userInf) {
        ServiceModel model = new ServiceModel();
    public ServiceModelOnce searchNums(User_inf userInf) {
        ServiceModelOnce model = new ServiceModelOnce();
        int nums= mapper.searchNums(userInf);
        model.setCode(1);
        model.setData(nums);
        model.setSum(nums);
        return model;
    }
    //落后单体查询：根据条件查询落后单体

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

@@ -21,7 +21,14 @@
    //添加关注
    public ServiceModel add(Batt_attention attention) {
        ServiceModel model = new ServiceModel();
        Boolean bl = mapper.add(attention)>0;
        Boolean bl = null;
        try {
            bl = mapper.add(attention)>0;
        } catch (Exception e) {
            e.printStackTrace();
            model.setMsg("添加失败!");
            return model;
        }
        if (bl) {
            model.setCode(1);
            model.setMsg("添加成功!");

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

@@ -47,15 +47,14 @@
    //3.4设备告警历史记录查询
    public ServiceModel serchByCondition(Batt_Maint_Dealarm bmd) {
        ServiceModel model = new ServiceModel();

        PageBean pageBean = bmd.getPageBean();
        PageHelper.startPage(pageBean.getPageNum(),pageBean.getPageSize(),true);
        List list=mapper.serchByCondition(bmd);
        PageInfo<Batt_Maint_Dealarm> pageInfo = new PageInfo<>(list);

        model.setCode(1);
        model.setData(pageInfo);

        PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize(), true);
        List<Batt_Maint_Dealarm> list = mapper.serchByCondition(bmd);
        if (null != list && list.size() > 0) {
            PageInfo<Batt_Maint_Dealarm> pageInfo = new PageInfo<>(list);
            model.setCode(1);
            model.setData(pageInfo);
        }
        return model;
    }
}