大屏-96333-应急详情电梯码修改

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -11,25 +10,14 @@ import com.baomidou.mybatisplus.core.toolkit.SystemClock;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
-import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
-import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
 import com.yeejoin.amos.boot.module.elevator.api.dto.*;
-import com.yeejoin.amos.boot.module.elevator.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchPaper;
-import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchTask;
-import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
-import com.yeejoin.amos.boot.module.elevator.api.entity.RepairConsult;
-import com.yeejoin.amos.boot.module.elevator.api.entity.TzsCitInfo;
-import com.yeejoin.amos.boot.module.elevator.api.entity.VoiceRecordFile;
+import com.yeejoin.amos.boot.module.elevator.api.entity.*;
 import com.yeejoin.amos.boot.module.elevator.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.elevator.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.elevator.api.enums.EquipmentClassifityEnum;
@@ -38,14 +26,11 @@ import com.yeejoin.amos.boot.module.elevator.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.elevator.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.elevator.api.service.IRescueStationService;
 import com.yeejoin.amos.boot.module.elevator.api.service.TzsAuthService;
-import com.yeejoin.amos.boot.module.elevator.biz.utils.AlertBeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.text.StrBuilder;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.redisson.api.RAtomicLong;
@@ -62,8 +47,6 @@ import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -1272,21 +1255,26 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             data.put("operater", r.getDescription());
             records.add(data);
         });
-        // 监管码
+        // 96333码
         HashMap<String, Object> qrcode = new HashMap<>();
         if (!ObjectUtils.isEmpty(alertCalledFormVo.getAlertCalledDto())) {
-            qrcode.put("value", alertCalledFormVo.getAlertCalledDto().getRegistrationCode());
+            qrcode.put("title", "96333码");
+            qrcode.put("value", alertCalledFormVo.getAlertCalledDto().getDeviceId());
             try {
-                qrcode.put("problemTime", DateUtil.formatDate(new Date(), DateUtil.Y_M_D_HMS));
+                String problemTime = DateUtil.formatDate(new Date(), DateUtil.Y_M_D_HMS);
+                qrcode.put("text", DateUtil.formatDate(DateUtil.smartFormat(problemTime), "yyyy-MM-dd"));
+                qrcode.put("subtext", DateUtil.formatDate(DateUtil.smartFormat(problemTime), "HH:mm:ss"));
+                String color;
+                if (alertCalledFormVo.getAlertCalledDto().getAlertStatus()) {
+                    color = "green";
+                } else {
+                    color = "red";
+                }
+                    qrcode.put("color", color);
             } catch (Exception e) {
                 e.printStackTrace();
             }
         }
-        // 96333码
-        HashMap<String, Object> qrcode2 = new HashMap<>();
-        if (!ObjectUtils.isEmpty(alertCalledFormVo.getAlertCalledDto())) {
-            qrcode2.put("value", alertCalledFormVo.getAlertCalledDto().getDeviceId());
-        }
         datas.put("datas", records);
         datas.put("title", "处置记录");
         datas.put("renderType", "timeline");
@@ -1294,7 +1282,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         keyinfoData.put("keyParams", jsonData);
         keyinfoData.put("infoRecords", datas);
         keyinfoData.put("qrcode", qrcode);
-        keyinfoData.put("qrcode2", qrcode2);
         return keyinfoData;
     }