From 5d90d170be0b2d3168d2347d66341bf239c2daad Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 14 三月 2025 16:37:04 +0800
Subject: [PATCH] A200设备相关代码命名规范化
---
src/main/java/com/whyc/mapper/DevalarmDataMapper.java | 8 ++++----
src/main/java/com/whyc/service/SubTablePageInfoService.java | 6 +++---
src/main/java/com/whyc/service/DevalarmDataService.java | 12 ++++++------
src/main/java/com/whyc/pojo/db_alarm/DevAlarmDataYear.java | 2 +-
src/main/java/com/whyc/pojo/db_alarm/DevAlarmData.java | 2 +-
src/main/resources/mapper/DevalarmDataMapper.xml | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/DevalarmDataMapper.java b/src/main/java/com/whyc/mapper/DevalarmDataMapper.java
index ff280c5..b2be05f 100644
--- a/src/main/java/com/whyc/mapper/DevalarmDataMapper.java
+++ b/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);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java b/src/main/java/com/whyc/pojo/db_alarm/DevAlarmData.java
similarity index 97%
rename from src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
rename to src/main/java/com/whyc/pojo/db_alarm/DevAlarmData.java
index 3f1b650..c16ba1c 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
+++ b/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;
diff --git a/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataYear.java b/src/main/java/com/whyc/pojo/db_alarm/DevAlarmDataYear.java
similarity index 97%
rename from src/main/java/com/whyc/pojo/db_alarm/DevalarmDataYear.java
rename to src/main/java/com/whyc/pojo/db_alarm/DevAlarmDataYear.java
index d0e7333..4229052 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataYear.java
+++ b/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;
diff --git a/src/main/java/com/whyc/service/DevalarmDataService.java b/src/main/java/com/whyc/service/DevalarmDataService.java
index 6a82cae..3573b2b 100644
--- a/src/main/java/com/whyc/service/DevalarmDataService.java
+++ b/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));
}
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 1298fcb..cc45b02 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/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"));
diff --git a/src/main/resources/mapper/DevalarmDataMapper.xml b/src/main/resources/mapper/DevalarmDataMapper.xml
index 5683978..238759c 100644
--- a/src/main/resources/mapper/DevalarmDataMapper.xml
+++ b/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"/>
--
Gitblit v1.9.1