A200设备相关代码命名规范化

whycxzp

2025-03-14 5d90d170be0b2d3168d2347d66341bf239c2daad

A200设备相关代码命名规范化

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

@@ -1,14 +1,14 @@
package com.whyc.mapper;

import com.whyc.dto.DalmDto;
import com.whyc.pojo.db_alarm.DevalarmData;
import com.whyc.pojo.db_alarm.DevAlarmData;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface DevalarmDataMapper extends CustomMapper<DevalarmData>{
public interface DevalarmDataMapper extends CustomMapper<DevAlarmData>{
    //获取设备告警信息
    List<DevalarmData> getDAlmInf(@Param("dto") DalmDto dto);
    List<DevAlarmData> getDAlmInf(@Param("dto") DalmDto dto);
    //弹窗告警
    List<DevalarmData> getDAlmPopUp(@Param("uid") int uid);
    List<DevAlarmData> getDAlmPopUp(@Param("uid") int uid);
}

 src/main/java/com/whyc/pojo/db_alarm/DevAlarmData.java

File was renamed from src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
@@ -28,7 +28,7 @@
@Accessors(chain = true)
@TableName(schema = "db_alarm",value ="tb_devalarm_data")
@ApiModel(value="DevalarmData对象", description="设备实时告警记录表")
public class DevalarmData implements Serializable {
public class DevAlarmData implements Serializable {

    private static final long serialVersionUID = 1L;


 src/main/java/com/whyc/pojo/db_alarm/DevAlarmDataYear.java

File was renamed from src/main/java/com/whyc/pojo/db_alarm/DevalarmDataYear.java
@@ -28,7 +28,7 @@
@Accessors(chain = true)
@TableName("tb_devalarm_data_Year")
@ApiModel(value="DevalarmDataYear对象", description="设备历史告警记录表")
public class DevalarmDataYear implements Serializable {
public class DevAlarmDataYear implements Serializable {

    private static final long serialVersionUID = 1L;


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

@@ -7,7 +7,7 @@
import com.whyc.dto.DalmDto;
import com.whyc.dto.Response;
import com.whyc.mapper.DevalarmDataMapper;
import com.whyc.pojo.db_alarm.DevalarmData;
import com.whyc.pojo.db_alarm.DevAlarmData;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.SubTablePageInfoUtil;
@@ -36,8 +36,8 @@
    public Response getDAlmInf(int uid, DalmDto dto) {
        PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
        dto.setUid(uid);
        List<DevalarmData> list=mapper.getDAlmInf(dto);
        for (DevalarmData data:list) {
        List<DevAlarmData> list=mapper.getDAlmInf(dto);
        for (DevAlarmData data:list) {
            UserInf uinf=uinfService.getUinfByUId(data.getConfirmedUid());
            data.setConfirmedUname(uinf!=null?uinf.getUname():"");
            int almId=data.getAlmId();
@@ -68,7 +68,7 @@
        wrapper.set("confirmed_uid",uinf.getUid());
        wrapper.set("confirmed_time",new Date());
        wrapper.eq("num",num);
        int flag=mapper.update((DevalarmData) ActionUtil.objeNull,wrapper);
        int flag=mapper.update((DevAlarmData) ActionUtil.objeNull,wrapper);
        return new Response().set(1,flag>0,"确认实时告警");
    }
    //获取所有的告警类型
@@ -78,8 +78,8 @@
    }
    //弹窗告警
    public Response getDAlmPopUp(Integer uid) {
        List<DevalarmData> list=mapper.getDAlmPopUp(uid);
        for (DevalarmData data:list) {
        List<DevAlarmData> list=mapper.getDAlmPopUp(uid);
        for (DevAlarmData data:list) {
            int almId=data.getAlmId();
            data.setAlmName(DevAlmEnum.getValue(almId));
        }

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

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

import com.whyc.dto.DalmDto;
import com.whyc.mapper.CallBack;
import com.whyc.pojo.db_alarm.DevalarmDataYear;
import com.whyc.pojo.db_alarm.DevAlarmDataYear;
import com.whyc.pojo.db_batt_testdata.BatttestdataId;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -189,9 +189,9 @@
        List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<DevalarmDataYear> list=new ArrayList<>();
                List<DevAlarmDataYear> list=new ArrayList<>();
                while (rs.next()){
                    DevalarmDataYear dataYear=new DevalarmDataYear();
                    DevAlarmDataYear dataYear=new DevAlarmDataYear();
                    dataYear.setNum(rs.getInt("num"));
                    dataYear.setDevId(rs.getInt("dev_id"));
                    dataYear.setAlmId(rs.getInt("alm_id"));

 src/main/resources/mapper/DevalarmDataMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.DevalarmDataMapper">
    <resultMap type="com.whyc.pojo.db_alarm.DevalarmData" id="almDev">
    <resultMap type="com.whyc.pojo.db_alarm.DevAlarmData" id="almDev">
        <id column="num" property="num"/>
        <result column="dev_id" property="devId"/>
        <result column="alm_id" property="almId"/>