Merge branch 'dev_question_naire' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java

@@ -17,14 +17,13 @@
 
 package com.epmet.dataaggre.entity.epmettduck;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户访问问卷记录表
  *
@@ -41,6 +40,7 @@ public class PrVistRecordEntity extends BaseEpmetEntity {
 	/**
 	 *
 	 */
+	@TableId(type = IdType.ID_WORKER_STR)
 	private String id;
 
     /**
@@ -58,9 +58,4 @@ public class PrVistRecordEntity extends BaseEpmetEntity {
      */
 	private String userType;
 
-    /**
-     * 项目key
-     */
-	private String projectKey;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrVistRecordService.java

@@ -101,4 +101,10 @@ public interface PrVistRecordService extends BaseService<PrVistRecordEntity> {
      * @Date 2021/9/23 14:16
      */
     PrVistRecordDTO getNewestRecord(String staffId);
+
+    /**
+     * desc:插入或更新记录
+     * @param param
+     */
+    void insertOrUpdate(PrVistRecordDTO param);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

@@ -254,37 +254,14 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             }
             r.setOrgName(orgName);
         });
-
-
-        insertPrVistRecord(formDTO);
-
-        return result;
-    }
-
-    /**
-     * desc：一步插入访问记录 不带projectKey
-     * @param formDTO
-     * @return
-     */
-    private Future<?> insertPrVistRecord(TDuckListFormDTO formDTO) {
-        return Executors.newCachedThreadPool().submit(()->{
-            log.info("insertPrVistRecord start =========");
         PrVistRecordDTO param = new PrVistRecordDTO();
         param.setCustomerId(formDTO.getCustomerId());
         param.setUserId(formDTO.getUserId());
-            param.setUserType(formDTO.getOrgType());
+        param.setUserType(formDTO.getClient());
-            param.setProjectKey(formDTO.getClient());
+        param.setCustomerId(formDTO.getCustomerId());
-            PrVistRecordDTO newestRecord = prVistRecordService.getNewestRecord(formDTO.getUserId());
+        prVistRecordService.insertOrUpdate(param);
-            PrVistRecordEntity entity = ConvertUtils.sourceToTarget(PrVistRecordDTO.class, PrVistRecordEntity.class);
+
-            if (newestRecord == null) {
+        return result;
-                prVistRecordService.insert(entity);
-            } else {
-                entity = new PrVistRecordEntity();
-                entity.setId(newestRecord.getId());
-                prVistRecordService.updateById(entity);
-            }
-            log.info("insertPrVistRecord end =========");
-        });
     }
 
     /**
@@ -827,7 +804,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             result.setRedPoint(NumConstant.ONE_STR);
             return result;
         }
-        if (list.get(0).getCreatedTime().compareTo(visitRecord.getCreatedTime()) > 0) {
+        if (list.get(0).getCreatedTime().compareTo(visitRecord.getUpdatedTime()) > 0) {
             result.setRedPoint(NumConstant.ONE_STR);
         } else {
             result.setRedPoint(NumConstant.ZERO_STR);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrVistRecordServiceImpl.java

@@ -115,12 +115,33 @@ public class PrVistRecordServiceImpl extends BaseServiceImpl<PrVistRecordDao, Pr
     public PrVistRecordDTO getNewestRecord(String staffId) {
         LambdaQueryWrapper<PrVistRecordEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PrVistRecordEntity::getUserId, staffId);
-        wrapper.orderByDesc(PrVistRecordEntity::getCreatedTime);
+        wrapper.orderByDesc(PrVistRecordEntity::getUpdatedTime);
+        wrapper.last("limit 1");
         List<PrVistRecordEntity> list = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(list)) {
             return null;
         }
-        return ConvertUtils.sourceToTarget(list, PrVistRecordDTO.class).get(0);
+        return ConvertUtils.sourceToTarget(list.get(0), PrVistRecordDTO.class);
+    }
+
+    @Override
+    public void insertOrUpdate(PrVistRecordDTO param) {
+        //Executors.newCachedThreadPool().submit(()-> {
+            try {
+
+                PrVistRecordDTO newestRecord = this.getNewestRecord(param.getUserId());
+                if (newestRecord == null) {
+                    PrVistRecordEntity entity = ConvertUtils.sourceToTarget(param, PrVistRecordEntity.class);
+                    this.insert(entity);
+                } else {
+                    PrVistRecordEntity entity = new PrVistRecordEntity();
+                    entity.setId(newestRecord.getId());
+                    this.updateById(entity);
+                }
+            } catch (Exception e) {
+                log.error("insertPrVistRecord excption", e);
+            }
+        //});
     }
 
 }