src/main/java/com/zy/asrs/controller/AgvWarnController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/AgvWarnController.java
@@ -63,7 +63,7 @@ List<AgvWarn> agvWarns = new ArrayList<>(); List<AgvWarn> updates = new ArrayList<>(); for (AgvWarnBody body : data) { List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginTime())); List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginTime()).eq("warn_content", body.getWarnContent())); if (Cools.isEmpty(agvWarnList)) { agvWarn = new AgvWarn(); agvWarn.setBeginTime(body.getBeginTime()); src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
@@ -2,9 +2,11 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.MesLocDetl; import com.zy.asrs.entity.ReportData; import com.zy.asrs.entity.ReportDataLog; import com.zy.asrs.service.ApiLogService; @@ -121,6 +123,17 @@ @Transactional public ReturnT<String> stock(Map<String, Object> mesTokenInfo) { String result = doHttpRequest("{}", mesTokenInfo, "同步MES库存", url, stock, null, "127.0.0.1"); JSONObject jsonObject = JSONObject.parseObject(result); Object o = jsonObject.get("data"); if (o != null) { JSONObject jsonObject1 = JSONObject.parseObject(o.toString()); Object o1 = jsonObject1.get("list"); if (o1 != null) { JSONArray jsonArray = JSONArray.parseArray(o1.toString()); //jsonArray. } } MesLocDetl mesLocDetl=new MesLocDetl(); return SUCCESS; }