fix: 修改导出记录

guzijian
1 parent 5d7106c9
Showing 3 changed files with 61 additions and 36 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/pojo/converter/FaceSignInConverter.java
 package com.ruoyi.driver.domain;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.ruoyi.pojo.converter.FaceSignInConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,94 +32,94 @@ public class Driver extends BaseEntity implements Serializable {
     /**
      * 工号
      */
-    @Excel(name = "工号")
+    @ExcelProperty(value = "工号")
     private String jobCode;
     /**
      * 公司编码
      */
-    @Excel(name = "公司编码")
+//    @ExcelProperty(value = "公司编码")
     private String companyCode;
     /**
      * 分公司编码
      */
-    @Excel(name = "分公司编码")
+//    @ExcelProperty(value = "分公司编码")
     private String brancheCompanyCode;
     /**
      * 姓名
      */
-    @Excel(name = "姓名")
+    @ExcelProperty(value = "姓名")
     private String personnelName;
     /**
      * 运营服务证书号
      */
-    @Excel(name = "运营服务证书号")
+//    @ExcelProperty(value = "运营服务证书号")
     private String papersCode;
     /**
      * 一卡通工作卡号
      */
-    @Excel(name = "一卡通工作卡号")
+//    @ExcelProperty(value = "一卡通工作卡号")
     private String icCardCode;
     /**
      * 性别
      */
-    @Excel(name = "性别")
+    @ExcelProperty(value = "性别")
     private String personnelType;
     /**
      * 所属岗位/工种
      */
-    @Excel(name = "所属岗位/工种")
+    @ExcelProperty(value = "所属岗位/工种")
     private String posts;
     /**
      * 身份证
      */
-    @Excel(name = "身份证")
+//    @ExcelProperty(value = "身份证")
     private String card;
     /**
      * 联系电话
      */
-    @Excel(name = "联系电话")
+//    @ExcelProperty(value = "联系电话")
     @JsonIgnoreProperties(ignoreUnknown = true)
     private String telphone;
     /**
      * RFID 人卡IC号
      */
-    @Excel(name = "RFID 人卡IC号")
+//    @ExcelProperty(value = "RFID 人卡IC号")
     private String icRfid;
     /**
      * RFID 人卡ID号（10进制）
      */
-    @Excel(name = "RFID 人卡ID号", readConverterExp = "1=0进制")
+//    @ExcelProperty(value = "RFID 人卡ID号", readConverterExp = "1=0进制")
     private String idRfid;
     /**
      * RFID 标签号
      */
-    @Excel(name = "RFID 标签号")
+//    @ExcelProperty(value = "RFID 标签号")
     private String tagRfid;
     /**
      * 线路名称
      */
-    @Excel(name = "线路名称")
+//    @ExcelProperty(value = "线路名称")
     private String lineName;
     /**
      * 线路编码
      */
-    @Excel(name = "线路编码")
+//    @ExcelProperty(value = "线路编码")
     private String lineCode;
     /**
      * 是否人脸注册
      */
-    @Excel(name = "是否人脸注册")
+    @ExcelProperty(value = "是否人脸注册",converter = FaceSignInConverter.class)
     @ApiModelProperty("是否人脸注册 0 注册 1 未注册 2 注册过期更新")
     private Integer faceSignIn;
     /**
@@ -133,7 +135,7 @@ public class Driver extends BaseEntity implements Serializable {
     private String signInEquipment;
     @ApiModelProperty("车队名称")
-    @Excel( name ="车队名称")
+    @ExcelProperty( value ="车队名称")
     private String fleetName;
 }
@@ -48,6 +48,8 @@ import java.util.stream.Collectors;
 import static com.ruoyi.common.ConstDriverProperties.*;
 import static com.ruoyi.common.ConstEquipmentProperties.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_FACE_ACTIVE;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_FACE_TIMEOUT;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.*;
 /**
@@ -152,17 +154,8 @@ public class DriverJob implements InitializingBean {
         // 多线程插入数据
         log.info("开始插入");
         THREAD_JOB_SERVICE.asyncUploadDriverWithUpdateImageUrl(drivers);
-//        String downloadImage = getDownloadImage(url, accessToken, "");
-
     }
-//    public static void main(String[] args) {
-//        String str = "[{\"previewUrl\":\"/ossFileHandle?appType=APP_HV8J7X8PFRXLJJW8JTZK&fileName=APP_HV8J7X8PFRXLJJW8JTZK_bWFuYWdlcjgxNF9QRTg2Nk1EMThYTUNaNkxVN002QTQ3N0hQV0E2MlNYMTMwQ0tMQTQ$.png&instId=&type=open&process=image/resize,m_fill,w_200,h_200,limit_0/quality,q_80\",\"size\":621992,\"name\":\"0332d25e3b9e80bca3d90daf0d5857d.png\",\"downloadUrl\":\"/ossFileHandle?appType=APP_HV8J7X8PFRXLJJW8JTZK&fileName=APP_HV8J7X8PFRXLJJW8JTZK_bWFuYWdlcjgxNF9QRTg2Nk1EMThYTUNaNkxVN002QTQ3N0hQV0E2MlNYMTMwQ0tMQTQ$.png&instId=&type=download\",\"fileUuid\":\"APP_HV8J7X8PFRXLJJW8JTZK_bWFuYWdlcjgxNF9QRTg2Nk1EMThYTUNaNkxVN002QTQ3N0hQV0E2MlNYMTMwQ0tMQTQ$.png\",\"url\":\"/ossFileHandle?appType=APP_HV8J7X8PFRXLJJW8JTZK&fileName=APP_HV8J7X8PFRXLJJW8JTZK_bWFuYWdlcjgxNF9QRTg2Nk1EMThYTUNaNkxVN002QTQ3N0hQV0E2MlNYMTMwQ0tMQTQ$.png&instId=&type=download\"}]";
-////        List<List> lists = JSONArray.parseArray(str, List.class);
-//        List<ImageField_lk9mk228> lists = JSONArray.parseArray(str, ImageField_lk9mk228.class);
-//        System.out.println(lists);
-//    }
-
     public static String getDownloadImageUrl(String accessToken, String preViewUrl) {
         accessToken = REDIS_CACHE.getCacheObject(REDIS_PERSONNEL_TOKEN);
         String url = "https://api.dingtalk.com/v1.0/yida/apps/temporaryUrls/APP_HV8J7X8PFRXLJJW8JTZK";
@@ -197,6 +190,7 @@ public class DriverJob implements InitializingBean {
     }
     // 弃用  无用方法
+    @Deprecated
     public void clearExceptionYesterdayRecord() {
         // 获取当前日期时间
         Calendar calendar = Calendar.getInstance();
@@ -398,8 +392,6 @@ public class DriverJob implements InitializingBean {
     public static void handleDriverList() throws Exception {
-//        Map<String, String> configMap = getStringStringMap(timestamp);
-//        String sign = getSHA1(configMap);
         Date date = new Date();
         List<TJkEmployeeinfo> vo = getPersonInfo();
         List<Driver> drivers = getDrivers(date, vo);
@@ -410,14 +402,6 @@ public class DriverJob implements InitializingBean {
         for (List<Driver> driverList : splitList) {
             saveDrivers(driverList);
         }
-//        for (int i = 1; i <= countPage; ) {
-//            if (++i <= countPage) {
-////                vo = getPersonInfo(accessToken, 100, i);
-////                drivers = getDrivers(date, vo);
-////                updateDrivers(drivers);
-//                saveDrivers(drivers, accessToken);
-//            }
-//        }
     }
     private static void handleNotEmptyJob(List<String> jobList) {
@@ -441,6 +425,7 @@ public class DriverJob implements InitializingBean {
                     driver.setPosts(item.getPositname());
                     driver.setUpdateTime(date);
                     driver.setCard(item.getStatus());
+                    driver.setFaceSignIn(SIGN_FACE_ACTIVE);
                     return driver;
                 }).collect(Collectors.toList());
         return drivers;
+package com.ruoyi.pojo.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_IN_FAIL_STRING;
+
+public class FaceSignInConverter implements Converter<Integer> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return Integer.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String str = "";
+        if (SIGN_FACE_SUCCESS.equals(value)){
+            str = "已完成人脸注册";
+        }else {
+            str = "未完成人脸注册";
+        }
+        return new CellData(str);
+    }
+}