Merge branch 'dev' into release

111

themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -25,7 +25,6 @@ import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.util.SimpleBeanUtil;
-import com.qmth.themis.mq.listener.RocketMessageConsumer;
 import com.qmth.themis.mq.service.MqLogicService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -365,11 +364,17 @@ public class MqLogicServiceImpl implements MqLogicService {
     public void execMqRecordUpdateLogic(MqDto mqDto, String key) {
         Gson gson = new Gson();
         Map<String, Object> param = (Map<String, Object>) mqDto.getBody();
-        Long recordId = (Long) param.get("recordId");
-        String colName = (String) param.get("colName");
-        Object colValue = (Object) param.get("colValue");
-        Integer isDate = (Integer) param.get("isDate");
-        examRecordService.dataUpdate(recordId, colName, colValue, isDate);
+        Long recordId = Long.parseLong(String.valueOf(param.get("recordId")));
+        String colName = String.valueOf(param.get("colName"));
+        Object colValue = param.get("colValue");
+        Integer isDate = Integer.parseInt(String.valueOf(param.get("isDate")));
+        if (colName.contains("client_last_sync_time") || colName.contains("last_break_time") || colName.contains("last_start_time")) {
+            Date date = new Date();
+            date.setTime(Long.parseLong(String.valueOf(colValue)));
+            examRecordService.dataUpdate(recordId, colName, date, isDate);
+        } else {
+            examRecordService.dataUpdate(recordId, colName, colValue, isDate);
+        }
         mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
         TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);
         tmRocketMessage.setBody(JacksonUtil.parseJson(tmRocketMessage.getBody()));