创建项目

.gitignore

@@ -0,0 +1,5 @@
+/.idea/
+/target/
+/scientific-cirle.iml
+.logback-spring.xml
+/data/log/

pom.xml

@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.1.7.RELEASE</version>
+    </parent>
+    <groupId>com.cirle</groupId>
+    <artifactId>scientific-cirle</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>scientific-cirle</name>
+    <description>全科界项目</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <lombok.version>1.18.2</lombok.version>
+        <ehcache.version>2.10.5</ehcache.version>
+        <mysql.connector.version>8.0.13</mysql.connector.version>
+        <jsoup.version>1.11.3</jsoup.version>
+        <!--excel工具框架版本：component.excel-->
+        <poi.version>4.0.0</poi.version>
+        <!--jwt处理框架版本：component.jwt-->
+        <jwt.version>3.4.0</jwt.version>
+        <!--swagger2接口文档版本：component.jwt-->
+        <swagger.version>2.9.2</swagger.version>
+        <!--swagger-knife4j接口文档页面：component.jwt-->
+        <swagger.knife4j.version>2.0.1</swagger.knife4j.version>
+        <commons.beanutils.version>1.8.0</commons.beanutils.version>
+        <commons-collections.version>3.2.2</commons-collections.version>
+        <aliyun-sdk-oss.version>3.5.0</aliyun-sdk-oss.version>
+        <commons-fileupload.version>1.3.1</commons-fileupload.version>
+        <jackson.version>2.12.3</jackson.version>
+        <bcprov-jdk16.version>1.46</bcprov-jdk16.version>
+        <codec.version>1.8</codec.version>
+        <oshi-json.version>3.6.1</oshi-json.version>
+        <commons-lang3.version>3.8</commons-lang3.version>
+        <thymeleaf-extras-springsecurity4.version>3.0.2.RELEASE</thymeleaf-extras-springsecurity4.version>
+        <skipTests>true</skipTests>
+        <tea-openapi.version>0.2.2</tea-openapi.version>
+        <dysmsapi2017052.version>2.0.9</dysmsapi2017052.version>
+        <weixin.version>0.0.3</weixin.version>
+        <aliyun-sdk-opensearch.version>3.1.3</aliyun-sdk-opensearch.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-data-redis</artifactId>
+<!--            <version>2.6.3</version>-->
+        </dependency>
+        <!-- thymeleaf模板 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <!--spring data jpa持久层框架-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--mysql连接驱动-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql.connector.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!--lombok语法糖-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!--html解析工具，处理xss攻击-->
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>${jsoup.version}</version>
+        </dependency>
+
+        <!--swagger2接口文档-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
+        <!--knife4j（swagger-bootstrap-ui）接口文档页面-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-ui</artifactId>
+            <version>${swagger.knife4j.version}</version>
+        </dependency>
+        <!-- CopyUtil需要用到 -->
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>${commons.beanutils.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${commons-collections.version}</version>
+        </dependency>
+
+        <!--阿里云相关-->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>${aliyun-sdk-oss.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-openapi</artifactId>
+            <version>${tea-openapi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+            <version>${dysmsapi2017052.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.49</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.opensearch</groupId>
+            <artifactId>aliyun-sdk-opensearch</artifactId>
+            <version>${aliyun-sdk-opensearch.version}</version>
+        </dependency>
+
+        <!-- 微信相关 -->
+        <dependency>
+            <groupId>com.github.wxpay</groupId>
+            <artifactId>wxpay-sdk</artifactId>
+            <version>${weixin.version}</version>
+        </dependency>
+
+        <!--文件上传相关-->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${commons-fileupload.version}</version>
+        </dependency>
+        <!-- Jackson Json处理工具包 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <!--提供更多的加密、填充方式-->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <version>${bcprov-jdk16.version}</version>
+        </dependency>
+        <!-- 引入redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <!-- Base64编码需要  -->
+        <dependency>
+            <groupId>org.apache.directory.studio</groupId>
+            <artifactId>org.apache.commons.codec</artifactId>
+            <version>${codec.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+        </dependency>
+
+        <!--https://github.com/oshi/oshi。-->
+        <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-json</artifactId>
+            <version>${oshi-json.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+
+        <!--集成redis-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.8.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.4</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory><!--java文件的路径-->
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+                 <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory><!--资源文件的路径-->
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+                 <filtering>false</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                    <addResources>true</addResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

src/main/java/AutoIncrMember.java

@@ -0,0 +1,118 @@
+
+import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class AutoIncrMember {
+
+    public static Map<String, Long> totalmap = new HashMap();
+    public static void main(String[] args) throws Exception {
+
+
+
+
+        Class.forName("com.mysql.cj.jdbc.Driver");
+        Connection conn = DriverManager.getConnection("jdbc:mysql://bj-cdb-ihmswuq0.sql.tencentcdb.com:59832/qkyxzx?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false","qunke#u03","Qk@mYPw2o2O6+6");
+
+        while(true){
+            SimpleDateFormat format = new SimpleDateFormat("HH:mm");
+            String now = format.format(new Date());
+            add(now,conn);
+
+            Thread.sleep(30000);
+        }
+        //conn.close();
+
+
+    }
+
+    public void updateparent( Connection conn,String parentid) throws SQLException {
+        String sql = "select sum(b.purchased_members) from qkj_live b where b.id in ("+parentid+") and live_status=1";
+            Statement stmt = conn.createStatement();
+            //6、执行sql
+            ResultSet rs = stmt.executeQuery(sql);
+            //7、处理结果
+            if(rs.next()){
+                int count =rs.getInt(1);
+                sql = "update    qkj_live  set  purchased_members  =  "+count+" where id=199";
+                System.out.println(sql);
+                updatesql(sql,conn);
+            }
+            rs.close();
+            //8、释放资源
+            stmt.close();
+    }
+
+
+    public static void add(String now,Connection conn) throws Exception{
+
+        String[] times = {"18:00-19:00,60","19:00-19:40,40"};
+        String[] lives = {"201:8102"};//,"164:58000"
+        realincr(now,conn,times,lives);
+    }
+
+    public static void realincr( String now,Connection conn,String[] times ,String[] lives ) throws Exception{
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for(String live:lives){
+            String liveid = live.split(":")[0];
+            Integer count = Integer.parseInt(live.split(":")[1]);
+
+            for(String time:times){
+                String start = time.split(",")[0].split("-")[0];
+                String end = time.split(",")[0].split("-")[1];
+                if(now.compareTo(start)>=0 &&  now.compareTo(end)<0){
+
+                }else{
+                    System.out.println("no start now="+now+" start="+start+" end="+end);
+                    continue;
+                }
+                long last = (format.parse("2022-07-16 "+end+":00").getTime()-format.parse("2022-07-16 "+start+":00").getTime())/1000;
+                String percent = time.split(",")[1];
+                int currenttotal = count*Integer.parseInt(percent)/100;
+                long incr = currenttotal*30/last;
+                long num = getnum(now,start,end,incr);
+                System.out.println("liveid="+liveid+" num="+num+" incr="+incr+" currenttotal="+currenttotal+" count="+count);
+                if(totalmap.get(liveid)==null){
+                    totalmap.put(liveid,num);
+                }else{
+                    totalmap.put(liveid,totalmap.get(liveid)+num);
+                }
+                String sql = "update    qkj_live set  purchased_members  =  purchased_members+"+num+" where id = "+liveid+" and live_status=1";
+                updatesql(sql,conn);
+            }
+
+
+        }
+    }
+
+    public static long getnum(String now,String start,String end,long incr){
+
+        System.out.print(now+" ");
+        if(now.compareTo(start)>=0 &&  now.compareTo(end)<0){
+
+        }else{
+            int random2 =    (int) ((Math.random() *10) ) ;
+            incr = random2;
+        }
+        int random =    (int) ((Math.random() *10+1) +incr) ;
+        if(random<0){
+            random=0;
+        }
+        int MAX = 10000;
+        if(random>MAX ){
+            random = random%MAX;
+        }
+        return random;
+
+    }
+
+
+    public static void updatesql(String sql,Connection conn) throws SQLException {
+        Statement s = conn.createStatement();
+        s.execute(sql);
+        s.close();
+    }
+
+}

src/main/java/com/cirle/scientific/ScientificCirleApplication.java

@@ -0,0 +1,17 @@
+package com.cirle.scientific;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@SpringBootApplication
+@EnableAsync
+@EnableSwagger2
+public class ScientificCirleApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ScientificCirleApplication.class, args);
+    }
+    
+}

src/main/java/com/cirle/scientific/component/SpringUtil.java

@@ -0,0 +1,35 @@
+package com.cirle.scientific.component;
+
+import com.sun.istack.logging.Logger;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * 获取bean的工具类
+ */
+@Component
+public class SpringUtil implements ApplicationContextAware {
+
+    private static Logger logger = Logger.getLogger(SpringUtil.class);
+    private static ApplicationContext applicationContext;
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        SpringUtil.applicationContext = applicationContext;
+
+    }
+
+    public ApplicationContext getApplicationContext(){
+        return applicationContext;
+    }
+
+    public static Object getBean(String beanName){
+        return applicationContext.getBean(beanName);
+    }
+
+    public static <T> T getBean(Class<T> clazz) {
+        logger.info("applicationContext======="+applicationContext);
+        return (T) applicationContext.getBean(clazz);
+    }
+}

src/main/java/com/cirle/scientific/config/AsyncConfig.java

@@ -0,0 +1,37 @@
+package com.cirle.scientific.config;
+
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+@EnableAsync
+@Configuration
+public class AsyncConfig implements AsyncConfigurer {
+
+    @Override
+    public Executor getAsyncExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+
+        executor.setCorePoolSize(5); //核心线程数
+        executor.setMaxPoolSize(10);  //最大线程数
+        executor.setQueueCapacity(500); //队列大小
+        executor.setKeepAliveSeconds(150); //线程最大空闲时间
+        executor.setThreadNamePrefix("fsx-Executor-"); //指定用于新创建的线程名称的前缀。
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); // 拒绝策略（一共四种，此处省略）
+
+        executor.initialize();
+        return executor;
+    }
+
+    // 异常处理器：当然你也可以自定义的，这里我就这么简单写了~~~
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return new SimpleAsyncUncaughtExceptionHandler();
+    }
+}

src/main/java/com/cirle/scientific/config/CirleConfigurer.java

@@ -0,0 +1,25 @@
+package com.cirle.scientific.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+
+@Configuration
+public class CirleConfigurer implements WebMvcConfigurer {
+    @Bean
+    public CirleInterceptor getInterceptor(){
+        return new CirleInterceptor();
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+
+        /**
+         * 自定义拦截器，添加拦截路径和排除拦截路径
+         * addPathPatterns():添加需要拦截的路径
+         */
+        registry.addInterceptor(getInterceptor()).addPathPatterns("/**");
+    }
+}

src/main/java/com/cirle/scientific/config/CirleInterceptor.java

@@ -0,0 +1,192 @@
+package com.cirle.scientific.config;
+
+import com.cirle.scientific.constants.LoginConsts;
+import com.cirle.scientific.utils.CookieUtil;
+import com.cirle.scientific.utils.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.concurrent.TimeUnit;
+
+
+@Component
+@Slf4j
+public class CirleInterceptor extends HandlerInterceptorAdapter {
+
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+
+    /*
+     * 视图渲染之后的操作
+     */
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object arg2, Exception arg3) throws Exception {
+
+        System.out.println("执行到了afterCompletion方法");
+    }
+
+    /*
+     * 处理请求完成后视图渲染之前的处理操作
+     * 通过ModelAndView参数改变显示的视图，或发往视图的方法
+     */
+    @Override
+    public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3) throws Exception {
+        arg0.setAttribute("memToken",arg0.getParameter("memToken"));
+    }
+
+    /*
+     * 进入controller层之前拦截请求
+     * 返回值：表示是否将当前的请求拦截下来  false：拦截请求，请求别终止。true：请求不被拦截，继续执行
+     * Object obj:表示被拦的请求的目标对象（controller中方法）
+     */
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
+        String memToken = getValueByCookie(request,"memToken");
+        if(StringUtils.isBlank(memToken)){
+            memToken = request.getParameter("memToken");
+        }
+        log.info("当前访问memToken:"+memToken);
+        String memCard = "";
+        if (StringUtils.isBlank(memToken)) {
+            memCard = request.getParameter("memCard");
+            log.info("当前访问memCard :{}", memCard);
+        } else {
+            Object memCard1 = stringRedisTemplate.opsForValue().get(memToken);
+            if(memCard1 != null){
+                memCard = memCard1.toString();
+                //更新m端redis存的登录状态的有效期
+                stringRedisTemplate.expire(memToken,LoginConsts.M_LOGIN_EXPIRE, TimeUnit.MINUTES);
+                String loginKeyToM = String.format(LoginConsts.M_LOGIN_USER_KEY, memCard);
+                stringRedisTemplate.expire(loginKeyToM, LoginConsts.M_LOGIN_EXPIRE, LoginConsts.UNIT);
+                CookieUtil.setMainCookie(response, memToken, memCard, StringUtil.getdomain(request));
+                log.info("续上了 memCard:{} memToken:{}", memCard, memToken);
+            }else {
+                clearCookies(response, StringUtil.getdomain(request), "/", "memToken");
+                clearCookies(response, StringUtil.getdomain(request), "/", "memNickname");
+                clearCookies(response, StringUtil.getdomain(request), "/", "memHeadImg");
+                clearCookies(response, StringUtil.getdomain(request), "/", "bindMobile");
+                //clearCookies(response, StringUtil.getdomain(request), "/", "memCard"); 需要判断是否是被顶掉，判断完再删掉
+            }
+        }
+        //memCard = "1fe53103fc6c48cb98ba4fb3586cc307";
+
+        if(StringUtils.isBlank(memCard)){
+            memCard = (String)request.getSession().getAttribute(LoginConsts.PC_LOGIN_SESSION_KEY);
+            if(StringUtils.isNotBlank(memCard)){//把账号的有效期续一下
+                String loginKey = String.format(LoginConsts.PC_LOGIN_USER_KEY, memCard);
+                stringRedisTemplate.expire(loginKey, LoginConsts.M_LOGIN_EXPIRE, LoginConsts.UNIT);
+            }
+            log.info("preHandle getSession memCard:{}", memCard);
+        }
+        log.info("preHandle memCard:{}", memCard);
+        if (StringUtils.isNotBlank(memCard)) {
+            request.setAttribute(LoginConsts.M_MEMCARD_KEY,memCard);
+
+        }
+
+        String fromMemCard = request.getParameter("fromMemCard");
+        if(StringUtils.isNotBlank(fromMemCard)){
+            addValue2Cookie(response, StringUtil.getdomain(request), "/", "fromMemCard", fromMemCard, 3600);
+        }
+        return true;
+    }
+
+    /**
+     * 获取cookie里的值
+     *
+     * @param request
+     * @param key
+     * @return 不存在 返回null
+     */
+    public String getValueByCookie(HttpServletRequest request, String key) {
+        String cookievalue = null;
+        Cookie[] cookies = request.getCookies();
+        if (null != cookies && cookies.length != 0) {
+            for (int i = 0; i < cookies.length; i++) {
+                Cookie cookie = cookies[i];
+                if (cookie.getName().equals(key)) {
+                    // String value = cookie.getValue();
+                    try {
+                        cookievalue = URLDecoder.decode(cookie.getValue(), "UTF-8");
+                    } catch (UnsupportedEncodingException e) {
+                        e.printStackTrace();
+                    }
+                    // cookievalue = value;
+                    break;
+                }
+            }
+        }
+        return cookievalue;
+    }
+    /**
+     * 将值存入cookie
+     *
+     * @param response
+     * @param key
+     * @param val
+     */
+    public void addValue2Cookie(HttpServletResponse response, String domain, String path, String key, String val,
+                                int time) {
+        if(val == null || "".equals(val)){
+            return;
+        }
+        try {
+            val = URLEncoder.encode(val, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        response.addHeader("P3P", "CP=CAO PSA OUR");
+        Cookie c = new Cookie(key, val);
+        c.setDomain(domain);
+        c.setMaxAge(time);
+        c.setPath(path);
+        response.addCookie(c);
+    }
+
+
+    /**
+     * 清除cookie
+     * @param response
+     */
+    public void clearCookies(HttpServletResponse response, String domain, String path, String key) {
+        Cookie c = new Cookie(key, null);
+        c.setDomain(domain);
+        c.setMaxAge(0);
+        c.setPath(path);
+        response.addCookie(c);
+    }
+
+    public static void main(String[] args) {
+        String tmp = "http://www.qkyxzx.com/";
+        String domain = "";
+        if(tmp.split(":").length>2){
+            domain = tmp.substring(0,tmp.lastIndexOf(":"));
+        }else{
+            if(tmp.endsWith("/")){
+                tmp = tmp.substring(0,tmp.length()-1);
+            }
+            domain = tmp;
+        }
+        if(domain.contains("http:")){
+            domain = domain.replaceAll("http://","");
+        }
+        if(domain.contains("https:")){
+            domain = domain.replaceAll("https://","");
+        }
+        if(domain.contains("www")){
+            domain = domain.replaceAll("www\\.","");
+        }
+        System.out.println(domain);
+    }
+}

src/main/java/com/cirle/scientific/config/OnlineSessionListener.java

@@ -0,0 +1,104 @@
+package com.cirle.scientific.config;/*
+ *24901
+ *2022/10/8
+ *22:00
+ */
+
+
+import com.cirle.scientific.constants.RedisKeyConstants;
+import com.cirle.scientific.utils.StringContextUtil;
+import com.cirle.scientific.utils.redis.DistributedLockCache;
+import com.cirle.scientific.utils.redis.QkLock;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.ServletRequestListener;
+import javax.servlet.annotation.WebListener;
+import javax.servlet.http.*;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+
+@Slf4j
+@Configuration
+@WebListener
+public class OnlineSessionListener implements HttpSessionListener, ServletContextListener,ServletRequestListener {
+
+
+
+    private StringRedisTemplate stringRedisTemplate;
+
+
+
+    @Override
+    public void sessionCreated(HttpSessionEvent httpSessionEvent) {
+        int online = 1;
+        HttpSession session = httpSessionEvent.getSession();
+        QkLock qkLock = new QkLock();
+        qkLock.setName("soles "+session.getId());
+        qkLock.setValue(session.getId());
+        if(stringRedisTemplate == null){
+            stringRedisTemplate = StringContextUtil.getBean(StringRedisTemplate.class);
+        }
+        String onlineNumber = stringRedisTemplate.opsForValue().get(RedisKeyConstants.redisOnlinePerson);
+        try {
+            boolean b = soleVerify(qkLock , 2);
+            if(b){
+                if (!StringUtils.isBlank(onlineNumber) && Integer.parseInt(onlineNumber) >= 1) {
+                    online = online + Integer.parseInt(onlineNumber);
+                }
+                stringRedisTemplate.opsForValue().set(RedisKeyConstants.redisOnlinePerson, String.valueOf(online));
+                log.info("新增一位在线用户！"+ session.getId() + "在线用户为" + online + "人");
+            }else{
+                log.info("重复了一位在线用户！"+ session.getId()+ "在线用户为" + online + "人");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("新增在线用户出现异常 e->{}" ,  e);
+        }
+    }
+
+
+    @Override
+    public void sessionDestroyed(HttpSessionEvent se) {
+        int online = 1;
+        HttpSession session = se.getSession();
+        if(stringRedisTemplate == null){
+            stringRedisTemplate = StringContextUtil.getBean(StringRedisTemplate.class);
+        }
+        String onlineNumber = stringRedisTemplate.opsForValue().get(RedisKeyConstants.redisOnlinePerson);
+        if(onlineNumber == null || Integer.parseInt(onlineNumber) == 1){
+            stringRedisTemplate.opsForValue().set(RedisKeyConstants.redisOnlinePerson, String.valueOf(1));
+        }else{
+            online = Integer.parseInt(onlineNumber) - online;
+            stringRedisTemplate.opsForValue().set(RedisKeyConstants.redisOnlinePerson, String.valueOf(online));
+        }
+        log.info("一位用户离线"+ session.getId() + "在线用户为" + online + "人");
+    }
+
+    /**
+     *
+     * @param lock 要锁的key 和 value
+     * @param lockExpireTime 保存redis的有效期
+     * @return 保存成功返回true 失败false
+     */
+    public boolean soleVerify(QkLock lock, long lockExpireTime){
+        try {
+            if (stringRedisTemplate.opsForValue().setIfAbsent(lock.getName(), lock.getValue())) {
+                Boolean flag = stringRedisTemplate.expire(lock.getName(), lockExpireTime, TimeUnit.MINUTES);
+                return flag;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("锁报错了  e->{}",e);
+        }
+        return false;
+    }
+}

src/main/java/com/cirle/scientific/config/RedisSessionConfiguration.java

@@ -0,0 +1,57 @@
+package com.cirle.scientific.config;
+
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.session.data.redis.RedisOperationsSessionRepository;
+import org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration;
+import org.springframework.session.web.http.CookieHttpSessionIdResolver;
+import org.springframework.session.web.http.DefaultCookieSerializer;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import javax.annotation.PostConstruct;
+
+
+@Configuration
+@Slf4j
+public class RedisSessionConfiguration extends RedisHttpSessionConfiguration {
+
+
+    @Value("${spring.session.cookieName:JSESSIONID}")
+    private String cookieName;
+
+    @Value("${spring.session.timeout:30}")
+    int sessionTimeoutInMinuts;
+
+    @PostConstruct
+    @Override
+    public void init() {
+        DefaultCookieSerializer cookieSerializer = new DefaultCookieSerializer();
+        cookieSerializer.setCookieName(cookieName);//sessionId名称
+        cookieSerializer.setUseBase64Encoding(false);
+        CookieHttpSessionIdResolver cookieHttpSessionIdResolver = new CookieHttpSessionIdResolver();
+        cookieHttpSessionIdResolver.setCookieSerializer(cookieSerializer);
+        super.setHttpSessionIdResolver(cookieHttpSessionIdResolver);
+        super.setCookieSerializer(cookieSerializer);
+    }
+
+    @Autowired
+    private RedisOperationsSessionRepository sessionRepository;
+    @PostConstruct
+    private void afterPropertiesSet() {
+        log.info("setting sesion 超时时间 = [{}]分钟",sessionTimeoutInMinuts);
+        sessionRepository.setDefaultMaxInactiveInterval(sessionTimeoutInMinuts * 60);
+        //sessionRepository.setRedisKeyNamespace(redisnamespace);
+
+    }
+
+}

src/main/java/com/cirle/scientific/config/SwaggerConfig.java

@@ -0,0 +1,42 @@
+package com.cirle.scientific.config;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Contact;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+
+
+    @Bean
+    public Docket api() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.cirle.scientific.controller"))
+                //加了ApiOperation注解的类，才生成接口文档
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .paths(PathSelectors.any())
+                .build()
+                .apiInfo(apiInfo());
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("SpringBoot API Doc")
+                .description("This is a restful api document of Spring Boot.")
+                .version("1.0")
+                .build();
+    }
+
+}

src/main/java/com/cirle/scientific/config/WebConfig.java

@@ -0,0 +1,14 @@
+package com.cirle.scientific.config;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+@Component
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+    }
+
+}

src/main/java/com/cirle/scientific/config/WebSocketConfig.java

@@ -0,0 +1,14 @@
+package com.cirle.scientific.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+
+@Configuration
+public class WebSocketConfig {
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+}

src/main/java/com/cirle/scientific/config/redis/RedisConfig.java

@@ -0,0 +1,95 @@
+package com.cirle.scientific.config.redis;
+ 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.*;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+ 
+/**
+ * redis配置类
+ */
+@Configuration
+@EnableCaching //开启注解
+public class RedisConfig extends CachingConfigurerSupport {
+ 
+    /**
+     * retemplate相关配置
+     */
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+ 
+        RedisTemplate<String, Object> template = new RedisTemplate<>();
+        // 配置连接工厂
+        template.setConnectionFactory(factory);
+ 
+        //使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值（默认使用JDK的序列化方式）
+        Jackson2JsonRedisSerializer jacksonSeial = new Jackson2JsonRedisSerializer(Object.class);
+ 
+        ObjectMapper om = new ObjectMapper();
+        // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会跑出异常
+        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        jacksonSeial.setObjectMapper(om);
+ 
+        // 值采用json序列化
+        template.setValueSerializer(jacksonSeial);
+        //使用StringRedisSerializer来序列化和反序列化redis的key值
+        template.setKeySerializer(new StringRedisSerializer());
+ 
+        // 设置hash key 和value序列化模式
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(jacksonSeial);
+        template.afterPropertiesSet();
+ 
+        return template;
+    }
+ 
+    /**
+     * 对hash类型的数据操作
+     */
+    @Bean
+    public HashOperations<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForHash();
+    }
+ 
+    /**
+     * 对redis字符串类型数据操作
+     */
+    @Bean
+    public ValueOperations<String, Object> valueOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForValue();
+    }
+ 
+    /**
+     * 对链表类型的数据操作
+     */
+    @Bean
+    public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForList();
+    }
+ 
+    /**
+     * 对无序集合类型的数据操作
+     */
+    @Bean
+    public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForSet();
+    }
+ 
+    /**
+     * 对有序集合类型的数据操作
+     */
+    @Bean
+    public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForZSet();
+    }
+ 
+}

src/main/java/com/cirle/scientific/constants/CheckWindowIdTypeConsts.java

@@ -0,0 +1,17 @@
+package com.cirle.scientific.constants;
+
+/**
+ * 弹窗的页面的类型
+ */
+public class CheckWindowIdTypeConsts {
+
+
+    //直播页面请求
+    public static final int ID_TYPE_LIVE = 1;
+    //品牌页面请求
+    public static final int ID_TYPE_BRAND = 2;
+    //课程页面请求
+    public static final int ID_TYPE_COURSE = 3;
+    //会议页面请求
+    public static final int ID_TYPE_MEETING = 4;
+}

src/main/java/com/cirle/scientific/constants/CourseWareConsts.java

@@ -0,0 +1,12 @@
+package com.cirle.scientific.constants;
+
+public class CourseWareConsts {
+
+    /**
+     *  课件上传默认封面图
+     */
+    public final static String DEFAULT_PPT = "http://files.qkyxzx.com/html5/ppt.png";
+    public final static String DEFAULT_WORD = "http://files.qkyxzx.com/html5/word.png";
+    public final static String DEFAULT_PDF = "http://files.qkyxzx.com/html5/pdf.png";
+    public final static String DEFAULT_EXCEL = "http://files.qkyxzx.com/html5/excel.png";
+}

src/main/java/com/cirle/scientific/constants/DictConsts.java

@@ -0,0 +1,11 @@
+package com.cirle.scientific.constants;
+
+public class DictConsts {
+
+    /**
+     *  字典项的key
+     */
+
+    //品牌专区的详情页的课件上传的图标的tital
+    public final static String BRAND_PRODUCT_TITLE_KEY = "brand_product_title";
+}

src/main/java/com/cirle/scientific/constants/LoginConsts.java

@@ -0,0 +1,67 @@
+package com.cirle.scientific.constants;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 登录相关
+ */
+public class LoginConsts {
+
+    //redis
+    /**
+     * pc登录后 把用户信息和session的对应关系 放进redis
+     */
+    public final static String PC_LOGIN_USER_KEY = "pc_login_user_%s";
+
+    /**
+     * m登录后 把用户信息和token的对应关系 放进redis
+     */
+    public final static String M_LOGIN_USER_KEY = "m_login_user_%s";
+
+
+
+
+    //session或者request
+    /**
+     * pc登录后 把用户id放进session里面
+     */
+    public final static String PC_LOGIN_SESSION_KEY = "UserCard";
+
+    /**
+     * m端从cookie解析的memcard放入request
+     */
+    public final static String M_MEMCARD_KEY = "memCard";
+
+    /**
+     * m端登录后存在cookie里的值的key
+     */
+    public final static String M_COOKIE_MEMCARD_KEY = "memCard";
+
+
+
+
+    /**
+     * m端登录有效期:数值 web的有效期在配置文件里改
+     */
+    public final static int M_LOGIN_EXPIRE = 30;
+
+    /**
+     * m端登录有效期:单位
+     */
+    public final static TimeUnit UNIT = TimeUnit.MINUTES;
+
+
+    /**
+     * m端cookie 有效期 :秒
+     */
+    public final static int M_LOGIN_COOKIE_EXPIRE = 60*30;
+
+    /**
+     * m端或者pc端被顶掉的标志
+     */
+    public final static String M_OR_PC_LOG_REPLACE_KEY = "replace_user_%s";
+
+
+
+
+}

src/main/java/com/cirle/scientific/constants/PlayRecordLogConstants.java

@@ -0,0 +1,9 @@
+package com.cirle.scientific.constants;
+
+public class PlayRecordLogConstants {
+
+    /**
+     * 增加观看记录的固定时间间隔 毫秒
+     */
+    public final static Integer TIME_GAP = 30000;
+}

src/main/java/com/cirle/scientific/constants/RedisKeyConstants.java

@@ -0,0 +1,16 @@
+package com.cirle.scientific.constants;/*
+ *24901
+ *2022/10/10
+ *14:47
+ */
+
+/**
+ * @author 24901
+ */
+public class RedisKeyConstants {
+
+    /**
+     * 获取redis中的在线人数key
+     */
+    public final static String redisOnlinePerson ="OnlineNumber1";
+}

src/main/java/com/cirle/scientific/constants/SaveYsAndSmConsts.java

@@ -0,0 +1,18 @@
+package com.cirle.scientific.constants;
+
+/**
+ * 认证类型常量需要进行的认证的类型 如果没有则不需要 1:以前的医师认证 2：以前的实名认证 3：欧佳龙医师认证 4：欧佳龙实名 5：不需要
+ */
+public class SaveYsAndSmConsts {
+
+
+    //1:以前的医师认证
+    public static final int ATTEST_TYPE_A = 1;
+
+    //2：以前的实名认证
+    public static final int ATTEST_TYPE_B = 2;
+    //3：欧佳龙医师认证
+    public static final int ATTEST_TYPE_C = 3;
+    //4.4：欧佳龙实名
+    public static final int ATTEST_TYPE_D = 4;
+}

src/main/java/com/cirle/scientific/constants/ServerConstants.java

@@ -0,0 +1,9 @@
+package com.cirle.scientific.constants;
+
+public class ServerConstants {
+
+    /**
+     * 首次登陆送200积分
+     */
+    public final static Integer IRST_LOGIN_TASK = 29;
+}

src/main/java/com/cirle/scientific/constants/ShareConsts.java

@@ -0,0 +1,11 @@
+package com.cirle.scientific.constants;
+
+public class ShareConsts {
+
+    /**
+     *  分享表活动类型常量
+     */
+
+    //直播
+    public final static Integer obj_type_live = 2;
+}

src/main/java/com/cirle/scientific/constants/StatusConsts.java

@@ -0,0 +1,19 @@
+package com.cirle.scientific.constants;
+
+public class StatusConsts {
+
+    /**
+     *  审核状态：1：未审核 2：通过 3：拒绝
+     */
+
+    //未审核
+    public final static Integer auditingStatus_no_auditing = 1;
+
+    //通过
+    public final static Integer auditingStatus_adopt_auditing = 2;
+
+    //拒绝
+    public final static Integer auditingStatus_refuse_auditing = 3;
+
+
+}

src/main/java/com/cirle/scientific/constants/TaskConsts.java

@@ -0,0 +1,22 @@
+package com.cirle.scientific.constants;
+
+public class TaskConsts {
+
+
+    //积分任务ID常数
+    /**
+     * 首次登录
+     */
+    public final static Integer FIRST_LOGIN_TASK = 29;
+
+    /**
+     * 分享的直播被点击一次
+     */
+    public final static Integer SHARE_TASK = 30;
+
+    //实名认证增加积分数量
+    public final static Integer TASK_22_POINTS = 200;
+
+    //医师认证增加积分数量
+    public final static Integer TASK_25_POINTS = 500;
+}

src/main/java/com/cirle/scientific/constants/UserInfoConsts.java

@@ -0,0 +1,12 @@
+package com.cirle.scientific.constants;
+
+public class UserInfoConsts {
+
+
+    //用户信息常用参数
+
+    /**
+     * 用户默认头像
+     */
+    public final static String MEM_HEADIMG = "https://files.qkyxzx.com/html5/mem_headimg_default.png";
+}

src/main/java/com/cirle/scientific/constants/WeixinConsts.java

@@ -0,0 +1,20 @@
+package com.cirle.scientific.constants;
+
+/**
+ *  微信相关的常量
+ */
+public class WeixinConsts {
+
+    /**
+     * 微信服务号- AppID(应用ID)-测试的应用ID
+     * 测试的：wxc931944ad7df2918
+     */
+    public final static String appId = "wxac5d392b940d1f6f";
+    /**
+     * 微信服务号-AppSecret(应用密钥)
+     *
+     * 测试的：107bb13d38ad3849a557d29fa2f5daee
+     */
+    public static String appSecret = "9a8e8a0f1500f3e2e2e44fa78f20cf1f";
+
+}

src/main/java/com/cirle/scientific/controller/brandProduct/BrandProductController.java

@@ -0,0 +1,73 @@
+package com.cirle.scientific.controller.brandProduct;
+
+
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.BrandProductService;
+import com.cirle.scientific.utils.DeviceUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/brand")
+@Api("品牌专区相关接口")
+public class BrandProductController {
+
+    @Autowired
+    private BrandProductService brandProductService;
+
+    @GetMapping("/detail")
+    @ApiOperation("跳转详情页")
+    public String detail(
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            @RequestParam(value = "productId") Long productId,
+            HttpServletRequest request
+    ) {
+        request.setAttribute("productId", productId);
+        boolean isM = DeviceUtil.isMobileDevice(request);
+        if (isM) {
+            return "html5/prefecture/prefecture";
+        } else {
+            return "web/brand/brand";
+        }
+//
+//        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+//            return "html5/prefecture/prefecture";
+//        } else if (StringUtils.isNotBlank(from) && from.equals("web")) {
+//            return "web/brand/brand";
+//        } else {
+//            return "";
+//        }
+    }
+    @GetMapping("/upload")
+    @ApiOperation("跳转课件上传页")
+    public String upload(
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            @RequestParam(value = "productId") Long productId,
+            HttpServletRequest request
+    ) {
+        request.setAttribute("productId", productId);
+        boolean isM = DeviceUtil.isMobileDevice(request);
+        if (isM) {
+            return "html5/prefecture/upload";
+        } else {
+            return "web/brand/upload";
+        }
+    }
+
+    @PostMapping("/getDetailData")
+    @ApiOperation("详情接口数据")
+    @ResponseBody
+    public Result getDetailData(
+            @RequestParam(value = "productId") Long productId
+    ) {
+        return brandProductService.getDetailData(productId);
+
+    }
+
+}

src/main/java/com/cirle/scientific/controller/course/CourseController.java

@@ -0,0 +1,235 @@
+package com.cirle.scientific.controller.course;
+
+
+import com.cirle.scientific.constants.LoginConsts;
+import com.cirle.scientific.controller.index.RootIndexController;
+import com.cirle.scientific.dto.QkjRecommendDTO;
+import com.cirle.scientific.dto.QkjTqcourseCourseDto;
+import com.cirle.scientific.po.QkjCatalogs;
+import com.cirle.scientific.po.QkjTqcourse;
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.CommonService;
+import com.cirle.scientific.service.CourseService;
+import com.cirle.scientific.service.RecommendService;
+import com.cirle.scientific.utils.DeviceUtil;
+import com.cirle.scientific.utils.IpUtil;
+import com.cirle.scientific.utils.LoginUtil;
+import com.cirle.scientific.utils.UserLoginUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@Controller
+@RequestMapping("/course")
+@Api("精品课相关接口")
+public class CourseController {
+
+
+    @Autowired
+    CourseService courseService;
+    @Autowired
+    CommonService commonService;
+    @Autowired
+    RecommendService recommendService;
+
+    @Autowired
+    LoginUtil loginUtil;
+
+
+    @GetMapping("/index")
+    @ApiOperation(value = "去往精品课首页")
+    public String courseIndex(@ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from) {
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/course/course-index";
+        } else {
+            return "web/course/course-index";
+        }
+    }
+
+    @GetMapping("/courseDetails")
+    @ApiOperation(value = "去往精品课详情页")
+    public String courseDetails(
+            HttpServletRequest request,
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            @ApiParam(name = "id", value = "专区id") @RequestParam(name = "id", required = true) Integer id, Model model
+    ) {
+        String refererUrl = request.getHeader("Referer");
+        if(refererUrl!=null && refererUrl.contains("login")){
+            model.addAttribute("fromlogin","1");
+        }else{
+            model.addAttribute("fromlogin","0");
+        }
+        request.setAttribute("id", id);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            QkjTqcourse qkjTqcourse = courseService.findById(id);
+            if (qkjTqcourse.getZq() == 2) {
+                //专区
+                return "html5/course/course-prefecture-list";
+            } else {
+                //普通课程
+                return "html5/course/course-details";
+            }
+
+        } else {
+            return "web/course/course-details";
+        }
+    }
+
+
+    @GetMapping("/coursePrefectureList")
+    @ApiOperation(value = "去往精品课专区列表页")
+    public String coursePrefectureList(
+            HttpServletRequest request,
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            @ApiParam(name = "id", value = "专区id") @RequestParam(name = "id", required = true) Integer id
+    ) {
+        request.setAttribute("id", id);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/course/course-prefecture-list";
+        } else {
+            return "web/course/course-prefecture-list";
+        }
+    }
+
+    @PostMapping("/getIndexData")
+    @ResponseBody
+    @ApiOperation(value = "课程数据接口")
+    public Result getIndexData(HttpServletRequest request,
+            Integer start, Integer size, Integer cataId, Integer fId, String sortBy,String from,
+            @ApiParam(name = "memCard", value = "用户唯一标识") @RequestAttribute(name = "memCard", required = false) String memCard
+    ) {
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        boolean isPC=DeviceUtil.isMobileDevice(request);
+        return courseService.getIndexData(cataId, fId, start, size, memCard, sortBy, from,isPC);
+    }
+
+
+    @PostMapping("/getCataList")
+    @ResponseBody
+    @ApiOperation(value = "课程首页获取分类")
+    public Result<List<QkjCatalogs>> getCataList(Integer fId, Integer type) {
+        return Result.success(commonService.getCatalogsByFuId(fId, type));
+    }
+
+    @PostMapping("/getCataListForThreeLevel")
+    @ResponseBody
+    @ApiOperation(value = "课程首页获取分类")
+    public Result<List<QkjCatalogs>> getCataListForTreeLevel(Integer fId, Integer type) {
+        return Result.success(commonService.getCatalogsByFuIdForThreeLevel(fId, type));
+    }
+
+    @PostMapping("/getCataListForCourseware")
+    @ResponseBody
+    @ApiOperation(value = "课程首页获取分类")
+    public Result<List<QkjCatalogs>> getCataListForCourseware(Integer fId, Integer type) {
+        return Result.success(commonService.getCatalogsByFuIdForCourseware(fId, type));
+    }
+
+    @PostMapping("/addVideoPlayRecorde")
+    @ResponseBody
+    @ApiOperation(value = "保存学习记录")
+    public Result addVideoPlayRecorde(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            @ApiParam(name = "memCard", value = "memCard") @RequestAttribute(value = "memCard", required = false) String memCard,
+            @ApiParam(name = "objType", value = "课程类型 1-精品课子课时  2-专栏子课时  3-直播  4.知识点  5.精品课背书 6.专栏背书") @RequestParam(name = "objType") int objType,
+            @ApiParam(name = "objId", value = "课程id") @RequestParam(name = "objId") int objId,
+            @ApiParam(name = "playTime", value = "视频播放截止时间（毫秒）") @RequestParam(name = "playTime") int playTime,
+            @ApiParam(name = "totalLearnTime", value = "学习时长（毫秒）") @RequestParam(name = "totalLearnTime") int totalLearnTime
+    ) {
+
+        boolean replace = loginUtil.isReplace(request, response, memCard);
+        if(replace){
+            return Result.failed(BizCodeEnum.NO_LOGIN_REPLACE);
+        }
+        String ipAddr = IpUtil.getIpAddr(request);
+        return Result.success(courseService.addVideoPlayRecorde(memCard, objType, objId, playTime, totalLearnTime, ipAddr));
+    }
+
+    @PostMapping("/saveplaylog")
+    @ResponseBody
+    @ApiOperation(value = "保存视频播放记录")
+    public Result saveplaylog(HttpServletRequest request,
+                                      @ApiParam(name = "memCard", value = "memCard") @RequestAttribute(value = "memCard", required = false) String memCard,
+                                      @ApiParam(name = "liveId", value = "直播id") @RequestParam(name = "liveId") int liveId,
+                                      @ApiParam(name = "learnTime", value = "学习时长（秒）") @RequestParam(name = "learnTime") int learnTime
+    ) {
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        return Result.success(courseService.saveplaylog(memCard, liveId, learnTime));
+    }
+
+    @PostMapping("/getAdInfo")
+    @ResponseBody
+    @ApiOperation(value = "课程首页获取广告位")
+    public Result<List<QkjRecommendDTO>> getAdInfo(HttpServletRequest request) {
+        // 默认展示pc端内容
+        Integer status = 3;
+        if(DeviceUtil.isMobileDevice(request)) {
+            status = 2;
+        }
+        List<QkjRecommendDTO> recmdTop = recommendService.findByPosIdLimit(3L, status, 1, 10);
+        return Result.success(recmdTop);
+    }
+
+    @PostMapping("/getAdInfoNew")
+    @ResponseBody
+    @ApiOperation(value = "课程首页获取广告位")
+    public Result<List<QkjRecommendDTO>> getAdInfoNew(
+            @RequestParam(name = "id", required = true) Long id
+    ) {
+        QkjTqcourse byId = courseService.findById(id.intValue());
+        List<QkjRecommendDTO> recmdTop = recommendService.findByPostTypeAndObjId(1, byId.getId().intValue(), 1, 100);
+        return Result.success(recmdTop);
+    }
+
+    @PostMapping("/findTqCourseCourseInfo")
+    @ResponseBody
+    @ApiOperation(value = "获取子课时详情")
+    public Result<QkjTqcourseCourseDto> findTqCourseCourseInfo(@RequestParam(name = "id", required = true) Long id) {
+        return courseService.findTqCourseCourseInfo(id);
+    }
+
+
+    @PostMapping("/saveCommon")
+    @ResponseBody
+    @ApiOperation(value = "保存用户留言")
+    public Result saveCommon(HttpServletRequest request,
+            @ApiParam(name = "memCard", value = "memCard") @RequestAttribute(value = "memCard", required = false) String memCard,
+            @ApiParam(name = "content", value = "content") @RequestParam(value = "content", required = false) String content,
+            @RequestParam(name = "id", required = true) Long id
+    ) {
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        return courseService.saveCommon(id, memCard, content);
+    }
+    @GetMapping("/checkCode")
+    @ResponseBody
+    @ApiOperation(value = "校验提取码")
+    public Result checkCode(HttpServletRequest request,
+                             @ApiParam(name = "memCard", value = "memCard") @RequestAttribute(value = "memCard", required = false) String memCard,
+                             @ApiParam(name = "code", value = "code") @RequestParam(value = "code", required = true) String code,
+                             @RequestParam(name = "id", required = true) Long id
+    ) {
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        String ip = IpUtil.getIpAddr(request);
+        return courseService.checkCode(ip, memCard, code,id);
+    }
+}

src/main/java/com/cirle/scientific/controller/courseware/CourseWareController.java

@@ -0,0 +1,270 @@
+package com.cirle.scientific.controller.courseware;
+
+
+import com.aliyun.opensearch.sdk.dependencies.com.google.common.collect.Lists;
+import com.cirle.scientific.dto.QkjCourseWareDto;
+import com.cirle.scientific.dto.QkjRecommendDTO;
+import com.cirle.scientific.po.QkjCourseWare;
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.QkjCourseWareService;
+import com.cirle.scientific.service.RecommendService;
+import com.cirle.scientific.utils.DeviceUtil;
+import com.cirle.scientific.utils.UserLoginUtil;
+import com.cirle.scientific.utils.page.ResultPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Controller
+@RequestMapping("/courseware")
+@Api("课件相关接口")
+@Slf4j
+public class CourseWareController {
+
+    @Autowired
+    QkjCourseWareService courseWareService;
+
+    @Autowired
+    RecommendService recommendService;
+
+    @GetMapping("/index")
+    @ApiOperation(value = "去往课件列表页")
+    public String index(HttpServletRequest request,
+            @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from, Model model
+    ){
+        String refererUrl = request.getHeader("Referer");
+        if(refererUrl!=null && refererUrl.contains("login")){
+            model.addAttribute("fromlogin","1");
+        }else{
+            model.addAttribute("fromlogin","0");
+        }
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/courseware/courseware";
+        } else {
+            return "web/courseware/courseware";
+        }
+    }
+
+    @GetMapping("/details")
+    @ApiOperation(value = "去往课件详情页")
+    public String detail(
+            HttpServletRequest request,
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            @ApiParam(name = "id", value = "课件id") @RequestParam(name = "id", required = true) Long id
+    ) {
+        request.setAttribute("id", id);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/courseware/courseware-details";
+        } else {
+            return "web/courseware/courseware-details";
+        }
+    }
+
+    @PostMapping("/getAdInfo")
+    @ResponseBody
+    @ApiOperation(value = "课程首页获取广告位")
+    public Result<List<QkjRecommendDTO>> getAdInfo(HttpServletRequest request) {
+        // 默认展示pc端内容  0全部不显示 、1全部显示 、2m端显示、3pc端显示
+        Integer status = 3;
+        if(DeviceUtil.isMobileDevice(request)) {
+            status = 2;
+        }
+        List<QkjRecommendDTO> recmdTop = recommendService.findByPosIdLimit(19L, status, 1, 10);
+        return Result.success(recmdTop);
+    }
+
+    @PostMapping("/getlistData")
+    @ApiOperation(value = "获取课件列表")
+    @ResponseBody
+    public Result getArtListData(
+            @ApiParam(name = "memCard",value = "memCard") @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "cataId",value = "分类id") @RequestParam(name = "cataId",required = false) Integer cataId,
+            @ApiParam(name = "page",value = "分页") @RequestParam(name = "page",required = true,defaultValue="1") Integer page,
+            @ApiParam(name = "size",value = "每页数量") @RequestParam(name = "size",required = true,defaultValue="10") Integer size
+    ){
+        return courseWareService.getListData(memCard, cataId, page, size);
+    }
+
+    @PostMapping("/getPageData")
+    @ApiOperation(value = "获取课件列表分页")
+    @ResponseBody
+    public ResultPage getPageData(
+            HttpServletRequest request,
+            @ApiParam(name = "memCard",value = "memCard") @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "cataId",value = "分类id") @RequestParam(name = "cataId",required = false) Integer cataId,
+            @ApiParam(name = "page",value = "当前页") @RequestParam(name = "page",required = true,defaultValue="1") Integer page,
+            @ApiParam(name = "size",value = "每页数量") @RequestParam(name = "size",required = true,defaultValue="10") Integer size
+    ){
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        return courseWareService.getPageData(memCard, cataId, page, size);
+    }
+
+    @GetMapping("/downFilebyWeb")
+    @ApiOperation(value = "web下载课件")
+    public String downFilebyWeb(
+            HttpServletResponse response, HttpServletRequest request,
+            @ApiParam(name = "id",value = "课件ID") @RequestParam(name = "id",required = true) Long id
+    ){
+        if(request.getSession().getAttribute("UserCard")==null){
+            return "web/user/login";
+        }
+        String memCard = (String)request.getSession().getAttribute("UserCard");
+        courseWareService.downFile(response, memCard, id);
+        return null;
+    }
+
+    @GetMapping("/downFile")
+    @ApiOperation(value = "下载课件")
+    public String downFile(
+            HttpServletResponse response,
+            @ApiParam(name = "memCard",value = "memCard") @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "id",value = "课件ID") @RequestParam(name = "id",required = true) Long id
+    ){
+        if(StringUtils.isBlank(memCard)){
+            return "html5/user/login";
+        }
+        courseWareService.downFile(response, memCard, id);
+        return null;
+    }
+    //自传课件相关接口
+    @GetMapping("/getlistData/forme")
+    @ApiOperation(value = "获取自传课件列表")
+    @ResponseBody
+    public ResultPage getArtListDataForMe(
+            HttpServletRequest request,
+            @ApiParam(name = "memCard", value = "memCard") @RequestAttribute(value = "memCard", required = false) String memCard,
+            @ApiParam(name = "belongBrandid", value = "品牌ID") @RequestParam(name = "belongBrandid", required = false) Integer belongBrandid,
+            @ApiParam(name = "page", value = "分页") @RequestParam(name = "page", required = true, defaultValue = "1") Integer page,
+            @ApiParam(name = "size", value = "每页数量") @RequestParam(name = "size", required = true, defaultValue = "10") Integer size
+    ) {
+        if (StringUtils.isBlank(memCard)) {//pc从session去 m从参数取
+            memCard = UserLoginUtil.isUserLogin(request);
+        }
+        return courseWareService.getListDataForMe(memCard, belongBrandid, page, size);
+    }
+
+    /**
+     * QkjCourseWare
+     *
+     * @param resources
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation("新增课件")
+    @ResponseBody
+    public Result createQkjCourseware(
+            HttpServletRequest request,
+            @RequestAttribute(value = "memCard", required = false) String memCard,
+            QkjCourseWareDto resources) {
+        if (StringUtils.isBlank(memCard)) {//pc从session去 m从参数取
+            memCard = UserLoginUtil.isUserLogin(request);
+        }
+        resources.setUploader(memCard);
+        return courseWareService.add(resources);
+    }
+
+    @PostMapping(value = "/delete")
+    @ApiOperation("删除自传课件")
+    @ResponseBody
+    public Result delete(@ApiParam(name = "courseWareId", value = "课件ID") @RequestParam(name = "courseWareId", required = false) Long courseWareId) {
+
+        log.info("delete join courseWareId:{}", courseWareId);
+        if (Objects.isNull(courseWareId)) {
+            return Result.failed(BizCodeEnum.PARAM_NULL);
+        }
+        return courseWareService.deleteAll(Lists.newArrayList(courseWareId));
+    }
+
+    @GetMapping("/downFile/ppt/web")
+    @ApiOperation(value = "下载课件")
+    public String downFilePptWeb(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            @ApiParam(name = "memCard",value = "memCard") @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "id",value = "课件ID") @RequestParam(name = "id",required = true) Long id
+    ){
+        if (StringUtils.isBlank(memCard)) {//pc从session去 m从参数取
+            memCard = UserLoginUtil.isUserLogin(request);
+        }
+        if(StringUtils.isBlank(memCard)){
+            return "web/user/login";
+        }
+        courseWareService.downFileForPPt(response, memCard, id);
+        return null;
+    }
+
+    @GetMapping("/downFile/ppt")
+    @ApiOperation(value = "下载课件")
+    public String downFilePpt(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            @ApiParam(name = "memCard",value = "memCard") @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "id",value = "课件ID") @RequestParam(name = "id",required = true) Long id
+    ){
+        if (StringUtils.isBlank(memCard)) {//pc从session去 m从参数取
+            memCard = UserLoginUtil.isUserLogin(request);
+        }
+        if(StringUtils.isBlank(memCard)){
+            return "html5/user/login";
+        }
+        courseWareService.downFileForPPt(response, memCard, id);
+        return null;
+    }
+
+    @GetMapping("/downFile/ppt/batch/web")
+    @ApiOperation(value = "批量下载课件")
+    public String downFilePptBatchWeb(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            @ApiParam(name = "memCard",value = "memCard") @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "ids",value = "课件ID集合") @RequestBody List<Integer> ids
+    ){
+        if (StringUtils.isBlank(memCard)) {//pc从session去 m从参数取
+            memCard = UserLoginUtil.isUserLogin(request);
+        }
+        if(StringUtils.isBlank(memCard)){
+            return "web/user/login";
+        }
+        courseWareService.downFileForPPtBatch(response, ids);
+        return null;
+    }
+    @GetMapping("/downFile/ppt/batch")
+    @ApiOperation(value = "下载课件")
+    public String downFilePptBatch(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            @ApiParam(name = "memCard",value = "memCard") @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "ids",value = "课件ID集合")  @RequestBody List<Integer> ids
+    ){
+        if (StringUtils.isBlank(memCard)) {//pc从session去 m从参数取
+            memCard = UserLoginUtil.isUserLogin(request);
+        }
+        if(StringUtils.isBlank(memCard)){
+            return "html5/user/login";
+        }
+        courseWareService.downFileForPPtBatch(response, ids);
+        return null;
+    }
+
+
+
+
+}

src/main/java/com/cirle/scientific/controller/error/ErrorPageController.java

@@ -0,0 +1,20 @@
+package com.cirle.scientific.controller.error;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class ErrorPageController {
+
+    @GetMapping("/404")
+    public String to404() {
+        return "/error/404.html";
+    }
+
+
+    @GetMapping("/other")
+    public String toOther() {
+        return "/error/other.html";
+    }
+
+}

src/main/java/com/cirle/scientific/controller/error/UncaughtErrorControllor.java

@@ -0,0 +1,63 @@
+package com.cirle.scientific.controller.error;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.error.ErrorController;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Controller
+@RequestMapping("${server.error.path:${error.path:/error}}")
+public class UncaughtErrorControllor implements ErrorController {
+    @Value("${server.error.path:${error.path:/error}}")
+    protected String errorPath;
+
+    @Override
+    public String getErrorPath() {
+        return errorPath;
+    }
+
+    /**
+     * @param request
+     * @param response
+     * @return java.lang.Object
+     */
+    @RequestMapping(value = "")
+    public void error(HttpServletRequest request, HttpServletResponse response) {
+//        try {
+//            HttpStatus statusCode = getHttpStatusCode(request);
+//            if (statusCode.equals(HttpStatus.NOT_FOUND)) {
+//                String from = request.getParameter("from");
+//                if ("H5".equals(from)) {
+//                    response.sendRedirect("/index/index?from=H5");
+//                } else {
+//                    response.sendRedirect("/index/index?from=web");
+//                }
+////                response.sendRedirect("/404");
+//            } else {
+//                response.sendRedirect("/other?code=" + statusCode);
+//            }
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+    }
+
+    private HttpStatus getHttpStatusCode(HttpServletRequest request) {
+        try {
+            Integer statusCode = (Integer) request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE);
+            if (statusCode == null) {
+                return HttpStatus.INTERNAL_SERVER_ERROR;
+            }
+            return HttpStatus.valueOf(statusCode);
+        } catch (Exception e) {
+            return HttpStatus.INTERNAL_SERVER_ERROR;
+        }
+    }
+
+}
+

src/main/java/com/cirle/scientific/controller/index/IndexController.java

@@ -0,0 +1,157 @@
+package com.cirle.scientific.controller.index;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.cirle.scientific.constants.LoginConsts;
+import com.cirle.scientific.dto.QkjPeopleCounDTO;
+import com.cirle.scientific.dto.QkjSearchdataDto;
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.utils.DeviceUtil;
+import com.cirle.scientific.utils.LoginUtil;
+import com.cirle.scientific.utils.UserLoginUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.cirle.scientific.dto.HomeDataDTO;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.HomeService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import javax.servlet.http.*;
+import java.util.List;
+import java.util.Objects;
+import java.util.Random;
+import java.util.stream.Collectors;
+
+@Controller
+@RequestMapping("/index")
+@Api("首页相关接口")
+public class IndexController {
+
+	@Autowired
+	private HomeService homeService;
+
+    @Autowired
+    LoginUtil loginUtil;
+
+
+
+    @GetMapping("/index")
+    @ApiOperation("首页接口")
+    public String index(HttpServletRequest request,
+                        @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from, Model model){
+        String refererUrl = request.getHeader("Referer");
+        if(refererUrl!=null && refererUrl.contains("login")){
+            model.addAttribute("fromlogin","1");
+        }else{
+            model.addAttribute("fromlogin","0");
+        }
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/index/index1";
+        }else if (StringUtils.isNotBlank(from) && from.equals("web")){
+            return "web/index";
+        } else {
+            return "";
+        }
+    }
+
+    @GetMapping("/search")
+    @ApiOperation("搜索页面")
+    public String search(@ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from){
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/search/search";
+        } else if (StringUtils.isNotBlank(from) && from.equals("web")){
+            return "web/search";
+        }else {
+            return "";
+        }
+    }
+
+    @PostMapping("/homeData")
+    @ApiOperation("首页接口数据")
+    @ResponseBody
+    public Result<HomeDataDTO> homeData(
+    		@RequestAttribute(value = "memCard",required = false) String memCard,HttpServletRequest request) {
+        // 默认展示pc端内容  0全部不显示 、1全部显示 、2m端显示、3pc端显示
+        Integer status = 3;
+        if(DeviceUtil.isMobileDevice(request)) {
+            status = 2;
+        }
+    		return homeService.getHomeData(memCard, status);
+    }
+
+    @PostMapping("/isLogin")
+    @ApiOperation("判断是否登录")
+    @ResponseBody
+    public Result isLogin(HttpServletRequest request, HttpServletResponse response,
+                          @RequestAttribute(value = "memCard", required = false) String memCard){
+
+        boolean replace = loginUtil.isReplace(request, response, memCard);
+        if(replace){
+            return Result.failed(BizCodeEnum.NO_LOGIN_REPLACE);
+        }
+
+        if(StringUtils.isBlank(memCard)){
+            return Result.success(BizCodeEnum.NO_LOGIN);
+        }
+
+        return Result.success(memCard);
+    }
+
+    /**
+     * 开放搜索接口
+     * @return
+     */
+    @PostMapping(value = "/search")
+    @ResponseBody
+    @ApiOperation("首页搜索接口")
+    public Result<Object> search(@RequestParam int start, @RequestParam int size
+            , @RequestParam String searchKw){
+        try {
+            String rdlist = homeService.search(searchKw, start, size);
+            JSONObject jsonObject = JSONObject.parseObject(rdlist);
+            String items  = jsonObject.getString("items");
+            List<QkjSearchdataDto> qkjSearchdataDtos = JSONArray.parseArray(items, QkjSearchdataDto.class);
+            if(CollectionUtils.isNotEmpty(qkjSearchdataDtos)){
+                qkjSearchdataDtos = qkjSearchdataDtos.stream().filter(e -> e.getObj_pid()==0).collect(Collectors.toList());
+            }
+            Object o = JSONArray.toJSON(qkjSearchdataDtos);
+            jsonObject.put("items",o);
+            //Object parse = JSONObject.parse(rdlist);
+            return Result.success(jsonObject);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.failed("搜索错误");
+        }
+    }
+
+    @GetMapping("/peopleCoun")
+    @ResponseBody
+    @ApiOperation("注册人数以及在线人数的接口")
+    public Result<Object> peopleCoun(HttpServletRequest request ) {
+        QkjPeopleCounDTO qkjPeopleCounDTO = homeService.peopleCount(request);
+        //进行虚拟填充
+        if (Objects.nonNull(qkjPeopleCounDTO)) {
+            qkjPeopleCounDTO.setRegisterPerson(qkjPeopleCounDTO.getRegisterPerson() + 150000);
+
+            Random random = new Random();
+            int randomInt = random.nextInt(50) + 51;
+            qkjPeopleCounDTO.setOnlinePerson(qkjPeopleCounDTO.getOnlinePerson() + randomInt);
+        }
+        return Result.success(qkjPeopleCounDTO);
+    }
+}

src/main/java/com/cirle/scientific/controller/index/PcIndexController.java

@@ -0,0 +1,74 @@
+package com.cirle.scientific.controller.index;
+
+import com.cirle.scientific.dto.HomeDataDTO;
+import com.cirle.scientific.dto.QkjPositionsDTO;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.HomeService;
+import com.cirle.scientific.service.RecommendService;
+import com.cirle.scientific.utils.DeviceUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+@Controller
+@RequestMapping("/web/index")
+@Api("首页相关测试")
+public class PcIndexController {
+
+    @Autowired
+    private RecommendService recommendService;
+
+    @Autowired
+    private HomeService homeService;
+
+
+    @PostMapping("/information")
+    @ApiOperation("首页资讯接口")
+    @ResponseBody
+    public Result<List<QkjPositionsDTO>> getInformation(
+            @RequestAttribute(value = "memCard",required = false) String memCard, HttpServletRequest request) {
+        // 默认展示pc端内容  0全部不显示 、1全部显示 、2m端显示、3pc端显示
+        Integer status = 3;
+        if(DeviceUtil.isMobileDevice(request)) {
+            status = 2;
+        }
+        List<QkjPositionsDTO> qkjPositionsDTOList = new ArrayList<>();
+        //long array[] = {8,9,10};
+        long array[] = {27,9,10};
+        for (long l : array) {
+            qkjPositionsDTOList.add(recommendService.findByPosId(l,status));
+        }
+        return Result.success(qkjPositionsDTOList);
+    }
+
+    @PostMapping("/homeData")
+    @ApiOperation("Web首页接口数据")
+    @ResponseBody
+    public Result<HomeDataDTO> homeData(
+            @RequestAttribute(value = "memCard",required = false) String memCard,HttpServletRequest request) {
+        // 默认展示pc端内容  0全部不显示 、1全部显示 、2m端显示、3pc端显示
+        Integer status = 3;
+        if(DeviceUtil.isMobileDevice(request)) {
+            status = 2;
+        }
+        Result<HomeDataDTO> homeData = homeService.getHomeData(memCard, status);
+        List<QkjPositionsDTO> children = homeData.getData().getSeriesRecommends().getChildren();
+        for (Iterator<QkjPositionsDTO> iterator=children.iterator(); iterator.hasNext();) {
+            QkjPositionsDTO next = iterator.next();
+            if (next.getPosName().contains("资讯")){
+                iterator.remove();
+            }
+        }
+        return homeData;
+    }
+}

src/main/java/com/cirle/scientific/controller/index/RootIndexController.java

@@ -0,0 +1,33 @@
+package com.cirle.scientific.controller.index;
+
+import com.cirle.scientific.utils.DeviceUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/")
+@Api("首页相关接口")
+public class RootIndexController {
+
+    @GetMapping("")
+    @ApiOperation("")
+    public String index(HttpServletRequest request){
+
+        if(DeviceUtil.isMobileDevice(request)){
+            System.out.println("手机端----------------------");
+            return "html5/index/index1";
+        }else{
+            System.out.println("pc端------------------------");
+            return "web/index";
+        }
+    }
+
+}

src/main/java/com/cirle/scientific/controller/live/CounterController.java

@@ -0,0 +1,64 @@
+package com.cirle.scientific.controller.live;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cirle.scientific.dao.QkjLiveDao;
+import com.cirle.scientific.dto.QkjRecommendDTO;
+import com.cirle.scientific.po.QkjLive;
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.LiveService;
+import com.cirle.scientific.utils.DeviceUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/livecounter")
+@Api("直播统计")
+public class CounterController {
+
+
+    @Autowired
+    LiveService liveService;
+
+    @Autowired
+    private QkjLiveDao qkjLiveDao;
+
+    @GetMapping("/getcounter")
+    @ResponseBody
+    @ApiOperation("获取当前学习人总数")
+    public Result getcounter(String liveId) {
+
+        JSONObject data = new JSONObject();
+        //
+        QkjLive live = liveService.getLiveInfo(Long.parseLong(liveId));
+        if(live.getLiveType()==2){
+            List<QkjLive> lives = qkjLiveDao.findSonList(live.getId().intValue(), 0, 100);
+            List<Map> listmap = new ArrayList();
+            for(QkjLive son : lives){
+                Map map = new HashMap();
+                map.put("liveId",son.getId());
+                map.put("count",son.getPurchasedMembers());
+                listmap.add(map);
+            }
+            data.put("children",listmap);
+        }else{
+            data.put("children",new ArrayList());
+        }
+        data.put("liveid", liveId);
+        data.put("count", live.getPurchasedMembers());
+        return Result.success(data);
+    }
+
+
+}

src/main/java/com/cirle/scientific/controller/live/LiveController.java

@@ -0,0 +1,469 @@
+package com.cirle.scientific.controller.live;
+
+
+import java.time.LocalDateTime;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.cirle.scientific.constants.ShareConsts;
+import com.cirle.scientific.constants.TaskConsts;
+import com.cirle.scientific.dao.QkjLiveDao;
+import com.cirle.scientific.dto.ShareRankDto;
+import com.cirle.scientific.po.QkjShare;
+import com.cirle.scientific.service.QkjShareService;
+import com.cirle.scientific.utils.DeviceUtil;
+import com.cirle.scientific.utils.UserLoginUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cirle.scientific.dto.QkjLiveCommentsDTO;
+import com.cirle.scientific.dto.QkjLiveDetailDTO;
+import com.cirle.scientific.po.QkjLive;
+import com.cirle.scientific.po.QkjQuestionAnswer;
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.server.WebSocketOneToMany;
+import com.cirle.scientific.service.LiveService;
+import com.cirle.scientific.service.OrderService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+@Controller
+@RequestMapping("/live")
+@Api("直播相关接口")
+@Slf4j
+public class LiveController {
+
+    @Autowired
+    private LiveService liveService;
+
+    @Autowired
+    private QkjLiveDao qkjLiveDao;
+
+    @Autowired
+    private WebSocketOneToMany webSocketOneToMany;
+
+    @Autowired
+    private OrderService orderService;
+
+
+    @Autowired
+    private QkjShareService qkjShareService;
+
+    @PostMapping("/pushUser")
+    @ResponseBody
+    @ApiOperation("推送流量")
+    /**
+     * JSONObject
+     * {
+     *  "liveId":117,
+     *  "users":[
+     *      张三,李四,王五
+     *  ]
+     * }
+     * users:用户数组
+     */
+    public Result pushUser(@RequestBody JSONObject data) {
+        webSocketOneToMany.sendComing(data);
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    @PostMapping("/sendStartLive")
+    @ResponseBody
+    @ApiOperation("推送开启或者关闭直播")
+    public Result sendStartLive(
+            @RequestParam(name = "liveId", required = true) Long liveId,
+            @RequestParam(name = "liveStatus", required = true) Integer liveStatus
+    ) {
+        webSocketOneToMany.sendStartOrStopLive(liveId, liveStatus);
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    @PostMapping("/sendImgPath")
+    @ResponseBody
+    @ApiOperation("推送图片")
+    public Result sendImgPath(
+            @RequestParam(name = "liveId", required = true) Long liveId,
+            @RequestParam(name = "imgPath", required = true) String imgPath
+    ) {
+        webSocketOneToMany.sendImgPath(liveId, imgPath);
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    @PostMapping("/sendLiveUserCount")
+    @ResponseBody
+    @ApiOperation("推送直播人气(当前在线人数)")
+    public Result sendLiveUserCount(
+            @RequestParam(name = "liveId", required = true) Long liveId,
+            @RequestParam(name = "count", required = true) Integer count
+    ) {
+        webSocketOneToMany.sendLiveUserCount(liveId, count);
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    @PostMapping("/pushBarrage")
+    @ResponseBody
+    @ApiOperation("推送弹幕")
+    /**
+     * JSONObject
+     * {
+     *  "liveId":117,
+     *  "barrage":[
+     *     {
+     *         "name":"李四",
+     *         "time":"11:11:11"  只要时分秒,
+     *         "headImg":"xxxxxxxx.png",
+     *         "content":"你好"
+     *     },
+     *     {
+     *      *         "name":"李四",
+     *      *         "time":"11:11:11"  只要时分秒,
+     *      *         "headImg":"xxxxxxxx.png",
+     *      *         "content":"你好"
+     *      *     }
+     *  ],
+     * }
+     * barrage :弹幕数组
+     */
+    public Result pushBarrage(@RequestBody JSONObject data) {
+        webSocketOneToMany.pushBarrage(data);
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    @GetMapping("/getOnlineUser")
+    @ResponseBody
+    @ApiOperation("获取当前在线用户的memcard")
+    public Result<JSONArray> getOnlineUser(@RequestParam(name = "liveId", required = true) Long liveId
+    ) {
+        Result<JSONArray> onlineUser = webSocketOneToMany.getOnlineUser(liveId);
+        return onlineUser;
+    }
+
+    @GetMapping("/getOnlineUserCount")
+    @ResponseBody
+    @ApiOperation("获取当前在线人数")
+    public Result<Integer> getOnlineUserCount(@RequestParam(name = "liveId", required = true) Long liveId
+    ) {
+        Result<Integer> onlineUsers = webSocketOneToMany.getOnlineUserCount(liveId);
+        return onlineUsers;
+    }
+
+    @GetMapping("/index")
+    @ApiOperation(value = "去往直播首页")
+    public String gotoLiveIndex(
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from
+    ) {
+
+
+
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/live/live-index";
+        } else {
+            return "web/live/live-index";
+        }
+    }
+
+    @GetMapping("/liveQuestion")
+    @ApiOperation(value = "去往直播专区问卷")
+    public String gotoLiveQuestion(
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from
+    ) {
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/live/live-questionnaire";
+        } else {
+            return "";
+        }
+    }
+
+    @PostMapping("/getIndexData")
+    @ApiOperation(value = "获取首页数据")
+    @ResponseBody
+    public Result indexData(HttpServletRequest request, @RequestAttribute(value = "memCard", required = false) String memCard) {
+        // 默认展示pc端内容  0全部不显示 、1全部显示 、2m端显示、3pc端显示
+        Integer status = 3;
+        if(DeviceUtil.isMobileDevice(request)) {
+            status = 2;
+        }
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        return Result.success(liveService.indexData(memCard, status));
+    }
+
+    @PostMapping("/liveList")
+    @ApiOperation(value = "获取首页直播列表")
+    @ResponseBody
+    public Result<List<QkjLiveDetailDTO>> liveList(HttpServletRequest request,
+                                                   @RequestAttribute(value = "memCard", required = false) String memCard,
+                                                   @ApiParam(name = "cId", value = "分类ID") @RequestParam(name = "cId", required = true) Integer cId,
+                                                   @ApiParam(name = "page", value = "分页") @RequestParam(name = "page", required = true, defaultValue = "1") Integer page,
+                                                   @ApiParam(name = "size", value = "每页数量") @RequestParam(name = "size", required = true, defaultValue = "10") Integer size
+    ) {
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        return Result.success(liveService.getLiveList(memCard, cId, page, size));
+    }
+
+    @PostMapping("/livepage")
+    @ApiOperation(value = "获取首页直播列表")
+    @ResponseBody
+    public Result<Map> livePage(HttpServletRequest request,
+                                @RequestAttribute(value = "memCard", required = false) String memCard,
+                                @ApiParam(name = "cId", value = "分类ID") @RequestParam(name = "cId", required = true) Integer cId,
+                                @ApiParam(name = "page", value = "分页") @RequestParam(name = "page", required = true, defaultValue = "1") Integer page,
+                                @ApiParam(name = "size", value = "每页数量") @RequestParam(name = "size", required = true, defaultValue = "10") Integer size
+    ) {
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        boolean isPC= DeviceUtil.isMobileDevice(request);
+        return Result.success(liveService.pageLiveList(memCard, cId, page, size,isPC));
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation(value = "去往直播详情页面")
+    public String detail(
+            HttpServletRequest request,
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            @ApiParam(name = "fromMemCard", value = "分享者的ID") @RequestParam(name = "fromMemCard", required = false) String fromMemCard,
+            @ApiParam(name = "liveId", value = "分类ID") @RequestParam(name = "liveId", required = true) Long liveId, Model model
+    ) {
+        String refererUrl = request.getHeader("Referer");
+        if(refererUrl!=null && refererUrl.contains("login")){
+            model.addAttribute("fromlogin","1");
+        }else{
+            model.addAttribute("fromlogin","0");
+        }
+        //获取详情
+        QkjLive liveInfo = liveService.getLiveInfo(liveId);
+        request.setAttribute("liveId", liveId);
+        if(StringUtils.isNotBlank(fromMemCard)){
+            request.setAttribute("fromMemCard", fromMemCard);
+        }
+
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            if (liveInfo.getLiveType() == 2) {
+                return "html5/live/live-prefecture";
+            } else {
+                return "html5/live/live-alive";
+            }
+        } else {
+            if (liveInfo.getLiveType() == 2) {
+                return "web/live/live-zhuanquxq";
+            } else {
+                return "web/live/live-prefecture";
+            }
+        }
+    }
+
+    @PostMapping("/getDetailData")
+    @ApiOperation(value = "获取直播详情")
+    @ResponseBody
+    public Result<QkjLiveDetailDTO> getDetailData(HttpServletRequest request,
+                                                  @RequestHeader(value="referer", defaultValue = "0") String referer,
+                                                  @RequestHeader(value="user-agent", defaultValue = "0") String userAgent,
+                                                  @RequestAttribute(value = "memCard", required = false) String memCard,
+                                                  @RequestParam(value = "fromMemCard", required = false) String fromMemCard,
+                                                  @ApiParam(name = "liveId", value = "直播ID") @RequestParam(name = "liveId", required = true) Long liveId
+    ) {
+        log.info("getDetailData  memCard:{} fromMemCard:{} referer:{} userAgent:{}", memCard, fromMemCard, referer, userAgent);
+        //借助详情的接口做分享的保存，点记者从分享者的链接进入必定调用这个接口
+        QkjShare share = QkjShare.builder()
+                .shareMemcard(fromMemCard)
+                .clickMemcard(memCard)
+                .objType(ShareConsts.obj_type_live)
+                .objId(liveId.intValue())
+                .createTime(LocalDateTime.now())
+                .updateTime(LocalDateTime.now())
+                .build();
+        qkjShareService.saveQkjShare(share);
+        return liveService.getLiveDetail(liveId, memCard);
+    }
+
+    @PostMapping("/infoByMember")
+    @ApiOperation(value = "获取直播详情")
+    @ResponseBody
+    public Result infoByMember(HttpServletRequest request,
+                               @RequestAttribute(value = "memCard", required = false) String memCard,
+                               @ApiParam(name = "liveId", value = "直播ID") @RequestParam(name = "liveId", required = true) Long liveId
+    ) {
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        return liveService.infoByMember(liveId, memCard);
+    }
+
+    @PostMapping("/commentList")
+    @ApiOperation(value = "获取直播评论列表")
+    @ResponseBody
+    public Result<List<QkjLiveCommentsDTO>> commentList(HttpServletRequest request,
+                                                        @RequestAttribute(value = "memCard", required = false) String memCard,
+                                                        @ApiParam(name = "liveId", value = "直播ID") @RequestParam(name = "liveId", required = true) Long liveId,
+                                                        @ApiParam(name = "cId", value = "分页") @RequestParam(name = "cId", required = true) Integer cId
+    ) {
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        return liveService.getLiveComments(memCard, liveId, cId);
+    }
+
+    @PostMapping("/addLiveComment")
+    @ApiOperation(value = "添加直播评论")
+    @ResponseBody
+    public Result<Boolean> addLiveComment(HttpServletRequest request,
+                                          @RequestAttribute(value = "memCard", required = false) String memCard,
+                                          @ApiParam(name = "liveId", value = "直播ID") @RequestParam(name = "liveId", required = true) Long liveId,
+                                          @ApiParam(name = "content", value = "评论内容") @RequestParam(name = "content", required = true) String content
+    ) {
+        if (memCard == null && request.getSession().getAttribute("UserCard") == null) {
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        memCard = memCard == null ? (String) request.getSession().getAttribute("UserCard") : memCard;
+        return Result.success(liveService.addLiveComment(liveId, memCard, content));
+    }
+
+    @GetMapping("/liveRanking")
+    @ApiOperation(value = "去往直播榜单页面")
+    public String liveRanking(
+            HttpServletRequest request,
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            @ApiParam(name = "liveId", value = "直播ID") @RequestParam(name = "liveId", required = true) Long liveId
+    ) {
+        request.setAttribute("liveId", liveId);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/live/live-ranking";
+        } else {
+            return "";
+        }
+    }
+
+    @PostMapping("/rankList")
+    @ResponseBody
+    public Result<JSONObject> rankList(
+            @RequestAttribute(value = "memCard", required = false) String memCard,
+            @RequestParam Integer objType,
+            @RequestParam Integer objId
+    ) {
+        List<ShareRankDto> rs = qkjShareService.inviteRank("", objType, objId);
+        JSONArray jsonArray = new JSONArray();
+        if (CollectionUtils.isNotEmpty(rs)) {
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(rs));
+        }
+        JSONObject rstData = new JSONObject();
+        rstData.put("rankList", jsonArray);
+        return Result.success(rstData);
+    }
+
+    @RequestMapping(value = "/addRemind", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<Map<String, Object>> addRemind(HttpServletRequest request,
+                                                 @RequestAttribute(value = "memCard", required = false) String memCard,
+                                                 @RequestParam Long liveId
+    ) {
+        if (memCard == null && request.getSession().getAttribute("UserCard") == null) {
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        memCard = memCard == null ? (String) request.getSession().getAttribute("UserCard") : memCard;
+        return liveService.reserveOrBets(memCard, liveId.toString());
+    }
+
+    @RequestMapping(value = "/saveQuestionAnswer", method = RequestMethod.POST)
+    @ResponseBody
+    public Result saveQuestionAnswer(HttpServletRequest request,
+                                     @RequestAttribute(value = "memCard", required = false) String memCard,
+                                     @RequestParam String questions,
+                                     @RequestParam Integer liveId
+    ) {
+        if (memCard == null && request.getSession().getAttribute("UserCard") == null) {
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        memCard = memCard == null ? (String) request.getSession().getAttribute("UserCard") : memCard;
+        return liveService.saveQuestionAnswer(memCard, questions, liveId);
+    }
+
+    /**
+     * 阿里云监听推流回调通知
+     * @param request
+     * @return
+     */
+    @GetMapping("/pushStreamCallback")
+    @ResponseBody
+    public Result pushStreamCallback(HttpServletRequest request) {
+        liveService.pushStreamCallback(request);
+        return Result.success(true);
+    }
+
+
+    @GetMapping("/auto/inc")
+    @ResponseBody
+    @ApiOperation("自动增长参与人数和预约人数")
+    public Result aotuLiveNum(
+            HttpServletRequest request,
+            @ApiParam(name = "memCard", value = "用户唯一标识") @RequestAttribute(name = "memCard", required = false) String memCard,
+            @RequestParam(value = "params", required = false) String params
+    ) {
+        if (StringUtils.isBlank(memCard)) {//pc从session去 m从参数取
+            memCard = UserLoginUtil.isUserLogin(request);
+        }
+        log.info("aotuLiveNum memCard is null   {}",params);
+
+        return Result.success(liveService.autoIncNum(params));
+    }
+
+    @GetMapping("/shenmi")
+    @ResponseBody
+    @ApiOperation("运营人员操作改变joinnumber")
+    public Result updateJoinNumber(
+            HttpServletRequest request,
+            @ApiParam(name = "memCard", value = "用户唯一标识") @RequestAttribute(name = "memCard", required = false) String memCard,
+            @RequestParam(value = "liveId", required = true) Long liveId,
+            @RequestParam(value = "num", required = true) Long num
+    ) {
+        log.info("updateJoinNumber liveId :{} num:{}", liveId, num);
+
+        if(num>0){
+            qkjLiveDao.updateJoinMembers(num, liveId);
+        }else  if (num<0){
+            qkjLiveDao.reduceJoinMembers(Math.abs(num), liveId);
+        } else if (num ==0) {
+            QkjLive byLiveId = qkjLiveDao.findById(String.valueOf(liveId));
+            if(Objects.nonNull(byLiveId)){
+                return Result.success(byLiveId.getJoinMembers());
+            }
+        }
+        return Result.success("修改成功");
+    }
+
+    @GetMapping("/getUserInfoByLiveId")
+    @ResponseBody
+    @ApiOperation("获取当前观看直播的人的信息")
+    public Result getUserInfoByLiveId(
+            @RequestParam(name = "liveId", required = true) Integer liveId,
+            @RequestAttribute(value = "memCard", required = false) String memCard
+    ) {
+
+        if(StringUtils.isBlank(memCard)){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return liveService.getUserInfoByLiveId(memCard, liveId);
+    }
+}

src/main/java/com/cirle/scientific/controller/live/resp/LiveUserinfoResp.java

@@ -0,0 +1,26 @@
+package com.cirle.scientific.controller.live.resp;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Calendar;
+
+@Data
+@Builder
+public class LiveUserinfoResp {
+
+    @ApiModelProperty(value = "微信昵称")
+    private String wxName;
+    @ApiModelProperty(value = "微信头像")
+    private String wxHeadImg;
+    @ApiModelProperty(value = "直播标题")
+    private String liveTitle;
+    @ApiModelProperty(value = "直播封面")
+    private String liveCoverImg;
+    @ApiModelProperty(value = "直播时间")
+    private String liveBeginTime;
+
+}

src/main/java/com/cirle/scientific/controller/login/LoginController.java

@@ -0,0 +1,780 @@
+package com.cirle.scientific.controller.login;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.cirle.scientific.constants.LoginConsts;
+import com.cirle.scientific.constants.WeixinConsts;
+import com.cirle.scientific.dao.MemberDao;
+import com.cirle.scientific.dao.QkjMemberOpenidDao;
+import com.cirle.scientific.dao.QkjMemberTaskInfoDao;
+import com.cirle.scientific.dto.WxUerInfoDTO;
+import com.cirle.scientific.po.QkjMember;
+import com.cirle.scientific.po.QkjMemberOpenid;
+import com.cirle.scientific.po.QkjMemberTaskInfo;
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.MemberService;
+import com.cirle.scientific.service.MemberTaskInfoService;
+import com.cirle.scientific.service.WeixinService;
+import com.cirle.scientific.service.impl.MemberServiceImpl;
+import com.cirle.scientific.utils.*;
+import com.cirle.scientific.utils.weixin.WeixinpayConfig;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gson.JsonObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.session.Session;
+import org.springframework.session.SessionRepository;
+import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.*;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Controller
+@RequestMapping("/login")
+@Api("登录相关接口")
+@Slf4j
+public class LoginController {
+
+    @Autowired
+    MemberDao memberDao;
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    WeixinService weixinService;
+    @Autowired
+    MemberService memberService;
+    @Autowired
+    MemberTaskInfoService memberTaskInfoService;
+    @Autowired
+    QkjMemberOpenidDao openidDao;
+
+    @GetMapping("")
+    @ApiOperation(value = "手机号登录页面")
+    public String login(
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            @ApiParam(name = "redirectUrl", value = "回调地址") @RequestParam(name = "redirectUrl", required = false) String redirectUrl,
+            HttpServletRequest request
+    ) {
+        request.setAttribute("redirectUrl", redirectUrl);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/user/login";
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * 获取所有的白名单用户
+     * @return
+     */
+    @GetMapping(value = "/getWhitelist")
+    @ResponseBody
+    public Result getWhitelist() {
+        List<QkjMember> members = memberDao.findAllWhitelist();
+        List<String> userNameList = Lists.newArrayList();
+        if(CollectionUtil.isNotEmpty(members)){
+            userNameList = members.stream().map(QkjMember::getMemNickname).collect(Collectors.toList());
+        }
+        log.info("getWhitelist userNameList:{}", userNameList);
+        return Result.success(userNameList);
+    }
+
+    @RequestMapping(value = "/mobileLogin", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    @ApiOperation(value = "m登录")
+    public Result mobileLogin(
+            @ApiParam(name = "memMobile", value = "用户手机号") @RequestParam(name = "memMobile", required = true) String memMobile,
+            @ApiParam(name = "valCode", value = "验证码") @RequestParam(name = "valCode", required = false) String valCode,
+            @ApiParam(name = "passwd", value = "密码") @RequestParam(name = "passwd", required = false) String passwd,
+            @ApiParam(name = "memRegisterSource", value = "注册终端，1-H5，2-pc") @RequestParam(name = "memRegisterSource", required = true) Integer memRegisterSource,
+            @ApiParam(name = "wxId", value = "微信unionid") @RequestParam(name = "wxId", required = false) String wxId,
+            @ApiParam(name = "memNickname", value = "微信昵称") @RequestParam(name = "memNickname", required = false) String memNickname,
+            @ApiParam(name = "openId", value = "微信openid") @RequestParam(name = "openId", required = false) String openId,
+            @ApiParam(name = "memHeadimg", value = "微信头像") @RequestParam(name = "memHeadimg", required = false) String memHeadimg,
+            @ApiParam(name = "subscribe", value = "是否关注服务号") @RequestParam(name = "subscribe", required = false, defaultValue = "0") Integer subscribe,
+            @ApiParam(name = "operationName", value = "操作类型，signInWithPhone-手机登录，signInWithPassword-密码登录") @RequestParam(name = "operationName", required = false) String operationName,
+            HttpServletRequest request, HttpServletResponse response
+    ) {
+        String from = "H5";
+        QkjMember member = null;
+        String ip = IpUtil.getIpAddr(request);
+        if ("signInWithPhone".equals(operationName)) {
+            int valRs = validateMobileYzm(memMobile, valCode);
+            if("qk,347".equalsIgnoreCase(valCode)){
+                log.info("God user "+memMobile+" "+ip);
+                valRs = 0;
+            }
+
+            log.info("----------------校验用户验证码结果-----------------------" + valRs);
+            if (valRs == -1) {
+                log.info("验证码已过期");
+                return Result.failed(BizCodeEnum.CODE_TIME_OUT);
+            }
+            if (valRs == -2) {
+                log.info("验证码错误");
+                return Result.failed(BizCodeEnum.CODE_ERROR);
+            }
+            member = memberService.memberLogin(memMobile, memRegisterSource, wxId, memNickname, openId, memHeadimg, subscribe);
+            if (member == null) {
+                log.info("创建用户失败");
+                return Result.failed("创建用户失败");
+            }
+        } else if ("signInWithPassword".equals(operationName)) {
+
+            Result<QkjMember> result = memberService.checkPwd(ip, memRegisterSource, memMobile, DigestUtils.md5DigestAsHex(passwd.getBytes()),from);
+            if (result.getCode() != 200) {
+                return result;
+            }
+            member = result.getData();
+        }
+        //验证码或者密码登录成功 清空错误次数
+        String key = MemberServiceImpl.USER_LOGIN_FAILED_COUNT +from+ memMobile;
+        stringRedisTemplate.delete(key);
+        setMemberCookie(request, response, from, member);
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    /**
+     * @param memMobile
+     * @param valCode
+     * @param memRegisterSource
+     * @param operationName
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/webLogin", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    @ApiOperation(value = "web登录")
+    public Result webLogin(
+            @ApiParam(name = "memMobile", value = "用户手机号") @RequestParam(name = "memMobile", required = true) String memMobile,
+            @ApiParam(name = "valCode", value = "验证码") @RequestParam(name = "valCode", required = false) String valCode,
+            @ApiParam(name = "passwd", value = "密码") @RequestParam(name = "passwd", required = false) String passwd,
+            @ApiParam(name = "memRegisterSource", value = "注册终端，1-H5，2-pc") @RequestParam(name = "memRegisterSource", required = true) Integer memRegisterSource,
+            @ApiParam(name = "operationName", value = "操作类型，signInWithPhone-手机登录，signInWithPassword-密码登录") @RequestParam(name = "operationName", required = false) String operationName,
+            @ApiParam(name = "wxId", value = "微信unionid") @RequestParam(name = "wxId", required = false) String wxId,
+            @ApiParam(name = "memNickname", value = "微信昵称") @RequestParam(name = "memNickname", required = false) String memNickname,
+            @ApiParam(name = "openId", value = "微信openid") @RequestParam(name = "openId", required = false) String openId,
+            @ApiParam(name = "memHeadimg", value = "微信头像") @RequestParam(name = "memHeadimg", required = false) String memHeadimg,
+            HttpServletRequest request,
+            HttpServletResponse response
+
+    ) {
+        String from = "web";
+        QkjMember member = null;
+        //验证码登录
+        String ip = IpUtil.getIpAddr(request);
+        if ("signInWithPhone".equals(operationName)) {
+            int valRs = validateMobileYzm(memMobile, valCode);
+            if("qk,#234abc343,".equalsIgnoreCase(valCode)){
+                log.info("God user "+memMobile+" "+ip);
+                valRs = 0;
+            }
+            log.info("----------------校验用户验证码结果-----------------------" + valRs);
+            if (valRs == -1) {
+                log.info("验证码已过期");
+                return Result.failed(BizCodeEnum.CODE_TIME_OUT);
+            }
+            if (valRs == -2) {
+                log.info("验证码错误");
+                return Result.failed(BizCodeEnum.CODE_ERROR);
+            }
+            member = memberService.memberLogin(memMobile, memRegisterSource, wxId, memNickname, openId, memHeadimg, 0);
+            if (member == null) {
+                log.info("创建用户失败");
+                return Result.failed("创建用户失败");
+            }
+            //密码登录
+        } else if ("signInWithPassword".equals(operationName)) {
+
+            Result<QkjMember> result = memberService.checkPwd(ip, memRegisterSource, memMobile, DigestUtils.md5DigestAsHex(passwd.getBytes()),from);
+            if (result.getCode() != 200) {
+                return result;
+            }
+            member = result.getData();
+        }
+        //验证码或者密码登录成功 清空错误次数
+        String key = MemberServiceImpl.USER_LOGIN_FAILED_COUNT +from+ memMobile;
+        stringRedisTemplate.delete(key);
+
+        String memCard = member.getMemCard();
+        //用户存入session
+        setMemberSession(request, response, memCard);
+
+        //初始化积分表
+        memberTaskInfoService.initMemberTaskInfo(memCard);
+
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    private void setMemberSession(HttpServletRequest request,
+                                  HttpServletResponse response,
+                                  String memCard){
+        request.getSession().setAttribute(LoginConsts.PC_LOGIN_SESSION_KEY, memCard);
+
+        //讲memcard放入cookie,为了判断是否是被顶掉的情况使用
+        addValue2Cookie(response, StringUtil.getdomain(request), "/", LoginConsts.M_COOKIE_MEMCARD_KEY, memCard, LoginConsts.M_LOGIN_COOKIE_EXPIRE);
+        //判断如果是b账号顶掉a账号的情况，清除a的登录
+        String loginKey = String.format(LoginConsts.PC_LOGIN_USER_KEY, memCard);
+        String sessionId = stringRedisTemplate.opsForValue().get(loginKey);
+        if(StringUtils.isNotBlank(sessionId) && ! StringUtils.equals(sessionId, request.getSession().getId())){
+            remove(request, sessionId);
+            //将被顶掉的信息存入redis
+            String format = String.format(LoginConsts.M_OR_PC_LOG_REPLACE_KEY, memCard);
+            stringRedisTemplate.opsForValue().set(format, memCard, LoginConsts.M_LOGIN_EXPIRE, LoginConsts.UNIT);
+        }
+
+        //pc登录后 把用户信息和session的对应关系 放进redis
+        stringRedisTemplate.opsForValue().set(loginKey, request.getSession().getId(), LoginConsts.M_LOGIN_EXPIRE, LoginConsts.UNIT);
+    }
+
+    private void setMemberCookie(HttpServletRequest request,
+                                 HttpServletResponse response,
+                                 String loginSource,
+                                 QkjMember member) {
+
+        // 生成memToken
+        String memToken = makeTokenApp(request, member.getMemCard(), loginSource);
+        // 存放cookie
+        setMainCookie(response, memToken, member, StringUtil.getdomain(request));
+        log.info("用户登录后的token=" + memToken);
+    }
+
+
+
+
+    @RequestMapping(value = "/wxlogin")
+    @ApiOperation(value = "微信登录")
+    public String wxlogin(HttpServletRequest request, HttpServletResponse response,
+                          RedirectAttributes redirectAttributes, Model model) {
+
+        String code = request.getParameter("code");
+        String redirectUrl = request.getParameter("redirectUrl");
+        log.info("redirectUrl:" + redirectUrl);
+
+        Map<String, String> tokenMap = null;
+        String wx_fwh_access_token = (String) stringRedisTemplate.opsForValue().get("wx_fwh_access_token" + code);
+        String wx_fwh_openid = (String) stringRedisTemplate.opsForValue().get("wx_fwh_openid" + code);
+        if (wx_fwh_access_token == null || wx_fwh_openid == null) {
+            // 通过code获取openid
+            tokenMap = weixinService.getTokenByCode(WeixinpayConfig.appId, WeixinpayConfig.appSecret, code,
+                    "authorization_code");
+            log.info("微信授权登陆，返回tokenMap为：" + tokenMap);
+            wx_fwh_access_token = tokenMap.get("access_token");
+            log.info("微信授权登陆，返回wx_fwh_access_token为：" + wx_fwh_access_token);
+            wx_fwh_openid = tokenMap.get("openid");
+            log.info("微信授权登陆，返回wx_fwh_openid为：" + wx_fwh_openid);
+
+            stringRedisTemplate.opsForValue().set("wx_fwh_access_token" + code, wx_fwh_access_token, 7100, TimeUnit.SECONDS);
+            stringRedisTemplate.opsForValue().set("wx_fwh_openid" + code, wx_fwh_openid, 7100, TimeUnit.SECONDS);
+        } else {
+            stringRedisTemplate.opsForValue().get("wx_fwh_access_token" + code);
+            stringRedisTemplate.opsForValue().get("wx_fwh_openid" + code);
+        }
+
+        // 获取微信用户信息
+        WxUerInfoDTO wxUerInfoDTO = weixinService.getUserInfo(wx_fwh_access_token, wx_fwh_openid);
+        log.info("wxlogin wxUerInfoDTO:{}", wxUerInfoDTO);
+        log.info(wxUerInfoDTO.getNickname());
+        if (wxUerInfoDTO == null) {
+            log.info("获取微信用户信息异常，返回手机号登录页面");
+            return "redirect: /login?from=H5";
+        }
+
+        JSONObject userInfo = weixinService.generateWxUserInfo(WeixinpayConfig.appId, WeixinpayConfig.appSecret, wxUerInfoDTO.getOpenid());
+        log.info("获取用户基本信息：" + userInfo.toString() + "*******************");
+        if (userInfo != null) {
+            if (userInfo.get("subscribe") != null) {
+                wxUerInfoDTO.setSubscribe((Integer) userInfo.get("subscribe"));
+            }
+        }
+
+       // QkjMember member = memberDao.findByWxId(wxUerInfoDTO.getUnionid());
+        QkjMember member = memberService.weixinLoginOAuth(wxUerInfoDTO);
+        if (member != null) {
+            //保存微信用户的openId，用于后期的模板推送
+            QkjMemberOpenid memberOpenid = openidDao.findByMemCardAndAppId(member.getMemCard(), WeixinpayConfig.appId);
+            if (memberOpenid == null) {
+                memberOpenid = new QkjMemberOpenid();
+            }
+            memberOpenid.setMemCard(member.getMemCard());
+            memberOpenid.setAppId(WeixinpayConfig.appId);
+            memberOpenid.setOpenId(wxUerInfoDTO.getOpenid());
+            openidDao.save(memberOpenid);
+            setMemberCookie(request, response, "H5", member);
+            return "redirect:" + redirectUrl;
+        } else {
+            log.info("不存在用户，去绑定手机号然后注册");
+            request.setAttribute("wxId", wxUerInfoDTO.getUnionid());
+            request.setAttribute("memNickname", wxUerInfoDTO.getNickname());
+            request.setAttribute("openId", wxUerInfoDTO.getOpenid());
+            request.setAttribute("memHeadimg", wxUerInfoDTO.getHeadimgurl());
+            request.setAttribute("subscribe", wxUerInfoDTO.getSubscribe());
+            request.setAttribute("redirectUrl", redirectUrl);
+            return "html5/user/login";
+        }
+
+    }
+    private void setRedisUserToToken(String memCard, String memToken){
+        try {
+            //判断如果原先绑定过解绑
+            String key = String.format(LoginConsts.M_LOGIN_USER_KEY, memCard);
+            String memTokenOld = stringRedisTemplate.opsForValue().get(key);
+            if(StringUtils.isNotBlank(memTokenOld)){
+                stringRedisTemplate.delete(memTokenOld);//删除 memToken 和 memCard 的对应关系在Redis里面
+                //将被顶掉的信息存入redis
+                String format = String.format(LoginConsts.M_OR_PC_LOG_REPLACE_KEY, memCard);
+                stringRedisTemplate.opsForValue().set(format, memCard, LoginConsts.M_LOGIN_EXPIRE, LoginConsts.UNIT);
+            }
+            stringRedisTemplate.opsForValue().set(key, memToken);
+        }catch (Exception e){
+
+        }
+    }
+
+    protected void setMainCookie(HttpServletResponse response, String memToken, QkjMember member, String domain) {
+
+        addValue2Cookie(response, domain, "/", "memNickname", member.getMemNickname(), LoginConsts.M_LOGIN_COOKIE_EXPIRE);
+
+        addValue2Cookie(response, domain, "/", "memHeadImg", member.getMemHeadimg(), LoginConsts.M_LOGIN_COOKIE_EXPIRE);
+
+        addValue2Cookie(response, domain, "/", "memCard", member.getMemCard(), LoginConsts.M_LOGIN_COOKIE_EXPIRE);
+
+        addValue2Cookie(response, domain, "/", "memToken", memToken, LoginConsts.M_LOGIN_COOKIE_EXPIRE);
+
+        if (member.getMemMobile() != null && !"".equals(member.getMemMobile())) {
+            addValue2Cookie(response, domain, "/", "bindMobile", "1", LoginConsts.M_LOGIN_COOKIE_EXPIRE);
+        }
+        setRedisUserToToken(member.getMemCard(), memToken);
+    }
+
+    /**
+     * 清除cookie
+     *
+     * @param response
+     */
+    public void clearCookies(HttpServletResponse response, String domain, String path, String key) {
+        Cookie c = new Cookie(key, null);
+        c.setDomain(domain);
+        c.setMaxAge(0);
+        c.setPath(path);
+        response.addCookie(c);
+    }
+
+    /**
+     * 获取cookie里的值
+     *
+     * @param request
+     * @param key
+     * @return 不存在 返回null
+     */
+    public String getValueByCookie(HttpServletRequest request, String key) {
+        String cookievalue = null;
+        Cookie[] cookies = request.getCookies();
+        if (null != cookies && cookies.length != 0) {
+            for (int i = 0; i < cookies.length; i++) {
+                Cookie cookie = cookies[i];
+                if (cookie.getName().equals(key)) {
+                    // String value = cookie.getValue();
+                    try {
+                        cookievalue = URLDecoder.decode(cookie.getValue(), "UTF-8");
+                    } catch (UnsupportedEncodingException e) {
+                        e.printStackTrace();
+                    }
+                    // cookievalue = value;
+                    break;
+                }
+            }
+        }
+        return cookievalue;
+    }
+
+    /**
+     * 将值存入cookie
+     *
+     * @param response
+     * @param key
+     * @param val
+     */
+    public void addValue2Cookie(HttpServletResponse response, String domain, String path, String key, String val,
+                                int time) {
+        if (val == null || "".equals(val)) {
+            return;
+        }
+        try {
+            val = URLEncoder.encode(val, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        response.addHeader("P3P", "CP=CAO PSA OUR");
+        Cookie c = new Cookie(key, val);
+        c.setDomain(domain);
+        c.setMaxAge(time);
+        c.setPath(path);
+        response.addCookie(c);
+    }
+
+
+    /**
+     * App生成Token
+     *
+     * @param request
+     * @param memCard
+     * @param loginSource 登录终端   APP  H5  PC  SAPP:微信小程序
+     * @return
+     */
+    protected String makeTokenApp(HttpServletRequest request, String memCard, String loginSource) {
+        String requestIp = IpUtil.getIpAddr(request);
+        DESUtil des = new DESUtil();
+
+        // 将Token放入缓存,有效时间
+
+        String curMemToken = null;
+        if ("SAPP".equals(loginSource)) {
+            curMemToken = (String) stringRedisTemplate.opsForValue().get(loginSource + "_" + memCard);
+            if (curMemToken == null) {
+                String memToken = loginSource + "_" + des.encryptStrToken(requestIp + "," + System.currentTimeMillis() + "," + memCard);
+                stringRedisTemplate.opsForValue().set(memToken, memCard, LoginConsts.M_LOGIN_EXPIRE, LoginConsts.UNIT);
+                stringRedisTemplate.opsForValue().set(loginSource + "_" + memCard, memToken, LoginConsts.M_LOGIN_EXPIRE, LoginConsts.UNIT);
+                return memToken;
+            }
+        } else {
+            String oldMemtoken = (String) stringRedisTemplate.opsForValue().get(loginSource + "_" + memCard);
+            if (oldMemtoken != null) {
+                stringRedisTemplate.delete(oldMemtoken);
+            }
+            String memToken = loginSource + "_" + des.encryptStrToken(requestIp + "," + System.currentTimeMillis() + "," + memCard);
+            stringRedisTemplate.opsForValue().set(memToken, memCard, LoginConsts.M_LOGIN_EXPIRE, LoginConsts.UNIT);
+            stringRedisTemplate.opsForValue().set(loginSource + "_" + memCard, memToken, LoginConsts.M_LOGIN_EXPIRE, LoginConsts.UNIT);
+            return memToken;
+        }
+
+        return curMemToken;
+    }
+
+    protected int validateMobileYzm(String memUserId, String inputYzm) {
+
+        String realYzm = (String) stringRedisTemplate.opsForValue().get(memUserId + "yzm");
+        log.info("用户输入的验证码 " + inputYzm);
+        log.info("缓存里面的验证码" + realYzm);
+        if (realYzm == null) {
+            return -1;
+        }
+
+        if (!inputYzm.equals(realYzm)) {
+            return -2;
+        }
+
+        stringRedisTemplate.delete(memUserId + "yzm");
+        return 0;
+    }
+
+    /**
+     * 发送手机验证码
+     *
+     * @return
+     */
+    @RequestMapping(value = "/sendMobileYzm", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "发送验证码")
+    public Result sendMobileYzm(
+            @ApiParam(name = "phone", value = "手机号") @RequestParam(name = "phone", required = true) String phone
+    ) {
+        String yzm = (int) ((Math.random() * 9 + 1) * 100000) + "";
+
+        JsonObject templateParams = new JsonObject();
+        templateParams.addProperty("code", yzm);
+
+        boolean sendRs = sendValidateNum(phone, "SMS_219905183", templateParams);
+        stringRedisTemplate.opsForValue().set(phone + "yzm", yzm, 1800, TimeUnit.SECONDS);
+
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    public boolean sendValidateNum(String mobile, String templId, JsonObject params) {
+        try {
+            boolean flag = SmsUtils.send(mobile, templId, params);
+            return flag;
+
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+
+    @GetMapping(value = "/logOut")
+    @ApiOperation(value = "m退出登录")
+    public String logOut(HttpServletRequest request, HttpServletResponse response,
+                         RedirectAttributes redirectAttributes, Model model) {
+        String domain = StringUtil.getdomain(request);
+        clearCookies(response, domain, "/", "memToken");
+        clearCookies(response, domain, "/", "memNickname");
+        clearCookies(response, domain, "/", "memHeadImg");
+        clearCookies(response, domain, "/", "bindMobile");
+        clearCookies(response, domain, "/", "memCard");
+        return "html5/user/login";
+
+    }
+
+    @GetMapping(value = "/logOutWeb")
+    @ApiOperation(value = "web退出登录")
+    public String logOutWeb(HttpServletRequest request,HttpServletResponse response) {
+        String userCard = (String)request.getSession().getAttribute("UserCard");
+        request.getSession().removeAttribute("UserCard");
+        //清除登录的时候放进cookie里面的memCard,和相关redis
+        clearLoginRedis(userCard, request, response);
+        return "web/index";
+    }
+    // 删除sessionId 方法
+    private static boolean remove(HttpServletRequest request , String sessionId) {
+        HttpSession httpSession = request.getSession();
+        if (httpSession.getId().equals(sessionId)) {
+            // 当前session
+            httpSession.invalidate();
+            return true;
+        } else {
+            // 非当前Session
+            SessionRepository sessionRepository =  (SessionRepository) request.getAttribute(SessionRepositoryFilter.SESSION_REPOSITORY_ATTR);
+            if (sessionRepository != null) {
+                Session session = sessionRepository.findById(sessionId);
+                if (session != null) {
+                    log.info("删除会话，ID: {}", sessionId);
+                }
+                sessionRepository.deleteById(sessionId);
+                return true;
+            }
+        }
+        return false; // session ID not found
+    }
+
+    /**
+     * 前端定时请求该方法获取redis中存入的时间戳
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/getWxLoginSoleCode")
+    @ApiOperation(value = "前端获取存入redis的时间戳")
+    public Object getWxLoginSoleCode(HttpServletRequest request) {
+        JSONObject jsonObj = new JSONObject();
+        try {
+            //取出请求中带有的时间戳
+            String soleCode = request.getParameter("soleCode");
+            if (StringUtils.isNotBlank(soleCode)) {
+                //定时器每秒获取一次redis中的时间戳
+                String resultGet = stringRedisTemplate.opsForValue().get(soleCode);
+                if (StringUtils.isBlank(resultGet)) {
+                    //当值为空已找不到时，说明二维码已到十分钟已过期，返回给前端停止定时器
+                    jsonObj.put("info", "stop");
+                    jsonObj.put("code", "success");
+                } else {
+                    //否则继续等待
+                    jsonObj.put("code", "success");
+                }
+            } else {
+                jsonObj.put("code", "failed");
+            }
+        } catch (Exception e) {
+            jsonObj.put("code", "failed");
+            e.printStackTrace();
+        }
+        return jsonObj;
+    }
+
+    /**
+     * 获取前端生成的时间戳存进redis
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/wxLoginSole")
+    @ApiOperation(value = "前端生成的时间戳存入redis")
+    public Result wxLoginSole(HttpServletRequest request) {
+
+        //取出时间戳
+        String soleCode = request.getParameter("soleCode");
+        if (StringUtils.isNotBlank(soleCode)) {
+            //将guid存在redis里，保存时间十分钟
+            stringRedisTemplate.opsForValue().set(soleCode, "1", 600, TimeUnit.SECONDS);
+        } else {
+            return Result.failed(BizCodeEnum.FAILED);
+        }
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    /**
+     * 微信扫码登录鉴权及跳转
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/wxLoginOAuth")
+    @ApiOperation(value = "微信授权登录")
+    public Result wxLoginOAuth(HttpServletRequest request, HttpServletResponse response) {
+
+        //解析参数
+        // 第三方发起微信授权登录请求，微信用户允许授权第三方应用后，微信会拉起应用或重定向到第三方网站，并且带上授权临时票据code参数；
+        String code = request.getParameter("code");
+        String redirectUrl = request.getParameter("redirectUrl");
+        //前端扫码登入传来的时间戳
+        String state = request.getParameter("state");
+        log.info("wxLoginOAuth code:{} redirectUrl:{} state:{}", code, redirectUrl, state);
+
+        //参数校验//用户拒绝授权时code为空，微信也不会请求该接口。为了防止非法请求，若code为空则返回
+        if (StringUtils.isBlank(code)) {
+            return Result.failed("登入请求被拒绝");
+        }
+        //请求state为空则不正常，直接返回。否则去redis验证是否正确合法
+        if (StringUtils.isBlank(state)) {
+            return Result.failed("请求状态异常");
+        } else {
+            //根据state判断redis中是否存在该state。若没值说明二维码已过期或者请求不合法
+            boolean resultHasKey = stringRedisTemplate.hasKey(state);
+            //微信账号和系统账号绑定时会用到 //在redis缓存中保留十分钟
+            stringRedisTemplate.opsForValue().set("code", code, 600);
+            if (!resultHasKey) {
+                return Result.failed("请求超时或异常，请重新扫码登入！");
+            }
+        }
+
+        try {
+            //请求微信通过code获取access_token
+            // 通过code获取openid
+            Map<String, String> tokenMap = weixinService.getTokenByCodeNew(WeixinConsts.appId, WeixinConsts.appSecret, code,
+                        "authorization_code");
+            if(CollectionUtils.isEmpty(tokenMap)){
+                return Result.failed("获取access_token异常，请重新扫码登入！");
+            }
+            String  access_token = tokenMap.get("access_token");
+            String openid = tokenMap.get("openid");
+
+            // 获取微信用户信息
+            WxUerInfoDTO wxUerInfoDTO = weixinService.getUserInfo(access_token, openid);
+            log.info("wxLoginOAuth wxUerInfoDTO:{}", wxUerInfoDTO);
+            if (wxUerInfoDTO == null) {
+                return Result.failed("获取微信用户信息异常，请重新扫码登入！");
+            }
+            //跟据授权标识查询用户
+            JSONObject userInfo = weixinService.generateWxUserInfo(WeixinConsts.appId, WeixinConsts.appSecret, wxUerInfoDTO.getOpenid());
+            if (userInfo != null) {
+                if (userInfo.get("subscribe") != null) {
+                    wxUerInfoDTO.setSubscribe((Integer) userInfo.get("subscribe"));
+                }
+            }
+            QkjMember member = memberService.weixinLoginOAuth(wxUerInfoDTO);
+            if(Objects.isNull(member)){
+                log.info("不存在用户，去绑定手机号然后注册");
+
+                LinkedHashMap<String, String> params = new LinkedHashMap<>();
+
+                if(StringUtils.isNotBlank(wxUerInfoDTO.getUnionid())){
+                    params.put("wxId", wxUerInfoDTO.getUnionid());
+                }
+                if(StringUtils.isNotBlank(wxUerInfoDTO.getNickname())){
+                    params.put("memNickname", wxUerInfoDTO.getNickname());
+                }
+
+                if(StringUtils.isNotBlank(wxUerInfoDTO.getHeadimgurl())){
+                    params.put("memHeadimg", wxUerInfoDTO.getHeadimgurl());
+                }
+
+                redirectUrl = UrlUtil.addParamsNotExist(redirectUrl, params);
+                log.info("wxLoginOAuth redirectUrl:{}", redirectUrl);
+                response.sendRedirect(redirectUrl);
+            }else {
+                //已存在用户直接登录
+                setMemberSession(request, response, member.getMemCard());
+                response.sendRedirect(redirectUrl);
+            }
+
+
+            //不管有没有绑定账号或登录成功，state已完成鉴权任务，所以删除redis中的state信息
+            stringRedisTemplate.delete(state);
+        } catch (Exception e) {
+            log.error("wxLoginOAuth err:{}", e);
+        }
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    /**
+     * 修改密码
+     * @param memCard
+     * @param passwd
+     * @param
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/updatePwd")
+    @ApiOperation(value = "修改密码")
+    public Result updatePwd(   @ApiParam(name = "memCard",value = "memCard") @RequestAttribute(value = "memCard",required = false) String memCard,
+                               @ApiParam(name = "passwd", value = "密码") @RequestParam(name = "passwd", required = false) String passwd,
+                               @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from,
+                               HttpServletRequest request,HttpServletResponse response)
+    {
+
+        if ("web".equals(from)){
+            if (request.getSession().getAttribute("UserCard") != null) {
+                memCard = (String) request.getSession().getAttribute("UserCard");
+            }
+        }
+
+        if (StringUtils.isEmpty(memCard)){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+
+        QkjMember member = memberDao.findByMemCard(memCard);
+        if (member == null){
+            return Result.failed(BizCodeEnum.NO_REGISTER);
+        }
+        member.setPasswd(DigestUtils.md5DigestAsHex(passwd.getBytes()));
+        memberDao.save(member);
+        if ("H5".equals(from)){
+            String domain = StringUtil.getdomain(request);
+            clearCookies(response, domain, "/", "memToken");
+            clearCookies(response, domain, "/", "memNickname");
+            clearCookies(response, domain, "/", "memHeadImg");
+            clearCookies(response, domain, "/", "bindMobile");
+            clearCookies(response, domain, "/", "memCard");
+        }else {
+            request.getSession().removeAttribute("UserCard");
+        }
+        clearLoginRedis(member.getMemCard(), request, response);
+        return Result.success(BizCodeEnum.SUCCESS);
+    }
+
+    //清掉登录的Redis pc/m 登录唯一标识那个 和登录痕迹cookie里的memCard
+    private void clearLoginRedis(String memCard, HttpServletRequest request, HttpServletResponse response) {
+        String domain = StringUtil.getdomain(request);
+        clearCookies(response, domain, "/", "memCard");
+        if (StringUtils.isNotBlank(memCard)) {
+            String pcLoginRedisKey = String.format(LoginConsts.PC_LOGIN_USER_KEY, memCard);
+            String mLoginRedisKey = String.format(LoginConsts.M_LOGIN_USER_KEY, memCard);
+            stringRedisTemplate.delete(pcLoginRedisKey);
+            stringRedisTemplate.delete(mLoginRedisKey);
+        }
+
+    }
+
+}

src/main/java/com/cirle/scientific/controller/meeting/MeetingController.java

@@ -0,0 +1,315 @@
+package com.cirle.scientific.controller.meeting;
+
+
+import com.cirle.scientific.dto.QkjPhotoWallResDto;
+import com.cirle.scientific.dto.QkjRecommendDTO;
+import com.cirle.scientific.po.QkjConference;
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.MeetingService;
+import com.cirle.scientific.service.QkjPhotoWallService;
+import com.cirle.scientific.service.RecommendService;
+import com.cirle.scientific.utils.DeviceUtil;
+import com.cirle.scientific.utils.IpUtil;
+import com.cirle.scientific.utils.page.ResultPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.java.Log;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/meeting")
+@Api("会议相关接口")
+@Slf4j
+public class MeetingController {
+
+    private QkjPhotoWallService qkjPhotoWallDto;
+
+    @Autowired
+    private MeetingService meetingService;
+
+    @Autowired
+    private RecommendService recommendService;
+
+    @Autowired
+    public void setQkjPhotoWallDto(QkjPhotoWallService qkjPhotoWallDto) {
+        this.qkjPhotoWallDto = qkjPhotoWallDto;
+    }
+
+    @GetMapping("/index")
+    @ApiOperation(value = "去往会议首页")
+    public String courseIndex( @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from){
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/meeting/meeting-index";
+        } else {
+            return "web/meeting/meeting-index";
+        }
+    }
+
+    @GetMapping("/details")
+    @ApiOperation(value = "去往会议详情页")
+    public String details(
+            HttpServletRequest request,
+            @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from,
+            @ApiParam(name = "conferId",value = "分类ID") @RequestParam(name = "conferId",required = true) Long conferId, Model model
+    ){
+        String refererUrl = request.getHeader("Referer");
+        if(refererUrl!=null && refererUrl.contains("login")){
+            model.addAttribute("fromlogin","1");
+        }else{
+            model.addAttribute("fromlogin","0");
+        }
+        QkjConference info = meetingService.getInfoById(conferId);
+        request.setAttribute("conferId",conferId);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            if(info.getType() == 1){
+                //系列会议页面
+                return "html5/meeting/meeting-prefecture-list";
+            }else{
+                //普通会议页面
+                return "html5/meeting/meeting-details";
+            }
+        } else {
+            if(info.getType() == 1){
+                //系列会议页面
+                return "web/meeting/meeting-prefecture-list";
+            }else{
+                //普通会议页面
+                return "web/meeting/meeting-details";
+            }
+        }
+    }
+
+    @GetMapping("/addUser")
+    @ApiOperation(value = "添加用户")
+    public String addUser( @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from,
+                           @ApiParam(name = "conferId",value = "分类ID") @RequestParam(name = "conferId",required = true) Long conferId,
+                           HttpServletRequest request){
+        request.setAttribute("conferId",conferId);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/meeting/meeting-add-user";
+        } else {
+            return "web/meeting/meeting-add-user";
+        }
+    }
+
+    @GetMapping("/photoWall")
+    @ApiOperation(value = "照片墙")
+    public String photoWall( @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from,
+                           @ApiParam(name = "id",value = "会议ID") @RequestParam(name = "id",required = true) Long id,
+                           HttpServletRequest request){
+        request.setAttribute("id",id);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/meeting/photo-wall";
+        } else {
+            return "web/meeting/photo-wall";
+        }
+    }
+
+    @GetMapping("/meetSupport")
+    @ApiOperation(value = "项目支持")
+    public String meetSupport( @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from,
+                             @ApiParam(name = "id",value = "会议ID") @RequestParam(name = "id",required = true) Long id,
+                             HttpServletRequest request){
+        request.setAttribute("id",id);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/meeting/meeting-support";
+        } else {
+            return "web/meeting/meeting-support";
+        }
+    }
+
+    @PostMapping("/getAdInfo")
+    @ResponseBody
+    @ApiOperation(value = "直播首页获取广告位")
+    public Result<List<QkjRecommendDTO>> getAdInfo(HttpServletRequest request) {
+        // 默认展示pc端内容  0全部不显示 、1全部显示 、2m端显示、3pc端显示
+        Integer status = 3;
+        if(DeviceUtil.isMobileDevice(request)) {
+            status = 2;
+        }
+        List<QkjRecommendDTO> recmdTop = recommendService.findByPosIdLimit(19L,status, 1, 10);
+        return Result.success(recmdTop);
+    }
+
+    @PostMapping("/getConferList")
+    @ApiOperation(value = "获取首页直播列表")
+    @ResponseBody
+    public Result getConferList(
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "page",value = "分页") @RequestParam(name = "page",required = true,defaultValue="1") Integer page,
+            @ApiParam(name = "size",value = "每页数量") @RequestParam(name = "size",required = true,defaultValue="10") Integer size
+    ){
+        return meetingService.getListData(memCard, page, size);
+    }
+
+    @GetMapping("/getPhotoWall")
+    @ApiOperation(value = "查看照片墙")
+    @ResponseBody
+    public Result getPhotoWall(@ApiParam(name = "page",value = "分页") @RequestParam(name = "page",required = true,defaultValue="1") Integer page,
+                                               @ApiParam(name = "size",value = "每页数量") @RequestParam(name = "size",required = true,defaultValue="10") Integer size,
+                                               @ApiParam(name = "id",value = "会议id") @RequestParam(name = "id",required = true) Integer id,
+                                               @ApiParam(name = "type",value = "类型") @RequestParam(name = "type",required = true) Integer type){
+        Map<String, Object> all = qkjPhotoWallDto.findAll(page, size, id, type);
+        return Result.success(all);
+    }
+
+    @PostMapping("/getPageData")
+    @ApiOperation(value = "获取会议列表web")
+    @ResponseBody
+    public ResultPage getPageData(
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "page",value = "分页") @RequestParam(name = "page",required = true,defaultValue="1") Integer page,
+            @ApiParam(name = "size",value = "每页数量") @RequestParam(name = "size",required = true,defaultValue="10") Integer size,
+            HttpServletRequest request
+    ){
+        boolean isPC= DeviceUtil.isMobileDevice(request);
+        return meetingService.getPageData(memCard, page, size,isPC);
+    }
+
+    @PostMapping("/getDetailData")
+    @ApiOperation(value = "获取会议详情")
+    @ResponseBody
+    public Result getDetailData(
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "conferId",value = "会议id") @RequestParam(name = "conferId") Long conferId
+    ){
+        return meetingService.getDetailData(conferId, memCard);
+    }
+
+    @PostMapping("/getPeopleList")
+    @ApiOperation(value = "获取会议报名人员信息")
+    @ResponseBody
+    public Result getPeopleList(
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "conferId",value = "会议id") @RequestParam(name = "conferId") Long conferId
+    ){
+        if(StringUtils.isBlank(memCard)){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return meetingService.getPeopleList(conferId, memCard);
+    }
+
+    @PostMapping("/pursePeopleBm")
+    @ApiOperation(value = "判断参会人是否已报名")
+    @ResponseBody
+    public Result pursePeopleBm(
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "conferId",value = "会议id") @RequestParam(name = "conferId") Long conferId,
+            @ApiParam(name = "peopleList",value = "参会人数据") @RequestParam(name = "peopleList") String peopleList
+    ){
+        if(StringUtils.isBlank(memCard)){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return meetingService.pursePeopleBm(memCard, conferId, peopleList);
+    }
+
+    @PostMapping("/peopleBm")
+    @ApiOperation(value = "判断参会人是否已报名")
+    @ResponseBody
+    public Result peopleBm(
+            HttpServletRequest request,
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "conferId",value = "会议id") @RequestParam(name = "conferId") Long conferId,
+            @ApiParam(name = "peopleList",value = "参会人数据") @RequestParam(name = "peopleList") String peopleList
+    ){
+        if(StringUtils.isBlank(memCard)){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return meetingService.peopleBm(memCard, conferId, peopleList, IpUtil.getIpAddr(request));
+    }
+
+    @PostMapping("/pursePeopleBmWeb")
+    @ApiOperation(value = "判断参会人是否已报名Web")
+    @ResponseBody
+    public Result pursePeopleBmWeb(
+            HttpServletRequest request,
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "conferId",value = "会议id") @RequestParam(name = "conferId") Long conferId,
+            @ApiParam(name = "peopleList",value = "参会人数据") @RequestParam(name = "peopleList") String peopleList
+    ){
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }else {
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+
+        return meetingService.pursePeopleBm(memCard, conferId, peopleList);
+    }
+    @PostMapping("/peopleBmWeb")
+    @ApiOperation(value = "判断参会人是否已报名Web")
+    @ResponseBody
+    public Result peopleBmWeb(
+            HttpServletRequest request,
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "conferId",value = "会议id") @RequestParam(name = "conferId") Long conferId,
+            @ApiParam(name = "peopleList",value = "参会人数据") @RequestParam(name = "peopleList") String peopleList
+    ){
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }else {
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return meetingService.peopleBm(memCard, conferId, peopleList, IpUtil.getIpAddr(request));
+    }
+
+    @GetMapping("/finish")
+    @ApiOperation(value = "报名成功跳转页面")
+    public String finish(  HttpServletRequest request,
+                           @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from,
+                           @ApiParam(name = "conferId",value = "分类ID") @RequestParam(name = "conferId",required = true) Long conferId){
+        request.setAttribute("conferId",conferId);
+
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/meeting/finish";
+        } else {
+            return "web/meeting/finish";
+        }
+    }
+
+
+    @PostMapping("/getQuestionList")
+    @ApiOperation(value = "获取问卷信息")
+    @ResponseBody
+    public Result getQuestionList(
+            HttpServletRequest request,
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "conferId",value = "会议id") @RequestParam(name = "conferId") Long conferId
+    ){
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }else {
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return meetingService.getQuestionList(conferId, memCard);
+    }
+
+    @PostMapping("/getDetailDataWeb")
+    @ApiOperation(value = "获取会议详情web")
+    @ResponseBody
+    public Result getDetailDataWeb(
+            HttpServletRequest request,
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "conferId",value = "会议id") @RequestParam(name = "conferId") Long conferId
+    ){
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        } else {
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return meetingService.getDetailData(conferId, memCard);
+    }
+}

src/main/java/com/cirle/scientific/controller/pay/PayCallbackController.java

@@ -0,0 +1,64 @@
+package com.cirle.scientific.controller.pay;
+
+import java.io.BufferedReader;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.cirle.scientific.service.PayCallbackService;
+import com.cirle.scientific.utils.XmlUtil;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+
+@Controller
+@RequestMapping("/paycallback")
+@Api("支付回调相关接口")
+@Slf4j
+public class PayCallbackController {
+
+	@Autowired
+	private PayCallbackService payCallbackService;
+	
+	@RequestMapping(value = "/weixin",produces = MediaType.APPLICATION_JSON_VALUE)
+	@ResponseBody
+	public String weixinpay(HttpServletRequest request) throws ServletException, IOException {
+		log.info("进入微信支付消息回调回掉接口-PayCallbackController");
+		BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), "utf-8"));
+		CharArrayWriter reqWriter = new CharArrayWriter();
+		char[] buf = new char[8192];
+		int ret;
+		while ((ret = in.read(buf, 0, 8192)) != -1) {
+			reqWriter.write(buf, 0, ret);
+		}
+		String requestBody = reqWriter.toString();
+		log.info("微信支付消息回调返回数据:\n " + requestBody + "\n");
+
+		String return_code = XmlUtil.readXMLStr(requestBody ,"return_code");
+		//获取自己的订单号
+		String out_trade_no = XmlUtil.readXMLStr(requestBody, "out_trade_no");
+		
+		// 支付成功
+		if ("SUCCESS".equals(return_code)) {
+	    	//获取微信支付订单号
+	    	String transaction_id = XmlUtil.readXMLStr(requestBody, "transaction_id");
+	    	//获取支付完成时间
+	    	String time_end = XmlUtil.readXMLStr(requestBody, "time_end");
+	    	
+			payCallbackService.updateStatus(out_trade_no, transaction_id, time_end, 1, 2);
+		} else {
+			payCallbackService.updateStatus(out_trade_no, null, null, 0, 2);
+		}
+
+		return "success";
+	}
+}

src/main/java/com/cirle/scientific/controller/pay/PayController.java

@@ -0,0 +1,204 @@
+package com.cirle.scientific.controller.pay;
+
+
+import com.cirle.scientific.utils.IpUtil;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.OrderService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/pay")
+@Api("支付相关接口")
+public class PayController {
+
+    @Autowired
+    private OrderService orderService;
+
+    @GetMapping("/pay")
+    @ApiOperation(value = "去往支付页")
+    public String pay(
+            HttpServletRequest request,
+            @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from,
+            @ApiParam(name = "objType",value = "类型，1-精品课， 2-直播，3-会议，4-课件") @RequestParam(name = "objType",required = true) String objType,
+            @ApiParam(name = "objId",value = "对象ID") @RequestParam(name = "objId",required = true) String objId,
+            @ApiParam(name = "objCount",value = "对象数量") @RequestParam(name = "objCount",defaultValue = "1") Integer objCount,
+            @ApiParam(name = "orderId",value = "订单ID") @RequestParam(name = "orderId",required = false) String orderId
+    ){
+        request.setAttribute("objType",objType);
+        request.setAttribute("objId",objId);
+        request.setAttribute("objCount",objCount);
+        request.setAttribute("orderId",orderId);
+
+        request.setAttribute("appId", request.getParameter("appId"));
+        request.setAttribute("timeStamp", request.getParameter("timeStamp"));
+        request.setAttribute("nonceStr", request.getParameter("nonceStr"));
+        request.setAttribute("packages", request.getParameter("packages"));
+        request.setAttribute("signType", request.getParameter("signType"));
+        request.setAttribute("paySign", request.getParameter("paySign"));
+
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/pay/pay";
+        } else {
+            return "web/pay/pay";
+        }
+    }
+
+    @RequestMapping(value = "/getObjInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Result getObjInfo(
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @RequestParam Integer objType,
+            @RequestParam Long objId,
+            @RequestParam(required = false,defaultValue = "1") Integer objCount
+    ) {
+        if(memCard == null){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return orderService.getObjInfo(memCard, objType, objId, objCount);
+    }
+
+
+    @RequestMapping(value = "/getObjInfoWeb", method = RequestMethod.POST)
+    @ResponseBody
+    public Result getObjInfoWeb(
+            HttpServletRequest request,
+            @RequestParam Integer objType,
+            @RequestParam Long objId,
+            @RequestParam(required = false,defaultValue = "1") Integer objCount
+    ) {
+        String memCard = (String)request.getSession().getAttribute("UserCard");
+        if(memCard == null){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return orderService.getObjInfo(memCard, objType, objId, objCount);
+    }
+
+    @RequestMapping(value = "/addFreeBuyApi", method = RequestMethod.POST)
+    @ResponseBody
+    public Result addFreeBuyApi(
+            HttpServletRequest request,
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @RequestParam Integer orderType,
+            @RequestParam Integer objId,
+            @RequestParam Integer paySource,
+            @RequestParam(required = false) String fromMemCard,
+            @RequestParam(required = false,defaultValue = "1") Integer objCount,
+            @RequestParam(required = false) String orderId
+    ) {
+
+        if(memCard == null && request.getSession().getAttribute("UserCard")==null){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        memCard = memCard == null ? (String) request.getSession().getAttribute("UserCard") : memCard ;
+        Result result = orderService.addFreeBuyApi(memCard, orderType, objId, paySource, fromMemCard,
+                IpUtil.getIpAddr(request), objCount, orderId);
+        return result;
+    }
+    @PostMapping("/pointPay")
+    @ResponseBody
+    @ApiModelProperty(value = "积分兑换")
+    public Result pointPay(
+            HttpServletRequest request,
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @RequestParam Integer objType,
+            @RequestParam Integer objId,
+            @RequestParam Integer paySource,
+            @RequestParam(required = false) String fromMemCard,
+            @RequestParam(required = false,defaultValue = "1") Integer objCount,
+            @RequestParam(required = false) String orderId
+    ) {
+        if(memCard == null){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+
+        Result result = orderService.pointPay(memCard, objType, objId, paySource, fromMemCard,
+                IpUtil.getIpAddr(request), objCount, orderId);
+        if(result.getCode() == 200){
+            //增加任务积分
+            orderService.addTask(memCard, objType, objId);
+        }
+        return result;
+    }
+
+    @PostMapping("/pointPayWeb")
+    @ResponseBody
+    @ApiModelProperty(value = "积分兑换")
+    public Result pointPay(
+            HttpServletRequest request,
+            @RequestParam Integer objType,
+            @RequestParam Integer objId,
+            @RequestParam Integer paySource,
+            @RequestParam(required = false) String fromMemCard,
+            @RequestParam(required = false,defaultValue = "1") Integer objCount,
+            @RequestParam(required = false) String orderId
+    ) {
+        String memCard ;
+        if(request.getSession().getAttribute("UserCard")==null){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }else{
+            memCard=(String)request.getSession().getAttribute("UserCard");
+        }
+        Result result = orderService.pointPay(memCard, objType, objId, paySource, fromMemCard,
+                IpUtil.getIpAddr(request), objCount, orderId);
+        if(result.getCode() == 200){
+            //增加任务积分
+            orderService.addTask(memCard, objType, objId);
+        }
+        return result;
+    }
+
+    @PostMapping("/createOrder")
+    @ResponseBody
+    @ApiModelProperty(value = "支付创建订单")
+    public Result createOrder(
+            HttpServletRequest request,
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @RequestParam Integer objType,
+            @RequestParam Integer objId,
+            @RequestParam Integer paySource,
+            @RequestParam(required = false) String fromMemCard,
+            @RequestParam(required = false,defaultValue = "1") Integer objCount,
+            @RequestParam(required = false) String orderId
+    ) {
+        if(memCard == null){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return orderService.createOrder(memCard, objType, objId, paySource, fromMemCard,
+                IpUtil.getIpAddr(request), objCount, orderId);
+    }
+
+
+    @PostMapping("/createOrderWeb")
+    @ResponseBody
+    @ApiModelProperty(value = "支付创建订单")
+    public Result createOrder(
+            HttpServletRequest request,
+            @RequestParam Integer objType,
+            @RequestParam Integer objId,
+            @RequestParam Integer paySource,
+            @RequestParam(required = false) String fromMemCard,
+            @RequestParam(required = false,defaultValue = "1") Integer objCount,
+            @RequestParam(required = false) String orderId
+    ) {
+        String memCard ;
+        if(request.getSession().getAttribute("UserCard")==null){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }else{
+            memCard=(String)request.getSession().getAttribute("UserCard");
+        }
+        return orderService.createOrder(memCard, objType, objId, paySource, fromMemCard,
+                IpUtil.getIpAddr(request), objCount, orderId);
+    }
+}

src/main/java/com/cirle/scientific/controller/pay/WeixinController.java

@@ -0,0 +1,399 @@
+package com.cirle.scientific.controller.pay;
+
+import com.cirle.scientific.dao.OrderDao;
+import com.cirle.scientific.dto.WxUerInfoDTO;
+import com.cirle.scientific.po.SalesOrdersMain;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.OrderService;
+import com.cirle.scientific.service.WeixinService;
+import com.cirle.scientific.utils.IpUtil;
+import com.cirle.scientific.utils.QRCodeUtil;
+import com.cirle.scientific.utils.weixin.WeiXinPay;
+import com.cirle.scientific.utils.weixin.WeixinpayConfig;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map;
+
+/**
+ * 微信相关
+ */
+@Controller
+@RequestMapping(value = "/weixin")
+@Slf4j
+public class WeixinController {
+
+	@Autowired
+	private WeixinService weixinService;
+
+	@Autowired
+	private OrderDao orderDao;
+
+	@Autowired
+	private OrderService orderService;
+
+	/**
+	 * jsapi支付
+	 */
+	@RequestMapping(value = "/jsapipay", method = RequestMethod.GET)
+	public String jsapipay(
+		HttpServletRequest request,
+		@RequestAttribute(value = "memCard",required = false) String memCard,
+		@RequestParam String code,
+		@RequestParam String orderId,
+		@RequestParam String redirectUrl
+	) {
+		log.info("进入微信公众号支付签名接口controller");
+		log.info("微信授权返回code:"+code);
+		log.info("当前用户memCard:"+memCard);
+
+		//获取订单信息
+		SalesOrdersMain ordersMain =  orderDao.getOrderInfo(orderId);
+
+		if (ordersMain == null || ordersMain.getOrderId() == null) {
+			log.warn("订单获取失败！");
+			return "redirect:" + redirectUrl;
+		}
+
+		//客户端IP
+		String ip = IpUtil.getIpAddr(request);
+		log.info("ip:"+ip);
+
+		WeiXinPay weiXinPay = new WeiXinPay();
+			weiXinPay.setAppId(WeixinpayConfig.appId);
+			weiXinPay.setAppSecret(WeixinpayConfig.appSecret);
+			weiXinPay.setMchId(WeixinpayConfig.mchId);
+			weiXinPay.setApiKey(WeixinpayConfig.apiKey);
+			weiXinPay.setTradeType("JSAPI");
+			weiXinPay.setIp(ip);
+			weiXinPay.setCode(code);
+			weiXinPay.setDeviceInfo("");
+
+		//拼装订单信息
+		weiXinPay = setOrderInfo(ordersMain, weiXinPay);
+
+		//统一下单
+		Map<String,String> wxInfo = weixinService.jsapipay(weiXinPay);
+
+		if(wxInfo != null){
+			redirectUrl += "&appId="+wxInfo.get("appId");
+			redirectUrl += "&timeStamp="+wxInfo.get("timeStamp");
+			redirectUrl += "&nonceStr="+wxInfo.get("nonceStr");
+			redirectUrl += "&packages="+wxInfo.get("packages");
+			redirectUrl += "&signType="+wxInfo.get("signType");
+			redirectUrl += "&paySign="+wxInfo.get("paySign");
+		}
+
+		log.info("入微信公众号支付签名回掉url:"+redirectUrl);
+
+		return "redirect:" + redirectUrl;
+	}
+
+	/**
+	 * NATIVE支付
+	 */
+	@RequestMapping(value = "/nativepay", method = RequestMethod.GET)
+	public String nativepay(HttpServletRequest request,
+			HttpServletResponse response, Model model) {
+		log.info("进入扫码支付NATIVE支付controller");
+
+		try {
+			//订单号
+			String orderId = request.getParameter("orderid").trim();
+			//客户端IP
+			String ip = IpUtil.getIpAddr(request);
+			//获取订单信息
+			SalesOrdersMain ordersMain =  orderDao.getOrderInfo(orderId);
+			//ordersMain.setOrderSizes(0.01);
+			request.setAttribute("orderInfo",ordersMain);
+
+			//统一下单
+			Map<String,String> wxInfo = weixinService.nativepay(ordersMain, ip);
+			request.setAttribute("wxInfo",wxInfo);
+			request.setAttribute("out_trade_no",orderId);
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.error("生成二维码失败!");
+
+		}
+
+		return "web/pay/prepaidPay";
+	}
+
+	/**
+	 * 微信h5支付签名
+	 */
+	@RequestMapping(value = "/mweb", produces = MediaType.APPLICATION_JSON_VALUE)
+	@ResponseBody
+	public String mweb(HttpServletRequest request,
+			@RequestAttribute(value = "memCard",required = false) String memCard,
+			@RequestParam String orderId
+	) throws ServletException, IOException {
+
+		log.info("进入微信h5支付签名接口");
+
+		if (orderId == null || "".equals(orderId)) {
+			log.warn("微信h5支付签名接口请求参数有误,orderId为空或者不存在");
+			return "";
+		}
+
+		//获取订单名称、描述、金额
+		SalesOrdersMain ordersMain = orderDao.getOrderInfo(orderId);
+		if (ordersMain == null) {
+			log.warn("微信h5支付未查询到订单号为：" + orderId +"的订单");
+			return "";
+		}
+		if(ordersMain.getStatus() == 1){
+			log.warn("微信h5支付请求支付的订单已完成 ");
+			return "";
+		}
+
+		// 客户端IP
+		String ip = IpUtil.getIpAddr(request);
+		log.info("ip:"+ip);
+
+		String wap_name = "";
+		if(ordersMain.getOrderType() == 1){
+			wap_name = "\"美沃斯大会报名支付\"";
+		}else{
+			wap_name = "\"美沃斯线上课程购买支付\"";
+		}
+
+		WeiXinPay weiXinPay = new WeiXinPay();
+		weiXinPay.setDeviceInfo("WEB");
+		weiXinPay.setAppId(WeixinpayConfig.appId);
+		weiXinPay.setAppSecret(WeixinpayConfig.appSecret);
+		weiXinPay.setMchId(WeixinpayConfig.mchId);
+		weiXinPay.setApiKey(WeixinpayConfig.apiKey);
+		weiXinPay.setTradeType("MWEB");
+		weiXinPay.setIp(ip);
+		weiXinPay.setSceneInfo("{\"h5_info\": {\"type\":\"Wap\",\"wap_url\": \"http://www.btmculture.com\",\"wap_name\":"+wap_name+"}}");
+
+		// 拼装订单信息
+		weiXinPay = setOrderInfo(ordersMain, weiXinPay);
+
+		// 统一下单
+		String mweb_url = weixinService.mwebpay(weiXinPay);
+		String redirect_url = "/web/v2/toWxPay/goodsInformation?orderType="+ordersMain.getOrderType()+"&objId="+ordersMain.getObjId()+"&ispackage="+ordersMain.getIspackage()+"&packDetailsId="+ordersMain.getPackDetailsId()+"&isCollage="+"&orderId="+ordersMain.getOrderId()+"&return_sign=pay";
+		redirect_url = URLEncoder.encode(redirect_url, "UTF-8");
+		mweb_url = mweb_url + "&redirect_url=" + redirect_url;
+		log.info("微信h5支付签名接口返回值：" + mweb_url);
+
+		return mweb_url;
+	}
+
+	@RequestMapping(value = "/payFinish")
+	public String payFinish(HttpServletRequest request){
+		log.info("支付成功跳转");
+		String orderId = request.getParameter("out_trade_no").trim();
+
+		log.info("获取订单号：" + orderId);
+		String return_page = "/web/v2/home/index?orderId=" + orderId;
+		SalesOrdersMain order = orderDao.getOrderInfo(orderId);
+		if(order != null){
+			if(order.getOrderType() == 2){
+				//专栏
+				return_page ="/web/v2/column/cDetail?columnId=" + order.getObjId();
+			}else if(order.getOrderType() == 3){ // 会议
+				//精品课
+				if(order.getIspackage() == 0){ // 系列会议
+//					return_page = "/web/v2/tq/sonDetail?courseId=" + order.getObjId();
+					return_page = "/web/meeting/details?conferId=" + order.getObjId()+"&from=web";
+				}else{ // 普通会员
+//					return_page = "/web/v2/tq/detail?tqcourseId=" + order.getObjId();
+					return_page = "/web/meeting/details?conferId=" + order.getObjId()+"&from=web";
+				}
+			}else if(order.getOrderType() == 7){
+				//直播
+				return_page = "/web/v2/live/lDetail?liveId=" + order.getObjId();
+			}else if(order.getOrderType() == 4){
+				//课件
+				return_page = "/courseware/index?from=web";
+			}
+		}
+		return "redirect:" + return_page;
+	}
+
+
+
+	/**
+	 * 微信分享
+	 */
+	@ResponseBody
+	@PostMapping("/share")
+	public Result wxshare(@RequestParam String url) {
+		Map<String,String> wxInfo = weixinService.wxshare(url);
+		return Result.success(wxInfo);
+	}
+
+	protected WeiXinPay setOrderInfo(SalesOrdersMain ordersMain, WeiXinPay weiXinPay) {
+		// 订单名称
+		String body = ordersMain.getOrderName();
+		// 订单号
+		String outTradeNo = ordersMain.getOrderId();
+		// 订单金额
+		int totalFee = (int) (ordersMain.getOrderSizes() * 100);
+		// 商品ID
+		String productId = ordersMain.getProductId();
+
+		weiXinPay.setBody(body);
+		weiXinPay.setOutTradeNo(outTradeNo);
+		weiXinPay.setTotalFee(totalFee);
+		weiXinPay.setProductId(productId);
+
+		return weiXinPay;
+	}
+
+	@GetMapping("/queryPayStatus")
+	@ResponseBody
+	@ApiModelProperty(value = "查询订单状态")
+	public Result queryPayStatus(
+			@RequestParam String orderNo
+	) {
+		Map<String,String> map = weixinService.queryPayStatus(orderNo);
+		System.out.println("***获取查询订单map集合***:"+map);
+		if (map == null){
+			return Result.failed("支付出错了");
+		}
+		if (map.get("trade_state").equals("SUCCESS")){
+			//支付成功,修改订单状态
+			return Result.success("支付成功");
+		}
+		return Result.success("支付中...");
+	}
+
+		/*
+		1.扫描二维码后，跳转到回调接口
+		2.回调接口判断用户是否用系统绑定、获取用户基本信息
+		3.跳转到生成海报页面
+		4.分享朋友圈或微信好友
+		*
+		* */
+	/**
+	 * 获取专属海报
+	 *
+	 * @param objType
+	 * @param openId
+	 * @return
+	 */
+	@ApiOperation(value = "获取专属海报")
+	@RequestMapping(value = "/getOwnPoster")
+	public String getOwnPoster(@RequestParam Integer objType,
+									 @RequestParam Long objId,
+									 @RequestParam(value = "code", required = false) String code,
+									 @RequestParam(value = "openId", required = false) String openId,
+							   		 @RequestAttribute(value = "memCard",required = false) String memCard,
+									 HttpServletRequest request) {
+
+
+		//TODO 暂时注释获取用户信息，判断是否绑定，未绑定进行绑定
+		//WxUerInfoDTO weixin =  weixinService.oauth2getAccessToken(code,memCard);
+		WxUerInfoDTO  weixin =new WxUerInfoDTO();
+		weixin.setNickname("测试昵称");
+		weixin.setCity("北京");
+		weixin.setHeadimgurl("https://www.qkyxzx.com/images/navlogo.svg");
+
+		// 生成专属二维码
+		String url = "https://www.qkyxzx.com";
+		if (objType == 1) {
+			//精品课
+			url += "/course/courseDetails?from=web&id="+objId;
+		} else if (objType == 2) {
+			//直播
+			url += "/live/detail?from=web&liveId="+objId;
+		} else if (objType == 3) {
+			//会议
+			url += "/meeting/details?from=web&conferId="+objId;
+		}
+		String qrcode = QRCodeUtil.creatRrCode(url, 200, 200);
+
+		request.setAttribute("qrcode", qrcode);
+		if (weixin.getNickname().length() > 5) {
+			weixin.setNickname(weixin.getNickname().substring(0, 3) + "...");
+		}
+		request.setAttribute("wxUserInfo", weixin);
+
+		//业务逻辑处理
+		Result objInfo = orderService.getObjInfo("", objType, objId, 0);
+		Map<String, Object> dataInfo = (Map<String, Object>) objInfo.getData();
+		request.setAttribute("dataInfo",dataInfo);
+		//获取请求参数名信息
+//		Enumeration enu = request.getParameterNames();
+//		String key = "";
+//		int a = 1;
+//		while (enu.hasMoreElements()) {
+//			key = (String) enu.nextElement();
+//			//得到参数名
+//			if (!"id".equals(key)) {
+//				sb.append((a == 1 ? "?" : "&") + key + "=" + request.getParameter(key));
+//				//获取参数值，同时进行拼装
+//				a++;
+//			}
+//		}
+		return "web/share/poster";
+	}
+
+	/**
+	 * 去生成分享扫描的二维码
+	 *
+	 * @param objId      会议编号/直播id/课程id
+	 * @param objType      1-精品课， 2-直播，3-会议
+	 * @param request
+	 */
+	@ApiOperation(value = "去生成分享扫描的二维码")
+	@RequestMapping(value = "/getShareQrCode")
+	public String  getShareQrCode(@RequestParam Integer objType, @RequestParam Integer objId,
+								HttpServletRequest request) {
+
+		if(request.getSession().getAttribute("UserCard")==null){
+			return "web/user/login";
+		}
+		String memCard = (String)request.getSession().getAttribute("UserCard");
+		String callbackUrl = "https://www.qkyxzx.com/weixin/getOwnPoster?objType="+objType+"&objId="+objId+"&memCard="+memCard;
+		try {
+
+			String redirect_uri = URLEncoder.encode(callbackUrl, "GBK");
+			//格式化，返回拼接后的url，去调微信的二维码
+			String shareUrl = String.format(WeixinpayConfig.OPEN_OAUTH_URL, WeixinpayConfig.appId, redirect_uri);
+			request.setAttribute("shareUrl", shareUrl);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return "web/share/share";
+	}
+
+
+
+//	public static void main(String[] args) {
+//		//获取海报url(详情页)
+//		String callbackUrl = "https://www.qkyxzx.com/meeting/details?from=web&conferId=28";
+//		try {
+//
+//
+//			//String redirect_uri = "https://www.qkyxzx.com/meeting/details?from=web&conferId=28?redirectUrl=" + localurl;
+//			String redirect_uri = URLEncoder.encode(callbackUrl, "GBK");
+//			String url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa35f548647a3fa20&redirect_uri=" + redirect_uri + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
+//			//String OPEN_QRCODE_URL = "https://open.weixin.qq.com/connect/qrconnect?appid=wxa35f548647a3fa20&redirect_uri=" + redirect_uri + "response_type=code&scope=snsapi_login&state=STATE#wechat_redirect";
+//			//格式化，返回拼接后的url，去调微信的二维码
+//			String oauthUrl = String.format(WeixinpayConfig.OPEN_OAUTH_URL,WeixinpayConfig.appId,callbackUrl);
+//			System.out.println(url);
+//			//System.out.println(OPEN_QRCODE_URL);
+//		} catch (UnsupportedEncodingException e) {
+//			e.printStackTrace();
+//		}
+//	}
+}
+
+

src/main/java/com/cirle/scientific/controller/popupWindow/PopuWIndowController.java

@@ -0,0 +1,77 @@
+package com.cirle.scientific.controller.popupWindow;
+
+
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.CommonService;
+import com.cirle.scientific.service.PopuWindowService;
+import com.cirle.scientific.service.RecommendService;
+import com.cirle.scientific.utils.DeviceUtil;
+import com.cirle.scientific.utils.IpUtil;
+import com.cirle.scientific.utils.StringUtil;
+import com.cirle.scientific.utils.UserLoginUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Controller
+@RequestMapping("/popu/window")
+@Api("弹窗相关接口")
+@Slf4j
+public class PopuWIndowController {
+
+
+    @Autowired
+    PopuWindowService popuWindowService;
+    @Autowired
+    CommonService commonService;
+    @Autowired
+    RecommendService recommendService;
+
+
+    @PostMapping("/checkWindow")
+    @ResponseBody
+    @ApiOperation(value = "校验是否弹窗接口（1：实名认证弹窗 2：医师认证弹窗 3：调查问卷弹窗）")
+    public Result checkWindow(HttpServletRequest request,
+                              @RequestHeader(value="referer", defaultValue = "0") String referer,
+                              @RequestHeader(value="user-agent", defaultValue = "0") String userAgent,
+                              @RequestParam(required = false) Long id,
+                              @RequestParam(required = false) Integer idType,
+                              @ApiParam(name = "memCard", value = "用户唯一标识") @RequestAttribute(name = "memCard", required = false) String memCard
+    ) {
+        log.info("checkWindow join id:{} idType:{} memCard:{} referer:{} userAgent:{}", id, idType, memCard, referer, userAgent);
+        if (StringUtils.isBlank(memCard)) {
+            memCard = UserLoginUtil.isUserLogin(request);
+        }
+//        if (request.getSession().getAttribute("UserCard") != null) {
+//            memCard = (String) request.getSession().getAttribute("UserCard");
+//        }
+        return popuWindowService.checkWindowNew(id, idType, memCard);
+    }
+
+    @PostMapping("/checkWindow/question")
+    @ResponseBody
+    @ApiOperation(value = "校验是否弹调查问卷弹窗）")
+    public Result checkWindowQuestion(HttpServletRequest request,
+                              @RequestHeader(value="referer", defaultValue = "0") String referer,
+                              @RequestHeader(value="user-agent", defaultValue = "0") String userAgent,
+                              @RequestParam(required = false) Long id,
+                              @RequestParam(required = false) Integer idType,
+                              @ApiParam(name = "memCard", value = "用户唯一标识") @RequestAttribute(name = "memCard", required = false) String memCard
+    ) {
+        log.info("checkWindow join id:{} idType:{} memCard:{} referer:{} userAgent:{}", id, idType, memCard, referer, userAgent);
+        if (StringUtils.isBlank(memCard)) {
+            memCard = UserLoginUtil.isUserLogin(request);
+        }
+
+        return popuWindowService.checkWindowNew(id, idType, memCard);
+    }
+
+}

src/main/java/com/cirle/scientific/controller/questionnaireSurvey/questionnaireSurveyController.java

@@ -0,0 +1,34 @@
+package com.cirle.scientific.controller.questionnaireSurvey;
+
+
+import com.cirle.scientific.questionnaire.service.QuestionnaireService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/questionnaire")
+@Api("品牌专区相关接口")
+public class questionnaireSurveyController {
+
+    @GetMapping("/page")
+    @ApiOperation("问卷调查页")
+    public String page(
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            HttpServletRequest request
+    ) {
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/questionnaire/index";
+        } else if (StringUtils.isNotBlank(from) && from.equals("web")) {
+            return "web/questionnaire/index";
+        } else {
+            return "";
+        }
+    }
+}

src/main/java/com/cirle/scientific/controller/register/RegisterController.java

@@ -0,0 +1,163 @@
+package com.cirle.scientific.controller.register;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cirle.scientific.dao.MemberDao;
+import com.cirle.scientific.dao.QkjMemberOpenidDao;
+import com.cirle.scientific.dao.QkjMemberTaskInfoDao;
+import com.cirle.scientific.dto.WxUerInfoDTO;
+import com.cirle.scientific.po.QkjMember;
+import com.cirle.scientific.po.QkjMemberOpenid;
+import com.cirle.scientific.po.QkjMemberTaskInfo;
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.MemberService;
+import com.cirle.scientific.service.WeixinService;
+import com.cirle.scientific.utils.DESUtil;
+import com.cirle.scientific.utils.IpUtil;
+import com.cirle.scientific.utils.SmsUtils;
+import com.cirle.scientific.utils.StringUtil;
+import com.cirle.scientific.utils.weixin.WeixinpayConfig;
+import com.google.common.collect.Maps;
+import com.google.gson.JsonObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+@Controller
+@RequestMapping("/register")
+@Api("登录相关接口")
+@Slf4j
+public class RegisterController {
+
+    @Autowired
+    MemberDao memberDao;
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    WeixinService weixinService;
+    @Autowired
+    MemberService memberService;
+    @Autowired
+    QkjMemberTaskInfoDao qkjMemberTaskInfoDao;
+    @Autowired
+    QkjMemberOpenidDao openidDao;
+
+    @GetMapping("")
+    @ApiOperation(value = "手机号登录页面")
+    public String login(
+            @ApiParam(name = "from", value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from", required = true) String from,
+            @ApiParam(name = "redirectUrl", value = "回调地址") @RequestParam(name = "redirectUrl", required = false) String redirectUrl,
+            HttpServletRequest request
+    ) {
+        request.setAttribute("redirectUrl", redirectUrl);
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/user/register";
+        } else {
+            return "";
+        }
+    }
+
+    @GetMapping(value = "/isRegister")
+    @ResponseBody
+    public Result isRegister(
+            @ApiParam(name = "wxId", value = "微信ID") @RequestParam(name = "wxId", required = false) String wxId
+    ) {
+        Map<String, Boolean> map = Maps.newHashMap();
+        boolean isRegister = true;
+        if (StringUtils.isNotBlank(wxId)) {
+            QkjMember member = memberDao.findByWxId(wxId);
+            if (Objects.isNull(member)) {
+                isRegister = false;
+            }
+        }
+        map.put("isRegister", isRegister);
+        return Result.success(map);
+    }
+
+    @RequestMapping(value = "/mobilReg", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public Result register(
+            @ApiParam(name = "memMobile", value = "用户手机号") @RequestParam(name = "memMobile", required = true) String memMobile,
+            @ApiParam(name = "memMobile", value = "用户名") @RequestParam(name = "userName", required = false) String userName,
+            @ApiParam(name = "valCode", value = "验证码") @RequestParam(name = "valCode", required = true) String valCode,
+            @ApiParam(name = "passwd", value = "密码") @RequestParam(name = "passwd", required = true) String passwd,
+            @ApiParam(name = "memRegisterSource", value = "注册终端，1-H5，2-pc") @RequestParam(name = "memRegisterSource", required = true) Integer memRegisterSource,
+            HttpServletRequest request
+    ) {
+
+        //校验用户名的唯一性
+        if(StringUtils.isNotBlank(userName)){
+            List<QkjMember> qkjMembers = memberDao.listByMemNickname(userName);
+            if(CollectionUtils.isNotEmpty(qkjMembers) && qkjMembers.size() >=1){
+                return Result.failed(BizCodeEnum.NAME_REPEAT);
+            }
+        }
+        //注册：修改密码
+        QkjMember member = memberDao.findByMemMobile(memMobile);
+
+        int valRs = validateMobileYzm(memMobile, valCode);
+        if (valRs == -1) {
+            return Result.failed(BizCodeEnum.CODE_TIME_OUT);
+        }
+        if (valRs == -2) {
+            return Result.failed(BizCodeEnum.CODE_ERROR);
+        }
+        if (member != null) {
+            member.setPasswd(DigestUtils.md5DigestAsHex(passwd.getBytes()));
+            if(StringUtils.isNotBlank(userName)){
+                member.setMemNickname(userName);
+            }
+            memberDao.save(member);
+            return Result.success("","手机号已注册，密码重置成功");
+        }
+
+
+        //注册：添加用户
+        member = memberService.register(memMobile, memRegisterSource, 0, DigestUtils.md5DigestAsHex(passwd.getBytes()), userName);
+        if (member == null) {
+            log.info("创建用户失败");
+            return Result.failed("创建用户失败");
+        }
+        return Result.success("","创建用户成功，请登录！");
+    }
+
+    protected int validateMobileYzm(String memUserId, String inputYzm) {
+
+        String realYzm = (String) stringRedisTemplate.opsForValue().get(memUserId + "yzm");
+        log.info("用户输入的验证码 " + inputYzm);
+        log.info("缓存里面的验证码" + realYzm);
+        if (realYzm == null) {
+            return -1;
+        }
+
+        if (!inputYzm.equals(realYzm)) {
+            return -2;
+        }
+
+        stringRedisTemplate.delete(memUserId + "yzm");
+        return 0;
+    }
+
+
+}

src/main/java/com/cirle/scientific/controller/signatrue/SignatrueDetailController.java

@@ -0,0 +1,120 @@
+package com.cirle.scientific.controller.signatrue;
+
+
+
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.SignatrueService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+
+
+/**
+ * @author 24901
+ */
+@Controller
+@RequestMapping(value = "/signatrue")
+public class SignatrueDetailController {
+
+
+    private SignatrueService signatrueService;
+
+    @Autowired
+    public void setSignatrueService(SignatrueService signatrueService) {
+        this.signatrueService = signatrueService;
+    }
+
+    @PostMapping(value = "/checkSign")
+    @ResponseBody
+    @ApiOperation(value = "查询签名信息")
+    public Result checkSign(HttpServletRequest request,
+                            @ApiParam(name = "memCard", value = "memCard") @RequestAttribute(value = "memCard", required = false) String memCard,
+                            @ApiParam(name = "conferenceId", value = "会议id") @RequestParam() String conferenceId){
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        if(memCard==null){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        return Result.success(signatrueService.selectSignatrue(memCard , conferenceId));
+    }
+
+    @GetMapping("/info")
+    @ApiOperation("签名页面")
+    public String search(@ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from){
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/sign/info";
+        }else {
+            return "";
+        }
+    }
+
+    @GetMapping("/sign")
+    @ApiOperation("签名页面")
+    public String sign(@ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from){
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/sign/sign";
+        } else if (StringUtils.isNotBlank(from) && from.equals("web")){
+            return "html5/sign/sign";
+        }else {
+            return "";
+        }
+    }
+
+
+
+    @PostMapping(value = "/addSign")
+    @ResponseBody
+    @ApiOperation(value = "用户劳务合同签名")
+    public Result addSign(HttpServletRequest request,
+                      @ApiParam(name = "memCard", value = "用户唯一标识") @RequestAttribute(value = "memCard", required = false) String memCard,
+                      @ApiParam(name = "conferenceId", value = "会议id") @RequestParam() String conferenceId,
+                      @ApiParam(name = "formId", value = "模板id") @RequestParam() String formId,
+                      @ApiParam(name = "partyB", value = "乙方") @RequestParam String partyB,
+                      @ApiParam(name = "identityId", value = "身份证号") @RequestParam String identityId,
+                      @ApiParam(name = "courseMatter", value = "讲课内容") @RequestParam String courseMatter,
+                      @ApiParam(name = "courseTime", value = "讲课时间") @RequestParam String courseTime,
+                      @ApiParam(name = "courseSite", value = "讲课地点") @RequestParam String courseSite,
+                      @ApiParam(name = "m", value = "费用") @RequestParam String m,
+                      @ApiParam(name = "bankProvince",value = "开户行省市") @RequestParam String bankProvince,
+                      @ApiParam(name = "bankOfDepositName",value = "开户行名称") @RequestParam String bankOfDepositName,
+                      @ApiParam(name = "bankId",value = "银行卡号") @RequestParam String bankId,
+                      @ApiParam(name = "bankName",value = "户名") @RequestParam String bankName,
+                      @ApiParam(name = "phone",value = "手机号") @RequestParam String phone,
+                      @ApiParam(name = "signImg",value = "签名的图片") @RequestParam String signImg,
+                      @ApiParam(name = "isSubmit", value = "用户是否提交") @RequestParam Integer isSubmit){
+        if (request.getSession().getAttribute("UserCard") != null) {
+            memCard = (String) request.getSession().getAttribute("UserCard");
+        }
+        if(memCard==null){
+            return Result.failed(BizCodeEnum.NO_LOGIN);
+        }
+        if(request.getParameter("money")!=null){
+            m = request.getParameter("money");
+        }
+        if("a".equalsIgnoreCase(m)){
+//                { value: 'a', label: '1000' },
+//                { value: 'b', label: '1500' },
+//                { value: 'c', label: '2000' },
+//                { value: 'd', label: '2500' }
+            m = "1000";
+        }else if("b".equalsIgnoreCase(m)){
+            m = "1500";
+        }else if("c".equalsIgnoreCase(m)){
+            m = "2000";
+        }else if("d".equalsIgnoreCase(m)){
+            m = "2500";
+        }else if("e".equalsIgnoreCase(m)){
+            m = "3000";
+        }
+        Result result = signatrueService.addSignatrue(memCard, conferenceId, formId, partyB, identityId, courseMatter, courseTime, courseSite, m, bankProvince, bankOfDepositName, bankId, bankName, phone, signImg, isSubmit);
+        return result;
+
+    }
+
+}

src/main/java/com/cirle/scientific/controller/sys/SysController.java

@@ -0,0 +1,51 @@
+package com.cirle.scientific.controller.sys;
+
+import com.cirle.scientific.dao.MemberDao;
+import com.cirle.scientific.dao.QkjMemberOpenidDao;
+import com.cirle.scientific.dao.QkjMemberTaskInfoDao;
+import com.cirle.scientific.dao.RegionDao;
+import com.cirle.scientific.dto.QkjMemberDto;
+import com.cirle.scientific.po.QkjMember;
+import com.cirle.scientific.po.SysRegion;
+import com.cirle.scientific.pojo.BizCodeEnum;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.MemberService;
+import com.cirle.scientific.service.SysRegionService;
+import com.cirle.scientific.service.WeixinService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/sys")
+@Api("后台配置相关接口")
+@Slf4j
+public class SysController {
+
+    @Autowired
+    SysRegionService sysRegionService;
+
+    @GetMapping("/getRegion")
+    @ApiOperation(value = "获取二级联动的省市信息")
+    @ResponseBody
+    public Result<List<SysRegion>> getRegion(
+            @ApiParam(name = "parentId", value = "父ID") @RequestParam(name = "parentId", required = false) Integer parentId
+    ) {
+       return Result.success(sysRegionService.getRegion(parentId));
+    }
+
+
+
+
+}

src/main/java/com/cirle/scientific/controller/view/ViewController.java

@@ -0,0 +1,117 @@
+package com.cirle.scientific.controller.view;
+
+import com.cirle.scientific.dao.QkjArticleDao;
+import com.cirle.scientific.dto.QkjRecommendDTO;
+import com.cirle.scientific.po.QkjArticle;
+import com.cirle.scientific.pojo.Result;
+import com.cirle.scientific.service.ArticleService;
+import com.cirle.scientific.service.RecommendService;
+import com.cirle.scientific.utils.DeviceUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Controller
+@RequestMapping("/view")
+@Api("资讯相关接口")
+public class ViewController {
+
+    @Autowired
+    private ArticleService articleService;
+
+    @Autowired
+    private RecommendService recommendService;
+
+    @Autowired
+    private QkjArticleDao articleDao;
+
+
+    @GetMapping("/index")
+    @ApiOperation(value = "去往资讯首页")
+    public String index(
+            HttpServletRequest request,
+            @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = true) String from
+    ){
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/view/view-index";
+        } else {
+            return "web/view/view-index";
+        }
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation(value = "去往文章详情页面")
+    public String detail(
+            HttpServletRequest request,
+            @ApiParam(name = "from",value = "请求类型 web：网站 H5：手机端") @RequestParam(name = "from",required = false) String from,
+            @ApiParam(name = "artId",value = "文章ID") @RequestParam(name = "artId",required = true) Long artId
+    ){
+        //获取详情
+        request.setAttribute("artId", artId);
+        QkjArticle art = articleDao.findById(artId).get();
+        if(art.getType() == 2){
+            String redirectUrl = "redirect:"+art.getContent().trim();
+            return redirectUrl;
+        }
+        if (StringUtils.isNotBlank(from) && from.equals("H5")) {
+            return "html5/view/view-detail";
+        } else {
+            return "web/view/view-detail";
+        }
+    }
+
+    @PostMapping("/getArtListData")
+    @ApiOperation(value = "获取文章列表")
+    @ResponseBody
+    public Result getArtListData(
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "cataId",value = "分类ID") @RequestParam(name = "cataId",required = true) Integer cataId,
+            @ApiParam(name = "sortBy",value = "排序字段") @RequestParam(name = "sortBy",required = false) String sortBy,
+            @ApiParam(name = "page",value = "分页") @RequestParam(name = "page",required = true,defaultValue="1") Integer page,
+            @ApiParam(name = "size",value = "每页数量") @RequestParam(name = "size",required = true,defaultValue="10") Integer size,
+            HttpServletRequest request
+    ){
+        boolean isPC= DeviceUtil.isMobileDevice(request);
+        return Result.success(articleService.getArtListData(memCard, cataId, page, size,sortBy,isPC));
+    }
+
+    @PostMapping("/getAdInfo")
+    @ResponseBody
+    @ApiOperation(value = "课程首页获取广告位")
+    public Result<List<QkjRecommendDTO>> getAdInfo(HttpServletRequest request) {
+        // 默认展示pc端内容  0全部不显示 、1全部显示 、2m端显示、3pc端显示
+        Integer status = 3;
+        if(DeviceUtil.isMobileDevice(request)) {
+            status = 2;
+        }
+        List<QkjRecommendDTO> recmdTop = recommendService.findByPosIdLimit(18L, status, 1, 10);
+        return Result.success(recmdTop);
+    }
+
+    @PostMapping("/updataClick")
+    @ResponseBody
+    @ApiOperation(value = "课程首页获取广告位")
+    public Result updataClick(
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "artId",value = "咨询id") @RequestParam(name = "artId",required = true) Long artId
+    ){
+        return  articleService.updataClick(artId);
+    }
+
+    @PostMapping("/getDetailData")
+    @ApiOperation(value = "获取资讯详情")
+    @ResponseBody
+    public Result getDetailData(
+            @RequestAttribute(value = "memCard",required = false) String memCard,
+            @ApiParam(name = "artId",value = "直播ID") @RequestParam(name = "artId",required = true) Long artId
+    ){
+        return articleService.getDetailData(artId, memCard);
+    }
+}

src/main/java/com/cirle/scientific/dao/CollectionDao.java

@@ -0,0 +1,24 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.SalesCollectionMain;
+import com.cirle.scientific.po.SalesOrdersMain;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface CollectionDao extends PagingAndSortingRepository<SalesCollectionMain, Long>, JpaSpecificationExecutor<SalesCollectionMain> {
+    @Query(value = "SELECT * FROM qkj_integral_collection WHERE mem_card = ?1 AND type_id = ?2 AND type = ?3",nativeQuery = true)
+    List<SalesCollectionMain> getCollectionInfo(String memCard, String typeId, Integer type);
+
+    @Query(value = "SELECT * FROM qkj_integral_collection WHERE mem_card = ?1 AND type = ?2 ORDER BY collection_time DESC LIMIT ?3,?4",nativeQuery = true)
+    List<SalesCollectionMain> findMyCollectionListAllByType(String memCard , Integer type, Integer start, Integer size);
+
+    @Query(value = "SELECT * FROM qkj_integral_collection WHERE mem_card = ?1 ORDER BY collection_time DESC LIMIT ?2,?3",nativeQuery = true)
+    List<SalesCollectionMain> findMyCollectionListAll(String memCard , Integer start, Integer size);
+
+}

src/main/java/com/cirle/scientific/dao/DictDao.java

@@ -0,0 +1,14 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.Dict;
+import com.cirle.scientific.po.QkjMember;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface DictDao extends PagingAndSortingRepository<Dict, Long>, JpaSpecificationExecutor<Dict> {
+
+
+    @Query(value = "select * from sys_dict  where name = ?1",nativeQuery = true)
+    Dict findDictByName(String dictName);
+}

src/main/java/com/cirle/scientific/dao/DictDetailDao.java

@@ -0,0 +1,16 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.Dict;
+import com.cirle.scientific.po.DictDetail;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface DictDetailDao extends PagingAndSortingRepository<DictDetail, Long>, JpaSpecificationExecutor<DictDetail> {
+
+
+    @Query(value = "select a.* from sys_dict_detail a left join sys_dict b on a.dict_id = b.dict_id where b.name = ?1 and label = ?2 ",nativeQuery = true)
+    List<DictDetail> listByNameAndLabel(String name, Long id);
+}

src/main/java/com/cirle/scientific/dao/MemberDao.java

@@ -0,0 +1,51 @@
+package com.cirle.scientific.dao;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjMember;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+@Repository
+public interface MemberDao extends PagingAndSortingRepository<QkjMember, Long>, JpaSpecificationExecutor<QkjMember> {
+
+    @Query(value = "select * from qkj_member where mem_card = ?1 and mem_status=0",nativeQuery = true)
+    public QkjMember findByMemCard(String memCard);
+
+    @Query(value = "select mem_mobile from qkj_member where mem_card = ?1 and mem_status=0",nativeQuery = true)
+    String findByMemCardA(String memCard);
+
+    @Query(value = "select * from qkj_member where mem_mobile = ?1 and mem_status=0",nativeQuery = true)
+    QkjMember findByMemMobile(String mobile);
+
+    @Query(value = "select * from qkj_member where mem_nickname = ?1 and mem_status=0",nativeQuery = true)
+    QkjMember findByMemNickname(String mobile);
+
+    @Query(value = "SELECT * FROM qkj_member WHERE wx_id = ?1 AND mem_status <> 1", nativeQuery = true)
+    QkjMember findByWxId(String wxId);
+
+
+    @Query(value = "SELECT * FROM qkj_member WHERE mem_card in (?1)", nativeQuery = true)
+    List<QkjMember> findAllBymemCards(List<String> memCards);
+
+    @Query(value = "select * from qkj_member where mem_nickname = ?1 and mem_status=0",nativeQuery = true)
+    List<QkjMember> listByMemNickname(String mobile);
+
+    @Query(value = "SELECT * FROM qkj_member WHERE is_whitelist = 1 AND mem_status <> 1", nativeQuery = true)
+    List<QkjMember> findAllWhitelist();
+
+    @Query(value = "select count(*) from qkj_member where mem_status = 0", nativeQuery = true)
+    Integer findPeople();
+
+
+    @Query(value = "select max(user_id) from qkj_member where mem_register_time between ?1 and ?2 and  mem_status = 0", nativeQuery = true)
+    Long getMaxUserId(LocalDateTime start, LocalDateTime end);
+
+    @Query(value = "select * from qkj_member where mem_register_time between ?1 and ?2 and  mem_status = 0", nativeQuery = true)
+    List<QkjMember> listByRegisterTime(LocalDateTime start, LocalDateTime end);
+}

src/main/java/com/cirle/scientific/dao/OrderDao.java

@@ -0,0 +1,58 @@
+package com.cirle.scientific.dao;
+
+import java.util.List;
+import java.util.Map;
+
+import com.cirle.scientific.dto.UserOderDto;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.SalesOrdersMain;
+
+
+@Repository
+public interface OrderDao extends PagingAndSortingRepository<SalesOrdersMain, Long>, JpaSpecificationExecutor<SalesOrdersMain> {
+    @Query(value = "SELECT * FROM sales_orders_main WHERE mem_card = ?1 AND order_id = ?2",nativeQuery = true)
+    SalesOrdersMain getOrderInfo(String memCard, String orderId);
+
+    @Query(value = "SELECT order_id FROM sales_orders_main WHERE mem_card = ?1 AND obj_id = ?2 and order_type = ?3 ",nativeQuery = true)
+    List<String> getOrderByMemCardAndObjIdAndOrderType(String memCard, String objId ,  Integer orderType);
+
+//    查询积分或金钱购买的订单
+    @Query(value = "SELECT * FROM sales_orders_main WHERE mem_card = ?1 AND status = 1 AND pay_type = ?4 ORDER BY createtime DESC LIMIT ?2,?3",nativeQuery = true)
+    List<SalesOrdersMain> findMyOrderList(String memCard, Integer payType);
+
+    @Query(value = "SELECT * FROM sales_orders_main WHERE mem_card = ?1 AND status = 1 AND order_type = ?4 ORDER BY createtime DESC LIMIT ?2,?3",nativeQuery = true)
+    List<SalesOrdersMain> findMyOrderListAll(String memCard,Integer start, Integer size,Integer orderType);
+
+    @Query(value = "SELECT * FROM sales_orders_main WHERE mem_card = ?1 AND status = 1 ORDER BY createtime DESC ",nativeQuery = true)
+    List<SalesOrdersMain> findUserAllOrderList(String memCard);
+
+    @Query(value = "SELECT * FROM sales_orders_main WHERE mem_card = ?1 AND status = 1 ORDER BY createtime DESC ",nativeQuery = true)
+    List<SalesOrdersMain> findMyOrderListAll(String memCard, Integer start, Integer size);
+
+    @Query(value = "SELECT * FROM sales_orders_main WHERE mem_card = ?1 AND status = ?2 AND is_shipping = ?3 AND order_type = 15 ORDER BY createtime DESC  LIMIT ?4,?5",nativeQuery = true)
+    List<SalesOrdersMain> findMyOrderListConditions(String memCard, Integer status, Integer isShipping, Integer start, Integer size);
+    
+    @Query(value = "SELECT * FROM sales_orders_main WHERE order_id = ?1",nativeQuery = true)
+    SalesOrdersMain getOrderInfo(String orderId);
+
+    @Query(value = "SELECT m.mem_nickname, m.mem_headimg, count(s.id) as num from sales_orders_main s "
+            +"	INNER JOIN qkj_member m on s.from_mem_card = m.mem_card "
+            +" where s.order_type=?1 and s.obj_id=?2 and s.ispackage=1 and s.`status`=1 and s.from_mem_card is not null GROUP BY s.from_mem_card ORDER BY num desc",nativeQuery = true)
+    List<Object[]> inviteRank(Integer objType, Integer objId);
+
+    @Query(value = "SELECT m.mem_nickname, m.mem_headimg, count(s.id) from sales_orders_main s "
+            +"	INNER JOIN qkj_member m on s.from_mem_card = m.mem_card "
+            +" where s.order_type=?1 and s.obj_id=?2 and s.`status`=1 and s.from_mem_card=?3",nativeQuery = true)
+    Object[] inviteRankByMember(Integer objType, Integer objId, String memCard);
+
+    List<SalesOrdersMain> findByWxpayOrderId(String orderId);
+
+
+    @Query(value = "select  * from sales_orders_main where mem_card = ?1 and obj_id = ?3 and order_type = ?2 and status = 1",nativeQuery = true)
+    List<SalesOrdersMain> findTqcourseOrderList(String memCard,Integer orderType,Integer productId);
+}

src/main/java/com/cirle/scientific/dao/QkjArticleDao.java

@@ -0,0 +1,32 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjArticle;
+import com.cirle.scientific.po.QkjBrandProduct;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjArticleDao extends PagingAndSortingRepository<QkjArticle, Long>, JpaSpecificationExecutor<QkjArticle> {
+
+    @Query(value = "SELECT a.* FROM qkj_article a WHERE a.status=1 and m_or_pc in (?3) order by a.publish_time desc limit ?1, ?2",nativeQuery = true)
+    List<QkjArticle> findList(Integer start, Integer size,Integer[] mOrPc);
+
+    @Query(value = "SELECT a.* FROM qkj_article a WHERE a.status=1 and m_or_pc in (?3) order by a.click desc limit ?1, ?2",nativeQuery = true)
+    List<QkjArticle> findListByHottest(Integer start, Integer size,Integer[] mOrPc);
+
+    @Query(value = "SELECT a.* FROM qkj_catalogs_detail d " +
+                        "INNER JOIN qkj_article a on d.obj_id=a.id " +
+                    "WHERE d.catalogs_id=?1 and d.obj_type=4 and a.status=1 and m_or_pc in (?4) order by a.publish_time desc limit ?2, ?3",nativeQuery = true)
+    List<QkjArticle> findByCataId(Integer cataId, Integer start, Integer size,Integer[] mOrPc);
+
+    @Query(value = "SELECT a.* FROM qkj_catalogs_detail d " +
+            "INNER JOIN qkj_article a on d.obj_id=a.id " +
+            "WHERE d.catalogs_id=?1 and d.obj_type=4 and a.status=1 and m_or_pc in (?4) order by a.click desc limit ?2, ?3",nativeQuery = true)
+    List<QkjArticle> ByCataIdHottest(Integer cataId, Integer start, Integer size,Integer[] mOrPc);
+}

src/main/java/com/cirle/scientific/dao/QkjAuditingDao.java

@@ -0,0 +1,23 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjAuditing;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface QkjAuditingDao extends PagingAndSortingRepository<QkjAuditing, Long>, JpaSpecificationExecutor<QkjAuditing> {
+
+    @Query(value = "SELECT a.* FROM qkj_auditing a WHERE a.mem_card=?1 and a.obj_type= ?2 and a.obj_id= ?3 ", nativeQuery = true)
+    List<QkjAuditing> getQkjAuditingList(String memCard, Integer objType, Integer objId);
+
+    @Modifying
+    @Query(value = "delete from qkj_auditing where mem_card = ?1 and obj_type=?2 and obj_id=?3", nativeQuery = true)
+    void deleteByMemberAndObjTypeAndOjbId(String memCard, Integer objType, Integer objId);
+
+
+}

src/main/java/com/cirle/scientific/dao/QkjBrandProductDao.java

@@ -0,0 +1,17 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjBrandProduct;
+import com.cirle.scientific.po.QkjCatalogs;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjBrandProductDao extends PagingAndSortingRepository<QkjBrandProduct, Long>, JpaSpecificationExecutor<QkjBrandProduct> {
+
+}

src/main/java/com/cirle/scientific/dao/QkjBrandProductDetailDao.java

@@ -0,0 +1,20 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjBrandProduct;
+import com.cirle.scientific.po.QkjBrandProductDetail;
+import com.cirle.scientific.po.QkjCatalogs;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjBrandProductDetailDao extends PagingAndSortingRepository<QkjBrandProductDetail, Long>, JpaSpecificationExecutor<QkjBrandProductDetail> {
+
+	@Query(value = "select * from qkj_brand_product_detail where product_id = ?1 order by sqn desc",nativeQuery = true)
+	List<QkjBrandProductDetail> findByProductId(Long productId);
+}

src/main/java/com/cirle/scientific/dao/QkjCatalogsDao.java

@@ -0,0 +1,24 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjCatalogs;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjCatalogsDao extends PagingAndSortingRepository<QkjCatalogs, Long>, JpaSpecificationExecutor<QkjCatalogs> {
+
+    @Query(value = "select * from qkj_catalogs where fu_id = ?1 order by sqn asc", nativeQuery = true)
+    List<QkjCatalogs> findByFuId(int fuId);
+
+    @Query(value = "select * from qkj_catalogs", nativeQuery = true)
+    List<QkjCatalogs> findAll();
+
+    @Query(value = "select description from qkj_catalogs where id = ?1 ", nativeQuery = true)
+    String findById(Integer id);
+}

src/main/java/com/cirle/scientific/dao/QkjCatalogsDetailDao.java

@@ -0,0 +1,29 @@
+package com.cirle.scientific.dao;
+
+import java.util.List;
+
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjCatalogsDetail;
+
+
+@Repository
+public interface QkjCatalogsDetailDao extends PagingAndSortingRepository<QkjCatalogsDetail, Long>, JpaSpecificationExecutor<QkjCatalogsDetail> {
+
+    @Query(value = "SELECT obj_id FROM qkj_catalogs_detail  WHERE obj_type=?1 AND catalogs_id=?2 ", nativeQuery = true)
+    List<Integer> findByObjTypeAndCatalogsId(Integer objType, Integer catalogsId);
+
+    @Query(value = "SELECT catalogs_id FROM qkj_catalogs_detail  WHERE obj_type=?1 AND obj_id=?2 ", nativeQuery = true)
+    List<Integer> findByObjTypeAndobjId(Integer objType, Integer objId);
+
+    @Query(value = "SELECT * FROM qkj_catalogs_detail  WHERE obj_type=?1 ", nativeQuery = true)
+    List<QkjCatalogsDetail> findByObjType(Integer objType);
+
+    @Query(value = "select * from  qkj_catalogs_detail where obj_type = :type  and  obj_id = :objId",nativeQuery = true)
+    List<QkjCatalogsDetail> findObjectByObjTypeAndObjId(@Param("type") Integer type, @Param("objId")Long objId);
+
+}

src/main/java/com/cirle/scientific/dao/QkjCertificatePhysiciansDao.java

@@ -0,0 +1,23 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjCertificatePhysicians;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjCertificatePhysiciansDao extends PagingAndSortingRepository<QkjCertificatePhysicians, Long>, JpaSpecificationExecutor<QkjCertificatePhysicians> {
+
+    @Query(value = "select  * from  qkj_certificate_physicians where mem_card = ?1", nativeQuery = true)
+    QkjCertificatePhysicians findByMemCard(String memCard);
+
+    @Query(value = "select  professional_two from  qkj_certificate_physicians where mem_card = ?1", nativeQuery = true)
+    Integer findByMemCardA(String memCard);
+
+    @Query(value = "select  * from  qkj_certificate_physicians where mem_card = ?1", nativeQuery = true)
+    List<QkjCertificatePhysicians> check(String businessLicense);
+
+    QkjCertificatePhysicians findByNum(String num);
+
+}

src/main/java/com/cirle/scientific/dao/QkjColumnistDao.java

@@ -0,0 +1,23 @@
+/*
+* create by mybatis-plus-generator  https://github.com/xiweile
+*/
+package com.cirle.scientific.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjColumnist;
+
+@Repository
+public interface QkjColumnistDao extends PagingAndSortingRepository<QkjColumnist, Long>, JpaSpecificationExecutor<QkjColumnist> {
+	
+	QkjColumnist findByMemCard(String memCard);
+	
+	@Query(value = "SELECT * FROM qkj_columnist WHERE status = 0", nativeQuery = true)
+	List<QkjColumnist> findAllList();
+}
+

src/main/java/com/cirle/scientific/dao/QkjColumnistDetailDao.java

@@ -0,0 +1,25 @@
+package com.cirle.scientific.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjColumnistDetail;
+
+
+@Repository
+public interface QkjColumnistDetailDao extends PagingAndSortingRepository<QkjColumnistDetail, Long>, JpaSpecificationExecutor<QkjColumnistDetail> {
+	
+	@Query(value = "select mpr.* from qkj_columnist_detail mpr where mpr.obj_type=?1 and mpr.obj_id=?2 ", nativeQuery = true)
+	List<QkjColumnistDetail> findByobjTypeAndobjId(Integer objType, long objId);
+	
+	@Query(value = "select mpr.obj_id from qkj_columnist_detail mpr where mpr.obj_type=?1 and mpr.mem_card in ?2", nativeQuery = true)
+	List<Integer> findByobjTypeAndMemCard(Integer objType, List<String> memCards);
+
+
+	@Query(value = "select * from qkj_columnist_detail where obj_type=?1 and obj_id=?2", nativeQuery = true)
+	List<QkjColumnistDetail> findByobjTypeAndobjIdAuthor(Integer objType, long objId);
+}

src/main/java/com/cirle/scientific/dao/QkjCommunityDao.java

@@ -0,0 +1,17 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjCommunity;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjCommunityDao  extends PagingAndSortingRepository<QkjCommunity, Long>, JpaSpecificationExecutor<QkjCommunity> {
+
+    @Query(value = "select * from qkj_community where stauts = 0 ", nativeQuery = true)
+    List<QkjCommunity> getQrImg();
+}

src/main/java/com/cirle/scientific/dao/QkjConferenceDao.java

@@ -0,0 +1,43 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjArticle;
+import com.cirle.scientific.po.QkjConference;
+import com.cirle.scientific.po.QkjLive;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjConferenceDao extends PagingAndSortingRepository<QkjConference, Long>, JpaSpecificationExecutor<QkjConference> {
+
+    @Query(value = "(SELECT a.* FROM (SELECT * FROM qkj_conference WHERE status=2 and is_visiable=1 and m_or_pc in (?3) ORDER BY bigen_time ASC) a) "
+                    +"	UNION all "
+                    +"	(SELECT b.* FROM (SELECT * FROM qkj_conference WHERE status=1 and is_visiable=1 and m_or_pc in (?3) ORDER BY bigen_time ASC) b) "
+                    +"	UNION all "
+                    +"	(SELECT d.* FROM (SELECT * FROM qkj_conference WHERE status=3 and is_visiable=1 and m_or_pc in (?3) ORDER BY bigen_time desc) d) "
+                    +"	limit ?1,?2",nativeQuery = true)
+    List<QkjConference> findList(int start, int size,Integer[] mOrPc);
+
+    @Query(value = "select sum(tmpcount) from ((SELECT count(*) tmpcount FROM qkj_conference WHERE status=2 and is_visiable=1 and m_or_pc in (?1) ORDER BY bigen_time ASC) " +
+            "          UNION all " +
+            "          (SELECT count(*) tmpcount FROM qkj_conference WHERE status=1 and is_visiable=1 and m_or_pc in (?1) ORDER BY bigen_time ASC) " +
+            "          UNION all " +
+            "          (SELECT count(*) tmpcount FROM qkj_conference WHERE status=3 and is_visiable=1 and m_or_pc in (?1) ORDER BY bigen_time desc) ) a ",
+            nativeQuery = true)
+    Integer findTotalList(Integer[] mOrPc);
+
+    @Query(value = "(SELECT a.* FROM (SELECT * FROM qkj_conference WHERE id in (SELECT confer_id from qkj_conference_series where series_id=?1) and status=2 ORDER BY bigen_time ASC) a) "
+            +"	UNION all "
+            +"	(SELECT b.* FROM (SELECT * FROM qkj_conference WHERE id in (SELECT confer_id from qkj_conference_series where series_id=?1) and status=1 ORDER BY bigen_time ASC) b) "
+            +"	UNION all "
+            +"	(SELECT d.* FROM (SELECT * FROM qkj_conference WHERE id in (SELECT confer_id from qkj_conference_series where series_id=?1) and status=3 ORDER BY bigen_time desc) d) ",nativeQuery = true)
+    List<QkjConference> findSonList(Long conferId);
+
+    @Query(value = "select * from qkj_conference q WHERE q.id = ?1",nativeQuery = true)
+    QkjConference findConferAllById(long Id);
+}

src/main/java/com/cirle/scientific/dao/QkjConferenceMenuDao.java

@@ -0,0 +1,19 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjArticle;
+import com.cirle.scientific.po.QkjConferenceMenu;
+import com.cirle.scientific.po.QkjLive;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjConferenceMenuDao extends PagingAndSortingRepository<QkjConferenceMenu, Long>, JpaSpecificationExecutor<QkjConferenceMenu> {
+
+    List<QkjConferenceMenu> findByConferIdOrderBySqnAsc(Integer conferId);
+}

src/main/java/com/cirle/scientific/dao/QkjConferencePeopelDao.java

@@ -0,0 +1,20 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjArticle;
+import com.cirle.scientific.po.QkjConferencePeopel;
+import com.cirle.scientific.po.QkjLive;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjConferencePeopelDao extends PagingAndSortingRepository<QkjConferencePeopel, Long>, JpaSpecificationExecutor<QkjConferencePeopel> {
+
+    QkjConferencePeopel findByMobile(String mobile);
+
+}

src/main/java/com/cirle/scientific/dao/QkjConferenceRecordDao.java

@@ -0,0 +1,34 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjArticle;
+import com.cirle.scientific.po.QkjConferenceRecord;
+import com.cirle.scientific.po.QkjLive;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjConferenceRecordDao extends PagingAndSortingRepository<QkjConferenceRecord, Long>, JpaSpecificationExecutor<QkjConferenceRecord> {
+
+    @Query(value = "select * from qkj_conference_record where mem_card=?2 and confer_id=?1 and status = 0 order by id asc", nativeQuery = true)
+    List<QkjConferenceRecord> findByConferIdAndMemCard(Long conferId, String memCard);
+
+    @Query(value = "SELECT r.* from qkj_conference_record r " +
+                        "INNER JOIN qkj_conference_peopel p on r.people_id=p.id " +
+                   "where r.confer_id=?1 and p.mobile=?2 and r.pay_status=1 and r.`status`=0", nativeQuery = true)
+    QkjConferenceRecord findByConferIdAndMobile(Long conferId, String mobile);
+
+    @Query(value = "select * from qkj_conference_record where mem_card=?2 and confer_id=?1 and pay_status=?3 and status=0  order by id asc", nativeQuery = true)
+    List<QkjConferenceRecord> findByConferIdAndMemCard(Long conferId, String memCard, Integer payStatus);
+
+    @Query(value = "select * from qkj_conference_record where order_id=?3 and mem_card=?2 and confer_id=?1 and status = 0 order by id asc", nativeQuery = true)
+    List<QkjConferenceRecord> findByConferIdAndMemCardAndOrderId(Long conferId, String memCard, String orderId);
+
+
+}

src/main/java/com/cirle/scientific/dao/QkjCourseWareDao.java

@@ -0,0 +1,45 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjCourseWare;
+import com.cirle.scientific.po.QkjTqcourse;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjCourseWareDao extends PagingAndSortingRepository<QkjCourseWare, Long>, JpaSpecificationExecutor<QkjCourseWare> {
+
+    @Query(value = "SELECT a.* FROM qkj_courseware a WHERE a.status=1 and a.is_visiable = 1 order by top_status desc, a.create_time desc limit ?1, ?2",nativeQuery = true)
+    List<QkjCourseWare> findList(Integer start, Integer size);
+
+    @Query(value = "select qt.* from qkj_courseware qt " +
+                        "inner join qkj_catalogs_detail qcd on qcd.obj_id = qt.id " +
+                    "where qcd.catalogs_id in (?1) and qcd.obj_type = 5 and qt.status = 1 and qt.is_visiable = 1 order by qt.top_status desc, qt.create_time desc limit ?2,?3",nativeQuery = true)
+    List<QkjCourseWare> findList(String cataIds, Integer start, Integer size);
+
+
+    @Query(value = "SELECT  count(*)  FROM qkj_courseware  WHERE status=1  and is_visiable = 1 ",nativeQuery = true)
+    Integer findListCount();
+
+    @Query(value = "select count(*)  from qkj_courseware qt " +
+            "inner join qkj_catalogs_detail qcd on qcd.obj_id = qt.id " +
+            "where qcd.catalogs_id in (?1) and qcd.obj_type = 5 and qt.status = 1 and qt.is_visiable = 1 ",nativeQuery = true)
+    Integer findListCount(String cataIds);
+
+    @Query(value = "select DISTINCT qt.* from qkj_courseware qt inner join qkj_catalogs_detail qcd on qcd.obj_id = qt.id where qcd.catalogs_id = ?1 and qcd.obj_type = 5 and qt.status = 1 and qt.is_visiable = 1 ", nativeQuery = true)
+    List<QkjCourseWare> getByCataIds(Integer intValue);
+
+    @Query(value = "SELECT a.* FROM qkj_courseware a WHERE a.uploader= ?1 and  a.status=1 and a.is_visiable in(0 ,1 , 2) order by top_status desc, a.create_time desc limit ?2, ?3",nativeQuery = true)
+    List<QkjCourseWare> findListByMember(String memCard,Integer start, Integer size);
+
+    @Query(value = "SELECT * FROM qkj_courseware  WHERE id = ?1",nativeQuery = true)
+    QkjCourseWare getQkjCourseWare(Long id);
+
+    @Query(value = "SELECT  count(*)  FROM qkj_courseware  WHERE status=1  and is_visiable = 2 and uploader = ?1 ",nativeQuery = true)
+    Integer findListCountPpt(String memCard);
+
+
+    @Query(value = "SELECT * FROM qkj_courseware  WHERE id in (?1) ",nativeQuery = true)
+    List<QkjCourseWare> listQkjCourseWare(List<Integer> ids);
+}

src/main/java/com/cirle/scientific/dao/QkjExaminationDetailDao.java

@@ -0,0 +1,17 @@
+package com.cirle.scientific.dao;
+
+
+
+
+import com.cirle.scientific.po.QkjExaminationDetail;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface QkjExaminationDetailDao  extends PagingAndSortingRepository<QkjExaminationDetail, Long>, JpaSpecificationExecutor<QkjExaminationDetail> {
+
+
+    @Query(value = "select ex_id from qkj_examination_detail where obj_type = ?1 and obj_id = ?2 and state = 0",nativeQuery = true)
+    Integer findExIdByObjTypeAndObjId(int objType , int objId);
+
+}

src/main/java/com/cirle/scientific/dao/QkjIntegralDetailDao.java

@@ -0,0 +1,22 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.dto.UserOderDto;
+import com.cirle.scientific.po.QkjIntegralDetail;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjIntegralDetailDao extends
+        PagingAndSortingRepository<QkjIntegralDetail, Long>, JpaSpecificationExecutor<QkjIntegralDetail> {
+
+	@Query(value = "SELECT * FROM qkj_integral_detail WHERE mem_card = ?1 ORDER BY change_time DESC LIMIT ?2,?3" ,nativeQuery = true)
+    List<QkjIntegralDetail> findByMemCard(String memCard,Integer start,Integer size);
+
+    @Query(value = "SELECT * FROM qkj_integral_detail WHERE mem_card = ?1 ORDER BY change_time DESC" ,nativeQuery = true)
+    List<QkjIntegralDetail> findUserOder(String memCard);
+
+	@Query(value = "SELECT * FROM qkj_integral_detail ORDER BY change_time DESC LIMIT ?1,?2" ,nativeQuery = true)
+    List<QkjIntegralDetail> findByNewChange(Integer start,Integer size);
+}

src/main/java/com/cirle/scientific/dao/QkjIntegralGoodsDao.java

@@ -0,0 +1,101 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjIntegralGoods;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+import java.util.Map;
+
+public interface QkjIntegralGoodsDao  extends PagingAndSortingRepository<QkjIntegralGoods, Long>, JpaSpecificationExecutor<QkjIntegralGoods> {
+
+
+    @Query(value = "select  * from qkj_integral_goods where goods_status = 0 order by sqn desc limit ?1,?2",nativeQuery = true)
+    List<QkjIntegralGoods> findGoodMallList(Integer page,Integer size);
+
+    @Query(value = "select  count(*) from qkj_integral_goods where goods_status = 0 order by sqn desc ",nativeQuery = true)
+    Integer findGoodMallListSize();
+
+    @Query(value = "SELECT\n" +
+            "\tcount(*) \n" +
+            "FROM\n" +
+            "\t(\n" +
+            "\tSELECT\n" +
+            "\t\tid,\n" +
+            "\t\tgoods_img AS 'img',\n" +
+            "\t\tgoods_name AS 'name',\n" +
+            "\t\t\"商品\" AS 'type',\n" +
+            "\t\t`goods_status` AS 'goodsStatus',\n" +
+            "\t\tNULL AS 'status',\n" +
+            "\t\tgoods_need_points AS \"points\",\n" +
+            "\t\tNULL AS \"price\",\n" +
+            "\t\tNULL AS \"zq\",\n" +
+            "\t\tNULL AS \"purchasedMembers\",\n" +
+            "\t\tNULL AS \"totalClassHours\" \n" +
+            "\tFROM\n" +
+            "\t\tqkj_integral_goods \n" +
+            "\tWHERE\n" +
+            "\t\tgoods_status = 0 UNION ALL\n" +
+            "\tSELECT\n" +
+            "\t\tid,\n" +
+            "\t\tcover_img AS 'img',\n" +
+            "\t\ttitle AS 'name',\n" +
+            "\t\t\"课程\" AS 'type',\n" +
+            "\t\tNULL AS \"goodsStatus\",\n" +
+            "\t\t`status` AS 'status',\n" +
+            "\t\tpoint AS \"points\",\n" +
+            "\t\tprice AS \"price\",\n" +
+            "\t\tzq AS \"zq\",\n" +
+            "\t\tpurchased_members AS \"purchasedMembers\",\n" +
+            "\t\ttotal_class_hours AS \"totalClassHours\" \n" +
+            "\tFROM\n" +
+            "\t\tqkj_tqcourse \n" +
+            "\tWHERE\n" +
+            "\t\tSTATUS = 1 \n" +
+            "\tAND is_visiable = 1 \n" +
+            "\t) AS test",nativeQuery = true)
+    Integer findAllListSize();
+
+    @Query(value = "SELECT\n" +
+            " *\n" +
+            "FROM\n" +
+            "\t(\n" +
+            "\tSELECT\n" +
+            "\t\tid AS 'id',\n" +
+            "\t\tgoods_img AS 'img',\n" +
+            "\t\tgoods_name AS 'name',\n" +
+            "\t\t\"商品\" AS 'type',\n" +
+            "\t\t`goods_status` AS 'goodsStatus',\n" +
+            "\t\tNULL AS 'status',\n" +
+            "\t\tgoods_need_points AS \"points\",\n" +
+            "\t\tNULL AS \"price\",\n" +
+            "\t\tNULL AS \"zq\",\n" +
+            "\t\tNULL AS \"purchasedMembers\",\n" +
+            "\t\tNULL AS \"totalClassHours\" \n" +
+            "\tFROM\n" +
+            "\t\tqkj_integral_goods \n" +
+            "\tWHERE\n" +
+            "\t\tgoods_status = 0 UNION ALL\n" +
+            "\tSELECT\n" +
+            "\t\tid AS 'id',\n" +
+            "\t\tcover_img AS 'img',\n" +
+            "\t\ttitle AS 'name',\n" +
+            "\t\t\"课程\" AS 'type',\n" +
+            "\t\tNULL AS \"goodsStatus\",\n" +
+            "\t\t`status` AS 'status',\n" +
+            "\t\tpoint AS \"points\",\n" +
+            "\t\tprice AS \"price\",\n" +
+            "\t\tzq AS \"zq\",\n" +
+            "\t\tpurchased_members AS \"purchasedMembers\",\n" +
+            "\t\ttotal_class_hours AS \"totalClassHours\" \n" +
+            "\tFROM\n" +
+            "\t\tqkj_tqcourse \n" +
+            "\tWHERE\n" +
+            "\t\tSTATUS = 1 \n" +
+            "\tAND is_visiable = 1 \n" +
+            "\t) AS test limit ?1, ?2\n" +
+            "\t",nativeQuery = true)
+    List<Map<String,Object>> findLimitAllList(Integer page,Integer size);
+
+}

src/main/java/com/cirle/scientific/dao/QkjLiveCommentsDao.java

@@ -0,0 +1,17 @@
+package com.cirle.scientific.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjLiveComments;
+
+
+@Repository
+public interface QkjLiveCommentsDao extends PagingAndSortingRepository<QkjLiveComments, Long>, JpaSpecificationExecutor<QkjLiveComments> {
+    @Query(value = "SELECT * from qkj_live_comments where live_id = ?1 and content != '' ORDER BY opr_time desc LIMIT 10",nativeQuery = true)
+    List<QkjLiveComments> getComments(Long liveId);
+}

src/main/java/com/cirle/scientific/dao/QkjLiveDao.java

@@ -0,0 +1,96 @@
+package com.cirle.scientific.dao;
+
+import java.util.List;
+
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjLive;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+@Repository
+public interface QkjLiveDao extends PagingAndSortingRepository<QkjLive, Long>, JpaSpecificationExecutor<QkjLive> {
+
+	QkjLive findByLiveId(String liveId);
+
+	@Query(value = "(SELECT a.* FROM (SELECT * FROM qkj_live WHERE live_status=1 and status=1 and live_type!=2 and is_visiable=1 and m_or_pc in (?3) ORDER BY live_begin_time ASC) a) "
+					+"	UNION all "
+					+"	(SELECT b.* FROM (SELECT * FROM qkj_live WHERE live_status=0 AND STATUS=1 and live_type!=2 and is_visiable=1 and m_or_pc in (?3) ORDER BY live_begin_time ASC) b) "
+					+"	UNION all "
+					+"	(SELECT b.* FROM (SELECT * FROM qkj_live WHERE STATUS=1 and live_type=2 and m_or_pc in (?3) ORDER BY create_time desc) b) "
+					+"	UNION all "
+					+"	(SELECT d.* FROM (SELECT * FROM qkj_live WHERE live_status=3 AND STATUS=1 and live_type!=2 and is_visiable=1 and m_or_pc in (?3) ORDER BY live_begin_time desc) d) "
+					+"	UNION all "
+					+"	(SELECT d.* FROM (SELECT * FROM qkj_live WHERE live_status=2 AND STATUS=1 and live_type!=2 and is_visiable=1 and m_or_pc in (?3) ORDER BY live_begin_time desc) d) "
+					+" order by istop  desc , create_time  desc  limit ?1,?2",nativeQuery = true)
+    List<QkjLive> findList(int start, int size,Integer[] mOrPc);
+
+	@Query(value = "(SELECT a.* FROM (SELECT * FROM qkj_live WHERE id in(SELECT d.live_id from qkj_live_series d where d.series_id = ?1) and live_status=1 and status=1 and is_visiable =1 ORDER BY live_begin_time ASC) a) "
+			+"	UNION all "
+			+"	(SELECT b.* FROM (SELECT * FROM qkj_live WHERE id in(SELECT d.live_id from qkj_live_series d where d.series_id = ?1) and live_status=0 AND STATUS=1 and is_visiable =1  ORDER BY live_begin_time ASC) b) "
+			+"	UNION all "
+			+"	(SELECT d.* FROM (SELECT * FROM qkj_live WHERE id in(SELECT d.live_id from qkj_live_series d where d.series_id = ?1) and live_status>=2 AND STATUS=1 and is_visiable =1  ORDER BY live_begin_time desc) d) "
+			+"  order by istop desc limit ?2,?3",nativeQuery = true)
+	List<QkjLive> findSonList(int seriesId, int start, int size);
+
+	/**
+	 * 更具系列直播id 查出子系列的直播的数据（过滤掉已隐藏的直播）
+	 * @param seriesId  系列直播的id
+	 * @param start  分页的页数
+	 * @param size   每页的行数
+	 * @return
+	 */
+	@Query(value = "SELECT * FROM qkj_live WHERE id = ?1 and  status=1 and is_visiable=1  limit ?2,?3",nativeQuery = true)
+	QkjLive selectSonList(int seriesId, int start, int size);
+
+	@Query(value = "SELECT d.live_id from qkj_live_series d where d.series_id = ?1 order by sqn asc ",nativeQuery = true)
+	List<Integer> selectLiveIdBySqn(int seriesId);
+
+	@Query(value = "select count(*) from ("
+			+"(SELECT a.* FROM (SELECT * FROM qkj_live WHERE live_status=1 and status=1 and live_type!=2 and is_visiable=1 and m_or_pc in (?1) ORDER BY live_begin_time ASC) a) "
+			+"	UNION all "
+			+"	(SELECT b.* FROM (SELECT * FROM qkj_live WHERE live_status=0 AND STATUS=1 and live_type!=2 and is_visiable=1 and m_or_pc in (?1) ORDER BY live_begin_time ASC) b) "
+			+"	UNION all "
+			+"	(SELECT b.* FROM (SELECT * FROM qkj_live WHERE STATUS=1 and live_type=2 and m_or_pc in (?1) ORDER BY create_time desc) b) "
+			+"	UNION all "
+			+"	(SELECT d.* FROM (SELECT * FROM qkj_live WHERE live_status=3 AND STATUS=1 and live_type!=2 and is_visiable=1 and m_or_pc in (?1) ORDER BY live_begin_time desc) d) "
+			+"	UNION all "
+			+"	(SELECT d.* FROM (SELECT * FROM qkj_live WHERE live_status=2 AND STATUS=1 and live_type!=2 and is_visiable=1 and m_or_pc in (?1) ORDER BY live_begin_time desc) d)" +
+			")m ",nativeQuery = true)
+	Integer selectAllCounts(Integer[] mOrPc);
+
+
+	@Query(value = "select a.* from qkj_live a where live_status=1  and  is_visiable=1 ",nativeQuery = true)
+	List<QkjLive> findMy();
+
+	@Transactional(propagation= Propagation.REQUIRES_NEW)
+	@Modifying
+	@Query(value = "update qkj_live set  purchased_members  =  purchased_members + :num where id = :liveId and live_status=1",nativeQuery = true)
+	void updatePurchasedMembers(@Param(value = "num")long num, @Param(value = "liveId")long liveId);
+
+	@Transactional(propagation= Propagation.REQUIRES_NEW)
+	@Modifying
+	@Query(value = "update qkj_live set  join_members  =  join_members + :num where id = :liveId and live_status=1",nativeQuery = true)
+	void updateJoinMembers(@Param(value = "num")long num, @Param(value = "liveId")long liveId);
+
+	@Transactional(propagation= Propagation.REQUIRES_NEW)
+	@Modifying
+	@Query(value = "update qkj_live set  join_members  =  join_members - :num where id = :liveId and live_status=1",nativeQuery = true)
+	void reduceJoinMembers(@Param(value = "num")long num, @Param(value = "liveId")long liveId);
+
+	@Query(value = "SELECT * FROM qkj_live WHERE id = ?1 ",nativeQuery = true)
+	QkjLive findById(String liveId);
+//
+//	@Transactional(propagation= Propagation.REQUIRES_NEW)
+//	@Modifying
+//	@Query("update QkjLive lv set lv.purchasedMembers=lv.purchasedMembers+: num where lv.id=:liveId and lv.liveStatus=1")
+//	void updatePurchasedMembers(@Param(value = "num") long num, @Param(value = "liveId")long liveId);
+
+
+}

src/main/java/com/cirle/scientific/dao/QkjLiveRemindDao.java

@@ -0,0 +1,23 @@
+package com.cirle.scientific.dao;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjLiveRemind;
+
+
+@Repository
+public interface QkjLiveRemindDao extends PagingAndSortingRepository<QkjLiveRemind, Long>, JpaSpecificationExecutor<QkjLiveRemind> {
+
+	QkjLiveRemind findByLiveIdAndMemCard(String liveId, String memCard);
+
+    List<QkjLiveRemind> findByLiveId(String liveId);
+
+    @Query(value = "SELECT COUNT(id) FROM qkj_live_remind WHERE live_id = ?1",nativeQuery = true)
+    BigInteger findRemindCount(String liveId);
+}

src/main/java/com/cirle/scientific/dao/QkjLiveSeriesDao.java

@@ -0,0 +1,19 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjLiveRemind;
+import com.cirle.scientific.po.QkjLiveSeries;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.math.BigInteger;
+import java.util.List;
+
+
+@Repository
+public interface QkjLiveSeriesDao extends PagingAndSortingRepository<QkjLiveSeries, Long>, JpaSpecificationExecutor<QkjLiveSeries> {
+
+	List<QkjLiveSeries> findByLiveId(Integer liveId);
+
+}

src/main/java/com/cirle/scientific/dao/QkjMemberDorecDao.java

@@ -0,0 +1,22 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjArticle;
+import com.cirle.scientific.po.QkjMemberDorec;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjMemberDorecDao extends PagingAndSortingRepository<QkjMemberDorec, Long>, JpaSpecificationExecutor<QkjMemberDorec> {
+
+    @Query(value = "SELECT * FROM qkj_member_dorec WHERE mem_card=?1 and opr_type=?2 and obj_type=?3 and obj_id=?4 and TO_DAYS(NOW())=TO_DAYS(opr_time)",nativeQuery = true)
+    List<QkjMemberDorec> findTodayLogs(String memCard, Integer oprType, Integer objType, Integer objId);
+
+    @Query(value = "SELECT * FROM qkj_member_dorec WHERE mem_card=?1 and opr_type=?2 and url=?3 and TO_DAYS(NOW())=TO_DAYS(opr_time)",nativeQuery = true)
+    List<QkjMemberDorec> findTodayLogs(String memCard, Integer oprType, String url);
+}

src/main/java/com/cirle/scientific/dao/QkjMemberOpenidDao.java

@@ -0,0 +1,17 @@
+package com.cirle.scientific.dao;
+
+
+import com.cirle.scientific.po.QkjBrandProductDetail;
+import com.cirle.scientific.po.QkjMemberOpenid;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjMemberOpenidDao extends PagingAndSortingRepository<QkjMemberOpenid, Long>, JpaSpecificationExecutor<QkjMemberOpenid> {
+
+	QkjMemberOpenid findByMemCardAndAppId(String memCard, String appId);
+}

src/main/java/com/cirle/scientific/dao/QkjMemberPersonalAuthDao.java

@@ -0,0 +1,16 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjMemberPersonalAuth;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface QkjMemberPersonalAuthDao extends PagingAndSortingRepository<QkjMemberPersonalAuth, Long>, JpaSpecificationExecutor<QkjMemberPersonalAuth> {
+
+    @Query(value = "select  * from  qkj_member_personal_auth where mem_card = ?1", nativeQuery = true)
+    QkjMemberPersonalAuth findByMemCard(String memCard);
+
+    @Query(value = "select  * from  qkj_member_personal_auth where mem_identity_id = ?1", nativeQuery = true)
+    QkjMemberPersonalAuth checkCard(String card);
+
+}

src/main/java/com/cirle/scientific/dao/QkjMemberTaskDao.java

@@ -0,0 +1,19 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjMemberTask;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjMemberTaskDao extends PagingAndSortingRepository<QkjMemberTask, Long>, JpaSpecificationExecutor<QkjMemberTask> {
+
+
+    @Query(value = "SELECT * FROM qkj_member_task WHERE task_type = ?1 AND task_status = 0" ,nativeQuery = true)
+    public List<QkjMemberTask> findByTaskType(Integer taskType);
+
+
+    @Query(value = "SELECT * FROM qkj_member_task order by sqn desc" ,nativeQuery = true)
+    List<QkjMemberTask> findUserTaskList();
+}

src/main/java/com/cirle/scientific/dao/QkjMemberTaskDetailDao.java

@@ -0,0 +1,29 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjMemberTaskDetail;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjMemberTaskDetailDao extends PagingAndSortingRepository<QkjMemberTaskDetail, Long>, JpaSpecificationExecutor<QkjMemberTaskDetail> {
+
+    @Query(value = "SELECT * FROM qkj_member_task_detail WHERE mem_card = ?1 AND task_id = ?2 And type=0" ,nativeQuery = true)
+    List<QkjMemberTaskDetail> findMemberAndTaskId(String memCard, Integer taskId);
+
+    @Query(value = "SELECT * FROM qkj_member_task_detail WHERE mem_card = ?1 AND task_id = ?2 And type=0 AND TO_DAYS(complete_time) = TO_DAYS(NOW())" ,nativeQuery = true)
+    List<QkjMemberTaskDetail> findDailyTask(String memCard, Integer taskId);
+
+    @Query(value = "select DATE_FORMAT(complete_time, '%Y-%m-%d') as date from qkj_member_task_detail where DATE_SUB(DATE_FORMAT(NOW(), '%Y-%m-%d'), interval 6 DAY) <= DATE_FORMAT(complete_time, '%Y-%m-%d') AND mem_card =?1 AND complete_time>=?2 AND task_id = 18 And type=0 group by date" ,nativeQuery = true)
+    List<Object> sevenDayCheckIn(String memCard,String time);
+
+    @Query(value = "select  DATE_FORMAT(complete_time, '%Y-%m-%d') as date from qkj_member_task_detail where DATE_SUB(DATE_FORMAT(NOW(), '%Y-%m-%d'), interval 7 DAY) <= DATE_FORMAT(complete_time, '%Y-%m-%d') AND mem_card =?1 AND complete_time>=?2 AND task_id = 18 And type=0 group by date " ,nativeQuery = true)
+    List<Object> sevenDayCheckInEn(String memCard, String time);
+
+    @Query(value = "select  DATE_FORMAT(complete_time, '%Y-%m-%d') as date from qkj_member_task_detail where DATE_SUB(DATE_FORMAT(NOW(), '%Y-%m-%d'), interval 6 DAY) <= DATE_FORMAT(complete_time, '%Y-%m-%d') AND mem_card =?1 AND complete_time>=?2 AND task_id = 18 And type=0 AND points=10 group by date" ,nativeQuery = true)
+    List<Object> sevenDayCheckInFirst(String memCard, String time);
+
+    @Query(value = "SELECT qmt.task_desc,qmtd.points,qmtd.change_type,qmtd.complete_time FROM qkj_member_task_detail qmtd left join qkj_member_task qmt on qmtd.task_id = qmt.id WHERE mem_card = ?1 order by qmtd.complete_time desc" ,nativeQuery = true)
+    List<Object[]> findUserTaskInfo(String memCard);
+}

src/main/java/com/cirle/scientific/dao/QkjMemberTaskInfoDao.java

@@ -0,0 +1,25 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjMemberTaskInfo;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjMemberTaskInfoDao  extends PagingAndSortingRepository<QkjMemberTaskInfo, Long>, JpaSpecificationExecutor<QkjMemberTaskInfo> {
+
+
+    @Query(value = "SELECT * FROM qkj_member_task_info WHERE mem_card = ?1 " ,nativeQuery = true)
+    public QkjMemberTaskInfo findByMemCard (String memCard);
+
+//    @Query(value = "SELECT * FROM qkj_member_task_info order by mem_total_points desc" ,nativeQuery = true)
+//    List<QkjMemberTaskInfo> findUserjfRanking();
+
+    @Query(value = "SELECT a.* FROM qkj_member_task_info a left join qkj_member b on a.mem_card = b.mem_card " +
+            "where b.mem_nickname is not null order by a.mem_residual_points desc ,b.mem_register_time asc limit 50" ,nativeQuery = true)
+    List<QkjMemberTaskInfo> findUserjfRanking();
+
+    @Query(value = "SELECT * FROM qkj_member_task_info order by mem_residual_points desc limit 50" ,nativeQuery = true)
+    List<QkjMemberTaskInfo> findUserjfRankingNew();
+}

src/main/java/com/cirle/scientific/dao/QkjPhotoWallDao.java

@@ -0,0 +1,25 @@
+package com.cirle.scientific.dao;/*
+ *24901
+ *2022/11/10
+ *14:14
+ */
+
+import com.cirle.scientific.po.QkjPhotoWall;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+/**
+ * @author 24901
+ */
+public interface QkjPhotoWallDao extends PagingAndSortingRepository<QkjPhotoWall, Long>, JpaSpecificationExecutor<QkjPhotoWall> {
+
+    @Query(value = "select * from qkj_photowall where type = ?1 and obj_id = ?2 and state = 0 limit ?3 ,?4",nativeQuery = true)
+    List<QkjPhotoWall> findAllByTypeAndObjId(Integer type, Integer id, Integer start, Integer size);
+
+    @Query(value = "select count(*) from qkj_photowall where type = ?1 and obj_id = ?2 and state = 0 ",nativeQuery = true)
+    Integer findAllByTypeAndObjId(Integer type, Integer id);
+
+}

src/main/java/com/cirle/scientific/dao/QkjPositonsDao.java

@@ -0,0 +1,17 @@
+package com.cirle.scientific.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import com.cirle.scientific.po.QkjPositions;
+
+public interface QkjPositonsDao
+						extends PagingAndSortingRepository<QkjPositions, Long>, JpaSpecificationExecutor<QkjPositions> {
+	
+	@Query(value = "SELECT * FROM qkj_positions WHERE p_posid = ?1 order by sqn DESC" ,nativeQuery = true)
+	List<QkjPositions> findBypPosId(Integer pid);
+
+}

src/main/java/com/cirle/scientific/dao/QkjPurchasedRecordsDao.java

@@ -0,0 +1,17 @@
+package com.cirle.scientific.dao;
+
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjPurchasedRecords;
+
+@Repository
+public interface QkjPurchasedRecordsDao extends PagingAndSortingRepository<QkjPurchasedRecords, Long>, JpaSpecificationExecutor<QkjPurchasedRecords> {
+
+    @Query(value = "select mpr.* from qkj_purchased_records mpr where mpr.status=0 and mpr.obj_type=?2 and mpr.mem_card=?1 and mpr.obj_id=?3 and mpr.ispackage=?4 limit 0,1", nativeQuery = true)
+    QkjPurchasedRecords findByMemCardAndObjId(String memCard, Integer objType, Integer objId, Integer ispackage);
+
+}

src/main/java/com/cirle/scientific/dao/QkjQuestionAnswerDao.java

@@ -0,0 +1,32 @@
+package com.cirle.scientific.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjQuestionAnswer;
+
+@Repository
+public interface QkjQuestionAnswerDao extends PagingAndSortingRepository<QkjQuestionAnswer, Long>, JpaSpecificationExecutor<QkjQuestionAnswer> {
+	
+	List<QkjQuestionAnswer> findByMemCardAndObjTypeAndObjId(String memCard, Integer objType, Integer objId);
+	
+	@Modifying
+	@Query(value = "delete from qkj_question_answer where mem_card = ?1 and obj_type=?2 and obj_id=?3", nativeQuery = true)
+	void deleteByMemberAndObjTypeAndOjbId(String memCard, Integer objType, Integer objId);
+
+	@Modifying
+	@Query(value = "delete from qkj_question_answer where mem_card = ?1 and obj_type=?2 and obj_id=?3 and record_id=?4", nativeQuery = true)
+	void deleteByMemberAndObjTypeAndOjbIdAndRecordId(String memCard, Integer objType, Integer objId, Integer recordId);
+
+	@Query(value = "SELECT a.* FROM qkj_question_answer a WHERE a.mem_card=?1 and a.obj_type=2 and a.obj_id=?2 and a.record_id=?3",nativeQuery = true)
+	List<QkjQuestionAnswer> findConferPeopleAttribute(String memCard,Integer conferId, Integer recordId);
+
+
+	@Query(value = "SELECT a.* FROM qkj_question_answer a WHERE  mem_card = ?1 and obj_type=?2 and obj_id=?3", nativeQuery = true)
+	List<QkjQuestionAnswer> findByCardAndTypeAndId(String memCard, Integer objType, Integer objId);
+}

src/main/java/com/cirle/scientific/dao/QkjQuestionDetailDao.java

@@ -0,0 +1,20 @@
+package com.cirle.scientific.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cirle.scientific.po.QkjQuestionDetail;
+
+@Repository
+public interface QkjQuestionDetailDao extends PagingAndSortingRepository<QkjQuestionDetail, Long>, JpaSpecificationExecutor<QkjQuestionDetail> {
+	
+	@Query(value = "SELECT * FROM qkj_question_detail WHERE obj_type=?1 and obj_id=?2 and status=0 order by sqn desc",nativeQuery = true)
+	List<QkjQuestionDetail> findByObjTypeAndObjId(Integer objType, Integer objId);
+
+	@Query(value = "SELECT * FROM qkj_question_detail WHERE obj_type=?1 and obj_id=?2 and status=0 order by sqn asc",nativeQuery = true)
+	List<QkjQuestionDetail> SelectByObjTypeAndObjId(Integer objType, Integer objId);
+}

src/main/java/com/cirle/scientific/dao/QkjRecommendDao.java

@@ -0,0 +1,38 @@
+package com.cirle.scientific.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import com.cirle.scientific.po.QkjRecommend;
+
+public interface QkjRecommendDao
+		extends PagingAndSortingRepository<QkjRecommend, Long>, JpaSpecificationExecutor<QkjRecommend> {
+
+	@Query(value = "select a.* from qkj_recommend a where a.pos_id=?1 and a.status = 1 order by a.sort_num desc limit ?2,?3", nativeQuery = true)
+	List<QkjRecommend> findByPosId(Integer posId, int start, int size);
+
+	@Query(value = "select a.* from qkj_recommend a where a.pos_id=?1 and (a.status = 1 or a.status=?2) order by a.sort_num desc limit ?3,?4", nativeQuery = true)
+	List<QkjRecommend> findByPosId(Integer posId, Integer status, int start, int size);
+
+	@Query(value = "SELECT * FROM qkj_recommend WHERE pos_id IN (SELECT id FROM sys_positions WHERE p_posid = ?1) LIMIT ?2,?3" ,nativeQuery = true)
+	List<QkjRecommend> findBypPosId(Integer pid, Integer start, Integer size);
+
+	@Query(value = "SELECT * FROM qkj_recommend WHERE pos_id IN (SELECT id FROM sys_positions WHERE p_posid = ?1) AND rcmd_obj_id = ?4 LIMIT ?2,?3",nativeQuery = true)
+	List<QkjRecommend> findByPosIdAndObjId(Integer posId, int i, int size, Long objId);
+
+	@Query(value = "SELECT * FROM qkj_recommend WHERE status=1 AND id = ?1",nativeQuery = true)
+	QkjRecommend findByIdAndStatus(Long id);
+
+	@Query(value = "SELECT r.* FROM qkj_recommend_detail d"
+					+"	LEFT JOIN qkj_recommend r on d.rcmd_id = r.id"
+					+" WHERE post_type=?1 and obj_id=?2 and d.`status`=0 and r.`status`=1 ORDER BY d.sqn desc LIMIT ?3,?4" ,nativeQuery = true)
+	List<QkjRecommend> findByPostTypeAndObjId(Integer postType, Integer objId, Integer start, Integer size);
+
+
+	@Query(value = "select * from qkj_recommend where rcmd_obj_id = ?1  and  rcmd_type =?2",nativeQuery = true)
+	List<QkjRecommend> findListByObjIdAndType(Long id, Integer type);
+
+}

src/main/java/com/cirle/scientific/dao/QkjShareDao.java

@@ -0,0 +1,22 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjShare;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface QkjShareDao extends PagingAndSortingRepository<QkjShare, Long>, JpaSpecificationExecutor<QkjShare> {
+    @Query(value = "SELECT * FROM qkj_share WHERE share_memcard = ?1 AND click_memcard = ?2" +
+            " AND obj_type = ?3 and obj_id= ?4", nativeQuery = true)
+    List<QkjShare> getQkjShare(String shareMemcard, String clickMemcard, Integer objType, Integer objId);
+
+
+    @Query(value = "SELECT * FROM qkj_share WHERE  obj_type = ?1 and obj_id= ?2", nativeQuery = true)
+    List<QkjShare> getQkjShareByObjTYpeAndObjId(Integer objType, Integer objId);
+
+}

src/main/java/com/cirle/scientific/dao/QkjTagsDao.java

@@ -0,0 +1,21 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjTags;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjTagsDao  extends PagingAndSortingRepository<QkjTags, Long>, JpaSpecificationExecutor<QkjTags> {
+
+    @Query(value = "select qt.* from qkj_tags qt inner join qkj_tags_detail qtd on qtd.tag_id = qt.id where qtd.obj_id = ?1 and qtd.obj_type = 2 order by qtd.sqn desc limit 0,2",nativeQuery = true)
+    List<QkjTags> findCourseTagsByCourseId(Long id);
+
+
+    @Query(value = "select qt.* from qkj_tags qt inner join qkj_tags_detail qtd on qtd.tag_id = qt.id where qtd.obj_id = ?1 and qtd.obj_type = ?2 order by qtd.sqn desc ",nativeQuery = true)
+    List<QkjTags> findTagsByObjIdAndObjType(Long objId,Integer objType);
+
+    @Query(value = "select qt.* from qkj_tags qt inner join qkj_tags_detail qtd on qtd.tag_id = qt.id where qtd.obj_id in (?1) and qtd.obj_type = 2 order by qtd.sqn desc",nativeQuery = true)
+    List<QkjTags> findAllTags(String ids);
+}

src/main/java/com/cirle/scientific/dao/QkjTagsDetailDao.java

@@ -0,0 +1,14 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjTagsDetail;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface QkjTagsDetailDao extends PagingAndSortingRepository<QkjTagsDetail, Long>, JpaSpecificationExecutor<QkjTagsDetail> {
+
+    @Modifying
+    @Query(value = "delete from qkj_tags_detail where obj_id = ?1 and obj_type = ?2",nativeQuery = true)
+    void deleteByObjIdAndObjType(Long objId, int type);
+}

src/main/java/com/cirle/scientific/dao/QkjTqcourseCommentsDao.java

@@ -0,0 +1,15 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjTqcourseComments;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjTqcourseCommentsDao extends PagingAndSortingRepository<QkjTqcourseComments, Long>, JpaSpecificationExecutor<QkjTqcourseComments> {
+
+
+    @Query(value = "select * from qkj_tqcourse_comments where tqcourse_id = ?1 order by opr_time desc",nativeQuery = true)
+    List<QkjTqcourseComments> findCommentsByCourseId(Long id);
+}

src/main/java/com/cirle/scientific/dao/QkjTqcourseCourseDao.java

@@ -0,0 +1,20 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjTqcourseCourse;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjTqcourseCourseDao extends PagingAndSortingRepository<QkjTqcourseCourse, Long>, JpaSpecificationExecutor<QkjTqcourseCourse> {
+
+
+
+    @Query(value = "select * from qkj_tqcourse_course where status = 1 and tqcourse_id = ?1 order by sort_num desc",nativeQuery = true)
+    List<QkjTqcourseCourse> findCourseCourse(Integer zqId);
+
+
+    @Query(value = "select id from qkj_tqcourse_course where status = 1 and tqcourse_id = ?1 order by sort_num desc",nativeQuery = true)
+    List<Long> findCourseCourseIds(Integer zqId);
+}

src/main/java/com/cirle/scientific/dao/QkjTqcourseDao.java

@@ -0,0 +1,71 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjTqcourse;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjTqcourseDao extends PagingAndSortingRepository<QkjTqcourse, Long>, JpaSpecificationExecutor<QkjTqcourse> {
+
+
+    @Query(value = "select DISTINCT qt.* from qkj_tqcourse qt inner join qkj_catalogs_detail qcd on qcd.obj_id = qt.id where qcd.catalogs_id in ?1 and qcd.obj_type = 2 and qt.status = 1 and qt.is_visiable = 1  order by qt.top_status desc, qt.create_time desc limit ?2,?3", nativeQuery = true)
+    List<QkjTqcourse> getIndexData(List cataId, Integer start, Integer size);
+
+    @Query(value = "select DISTINCT qt.* from qkj_tqcourse qt inner join qkj_catalogs_detail qcd on qcd.obj_id = qt.id where qcd.catalogs_id = ?1 and qcd.obj_type = 2 and qt.status = 1 and qt.is_visiable = 1 ", nativeQuery = true)
+    List<QkjTqcourse> getTqByCataIds(Integer cataId);
+
+    @Query(value = "select qzt.tqcoursezq_id from qkj_tqcourse qt inner join qkj_zq_tqcourse_detail qzt on qzt.tqcourse_id = qt.id where tqcourse_id = ?1", nativeQuery = true)
+    List<Integer> getTqcoursezqIdByTqcourseId(Long TqcourseId);
+
+    @Query(value = "select count(*) from (select DISTINCT qt.* from qkj_tqcourse qt inner join qkj_catalogs_detail qcd on qcd.obj_id = qt.id where qcd.catalogs_id in ?1 and qcd.obj_type = 2 and qt.status = 1 and qt.is_visiable = 1) a", nativeQuery = true)
+    Integer getIndexDataCounts(List cataId);
+
+    @Query(value = "select * from qkj_tqcourse where status = 1 and is_visiable = 1 and m_or_pc in (?3) order by top_status desc, create_time desc , sort_num desc limit ?1,?2", nativeQuery = true)
+    List<QkjTqcourse> getIndexDataBysortNum(Integer start, Integer size, Integer[] mOrPc);
+
+    @Query(value = "select * from qkj_tqcourse where status = 1 and is_visiable = 1 and m_or_pc in (?3) order by top_status desc, create_time desc limit ?1,?2", nativeQuery = true)
+    List<QkjTqcourse> getIndexNewestData(Integer start, Integer size, Integer[] mOrPc);
+
+    @Query(value = "select * from qkj_tqcourse where status = 1 and is_visiable = 1 order by top_status desc, create_time desc limit ?1,?2", nativeQuery = true)
+    List<QkjTqcourse> getIndexDataAll(Integer page, Integer size);
+
+    @Query(value = "select count(*) from qkj_tqcourse where status = 1 and is_visiable = 1 order by top_status desc, create_time desc", nativeQuery = true)
+    Integer getIndexDataAllSize();
+
+
+    @Query(value = "select * from qkj_tqcourse where status = 1 and is_visiable = 1 and m_or_pc in (?3) order by study_num desc limit ?1,?2", nativeQuery = true)
+    List<QkjTqcourse> getIndexHottestData(Integer start, Integer size, Integer[] mOrPc);
+
+    @Query(value = "select count(*) from qkj_tqcourse where status = 1 and is_visiable = 1 order by study_num desc", nativeQuery = true)
+    Integer getIndexDataCounts();
+
+
+    @Query(value = "select count(*) from qkj_tqcourse where status = 1 and is_visiable = 1 and m_or_pc in (?1) order by study_num desc", nativeQuery = true)
+    Integer getIndexDataCounts(Integer[] mOrPc);
+
+    @Query(value = "select qt.* from qkj_tqcourse qt inner join qkj_zq_tqcourse_detail qzt on qzt.tqcourse_id = qt.id where qt.status = 1 and qt.is_visiable = 1 and qzt.tqcoursezq_id = ?1 order by qt.create_time desc,qzt.sort desc limit ?2,?3", nativeQuery = true)
+    List<QkjTqcourse> findTqListForZq(Integer zqId, int start, Integer size);
+
+    @Query(value = "select qt.* from qkj_tqcourse qt inner join qkj_zq_tqcourse_detail qzt on qzt.tqcourse_id = qt.id where qt.status = 1 and qt.is_visiable = 1 and qzt.tqcoursezq_id = ?1 order by qzt.sort asc limit ?2,?3", nativeQuery = true)
+    List<QkjTqcourse> findTqListForZq1(Integer zqId, int start, Integer size);
+
+
+    @Query(value = "select qt.* from qkj_tqcourse qt inner join qkj_zq_tqcourse_detail qzt on qzt.tqcourse_id = qt.id where qt.status = 1 and qt.is_visiable = 1 and qzt.tqcoursezq_id = ?1 order by qt.create_time desc,qzt.sort desc", nativeQuery = true)
+    List<QkjTqcourse> findTqListForZq(Integer zqId);
+
+    @Query(value = "select qt.* from qkj_tqcourse qt inner join qkj_zq_tqcourse_detail qzt on qzt.tqcoursezq_id = qt.id where qt.status = 1 and qt.is_visiable = 1 and qzt.tqcourse_id = ?1 order by qt.create_time desc,qzt.sort desc", nativeQuery = true)
+    List<QkjTqcourse> findTqListFortqId(Integer tqId);
+
+    @Query(value = "select qt.* from qkj_catalogs_detail qcd inner join qkj_tqcourse qt on qt.id = qcd.obj_id where qcd.catalogs_id in (?1) and qt.id != ?2 and qcd.obj_type = 2 and qt.status = 1 order by qt.create_time desc,qcd.sqn desc limit 0,10", nativeQuery = true)
+    List<QkjTqcourse> findTqListForCataList(String ids, Long id);
+
+    @Query(value = "SELECT DISTINCT qt.* from qkj_tqcourse qt left JOIN qkj_tqcourse_course qtc on qtc.tqcourse_id = qt.id left JOIN qkj_tags_detail qtd on qtd.obj_id = qtc.id where qtd.tag_id in (1,2) and qt.status = 1", nativeQuery = true)
+    List<QkjTqcourse> findTqListByTags(String tagIds);
+
+
+    @Query(value = "SELECT * from qkj_tqcourse qt  where qt.tag_ids like %?1% and qt.status = 1 and qt.id != ?2", nativeQuery = true)
+    List<QkjTqcourse> findTqListByTagIds(String tagIds, Long id);
+
+}

src/main/java/com/cirle/scientific/dao/QkjVedioPlayRecordDao.java

@@ -0,0 +1,31 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjVedioPlayRecord;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface QkjVedioPlayRecordDao extends PagingAndSortingRepository<QkjVedioPlayRecord, Long>, JpaSpecificationExecutor<QkjVedioPlayRecord> {
+    QkjVedioPlayRecord findByMemCardAndObjTypeAndObjId(String memCard, int objType, int objId);
+
+
+    @Query(value = "select SUM(l.study_percent) from qkj_video_play_record l where l.mem_card =?1 and l.obj_type=?2 and l.pobj_id=?3",nativeQuery = true)
+    BigDecimal findTotalPercentByPobjId(String memCard, Integer objType, int intValue);
+
+
+    @Query(value = "SELECT * from (SELECT l.* from qkj_video_play_record l INNER JOIN qkj_tqcourse qt on qt.id = l.obj_id  where l.mem_card = ?1 and l.obj_type = 7  and qt.status = 1\n" +
+            "UNION\n" +
+            "SELECT l.* from qkj_video_play_record l INNER JOIN qkj_live ql on ql.id = l.obj_id  where l.mem_card = ?1 and l.obj_type = 2  and ql.status = 1) as a order by opr_time desc limit ?2,?3",nativeQuery = true)
+    List<QkjVedioPlayRecord> findUserStudyList(String memCard, int start,int size);
+
+
+    @Query(value = "select COUNT(DISTINCT l.mem_card) from qkj_video_play_record l where l.obj_type=?1 and l.pobj_id=?2",nativeQuery = true)
+    BigDecimal findMemberCountByPobjId(int objType, int pobjId);
+
+
+    @Query(value = "select * from qkj_video_play_record where mem_card = ?1 and obj_type =?2 and pobj_id = ?3",nativeQuery = true)
+    List<QkjVedioPlayRecord> findPlayTimeByMemCardAndObjIdAndObjTypeAndPobjId(String memCard , int objType , int pobjId);
+}

src/main/java/com/cirle/scientific/dao/QkjVedioPlayRecordLogDao.java

@@ -0,0 +1,27 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjVedioPlayRecordLog;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface QkjVedioPlayRecordLogDao extends PagingAndSortingRepository<QkjVedioPlayRecordLog, Long>, JpaSpecificationExecutor<QkjVedioPlayRecordLog> {
+
+    @Query(value = "select * from qkj_video_play_record_log where mem_card = ?1 limit ?2,?3",nativeQuery = true)
+    List<QkjVedioPlayRecordLog> findUserStudyRecord(String memCard, int i, Integer size);
+
+
+    @Query(value = "select l.* from qkj_video_play_record_log l where l.mem_card =?1 and l.obj_type=?2 and l.obj_id=?3 order by l.opr_time desc limit 0,1",nativeQuery = true)
+    QkjVedioPlayRecordLog findMaxEndPlayTime(String memCard, Integer objType, Integer objId);
+
+    @Query(value = "select * from qkj_video_play_record_log l where l.mem_card =?1 and l.obj_type=?2 and l.obj_id=?3 and look_up = ?4",nativeQuery = true)
+    List<QkjVedioPlayRecordLog> findAllByMemCardAndObjIdAndObjTypeAndObjType(String memCard, Integer objType, Integer objId ,Integer lookUp);
+
+    @Query(value = "select learn_time from qkj_video_play_record_log l where l.mem_card =?1 and l.obj_type=?2 and l.obj_id=?3 and look_up = ?4",nativeQuery = true)
+    List<Integer> findCountPlayTime(String memCard, Integer objType, Integer objId ,Integer lookUp);
+
+    @Query(value = "SELECT * FROM qkj_video_play_record_log WHERE mem_card =?1 and obj_type = ?2 and obj_id = ?3 order by opr_time asc " , nativeQuery = true)
+    List<QkjVedioPlayRecordLog> listPlayRecordLog(String memCard, Integer objType, long objId);
+}

src/main/java/com/cirle/scientific/dao/QkjVideoPlayLogDao.java

@@ -0,0 +1,26 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjLive;
+import com.cirle.scientific.po.QkjVedioPlayRecord;
+import com.cirle.scientific.po.QkjVideoPlayLog;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface QkjVideoPlayLogDao extends PagingAndSortingRepository<QkjVideoPlayLog, Long>, JpaSpecificationExecutor<QkjVideoPlayLog> {
+
+    @Query(value = "SELECT t1.id , courseid , liveid , logtime , t1.mem_card , SUM(learntime) learntime FROM (\n" +
+            "\tSELECT * FROM qkj_video_play_log WHERE learntime > 0 and  mem_card = ?1 \n" +
+            ") t1 INNER JOIN(\n" +
+            "\tSELECT * FROM qkj_tqcourse_course WHERE tqcourse_id = ?2 \n" +
+            ") t2 ON t1.courseid = t2.id",nativeQuery = true)
+    QkjVideoPlayLog findCourseLogList(String memCard , Long tqcourseId);
+
+    @Query(value = "SELECT id,courseid,liveid,logtime,mem_card,SUM(learntime) learntime " +
+                   "FROM qkj_video_play_log WHERE mem_card = ?1 AND liveid = ?2 AND learntime > 0",nativeQuery = true)
+    QkjVideoPlayLog findLiveLogList(String memCard , Long liveId);
+
+}

src/main/java/com/cirle/scientific/dao/QkjVodinfoDao.java

@@ -0,0 +1,8 @@
+package com.cirle.scientific.dao;
+
+import com.cirle.scientific.po.QkjVodinfo;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface QkjVodinfoDao extends PagingAndSortingRepository<QkjVodinfo, Long>, JpaSpecificationExecutor<QkjVodinfo> {
+}