|
|
@@ -6,16 +6,19 @@ import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
-import java.util.stream.Collectors;
|
|
|
+
|
|
|
import javax.annotation.Resource;
|
|
|
+
|
|
|
import org.apache.log4j.Logger;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.js.kbt.mapper.MouldCycleRuntimeMapper;
|
|
|
import com.js.kbt.mapper.MouldDownPacketMapper;
|
|
|
import com.js.kbt.mapper.MouldHistoryMapper;
|
|
|
import com.js.kbt.mapper.MouldHistoryTimeMapper;
|
|
|
import com.js.kbt.mapper.MouldHodingMapper;
|
|
|
+import com.js.kbt.mapper.RecDataLogMapper;
|
|
|
import com.js.kbt.mapper.SensorThresholdMapper;
|
|
|
import com.js.kbt.mapper.TbFactoryMapper;
|
|
|
import com.js.kbt.mapper.TbMouldEquipmentMapper;
|
|
|
@@ -29,6 +32,7 @@ import com.js.kbt.model.MouldHistory;
|
|
|
import com.js.kbt.model.MouldHistoryExample;
|
|
|
import com.js.kbt.model.MouldHistoryTime;
|
|
|
import com.js.kbt.model.MouldHistoryTimeExample;
|
|
|
+import com.js.kbt.model.RecDataLog;
|
|
|
import com.js.kbt.model.SensorThreshold;
|
|
|
import com.js.kbt.model.SensorThresholdExample;
|
|
|
import com.js.kbt.model.TbMould;
|
|
|
@@ -36,7 +40,6 @@ import com.js.kbt.model.TbMouldEquipment;
|
|
|
import com.js.kbt.model.TbMouldEquipmentExample;
|
|
|
import com.js.kbt.model.TbMouldExample;
|
|
|
import com.js.kbt.model.TimeCalibrationRecord;
|
|
|
-import com.sun.mail.dsn.message_deliverystatus;
|
|
|
|
|
|
import io.netty.buffer.ByteBuf;
|
|
|
import io.netty.buffer.Unpooled;
|
|
|
@@ -72,6 +75,8 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
|
|
|
private MouldCycleRuntimeMapper mouldCycleRuntimeMapper;
|
|
|
@Resource
|
|
|
private SensorThresholdMapper sensorThresholdMapper;
|
|
|
+ @Resource
|
|
|
+ private RecDataLogMapper recDataLogMapper;
|
|
|
|
|
|
|
|
|
@Override
|
|
|
@@ -93,6 +98,9 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
|
|
|
logger.info("非云模盒消息，不处理");
|
|
|
return ret;
|
|
|
}
|
|
|
+ RecDataLog logItem = new RecDataLog();
|
|
|
+ logItem.setRecData(input);
|
|
|
+ recDataLogMapper.insertSelective(logItem);
|
|
|
MouldHistory item = new MouldHistory();
|
|
|
// 抽取手机号码4-5(预留)丢包情况硬件会上报状态01，服务器判断02时候下发printall
|
|
|
String mobilePart = input.substring(4 * 2, 5 * 2);
|
|
|
@@ -156,7 +164,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
|
|
|
+ item.getGprsCi() + "&output=json";
|
|
|
String resp = com.js.kbt.util.HttpRequest.sendGet(api, null);
|
|
|
JSONObject json = JSONObject.parseObject(resp);
|
|
|
- if (json.getInteger("errcode") == 0) {
|
|
|
+ if (json != null && json.getInteger("errcode") == 0) {
|
|
|
item.setLng(json.getDouble("lon") + "");
|
|
|
item.setLat(json.getDouble("lat") + "");
|
|
|
} else {
|
