1.添加主播 UID字段

pom.xml

@@ -12,8 +12,8 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.yupi</groupId>
-    <artifactId>springboot-init</artifactId>
+    <artifactId>crawl-client</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0</version>
     <name>springboot-init</name>
     <properties>
         <java.version>1.8</java.version>

src/main/java/com/yupi/springbootinit/mapper/NewHostsMapper.java

@@ -33,6 +33,5 @@ public interface NewHostsMapper extends BaseMapper<NewHosts> {
 
     Page<NewHostsVO> selectPageByCondition(@Param("page") Page<NewHostsVO> page, @Param("hostInfoDTO") HostInfoDTO hostInfoDTO);
 
-    List<SevenDaysData> selectSevenDaysData(HistoryDataDTO historyDataDTO);
 
 }

src/main/java/com/yupi/springbootinit/model/vo/hosts/NewHostsVO.java

@@ -84,4 +84,5 @@ public class NewHostsVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
+    private String uid;
 }

src/main/java/com/yupi/springbootinit/service/HostInfoService.java

@@ -21,5 +21,4 @@ public interface HostInfoService extends IService<NewHosts> {
 
     Page<NewHostsVO> getConditionHosts(HostInfoDTO hostInfoDTO);
 
-    List<SevenDaysData> getSevenDaysData(HistoryDataDTO historyDataDTO);
 }

src/main/java/com/yupi/springbootinit/service/impl/HostInfoServiceImpl.java

@@ -44,9 +44,5 @@ public class HostInfoServiceImpl extends ServiceImpl<NewHostsMapper, NewHosts> i
         return newHostsMapper.selectPageByCondition(page, hostInfoDTO);
     }
 
-    @Override
+
-    public List<SevenDaysData> getSevenDaysData(HistoryDataDTO historyDataDTO) {
-        List<SevenDaysData> data = newHostsMapper.selectSevenDaysData(historyDataDTO);
-        return data;
-    }
 }

src/main/java/com/yupi/springbootinit/service/impl/SystemTenantServiceImpl.java

@@ -22,7 +22,8 @@ public class SystemTenantServiceImpl extends ServiceImpl<SystemTenantMapper, Sys
     @Override
     public Long getTenantIdByName(String name) {
         QueryWrapper<SystemTenant> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("name",name);
+        queryWrapper.eq("name",name)
+                .eq("deleted",false );
         SystemTenant systemTenant = baseMapper.selectOne(queryWrapper);
         if (systemTenant == null){
             throw new BusinessException(ErrorCode.TENANT_NAME_NOT_EXISTS);

src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
   # todo 需替换配置
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.79.98.113:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
+    url: jdbc:mysql://localhost:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
     username: root
     password: 123asd
   # Redis 配置

src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
     name: springboot-init
   # 默认 dev 环境
   profiles:
-    active: prod
+    active: dev
   # 支持 swagger3
   mvc:
     pathmatch:

src/main/resources/mapper/NewHostsMapper.xml

@@ -38,6 +38,7 @@
     <result column="hosts_kind" jdbcType="VARCHAR" property="hostsKind" />
     <result column="online_fans" jdbcType="INTEGER" property="onlineFans"/>
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -245,7 +246,7 @@
 
   <select id="selectPageByCondition" resultMap="HostInfoVo">
     select ns.id,hosts_id, hosts_level, hosts_coins, Invitation_type, fans, fllowernum,
-    yesterday_coins,ns.create_time, country, online_fans,hosts_kind from server_new_hosts ns left join server_country_info ci ON ns.country = ci.country_name
+    yesterday_coins,ns.create_time, country, online_fans,hosts_kind, uid from server_new_hosts ns left join server_country_info ci ON ns.country = ci.country_name
     where ns.tenant_id=#{hostInfoDTO.tenantId}
     <!--  主播国家筛选    -->
     <if test="hostInfoDTO.country!= '' and hostInfoDTO.country != null">