From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001 From: lxw <810412026@qq.com> Date: 星期二, 15 八月 2023 08:49:47 +0800 Subject: [PATCH] 审批页面修改 --- src/main/java/com/whyc/service/PowerInfService.java | 90 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 74 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java index db3b05f..7a2cf49 100644 --- a/src/main/java/com/whyc/service/PowerInfService.java +++ b/src/main/java/com/whyc/service/PowerInfService.java @@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; +import com.whyc.dto.paramter.PowerInfPar; import com.whyc.mapper.PowerInfMapper; import com.whyc.pojo.PowerInf; import org.springframework.stereotype.Service; @@ -12,7 +14,7 @@ import javax.annotation.Resource; import java.util.Iterator; import java.util.List; -import java.util.Map; +import java.util.stream.Collectors; @Service public class PowerInfService { @@ -81,28 +83,28 @@ return new Response().set(1,list,"鏌ヨ鎴愬姛"); } - public Response getExistStations(String stationName1,String stationName2,String stationName5){ - List<PowerInf> list = mapper.getExistStations(stationName1,stationName2,stationName5); - return new Response().set(1,list,"鏌ヨ鎴愬姛"); + public Response getExistStations(String stationName1, String stationName2, String stationName5) { + List<PowerInf> list = mapper.getExistStations(stationName1, stationName2, stationName5); + return new Response().set(1, list, "鏌ヨ鎴愬姛"); } - public Response getStations(Long userId,String stationName5){ - List<PowerInf> list = mapper.getStations(userId,stationName5); - return new Response().set(1,list,"鏌ヨ鎴愬姛"); + public Response getStations(Long userId, String stationName5) { + List<PowerInf> list = mapper.getStations(userId, stationName5); + return new Response().set(1, list, "鏌ヨ鎴愬姛"); } - public Response getPowerDevicesPage(int pageNum,int pageSize,Long uId,String stationId, String stationName1,String stationName2,String stationName5){ - PageHelper.startPage(pageNum,pageSize); - List<PowerInf> list = mapper.getPowerDevicesPage(uId,stationId, stationName1, stationName2,stationName5); + public Response getPowerDevicesPage(int pageNum, int pageSize, Long uId, PowerInfPar powerInfPar) { + PageHelper.startPage(pageNum, pageSize); + List<PowerInf> list = mapper.getPowerDevicesPage(uId, powerInfPar); PageInfo<PowerInf> pageInfo = new PageInfo<>(list); - return new Response().set(1,pageInfo,"鏌ヨ鎴愬姛"); + return new Response().set(1, pageInfo, "鏌ヨ鎴愬姛"); } - public Response getPowerDevices(String stationId){ + public Response getPowerDevices(String stationId) { QueryWrapper<PowerInf> queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("stationid",stationId); + queryWrapper.eq("stationid", stationId); List<PowerInf> list = mapper.selectList(queryWrapper); - return new Response().set(1,list,"鏌ヨ鎴愬姛"); + return new Response().set(1, list, "鏌ヨ鎴愬姛"); } //鏌ヨ鏌愪釜鐢垫簮鐨勮缁嗕俊鎭� @@ -125,7 +127,63 @@ } //绠$悊鍛橀椤�:鐢垫簮淇℃伅 - public Response<Map> getPwrdevInfAnalysis(int userId) { - return new Response().set(1); + public List<PowerInf> getPwrdevInfAnalysis(int userId) { + List<PowerInf> list = mapper.getPwrdevInfAnalysis(userId); + return list; + } + + public Response updateExceptionCause(PowerInf powerInf) { + //闈炵┖鏍¢獙 + if(powerInf.getExceptionCause()==null || powerInf.getExceptionCause().isEmpty()){ + return new Response().set(1,false,"寮傚父鍘熷洜涓嶈兘涓虹┖"); + } + mapper.updateById(powerInf); + return new Response().set(1,true,"濉啓瀹屾垚"); + } + + public Response updateCancelExceptionCause(int num) { + UpdateWrapper<PowerInf> update = Wrappers.update(); + update.set("exception_cause", null).set("exception_cause_analysis", null).eq("num", num); + mapper.update(null, update); + return new Response().setII(1, "鍙栨秷鎴愬姛"); + } + + public Response getExceptionCause(int num) { + QueryWrapper<PowerInf> query = Wrappers.query(); + query.select("StationName", "PowerProducer", "exception_cause", "exception_cause_analysis").eq("num", num); + PowerInf powerInf = mapper.selectOne(query); + return new Response().set(1, powerInf); + } + + public Response getPwrInf(Long uId) { + List<PowerInf> list = mapper.getPwrInf(uId); + return new Response().set(1, list, "鏌ヨ鎴愬姛"); + } + + //鑾峰彇鎵�鏈夌殑鐢垫簮鍝佺墝 + public Response getPwrProducer() { + List<String> list = mapper.getPwrProducer(); + return new Response().setII(1, list.size() > 0 ? true : false, list, "鑾峰彇鎵�鏈夌殑鐢垫簮鍝佺墝"); + } + + public Response getModelList() { + QueryWrapper<PowerInf> query = Wrappers.query(); + query.select("distinct model"); + List<PowerInf> powerInfList = mapper.selectList(query); + List<String> modelList = powerInfList.stream().filter(model -> model != null).map(PowerInf::getModel).collect(Collectors.toList()); + return new Response().set(1, modelList); + + } + + //鏍规嵁鍝佺墝鏌ヨ鍨嬪彿 + public Response getModelListByPwrProducer(List<String> producer) { + QueryWrapper<PowerInf> query = Wrappers.query(); + query.select("distinct model"); + if (producer != null && producer.size() > 0) { + query.in("PowerProducer", producer); + } + List<PowerInf> powerInfList = mapper.selectList(query); + List<String> modelList = powerInfList.stream().filter(model -> model != null).map(PowerInf::getModel).collect(Collectors.toList()); + return new Response().set(1, modelList); } } -- Gitblit v1.9.1