fix bug

bin/appcount.sh

@@ -6,9 +6,10 @@ LAST_DT=$(date +%Y%m%d -d "-7 day $DT")
 
 hive -hivevar dt=${DT} -hivevar last_dt=${LAST_DT} -f base.sql
 
-# sqoop eval --connect jdbc:mysql://192.168.32.128:3306/app_tag  \
-#       --username root --password 19920627 --table tag_list --columns "package_name,app_name,category_list,track_view_url,install_nums" \
-#       --export-dir s3://mob-emr-test/dataplatform/DataWareHouse/dwh.db/package_list --input-fields-terminated-by '\001'
+sqoop eval --connect jdbc:mysql://dataplatform-app-tag.c5yzcdreb1xr.us-east-1.rds.amazonaws.com:3306/app_tag  --username apptag_rw --password 7gyLEVtkER3u8c9 --table tag_list --columns "package_name,app_name,category_list,track_view_url,install_nums" --export-dir s3://mob-emr-test/dataplatform/DataWareHouse/dwh.db/package_list --input-fields-terminated-by '\001'
 
+hive -e "USE dwh;DROP TABLE IF EXISTS package_num;"
 
-hive -e "USE dwh;DROP TABLE IF EXISTS package_list_${dt};"
+hive -e "USE dwh;DROP TABLE IF EXISTS package_info;"
\ No newline at end of file
+
+hive -e "USE dwh;DROP TABLE IF EXISTS package_list;"
\ No newline at end of file

sql/base.sql

@@ -15,17 +15,17 @@ CREATE TABLE package_num AS SELECT tt.package_name,tt.install_nums FROM
         ON t1.package_name = t2.package_name
     ) tt WHERE tt.install_nums > 30000; 
 
-DROP TABLE IF EXISTS package_num;
+DROP TABLE IF EXISTS package_info;
 CREATE TABLE package_info AS 
-    SELECT package_name,app_name,category_list,track_view_url 
+    SELECT package_name,substring(app_name,0,100) AS app_name,category_list,track_view_url,'IOS' AS platform 
     FROM dwh.dim_app_info_ios WHERE CONCAT(year,month,day) = '${dt}' 
     UNION ALL 
-    SELECT package_name,app_name,category_list,track_view_url 
+    SELECT package_name,substring(app_name,0,100) AS app_name,category_list,track_view_url,'Android' AS platform 
     FROM dwh.dim_app_info_adr WHERE CONCAT(year,month,day) = '${dt}';
 
-DROP TABLE IF EXISTS package_list_'${dt}';
-CREATE TABLE package_list_'${dt}' AS 
-    SELECT /*+ mapjoin(t)*/ p.package_name,p.app_name,p.track_view_url,p.category_list,t.install_nums
+DROP TABLE IF EXISTS package_list;
+CREATE TABLE package_list AS 
+    SELECT /*+ mapjoin(t)*/ p.package_name,p.app_name,p.platform,p.track_view_url,p.category_list,t.install_nums
     FROM package_num t 
     JOIN package_info p 
     ON t.package_name = p.package_name;
\ No newline at end of file

src/main/java/com/mobvista/apptag/controller/TagController.java

@@ -138,11 +138,11 @@ public class TagController {
 
     @PostMapping("/list")
     @ResponseBody
-    public PageUtil list(@SessionAttribute(WebSecurityConfig.SESSION_KEY) String username, @RequestBody Query query,
+    public PageUtil list(@RequestBody Query query,
             @RequestParam(name = "tag", required = false, defaultValue = "0") int tag) {
         PageHelper.startPage(query.getOffset() + 1, query.getLimit());
-        List<Tag> tags = tagDao.list(tag, username);
-        int total = tagDao.count(tag, username);
+        List<Tag> tags = tagDao.list(tag);
+        int total = tagDao.count(tag);
         PageUtil pageUtil = new PageUtil(tags, total);
         return pageUtil;
     }

src/main/java/com/mobvista/apptag/mapper/TagDao.java

@@ -25,7 +25,7 @@ public interface TagDao {
                         @Result(property = "install", column = "install"), @Result(property = "tag", column = "tag"),
                         @Result(property = "userId", column = "user_id"),
                         @Result(property = "updateTime", column = "update_time") })
-        List<Tag> list(int tag, String userId);
+        List<Tag> list(int tag);
 
         @Select("SELECT * FROM tag_list WHERE tag = #{tag} ORDER BY install DESC")
         @Results({ @Result(property = "packageName", column = "package_name"),
@@ -57,6 +57,6 @@ public interface TagDao {
                         @Result(property = "updateTime", column = "update_time") })
         Tag find(String package_name);
 
-        @Select("SELECT COUNT(1) FROM tag_list WHERE tag = #{tag} AND user_id = #{userId}")
-        int count(int tag, String userId);
+        @Select("SELECT COUNT(1) FROM tag_list WHERE tag = #{tag}")
+        int count(int tag);
 }
\ No newline at end of file

src/main/java/com/mobvista/apptag/service/impl/TagServiceImpl.java

@@ -44,6 +44,6 @@ public class TagServiceImpl implements TagService {
     @Override
     public List<Tag> list(int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        return tagDao.list(1, "");
+        return tagDao.list(1);
     }
 }
\ No newline at end of file