爱心互助，生产发送钉钉环境prod

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -235,7 +235,7 @@
             </activation>-->
             <properties>
                 <server.port>8111</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
+                <spring.profiles.active>prod</spring.profiles.active>
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@@ -212,8 +212,8 @@ public class ResiActListController {
      * @Date 13:39 2020-07-21
      **/
     @PostMapping("livereclist")
-    public Result<ResiActLiveRecResultDTO> liveRecList(@RequestBody Map<String, String> map) {
+    public Result<ResiActLiveRecResultDTO> liveRecList(@LoginUser TokenDto tokenDto,@RequestBody Map<String, String> map) {
-        return actLiveRecService.liveRecList(map);
+        return actLiveRecService.liveRecList(tokenDto,map);
     }
 
     /**

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

@@ -42,7 +42,7 @@ public interface ActLiveRecService extends BaseService<ActLiveRecEntity> {
      * @Author zhangyong
      * @Date 13:39 2020-07-21
      **/
-    Result<ResiActLiveRecResultDTO> liveRecList(Map<String, String> map);
+    Result<ResiActLiveRecResultDTO> liveRecList(TokenDto tokenDto,Map<String, String> map);
 
     /**
      * 活动-添加实况

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

@@ -36,7 +36,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.commons.tools.utils.SendMqMsgUtils;
-import com.epmet.constant.ActMessageConstant;
 import com.epmet.dao.ActLivePicDao;
 import com.epmet.dao.ActLiveRecDao;
 import com.epmet.dto.ActInfoDTO;
@@ -90,10 +89,10 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     private String imgSyncScanMethod;
 
     @Override
-    public Result<ResiActLiveRecResultDTO> liveRecList(Map<String, String> map) {
+    public Result<ResiActLiveRecResultDTO> liveRecList(TokenDto tokenDto,Map<String, String> map) {
-        if (map.get("actId") == null){
+        if (!map.containsKey("actId") || StringUtils.isEmpty(map.get("actId"))) {
-            logger.error("传参中没有活动ID");
+            logger.warn("传参中没有actId,或者actId为空,userId:" + tokenDto.getUserId() + "客户id:" + tokenDto.getCustomerId());
-            throw new RenException("传参中没有活动ID");
+            throw new RenException("actId不能为空");
         }
         // 数据汇总
         ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO();