活动扫码签到接口 bug修改

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml

@@ -171,7 +171,7 @@
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.105.119.155:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
-                <nacos.namespace></nacos.namespace>
+                <nacos.namespace>1da17390-6495-4e16-9ec6-0b8ece18a4a0</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.contentSecurity.group>jinshui-contentSecurityGroup</rocketmq.consumer.contentSecurity.group>

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActSignInQrCodeServiceImpl.java

@@ -27,7 +27,6 @@ import com.elink.esua.epdc.activity.form.ActSignInFormDTO;
 import com.elink.esua.epdc.activity.form.ActSignInRecordFormDTO;
 import com.elink.esua.epdc.activity.form.ActSignInScanQrCodeFormDTO;
 import com.elink.esua.epdc.activity.result.ActSignInQrCodeResultDTO;
-import com.elink.esua.epdc.activity.result.ActSignInRecordsDTO;
 import com.elink.esua.epdc.activity.result.ActSignInRecordsResultDTO;
 import com.elink.esua.epdc.activity.result.ActSignInScanQrCodeResultDTO;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@@ -45,7 +44,7 @@ import com.elink.esua.epdc.modules.activity.dao.ActSignInQrCodeDao;
 import com.elink.esua.epdc.modules.activity.entity.ActSignInQrCodeEntity;
 import com.elink.esua.epdc.modules.activity.service.*;
 import com.elink.esua.epdc.modules.constant.ActSignInQrCodeConstant;
-import com.elink.esua.epdc.modules.feign.OssFeignClient;
+import com.elink.esua.epdc.modules.feign.EpdcOssFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,7 +64,7 @@ import java.util.Map;
 public class ActSignInQrCodeServiceImpl extends BaseServiceImpl<ActSignInQrCodeDao, ActSignInQrCodeEntity> implements ActSignInQrCodeService {
 
     @Autowired
-    private OssFeignClient ossFeignClient;
+    private EpdcOssFeignClient ossFeignClient;
 
     @Autowired
     private ActInfoService actInfoService;

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java → esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/EpdcOssFeignClient.java

@@ -4,7 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.dto.UploadToOssDTO;
-import com.elink.esua.epdc.feign.fallback.OssFeignClientFallback;
+import com.elink.esua.epdc.modules.feign.fallback.EpdcOssFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.PostMapping;
  * @Author LC
  * @Date 2019/9/8 18:24
  */
-@FeignClient(name = ServiceConstant.EPDC_OSS_SERVER, fallback = OssFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_OSS_SERVER, fallback = EpdcOssFeignClientFallback.class)
-public interface OssFeignClient {
+public interface EpdcOssFeignClient {
 
     /**
      * 图片上传

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java → esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/EpdcOssFeignClientFallback.java

@@ -5,7 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.dto.UploadToOssDTO;
-import com.elink.esua.epdc.modules.feign.OssFeignClient;
+import com.elink.esua.epdc.modules.feign.EpdcOssFeignClient;
 import org.springframework.stereotype.Component;
 
 /**
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
  * @Date 2019/9/8 18:25
  */
 @Component
-public class OssFeignClientFallback implements OssFeignClient {
+public class EpdcOssFeignClientFallback implements EpdcOssFeignClient {
 
     @Override
     public Result<String> upload(UploadFormDTO formDTO) {

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -546,6 +546,6 @@
           AND DATE_FORMAT( NOW(), '%Y-%m-%d %H:%i:%s' ) BETWEEN t.SIGNIN_START_TIME
             AND t.SIGNIN_END_TIME
             ORDER BY t.SIGNIN_START_TIME DESC
-            LIMIT #{formDto.pageIndex}, #{formDto.pageSize}
+            LIMIT #{pageIndex}, #{pageSize}
     </select>
 </mapper>