Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java

@@ -38,15 +38,12 @@ import com.epmet.dao.ActSignInRecDao;
 import com.epmet.dao.ActUserRelationDao;
 import com.epmet.dto.ActSignInRecDTO;
 import com.epmet.dto.ActUserRelationDTO;
-import com.epmet.dto.HeartUserInfoDTO;
 import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO;
 import com.epmet.dto.form.resi.ResiActSignInFormDTO;
 import com.epmet.entity.ActSignInPicEntity;
 import com.epmet.entity.ActSignInRecEntity;
-import com.epmet.redis.ActSignInRecRedis;
 import com.epmet.service.ActLiveRecService;
 import com.epmet.service.ActSignInRecService;
-import com.epmet.service.HeartUserInfoService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,9 +63,6 @@ import java.util.UUID;
 @Service
 public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, ActSignInRecEntity> implements ActSignInRecService {
 
-    @Autowired
-    private ActSignInRecRedis actSignInRecRedis;
-
     @Autowired
     private ActUserRelationDao actUserRelationDao;
 
@@ -78,9 +72,6 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
     @Autowired
     private ActLiveRecService actLiveRecService;
 
-//    @Autowired
-//    private HeartUserInfoService heartUserInfoService;
-
     private Logger logger = LogManager.getLogger(ActSignInRecServiceImpl.class);
     @Value("${openapi.scan.server.url}")
     private String scanApiUrl;
@@ -129,13 +120,6 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
                 actSignInPicDao.insert(actLivePicEntity);
             }
         }
-
-        // 用户信息表，实际参与活动个数（签到+1）
-        // 暂时注释掉，将（实际参与活动个数）字段，放在活动结束后进行统计
-//        HeartUserInfoDTO heartUserInfoDTO = new HeartUserInfoDTO();
-//        heartUserInfoDTO.setUserId(formDTO.getUserId());
-//        heartUserInfoDTO.setParticipationNum(NumConstant.ONE);
-//        heartUserInfoService.updateHeartUserInfoByUserId(heartUserInfoDTO);
         return new Result();
     }