diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssMsgStatusController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssMsgStatusController.java index 85bc992b..881ee762 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssMsgStatusController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssMsgStatusController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import java.util.List; /** * 状态消息 控制器 @@ -40,7 +41,17 @@ public class GnssMsgStatusController extends BasicController implements CommonEx @RequestMapping("/gnss/msg/status/list") @ResponseBody public JSONObject listStatusMsg(HttpSession session, Integer page, Integer limit, String searchParams) { - return this.pageList(session, page, limit, searchParams); + JSONObject obj = this.pageList(session, page, limit, searchParams); + List msgList = (List) obj.get("data"); + for(GnssStatusMsg msg:msgList){ + if(msg.getChargecurrency()!=null && msg.getSolarvoltage()!=null){ + if(msg.getVoltage()>msg.getSolarvoltage()+3000){ + msg.setChargecurrency(0); + msg.setChargewatt(0.0F); + } + } + } + return obj; } /**