From e50d8c30b43dd30daa77da27101ce21d8ef2fcef Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 17 三月 2025 17:20:10 +0800
Subject: [PATCH] 锂电设备相关代码更新
---
src/main/java/com/whyc/service/DevLithiumAlarmDataService.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/whyc/service/DevAlarmDataService.java b/src/main/java/com/whyc/service/DevLithiumAlarmDataService.java
similarity index 68%
rename from src/main/java/com/whyc/service/DevAlarmDataService.java
rename to src/main/java/com/whyc/service/DevLithiumAlarmDataService.java
index f6d8cd6..5ed5b0a 100644
--- a/src/main/java/com/whyc/service/DevAlarmDataService.java
+++ b/src/main/java/com/whyc/service/DevLithiumAlarmDataService.java
@@ -4,10 +4,10 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.DevAlmEnum;
-import com.whyc.dto.DalmDto;
+import com.whyc.dto.DevA200AlarmDto;
import com.whyc.dto.Response;
-import com.whyc.mapper.DevAlarmDataMapper;
-import com.whyc.pojo.db_alarm.DevAlarmData;
+import com.whyc.mapper.DevLithiumAlarmDataMapper;
+import com.whyc.pojo.db_alarm.DevLithiumAlarmData;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.SubTablePageInfoUtil;
@@ -21,10 +21,10 @@
import java.util.Map;
@Service
-public class DevAlarmDataService {
+public class DevLithiumAlarmDataService {
@Autowired(required = false)
- private DevAlarmDataMapper mapper;
+ private DevLithiumAlarmDataMapper mapper;
@Autowired(required = false)
private SubTablePageInfoUtil service;
@@ -33,21 +33,21 @@
private UserInfService uerInfService;
//鑾峰彇璁惧鍛婅淇℃伅
- public Response getDevAlmInf(int uid, DalmDto dto) {
+ public Response getPage(int uid, DevA200AlarmDto dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
dto.setUid(uid);
- List<DevAlarmData> list=mapper.getDevAlmInf(dto);
- for (DevAlarmData data:list) {
+ List<DevLithiumAlarmData> list=mapper.getDevAlmInf(dto);
+ for (DevLithiumAlarmData data:list) {
UserInf uinf=uerInfService.getUinfByUId(data.getConfirmedUid());
data.setConfirmedUname(uinf!=null?uinf.getUname():"");
int almId=data.getAlmId();
data.setAlmName(DevAlmEnum.getValue(almId));
}
PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,pageInfo,"鑾峰彇璁惧鍛婅淇℃伅");
+ return new Response().setII(1,list!=null,pageInfo,null);
}
//鑾峰彇鍘嗗彶鍛婅
- public Response getDevAlmHis(DalmDto dto) throws ParseException {
+ public Response getPage(DevA200AlarmDto dto) throws ParseException {
UserInf uinf= ActionUtil.getUser();
dto.setUid(uinf.getUid());
if(dto.getStartTime()==null){
@@ -58,31 +58,31 @@
}
PageInfo pageInfo=service.getPageInfo(dto.getPageNum(),dto.getPageSize(),dto.getStartTime(),dto.getEndTime()
,"db_alarm", "tb_devalarm_data", dto);
- return new Response().setII(1,pageInfo!=null,pageInfo,"鑾峰彇璁惧鍛婅淇℃伅");
+ return new Response().setII(1,pageInfo!=null,pageInfo,null);
}
//纭瀹炴椂鍛婅
- public Response confirmAlm(int num) {
+ public Response confirm(int num) {
UserInf uinf= ActionUtil.getUser();
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.set("alm_is_confirmed",1);
wrapper.set("confirmed_uid",uinf.getUid());
wrapper.set("confirmed_time",new Date());
wrapper.eq("num",num);
- int flag=mapper.update((DevAlarmData) ActionUtil.objeNull,wrapper);
- return new Response().set(1,flag>0,"纭瀹炴椂鍛婅");
+ int flag=mapper.update((DevLithiumAlarmData) ActionUtil.objeNull,wrapper);
+ return new Response().set(1,flag>0,null);
}
//鑾峰彇鎵�鏈夌殑鍛婅绫诲瀷
public Response getAllAlmName() {
Map<Integer,String> map=DevAlmEnum.getOpInfo();
- return new Response().setII(1,true,map,"鑾峰彇鎵�鏈夌殑鍛婅绫诲瀷");
+ return new Response().setII(1,true,map,null);
}
//寮圭獥鍛婅
- public Response getDevAlmPopUp(Integer uid) {
- List<DevAlarmData> list=mapper.getDevAlmPopUp(uid);
- for (DevAlarmData data:list) {
+ public Response getPopup(Integer uid) {
+ List<DevLithiumAlarmData> list=mapper.getPopup(uid);
+ for (DevLithiumAlarmData data:list) {
int almId=data.getAlmId();
data.setAlmName(DevAlmEnum.getValue(almId));
}
- return new Response().setII(1,list!=null,list,"寮圭獥鍛婅");
+ return new Response().setII(1,list!=null,list,null);
}
}
\ No newline at end of file
--
Gitblit v1.9.1