update

src/main/java/cn/com/acadsoc/core/common/model/Constant.java

+package cn.com.acadsoc.core.common.model;
+
+public class Constant {
+
+
+
+
+
+    public static class ReturnStatusCode {
+        public static final Integer SUCCESS = 20000; // 成功
+        public static final Integer TOKEN_INVALID = 40001;//token无效
+        public static final Integer TOKEN_NULL = 40002;// token is null
+        public static final Integer PARAM_NULL = 40003;//必要参数为空
+        public static final Integer FILE_ILLEGAL = 40004;//文件不合法
+        public static final Integer ERROR = 40005;//内部错误
+
+        public static final Integer USER_NO_EXISTS = 41001; //用户不存在
+        public static final Integer USER_REPEAT = 41002; //存在多个相同的用户名
+        public static final Integer REPEAT = 41003; //xxx已存在
+        public static final Integer UNAUTHORIZED = 41004; //xxx已存在
+    }
+
+
+
+}

src/main/java/cn/com/acadsoc/core/controller/TextbookController.java

@@ -16,7 +16,7 @@ public class TextbookController {
     private TextbookService textbookService;
 
     @RequestMapping("/GetCatIDByUserInterest")
-    public void getCatIDByUserInterest(){
+    public void getCatIDByUserInterest(String uid){
         List<Map<String, Object>> list =  textbookService.getTextbookByGrade("1");
         for (Map<String, Object> stringObjectMap : list) {
             System.out.println(stringObjectMap);

src/main/java/cn/com/acadsoc/core/dao/impl/TextbookDaoImpl.java

@@ -20,7 +20,22 @@ public class TextbookDaoImpl implements TextbookDao {
 
     @Override
     public List<Map<String, Object>> getTextbookByGrade(String grade) {
-        String sql = "select * from temp.temp_recommend_list_all";
+        String sql = "SELECT ds.uid,multi_dept_source_name,user_level,a.CLID,b.*,b.CatID as `试课教材ID`,b.SID as `试课课件ID`\n" +
+                "FROM dm.dm_api_tag_student  ds\n" +
+                "LEFT JOIN (\n" +
+                "\t\t\tSELECT uid,CLID as `试课ID`, status as `试课状态`,allocationtime as `约课时间`, ClassTime `试课时间` ,CLID,\n" +
+                "\t\t\tFROM src.src_a1_class_courselesson_all WHERE  uid = '9474704' and status != -1\n" +
+                ")  a ON ds.hash_uid = a.uid\n" +
+                "LEFT JOIN src.src_a1_uc_usersubject_all b ON a.CLID = b.CLID\n" +
+                "where hash_uid = '9474704' ";
         return jdbcTemplate.queryForList(sql);
     }
+    /*SELECT ds.uid,multi_dept_source_name,user_level,a.CLID,b.*,b.CatID as `试课教材ID`,b.SID as `试课课件ID`
+    FROM dm.dm_api_tag_student  ds
+    LEFT JOIN (
+            SELECT uid,CLID as `试课ID`, status as `试课状态`,allocationtime as `约课时间`, ClassTime `试课时间` ,CLID,
+            FROM src.src_a1_class_courselesson_all WHERE  uid = '9474704' and status != -1
+    )  a ON ds.hash_uid = a.uid
+    LEFT JOIN src.src_a1_uc_usersubject_all b ON a.CLID = b.CLID
+    where hash_uid = '9474704'*/
 }

src/main/java/cn/com/acadsoc/core/model/TextbookShuntLog.java

@@ -3,14 +3,57 @@ package cn.com.acadsoc.core.model;
 public class TextbookShuntLog {
 
     private String uid;
-    private String source_type_name;
-    private String userLevel;
     private String grade;//用户兴趣
+    private String tCatId;//推荐教材ID
+    private String tSid;//推荐课件ID
+    private String requestUser;//请求方，APP，admin后台
+    private String type;//所有教材，推荐教材
 
-    private String first_allocation_time;//试课
-    private String first_trial_time;//约课
-    private String catid;//推荐教材ID
-    private String sid;//推荐课件ID
+    public String getUid() {
+        return uid;
+    }
 
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
 
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public String gettCatId() {
+        return tCatId;
+    }
+
+    public void settCatId(String tCatId) {
+        this.tCatId = tCatId;
+    }
+
+    public String gettSid() {
+        return tSid;
+    }
+
+    public void settSid(String tSid) {
+        this.tSid = tSid;
+    }
+
+    public String getRequestUser() {
+        return requestUser;
+    }
+
+    public void setRequestUser(String requestUser) {
+        this.requestUser = requestUser;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

src/main/java/cn/com/acadsoc/core/service/impl/TextbookServiceImpl.java

@@ -16,6 +16,7 @@ public class TextbookServiceImpl implements TextbookService {
 
     @Override
     public List<Map<String, Object>> getTextbookByGrade(String grade) {
+
        return textbookDao.getTextbookByGrade(grade);
     }
 }