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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java

@@ -4,8 +4,6 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -69,6 +67,7 @@ public class TDuckListResultDTO implements Serializable {
     private String client;
 
     private String createdTime;
+    private String updatedTime;
 
     /**
      * 是否填写问卷，true：是，false：否
@@ -107,6 +106,7 @@ public class TDuckListResultDTO implements Serializable {
         this.status = NumConstant.ONE;
         this.client = "";
         this.createdTime = "";
+        this.updatedTime = "";
         this.fillStatus = false;
         this.isFillQuestion = true;
         this.orgName = "";

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

@@ -51,6 +51,7 @@ import com.epmet.dataaggre.dto.epmettduck.result.*;
 import com.epmet.dataaggre.dto.epmettduck.struct.*;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
+import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
 import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
 import com.epmet.dataaggre.service.epmettduck.PrVistRecordService;
@@ -70,6 +71,8 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -251,9 +254,39 @@ 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.setProjectKey(formDTO.getClient());
+            PrVistRecordDTO newestRecord = prVistRecordService.getNewestRecord(formDTO.getUserId());
+            PrVistRecordEntity entity = ConvertUtils.sourceToTarget(PrVistRecordDTO.class, PrVistRecordEntity.class);
+            if (newestRecord == null) {
+                prVistRecordService.insert(entity);
+            } else {
+                entity = new PrVistRecordEntity();
+                entity.setId(newestRecord.getId());
+                prVistRecordService.updateById(entity);
+            }
+            log.info("insertPrVistRecord end =========");
+        });
+    }
+
     /**
      * @Description  orgIds拼接
      * @Param pids
@@ -580,8 +613,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 }
                 //按照星星大小升序排列
                 this.sortMap(starMap, true);
-                //2、平均分
-                detail.put("avgStarNum", new BigDecimal((float)totalStarNum / validTotal).setScale(0, BigDecimal.ROUND_HALF_UP));
+                //2、平均分 (09.30,产品需求：直接显示平均星数，保留小数点后两位，无需四舍五入)
+                detail.put("avgStarNum", new BigDecimal((float)totalStarNum / validTotal).setScale(2, BigDecimal.ROUND_DOWN));
                 //3、几条有效记录
                 detail.put("validTotal", validTotal);
                 //4、得分列表
@@ -808,4 +841,4 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         query.eq(PrUserProjectEntity::getKey, key);
         return baseDao.selectOne(query);
     }
-}
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml

@@ -92,7 +92,7 @@
                 #{key}
             </foreach>
             )
-        ORDER BY up.created_time DESC
+        ORDER BY up.updated_time DESC
     </select>
 
 </mapper>