From 95d00bea6287620ffd8ef304ba4a78512c1e8938 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 18 十一月 2024 14:52:53 +0800 Subject: [PATCH] Maven编译打包时会产生一些警告信息,进行一个类的注解,消除这些警告信息 --- pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java | 153 +++++++++++++++++++++++++------------------------- 1 files changed, 76 insertions(+), 77 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java index b22b435..d48c4fd 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java @@ -6,6 +6,7 @@ import com.dy.common.multiDataSource.DataSourceContext; import com.dy.common.mw.protocol.Command; import com.dy.common.webUtil.BaseResponse; +import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper; import com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveHistoryMapper; @@ -25,8 +26,6 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -69,39 +68,36 @@ * @return */ public VoOnLineIntake selectOneIntake(OnLineIntakesQO qo) { - Command com = new Command() ; - com.id = Command.defaultId; - com.code = "LCD0001"; - com.type = "innerCommand"; - comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw); + //Command com = new Command() ; + //com.id = Command.defaultId; + //com.code = "LCD0001"; + //com.type = "innerCommand"; + //comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw); + // + //JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com)); + // + //JSONArray jsonArray = new JSONArray(); + //if(response != null && response.getString("code").equals("0001")) { + // JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment"); + // if(attachment != null) { + // attachment.forEach((key, value) -> { + // JSONObject jsonObject = new JSONObject(); + // jsonObject.put("rtuAddr", key); + // jsonObject.put("isOnLine", value); + // jsonArray.add(jsonObject); + // }); + // } + //} + //qo.setOnLineMap(jsonArray.toJSONString()); - JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com)); - if(response != null && response.getString("code").equals("0001")) { - JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap"); - - JSONArray jsonArray = new JSONArray(); - if(attachment != null) { - HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class); - for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("rtuAddr", entry.getKey()); - jsonObject.put("isOnLine", entry.getValue()); - jsonArray.add(jsonObject); - } - } - - qo.setOnLineMap(jsonArray.toJSONString()); - // 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄 - String intakeNum = qo.getIntakeNum(); - if(intakeNum != null) { - qo.setIntakeNum(intakeNum.toLowerCase()); - } - - Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ; - return prIntakeMapper.getIntakeByName(params); - } else { - return new VoOnLineIntake(); + // 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄 + String intakeNum = qo.getIntakeNum(); + if(intakeNum != null) { + qo.setIntakeNum(intakeNum.toLowerCase()); } + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ; + return prIntakeMapper.getIntakeByName(params); } /** @@ -109,47 +105,44 @@ * @return */ public QueryResultVo<List<VoOnLineIntake>> selectAllIntakes(OnLineIntakesQO qo) { - Command com = new Command() ; - com.id = Command.defaultId; - com.code = "LCD0001"; - com.type = "innerCommand"; - comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw); + //Command com = new Command() ; + //com.id = Command.defaultId; + //com.code = "LCD0001"; + //com.type = "innerCommand"; + //comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw); + // + //JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com)); + // + //JSONArray jsonArray = new JSONArray(); + //if(response != null && response.getString("code").equals("0001")) { + // JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment"); + // if(attachment != null) { + // attachment.forEach((key, value) -> { + // JSONObject jsonObject = new JSONObject(); + // jsonObject.put("rtuAddr", key); + // jsonObject.put("isOnLine", value); + // jsonArray.add(jsonObject); + // }); + // } + //} + //qo.setOnLineMap(jsonArray.toJSONString()); - JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com)); - if(response != null && response.getString("code").equals("0001")) { - JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap"); - - JSONArray jsonArray = new JSONArray(); - if(attachment != null) { - HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class); - for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("rtuAddr", entry.getKey()); - jsonObject.put("isOnLine", entry.getValue()); - jsonArray.add(jsonObject); - } - } - - qo.setOnLineMap(jsonArray.toJSONString()); - // 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄 - String intakeNum = qo.getIntakeNum(); - if(intakeNum != null) { - qo.setIntakeNum(intakeNum.toLowerCase()); - } - - Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ; - Long itemTotal = prIntakeMapper.getOnLineIntakesCount(params); - - QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>() ; - rsVo.pageSize = qo.pageSize ; - rsVo.pageCurr = qo.pageCurr ; - rsVo.calculateAndSet(itemTotal, params); - rsVo.obj = prIntakeMapper.getOnLineIntakes(params); - return rsVo; - } else { - QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>(); - return rsVo; + // 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄 + String intakeNum = qo.getIntakeNum(); + if(intakeNum != null) { + qo.setIntakeNum(intakeNum.toLowerCase()); } + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ; + Long itemTotal = prIntakeMapper.getOnLineIntakesCount(params); + + QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>() ; + rsVo.pageSize = qo.pageSize ; + rsVo.pageCurr = qo.pageCurr ; + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = prIntakeMapper.getOnLineIntakes(params); + return rsVo; + } /** @@ -169,10 +162,9 @@ //JSONObject response = JSON.parseObject(response_Str); //String test = response.toJSONString(); + JSONArray jsonArray = new JSONArray(); if(response != null && response.getString("code").equals("0001")) { JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment"); - - JSONArray jsonArray = new JSONArray(); if(attachment != null) { attachment.forEach((key, value) -> { JSONObject jsonObject = new JSONObject(); @@ -184,10 +176,12 @@ } System.out.println(jsonArray.toJSONString()); - return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operatorId); - } else { - return new ArrayList<>(); + //return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operatorId); + //} else { + // return new ArrayList<>(); } + + return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operatorId); } /** @@ -207,6 +201,11 @@ } catch (Exception e) { e.printStackTrace(); } + + if(response == null) { + return BaseResponseUtils.buildErrorMsg("涓棿浠惰皟鐢ㄥけ璐�"); + } + return response.getBody(); } -- Gitblit v1.8.0