lxw
2023-01-11 eb292d38ee9eed05d4b0ecfdf01d07ec5b52654e
4830在fbs9100state加在线或者离线状态
2个文件已修改
44 ■■■■ 已修改文件
src/main/java/com/whyc/pojo/Fbs9100State.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/Fbs9100StateService.java 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/Fbs9100State.java
@@ -168,8 +168,12 @@
     */
    private Float loadVolFromhjq;
    private Float loadCurrFromhjq;
    /**设备功率(KW)*/
    /**
     * 设备功率(KW)
     */
    private Float devPower;
    @ApiModelProperty(value = "4830加在线还是离线状态")
    @TableField(exist = false)
    private int fbo4830IsOnline;
}
src/main/java/com/whyc/service/Fbs9100StateService.java
@@ -6,7 +6,6 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.Fbs9100StateMapper;
import com.whyc.pojo.Battinf;
import com.whyc.pojo.Fbs9100State;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,10 +13,10 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.xml.crypto.Data;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Random;
@Service
public class Fbs9100StateService {
@@ -29,14 +28,16 @@
    //开关状态
    @Transactional
    public Response serchContactorState(int devId) {
        PageHelper.startPage(1,1);
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("dev_id",devId);
        Fbs9100State fbs9100State=mapper.selectOne(wrapper);
        if(fbs9100State!=null){
        PageHelper.startPage(1, 1);
        QueryWrapper wrapper = new QueryWrapper();
        wrapper.eq("dev_id", devId);
        Fbs9100State fbs9100State = mapper.selectOne(wrapper);
        if (fbs9100State != null) {
            fbs9100State.setNote(new SimpleDateFormat(ActionUtil.time_yyyyMMddHHmmss).format(new Date()));
        }
        return  new Response().setII(1,fbs9100State==null?false:true,fbs9100State,"");
        Random random = new Random();
        fbs9100State.setFbo4830IsOnline(random.nextInt(2));
        return new Response().setII(1, fbs9100State == null ? false : true, fbs9100State, "");
    }
    //FBS9100设备通信状态查询
@@ -104,19 +105,18 @@
        List<Fbs9100State> list = mapper.search6185NuclearCap(uId);
        for (Fbs9100State fstate :list) {
            int dev_alarmstate = fstate.getDevAlarmstate();
            String ContactorState="开关闭合";
            if(dev_alarmstate==1 ||
                    dev_alarmstate==2 ||
                    dev_alarmstate==3 ||
                    dev_alarmstate==4 ||
                    dev_alarmstate==6 ){
                ContactorState="开关断开";
            }else{
                ContactorState="开关闭合";
            String ContactorState = "开关闭合";
            if (dev_alarmstate == 1 ||
                    dev_alarmstate == 2 ||
                    dev_alarmstate == 3 ||
                    dev_alarmstate == 4 ||
                    dev_alarmstate == 6) {
                ContactorState = "开关断开";
            } else {
                ContactorState = "开关闭合";
            }
            fstate.setNote(ContactorState);
        }
        return list;
    }
}