Browse Source

谁是舞王

xiongzhu 7 years ago
parent
commit
5619c0ea8a
29 changed files with 685 additions and 89 deletions
  1. 3 0
      src/main/java/com/thmodel/jooq/Indexes.java
  2. 6 0
      src/main/java/com/thmodel/jooq/Keys.java
  3. 6 0
      src/main/java/com/thmodel/jooq/Tables.java
  4. 8 1
      src/main/java/com/thmodel/jooq/Thmodel.java
  5. 183 0
      src/main/java/com/thmodel/jooq/tables/Ads.java
  6. 6 1
      src/main/java/com/thmodel/jooq/tables/Parttysign.java
  7. 287 0
      src/main/java/com/thmodel/jooq/tables/records/AdsRecord.java
  8. 60 11
      src/main/java/com/thmodel/jooq/tables/records/ParttysignRecord.java
  9. 1 0
      src/main/java/com/thmodel/util/DBRecordsPack.java
  10. 2 2
      src/main/webapp/dancer/component/player.jsp
  11. 28 29
      src/main/webapp/dancer/component/ranking.jsp
  12. 2 3
      src/main/webapp/dancer/index.jsp
  13. 0 9
      src/main/webapp/dancer/meta.jsp
  14. 5 6
      src/main/webapp/dancer/modelDetail.jsp
  15. 88 27
      src/main/webapp/dancer/rankingList.jsp
  16. BIN
      src/main/webapp/upload/activity/2018-06-15/451123138753678023.jpg
  17. BIN
      src/main/webapp/upload/activity/2018-06-15/632648482744828567.jpg
  18. BIN
      src/main/webapp/upload/hphoto/2018-07-13/h1.png
  19. BIN
      src/main/webapp/upload/hphoto/2018-07-13/h2.png
  20. BIN
      src/main/webapp/upload/logo/2018-06-14/151433619925078671.png
  21. BIN
      src/main/webapp/upload/logo/2018-06-14/514545182007297920.png
  22. BIN
      src/main/webapp/upload/logo/2018-06-14/563623058827878337.png
  23. BIN
      src/main/webapp/upload/photo/2018-06-11/165506282189714005.png
  24. BIN
      src/main/webapp/upload/photo/2018-06-11/354727579990910245.png
  25. BIN
      src/main/webapp/upload/photo/2018-06-11/460971478136359524.png
  26. BIN
      src/main/webapp/upload/photo/2018-06-11/493452113473660865.jpg
  27. BIN
      src/main/webapp/upload/photo/2018-06-11/861537846612330270.png
  28. BIN
      src/main/webapp/upload/photo/2018-06-11/864906035870622763.png
  29. BIN
      src/main/webapp/upload/photo/2018-06-11/900857256939806662.png

+ 3 - 0
src/main/java/com/thmodel/jooq/Indexes.java

@@ -6,6 +6,7 @@ package com.thmodel.jooq;
 
 
 import com.thmodel.jooq.tables.Accountrecord;
 import com.thmodel.jooq.tables.Accountrecord;
 import com.thmodel.jooq.tables.Accrecord;
 import com.thmodel.jooq.tables.Accrecord;
+import com.thmodel.jooq.tables.Ads;
 import com.thmodel.jooq.tables.Brokerinfor;
 import com.thmodel.jooq.tables.Brokerinfor;
 import com.thmodel.jooq.tables.Cardaccount;
 import com.thmodel.jooq.tables.Cardaccount;
 import com.thmodel.jooq.tables.Cashrecord;
 import com.thmodel.jooq.tables.Cashrecord;
@@ -71,6 +72,7 @@ public class Indexes {
     public static final Index ACCOUNTRECORD_PRIMARY = Indexes0.ACCOUNTRECORD_PRIMARY;
     public static final Index ACCOUNTRECORD_PRIMARY = Indexes0.ACCOUNTRECORD_PRIMARY;
     public static final Index ACCRECORD_INDEX_1 = Indexes0.ACCRECORD_INDEX_1;
     public static final Index ACCRECORD_INDEX_1 = Indexes0.ACCRECORD_INDEX_1;
     public static final Index ACCRECORD_PRIMARY = Indexes0.ACCRECORD_PRIMARY;
     public static final Index ACCRECORD_PRIMARY = Indexes0.ACCRECORD_PRIMARY;
+    public static final Index ADS_PRIMARY = Indexes0.ADS_PRIMARY;
     public static final Index BROKERINFOR_INDEX_1 = Indexes0.BROKERINFOR_INDEX_1;
     public static final Index BROKERINFOR_INDEX_1 = Indexes0.BROKERINFOR_INDEX_1;
     public static final Index BROKERINFOR_INDEX_2 = Indexes0.BROKERINFOR_INDEX_2;
     public static final Index BROKERINFOR_INDEX_2 = Indexes0.BROKERINFOR_INDEX_2;
     public static final Index BROKERINFOR_PRIMARY = Indexes0.BROKERINFOR_PRIMARY;
     public static final Index BROKERINFOR_PRIMARY = Indexes0.BROKERINFOR_PRIMARY;
@@ -161,6 +163,7 @@ public class Indexes {
         public static Index ACCOUNTRECORD_PRIMARY = Internal.createIndex("PRIMARY", Accountrecord.ACCOUNTRECORD, new OrderField[] { Accountrecord.ACCOUNTRECORD.PK }, true);
         public static Index ACCOUNTRECORD_PRIMARY = Internal.createIndex("PRIMARY", Accountrecord.ACCOUNTRECORD, new OrderField[] { Accountrecord.ACCOUNTRECORD.PK }, true);
         public static Index ACCRECORD_INDEX_1 = Internal.createIndex("Index_1", Accrecord.ACCRECORD, new OrderField[] { Accrecord.ACCRECORD.MEMBERPK, Accrecord.ACCRECORD.ADATE, Accrecord.ACCRECORD.ACCTYPE }, false);
         public static Index ACCRECORD_INDEX_1 = Internal.createIndex("Index_1", Accrecord.ACCRECORD, new OrderField[] { Accrecord.ACCRECORD.MEMBERPK, Accrecord.ACCRECORD.ADATE, Accrecord.ACCRECORD.ACCTYPE }, false);
         public static Index ACCRECORD_PRIMARY = Internal.createIndex("PRIMARY", Accrecord.ACCRECORD, new OrderField[] { Accrecord.ACCRECORD.PK }, true);
         public static Index ACCRECORD_PRIMARY = Internal.createIndex("PRIMARY", Accrecord.ACCRECORD, new OrderField[] { Accrecord.ACCRECORD.PK }, true);
+        public static Index ADS_PRIMARY = Internal.createIndex("PRIMARY", Ads.ADS, new OrderField[] { Ads.ADS.ID }, true);
         public static Index BROKERINFOR_INDEX_1 = Internal.createIndex("Index_1", Brokerinfor.BROKERINFOR, new OrderField[] { Brokerinfor.BROKERINFOR.MEMBERPK, Brokerinfor.BROKERINFOR.SEX, Brokerinfor.BROKERINFOR.NAME, Brokerinfor.BROKERINFOR.SUPERPK, Brokerinfor.BROKERINFOR.ISADMIN }, false);
         public static Index BROKERINFOR_INDEX_1 = Internal.createIndex("Index_1", Brokerinfor.BROKERINFOR, new OrderField[] { Brokerinfor.BROKERINFOR.MEMBERPK, Brokerinfor.BROKERINFOR.SEX, Brokerinfor.BROKERINFOR.NAME, Brokerinfor.BROKERINFOR.SUPERPK, Brokerinfor.BROKERINFOR.ISADMIN }, false);
         public static Index BROKERINFOR_INDEX_2 = Internal.createIndex("Index_2", Brokerinfor.BROKERINFOR, new OrderField[] { Brokerinfor.BROKERINFOR.MEMBERPK, Brokerinfor.BROKERINFOR.AUTH, Brokerinfor.BROKERINFOR.SUPERPK, Brokerinfor.BROKERINFOR.LINKMAN, Brokerinfor.BROKERINFOR.LINKTYPE, Brokerinfor.BROKERINFOR.ISADMIN }, false);
         public static Index BROKERINFOR_INDEX_2 = Internal.createIndex("Index_2", Brokerinfor.BROKERINFOR, new OrderField[] { Brokerinfor.BROKERINFOR.MEMBERPK, Brokerinfor.BROKERINFOR.AUTH, Brokerinfor.BROKERINFOR.SUPERPK, Brokerinfor.BROKERINFOR.LINKMAN, Brokerinfor.BROKERINFOR.LINKTYPE, Brokerinfor.BROKERINFOR.ISADMIN }, false);
         public static Index BROKERINFOR_PRIMARY = Internal.createIndex("PRIMARY", Brokerinfor.BROKERINFOR, new OrderField[] { Brokerinfor.BROKERINFOR.PK }, true);
         public static Index BROKERINFOR_PRIMARY = Internal.createIndex("PRIMARY", Brokerinfor.BROKERINFOR, new OrderField[] { Brokerinfor.BROKERINFOR.PK }, true);

+ 6 - 0
src/main/java/com/thmodel/jooq/Keys.java

@@ -6,6 +6,7 @@ package com.thmodel.jooq;
 
 
 import com.thmodel.jooq.tables.Accountrecord;
 import com.thmodel.jooq.tables.Accountrecord;
 import com.thmodel.jooq.tables.Accrecord;
 import com.thmodel.jooq.tables.Accrecord;
+import com.thmodel.jooq.tables.Ads;
 import com.thmodel.jooq.tables.Brokerinfor;
 import com.thmodel.jooq.tables.Brokerinfor;
 import com.thmodel.jooq.tables.Cardaccount;
 import com.thmodel.jooq.tables.Cardaccount;
 import com.thmodel.jooq.tables.Cashrecord;
 import com.thmodel.jooq.tables.Cashrecord;
@@ -44,6 +45,7 @@ import com.thmodel.jooq.tables.Sharerecord;
 import com.thmodel.jooq.tables.Videorecord;
 import com.thmodel.jooq.tables.Videorecord;
 import com.thmodel.jooq.tables.records.AccountrecordRecord;
 import com.thmodel.jooq.tables.records.AccountrecordRecord;
 import com.thmodel.jooq.tables.records.AccrecordRecord;
 import com.thmodel.jooq.tables.records.AccrecordRecord;
+import com.thmodel.jooq.tables.records.AdsRecord;
 import com.thmodel.jooq.tables.records.BrokerinforRecord;
 import com.thmodel.jooq.tables.records.BrokerinforRecord;
 import com.thmodel.jooq.tables.records.CardaccountRecord;
 import com.thmodel.jooq.tables.records.CardaccountRecord;
 import com.thmodel.jooq.tables.records.CashrecordRecord;
 import com.thmodel.jooq.tables.records.CashrecordRecord;
@@ -108,6 +110,7 @@ public class Keys {
 
 
     public static final Identity<AccountrecordRecord, Integer> IDENTITY_ACCOUNTRECORD = Identities0.IDENTITY_ACCOUNTRECORD;
     public static final Identity<AccountrecordRecord, Integer> IDENTITY_ACCOUNTRECORD = Identities0.IDENTITY_ACCOUNTRECORD;
     public static final Identity<AccrecordRecord, Integer> IDENTITY_ACCRECORD = Identities0.IDENTITY_ACCRECORD;
     public static final Identity<AccrecordRecord, Integer> IDENTITY_ACCRECORD = Identities0.IDENTITY_ACCRECORD;
+    public static final Identity<AdsRecord, Integer> IDENTITY_ADS = Identities0.IDENTITY_ADS;
     public static final Identity<BrokerinforRecord, Integer> IDENTITY_BROKERINFOR = Identities0.IDENTITY_BROKERINFOR;
     public static final Identity<BrokerinforRecord, Integer> IDENTITY_BROKERINFOR = Identities0.IDENTITY_BROKERINFOR;
     public static final Identity<CardaccountRecord, Integer> IDENTITY_CARDACCOUNT = Identities0.IDENTITY_CARDACCOUNT;
     public static final Identity<CardaccountRecord, Integer> IDENTITY_CARDACCOUNT = Identities0.IDENTITY_CARDACCOUNT;
     public static final Identity<CashrecordRecord, Integer> IDENTITY_CASHRECORD = Identities0.IDENTITY_CASHRECORD;
     public static final Identity<CashrecordRecord, Integer> IDENTITY_CASHRECORD = Identities0.IDENTITY_CASHRECORD;
@@ -151,6 +154,7 @@ public class Keys {
 
 
     public static final UniqueKey<AccountrecordRecord> KEY_ACCOUNTRECORD_PRIMARY = UniqueKeys0.KEY_ACCOUNTRECORD_PRIMARY;
     public static final UniqueKey<AccountrecordRecord> KEY_ACCOUNTRECORD_PRIMARY = UniqueKeys0.KEY_ACCOUNTRECORD_PRIMARY;
     public static final UniqueKey<AccrecordRecord> KEY_ACCRECORD_PRIMARY = UniqueKeys0.KEY_ACCRECORD_PRIMARY;
     public static final UniqueKey<AccrecordRecord> KEY_ACCRECORD_PRIMARY = UniqueKeys0.KEY_ACCRECORD_PRIMARY;
+    public static final UniqueKey<AdsRecord> KEY_ADS_PRIMARY = UniqueKeys0.KEY_ADS_PRIMARY;
     public static final UniqueKey<BrokerinforRecord> KEY_BROKERINFOR_PRIMARY = UniqueKeys0.KEY_BROKERINFOR_PRIMARY;
     public static final UniqueKey<BrokerinforRecord> KEY_BROKERINFOR_PRIMARY = UniqueKeys0.KEY_BROKERINFOR_PRIMARY;
     public static final UniqueKey<CardaccountRecord> KEY_CARDACCOUNT_PRIMARY = UniqueKeys0.KEY_CARDACCOUNT_PRIMARY;
     public static final UniqueKey<CardaccountRecord> KEY_CARDACCOUNT_PRIMARY = UniqueKeys0.KEY_CARDACCOUNT_PRIMARY;
     public static final UniqueKey<CashrecordRecord> KEY_CASHRECORD_PRIMARY = UniqueKeys0.KEY_CASHRECORD_PRIMARY;
     public static final UniqueKey<CashrecordRecord> KEY_CASHRECORD_PRIMARY = UniqueKeys0.KEY_CASHRECORD_PRIMARY;
@@ -201,6 +205,7 @@ public class Keys {
     private static class Identities0 {
     private static class Identities0 {
         public static Identity<AccountrecordRecord, Integer> IDENTITY_ACCOUNTRECORD = Internal.createIdentity(Accountrecord.ACCOUNTRECORD, Accountrecord.ACCOUNTRECORD.PK);
         public static Identity<AccountrecordRecord, Integer> IDENTITY_ACCOUNTRECORD = Internal.createIdentity(Accountrecord.ACCOUNTRECORD, Accountrecord.ACCOUNTRECORD.PK);
         public static Identity<AccrecordRecord, Integer> IDENTITY_ACCRECORD = Internal.createIdentity(Accrecord.ACCRECORD, Accrecord.ACCRECORD.PK);
         public static Identity<AccrecordRecord, Integer> IDENTITY_ACCRECORD = Internal.createIdentity(Accrecord.ACCRECORD, Accrecord.ACCRECORD.PK);
+        public static Identity<AdsRecord, Integer> IDENTITY_ADS = Internal.createIdentity(Ads.ADS, Ads.ADS.ID);
         public static Identity<BrokerinforRecord, Integer> IDENTITY_BROKERINFOR = Internal.createIdentity(Brokerinfor.BROKERINFOR, Brokerinfor.BROKERINFOR.PK);
         public static Identity<BrokerinforRecord, Integer> IDENTITY_BROKERINFOR = Internal.createIdentity(Brokerinfor.BROKERINFOR, Brokerinfor.BROKERINFOR.PK);
         public static Identity<CardaccountRecord, Integer> IDENTITY_CARDACCOUNT = Internal.createIdentity(Cardaccount.CARDACCOUNT, Cardaccount.CARDACCOUNT.PK);
         public static Identity<CardaccountRecord, Integer> IDENTITY_CARDACCOUNT = Internal.createIdentity(Cardaccount.CARDACCOUNT, Cardaccount.CARDACCOUNT.PK);
         public static Identity<CashrecordRecord, Integer> IDENTITY_CASHRECORD = Internal.createIdentity(Cashrecord.CASHRECORD, Cashrecord.CASHRECORD.PK);
         public static Identity<CashrecordRecord, Integer> IDENTITY_CASHRECORD = Internal.createIdentity(Cashrecord.CASHRECORD, Cashrecord.CASHRECORD.PK);
@@ -242,6 +247,7 @@ public class Keys {
     private static class UniqueKeys0 {
     private static class UniqueKeys0 {
         public static final UniqueKey<AccountrecordRecord> KEY_ACCOUNTRECORD_PRIMARY = Internal.createUniqueKey(Accountrecord.ACCOUNTRECORD, "KEY_accountrecord_PRIMARY", Accountrecord.ACCOUNTRECORD.PK);
         public static final UniqueKey<AccountrecordRecord> KEY_ACCOUNTRECORD_PRIMARY = Internal.createUniqueKey(Accountrecord.ACCOUNTRECORD, "KEY_accountrecord_PRIMARY", Accountrecord.ACCOUNTRECORD.PK);
         public static final UniqueKey<AccrecordRecord> KEY_ACCRECORD_PRIMARY = Internal.createUniqueKey(Accrecord.ACCRECORD, "KEY_accrecord_PRIMARY", Accrecord.ACCRECORD.PK);
         public static final UniqueKey<AccrecordRecord> KEY_ACCRECORD_PRIMARY = Internal.createUniqueKey(Accrecord.ACCRECORD, "KEY_accrecord_PRIMARY", Accrecord.ACCRECORD.PK);
+        public static final UniqueKey<AdsRecord> KEY_ADS_PRIMARY = Internal.createUniqueKey(Ads.ADS, "KEY_ads_PRIMARY", Ads.ADS.ID);
         public static final UniqueKey<BrokerinforRecord> KEY_BROKERINFOR_PRIMARY = Internal.createUniqueKey(Brokerinfor.BROKERINFOR, "KEY_brokerinfor_PRIMARY", Brokerinfor.BROKERINFOR.PK);
         public static final UniqueKey<BrokerinforRecord> KEY_BROKERINFOR_PRIMARY = Internal.createUniqueKey(Brokerinfor.BROKERINFOR, "KEY_brokerinfor_PRIMARY", Brokerinfor.BROKERINFOR.PK);
         public static final UniqueKey<CardaccountRecord> KEY_CARDACCOUNT_PRIMARY = Internal.createUniqueKey(Cardaccount.CARDACCOUNT, "KEY_cardaccount_PRIMARY", Cardaccount.CARDACCOUNT.PK);
         public static final UniqueKey<CardaccountRecord> KEY_CARDACCOUNT_PRIMARY = Internal.createUniqueKey(Cardaccount.CARDACCOUNT, "KEY_cardaccount_PRIMARY", Cardaccount.CARDACCOUNT.PK);
         public static final UniqueKey<CashrecordRecord> KEY_CASHRECORD_PRIMARY = Internal.createUniqueKey(Cashrecord.CASHRECORD, "KEY_cashrecord_PRIMARY", Cashrecord.CASHRECORD.PK);
         public static final UniqueKey<CashrecordRecord> KEY_CASHRECORD_PRIMARY = Internal.createUniqueKey(Cashrecord.CASHRECORD, "KEY_cashrecord_PRIMARY", Cashrecord.CASHRECORD.PK);

+ 6 - 0
src/main/java/com/thmodel/jooq/Tables.java

@@ -6,6 +6,7 @@ package com.thmodel.jooq;
 
 
 import com.thmodel.jooq.tables.Accountrecord;
 import com.thmodel.jooq.tables.Accountrecord;
 import com.thmodel.jooq.tables.Accrecord;
 import com.thmodel.jooq.tables.Accrecord;
+import com.thmodel.jooq.tables.Ads;
 import com.thmodel.jooq.tables.Brokerinfor;
 import com.thmodel.jooq.tables.Brokerinfor;
 import com.thmodel.jooq.tables.Cardaccount;
 import com.thmodel.jooq.tables.Cardaccount;
 import com.thmodel.jooq.tables.Cashrecord;
 import com.thmodel.jooq.tables.Cashrecord;
@@ -69,6 +70,11 @@ public class Tables {
      */
      */
     public static final Accrecord ACCRECORD = com.thmodel.jooq.tables.Accrecord.ACCRECORD;
     public static final Accrecord ACCRECORD = com.thmodel.jooq.tables.Accrecord.ACCRECORD;
 
 
+    /**
+     * The table <code>thmodel.ads</code>.
+     */
+    public static final Ads ADS = com.thmodel.jooq.tables.Ads.ADS;
+
     /**
     /**
      * The table <code>thmodel.brokerinfor</code>.
      * The table <code>thmodel.brokerinfor</code>.
      */
      */

+ 8 - 1
src/main/java/com/thmodel/jooq/Thmodel.java

@@ -6,6 +6,7 @@ package com.thmodel.jooq;
 
 
 import com.thmodel.jooq.tables.Accountrecord;
 import com.thmodel.jooq.tables.Accountrecord;
 import com.thmodel.jooq.tables.Accrecord;
 import com.thmodel.jooq.tables.Accrecord;
+import com.thmodel.jooq.tables.Ads;
 import com.thmodel.jooq.tables.Brokerinfor;
 import com.thmodel.jooq.tables.Brokerinfor;
 import com.thmodel.jooq.tables.Cardaccount;
 import com.thmodel.jooq.tables.Cardaccount;
 import com.thmodel.jooq.tables.Cashrecord;
 import com.thmodel.jooq.tables.Cashrecord;
@@ -67,7 +68,7 @@ import org.jooq.impl.SchemaImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Thmodel extends SchemaImpl {
 public class Thmodel extends SchemaImpl {
 
 
-    private static final long serialVersionUID = 940047815;
+    private static final long serialVersionUID = 667206565;
 
 
     /**
     /**
      * The reference instance of <code>thmodel</code>
      * The reference instance of <code>thmodel</code>
@@ -84,6 +85,11 @@ public class Thmodel extends SchemaImpl {
      */
      */
     public final Accrecord ACCRECORD = com.thmodel.jooq.tables.Accrecord.ACCRECORD;
     public final Accrecord ACCRECORD = com.thmodel.jooq.tables.Accrecord.ACCRECORD;
 
 
+    /**
+     * The table <code>thmodel.ads</code>.
+     */
+    public final Ads ADS = com.thmodel.jooq.tables.Ads.ADS;
+
     /**
     /**
      * The table <code>thmodel.brokerinfor</code>.
      * The table <code>thmodel.brokerinfor</code>.
      */
      */
@@ -291,6 +297,7 @@ public class Thmodel extends SchemaImpl {
         return Arrays.<Table<?>>asList(
         return Arrays.<Table<?>>asList(
             Accountrecord.ACCOUNTRECORD,
             Accountrecord.ACCOUNTRECORD,
             Accrecord.ACCRECORD,
             Accrecord.ACCRECORD,
+            Ads.ADS,
             Brokerinfor.BROKERINFOR,
             Brokerinfor.BROKERINFOR,
             Cardaccount.CARDACCOUNT,
             Cardaccount.CARDACCOUNT,
             Cashrecord.CASHRECORD,
             Cashrecord.CASHRECORD,

+ 183 - 0
src/main/java/com/thmodel/jooq/tables/Ads.java

@@ -0,0 +1,183 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package com.thmodel.jooq.tables;
+
+
+import com.thmodel.jooq.Indexes;
+import com.thmodel.jooq.Keys;
+import com.thmodel.jooq.Thmodel;
+import com.thmodel.jooq.tables.records.AdsRecord;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Identity;
+import org.jooq.Index;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.11.5"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Ads extends TableImpl<AdsRecord> {
+
+    private static final long serialVersionUID = 1715187154;
+
+    /**
+     * The reference instance of <code>thmodel.ads</code>
+     */
+    public static final Ads ADS = new Ads();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<AdsRecord> getRecordType() {
+        return AdsRecord.class;
+    }
+
+    /**
+     * The column <code>thmodel.ads.id</code>.
+     */
+    public final TableField<AdsRecord, Integer> ID = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false).identity(true), this, "");
+
+    /**
+     * The column <code>thmodel.ads.pic</code>.
+     */
+    public final TableField<AdsRecord, String> PIC = createField("pic", org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+    /**
+     * The column <code>thmodel.ads.parttypk</code>.
+     */
+    public final TableField<AdsRecord, Integer> PARTTYPK = createField("parttypk", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+    /**
+     * The column <code>thmodel.ads.name</code>.
+     */
+    public final TableField<AdsRecord, String> NAME = createField("name", org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+    /**
+     * Create a <code>thmodel.ads</code> table reference
+     */
+    public Ads() {
+        this(DSL.name("ads"), null);
+    }
+
+    /**
+     * Create an aliased <code>thmodel.ads</code> table reference
+     */
+    public Ads(String alias) {
+        this(DSL.name(alias), ADS);
+    }
+
+    /**
+     * Create an aliased <code>thmodel.ads</code> table reference
+     */
+    public Ads(Name alias) {
+        this(alias, ADS);
+    }
+
+    private Ads(Name alias, Table<AdsRecord> aliased) {
+        this(alias, aliased, null);
+    }
+
+    private Ads(Name alias, Table<AdsRecord> aliased, Field<?>[] parameters) {
+        super(alias, null, aliased, parameters, DSL.comment(""));
+    }
+
+    public <O extends Record> Ads(Table<O> child, ForeignKey<O, AdsRecord> key) {
+        super(child, key, ADS);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Schema getSchema() {
+        return Thmodel.THMODEL;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<Index> getIndexes() {
+        return Arrays.<Index>asList(Indexes.ADS_PRIMARY);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Identity<AdsRecord, Integer> getIdentity() {
+        return Keys.IDENTITY_ADS;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public UniqueKey<AdsRecord> getPrimaryKey() {
+        return Keys.KEY_ADS_PRIMARY;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<UniqueKey<AdsRecord>> getKeys() {
+        return Arrays.<UniqueKey<AdsRecord>>asList(Keys.KEY_ADS_PRIMARY);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Ads as(String alias) {
+        return new Ads(DSL.name(alias), this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Ads as(Name alias) {
+        return new Ads(alias, this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public Ads rename(String name) {
+        return new Ads(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public Ads rename(Name name) {
+        return new Ads(name, null);
+    }
+}

+ 6 - 1
src/main/java/com/thmodel/jooq/tables/Parttysign.java

@@ -43,7 +43,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Parttysign extends TableImpl<ParttysignRecord> {
 public class Parttysign extends TableImpl<ParttysignRecord> {
 
 
-    private static final long serialVersionUID = 1228626944;
+    private static final long serialVersionUID = -1215992459;
 
 
     /**
     /**
      * The reference instance of <code>thmodel.parttysign</code>
      * The reference instance of <code>thmodel.parttysign</code>
@@ -133,6 +133,11 @@ public class Parttysign extends TableImpl<ParttysignRecord> {
      */
      */
     public final TableField<ParttysignRecord, Integer> VIEW = createField("view", org.jooq.impl.SQLDataType.INTEGER.defaultValue(org.jooq.impl.DSL.inline("1", org.jooq.impl.SQLDataType.INTEGER)), this, "");
     public final TableField<ParttysignRecord, Integer> VIEW = createField("view", org.jooq.impl.SQLDataType.INTEGER.defaultValue(org.jooq.impl.DSL.inline("1", org.jooq.impl.SQLDataType.INTEGER)), this, "");
 
 
+    /**
+     * The column <code>thmodel.parttysign.out</code>.
+     */
+    public final TableField<ParttysignRecord, Integer> OUT = createField("out", org.jooq.impl.SQLDataType.INTEGER.defaultValue(org.jooq.impl.DSL.inline("0", org.jooq.impl.SQLDataType.INTEGER)), this, "");
+
     /**
     /**
      * Create a <code>thmodel.parttysign</code> table reference
      * Create a <code>thmodel.parttysign</code> table reference
      */
      */

+ 287 - 0
src/main/java/com/thmodel/jooq/tables/records/AdsRecord.java

@@ -0,0 +1,287 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package com.thmodel.jooq.tables.records;
+
+
+import com.thmodel.jooq.tables.Ads;
+
+import javax.annotation.Generated;
+
+import org.jooq.Field;
+import org.jooq.Record1;
+import org.jooq.Record4;
+import org.jooq.Row4;
+import org.jooq.impl.UpdatableRecordImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@Generated(
+    value = {
+        "http://www.jooq.org",
+        "jOOQ version:3.11.5"
+    },
+    comments = "This class is generated by jOOQ"
+)
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AdsRecord extends UpdatableRecordImpl<AdsRecord> implements Record4<Integer, String, Integer, String> {
+
+    private static final long serialVersionUID = -605133729;
+
+    /**
+     * Setter for <code>thmodel.ads.id</code>.
+     */
+    public void setId(Integer value) {
+        set(0, value);
+    }
+
+    /**
+     * Getter for <code>thmodel.ads.id</code>.
+     */
+    public Integer getId() {
+        return (Integer) get(0);
+    }
+
+    /**
+     * Setter for <code>thmodel.ads.pic</code>.
+     */
+    public void setPic(String value) {
+        set(1, value);
+    }
+
+    /**
+     * Getter for <code>thmodel.ads.pic</code>.
+     */
+    public String getPic() {
+        return (String) get(1);
+    }
+
+    /**
+     * Setter for <code>thmodel.ads.parttypk</code>.
+     */
+    public void setParttypk(Integer value) {
+        set(2, value);
+    }
+
+    /**
+     * Getter for <code>thmodel.ads.parttypk</code>.
+     */
+    public Integer getParttypk() {
+        return (Integer) get(2);
+    }
+
+    /**
+     * Setter for <code>thmodel.ads.name</code>.
+     */
+    public void setName(String value) {
+        set(3, value);
+    }
+
+    /**
+     * Getter for <code>thmodel.ads.name</code>.
+     */
+    public String getName() {
+        return (String) get(3);
+    }
+
+    // -------------------------------------------------------------------------
+    // Primary key information
+    // -------------------------------------------------------------------------
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Record1<Integer> key() {
+        return (Record1) super.key();
+    }
+
+    // -------------------------------------------------------------------------
+    // Record4 type implementation
+    // -------------------------------------------------------------------------
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Row4<Integer, String, Integer, String> fieldsRow() {
+        return (Row4) super.fieldsRow();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Row4<Integer, String, Integer, String> valuesRow() {
+        return (Row4) super.valuesRow();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Field<Integer> field1() {
+        return Ads.ADS.ID;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Field<String> field2() {
+        return Ads.ADS.PIC;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Field<Integer> field3() {
+        return Ads.ADS.PARTTYPK;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Field<String> field4() {
+        return Ads.ADS.NAME;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Integer component1() {
+        return getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String component2() {
+        return getPic();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Integer component3() {
+        return getParttypk();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String component4() {
+        return getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Integer value1() {
+        return getId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String value2() {
+        return getPic();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Integer value3() {
+        return getParttypk();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String value4() {
+        return getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public AdsRecord value1(Integer value) {
+        setId(value);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public AdsRecord value2(String value) {
+        setPic(value);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public AdsRecord value3(Integer value) {
+        setParttypk(value);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public AdsRecord value4(String value) {
+        setName(value);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public AdsRecord values(Integer value1, String value2, Integer value3, String value4) {
+        value1(value1);
+        value2(value2);
+        value3(value3);
+        value4(value4);
+        return this;
+    }
+
+    // -------------------------------------------------------------------------
+    // Constructors
+    // -------------------------------------------------------------------------
+
+    /**
+     * Create a detached AdsRecord
+     */
+    public AdsRecord() {
+        super(Ads.ADS);
+    }
+
+    /**
+     * Create a detached, initialised AdsRecord
+     */
+    public AdsRecord(Integer id, String pic, Integer parttypk, String name) {
+        super(Ads.ADS);
+
+        set(0, id);
+        set(1, pic);
+        set(2, parttypk);
+        set(3, name);
+    }
+}

+ 60 - 11
src/main/java/com/thmodel/jooq/tables/records/ParttysignRecord.java

@@ -13,8 +13,8 @@ import javax.annotation.Generated;
 
 
 import org.jooq.Field;
 import org.jooq.Field;
 import org.jooq.Record1;
 import org.jooq.Record1;
-import org.jooq.Record15;
-import org.jooq.Row15;
+import org.jooq.Record16;
+import org.jooq.Row16;
 import org.jooq.impl.UpdatableRecordImpl;
 import org.jooq.impl.UpdatableRecordImpl;
 
 
 
 
@@ -29,9 +29,9 @@ import org.jooq.impl.UpdatableRecordImpl;
     comments = "This class is generated by jOOQ"
     comments = "This class is generated by jOOQ"
 )
 )
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> implements Record15<Integer, Integer, Integer, Timestamp, String, String, Integer, BigDecimal, Integer, Timestamp, Integer, String, String, String, Integer> {
+public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> implements Record16<Integer, Integer, Integer, Timestamp, String, String, Integer, BigDecimal, Integer, Timestamp, Integer, String, String, String, Integer, Integer> {
 
 
-    private static final long serialVersionUID = 887423687;
+    private static final long serialVersionUID = 259533251;
 
 
     /**
     /**
      * Setter for <code>thmodel.parttysign.PK</code>.
      * Setter for <code>thmodel.parttysign.PK</code>.
@@ -243,6 +243,20 @@ public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> impl
         return (Integer) get(14);
         return (Integer) get(14);
     }
     }
 
 
+    /**
+     * Setter for <code>thmodel.parttysign.out</code>.
+     */
+    public void setOut(Integer value) {
+        set(15, value);
+    }
+
+    /**
+     * Getter for <code>thmodel.parttysign.out</code>.
+     */
+    public Integer getOut() {
+        return (Integer) get(15);
+    }
+
     // -------------------------------------------------------------------------
     // -------------------------------------------------------------------------
     // Primary key information
     // Primary key information
     // -------------------------------------------------------------------------
     // -------------------------------------------------------------------------
@@ -256,23 +270,23 @@ public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> impl
     }
     }
 
 
     // -------------------------------------------------------------------------
     // -------------------------------------------------------------------------
-    // Record15 type implementation
+    // Record16 type implementation
     // -------------------------------------------------------------------------
     // -------------------------------------------------------------------------
 
 
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
     @Override
     @Override
-    public Row15<Integer, Integer, Integer, Timestamp, String, String, Integer, BigDecimal, Integer, Timestamp, Integer, String, String, String, Integer> fieldsRow() {
-        return (Row15) super.fieldsRow();
+    public Row16<Integer, Integer, Integer, Timestamp, String, String, Integer, BigDecimal, Integer, Timestamp, Integer, String, String, String, Integer, Integer> fieldsRow() {
+        return (Row16) super.fieldsRow();
     }
     }
 
 
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
     @Override
     @Override
-    public Row15<Integer, Integer, Integer, Timestamp, String, String, Integer, BigDecimal, Integer, Timestamp, Integer, String, String, String, Integer> valuesRow() {
-        return (Row15) super.valuesRow();
+    public Row16<Integer, Integer, Integer, Timestamp, String, String, Integer, BigDecimal, Integer, Timestamp, Integer, String, String, String, Integer, Integer> valuesRow() {
+        return (Row16) super.valuesRow();
     }
     }
 
 
     /**
     /**
@@ -395,6 +409,14 @@ public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> impl
         return Parttysign.PARTTYSIGN.VIEW;
         return Parttysign.PARTTYSIGN.VIEW;
     }
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Field<Integer> field16() {
+        return Parttysign.PARTTYSIGN.OUT;
+    }
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
@@ -515,6 +537,14 @@ public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> impl
         return getView();
         return getView();
     }
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Integer component16() {
+        return getOut();
+    }
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
@@ -635,6 +665,14 @@ public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> impl
         return getView();
         return getView();
     }
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Integer value16() {
+        return getOut();
+    }
+
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
@@ -774,7 +812,16 @@ public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> impl
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
     @Override
     @Override
-    public ParttysignRecord values(Integer value1, Integer value2, Integer value3, Timestamp value4, String value5, String value6, Integer value7, BigDecimal value8, Integer value9, Timestamp value10, Integer value11, String value12, String value13, String value14, Integer value15) {
+    public ParttysignRecord value16(Integer value) {
+        setOut(value);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ParttysignRecord values(Integer value1, Integer value2, Integer value3, Timestamp value4, String value5, String value6, Integer value7, BigDecimal value8, Integer value9, Timestamp value10, Integer value11, String value12, String value13, String value14, Integer value15, Integer value16) {
         value1(value1);
         value1(value1);
         value2(value2);
         value2(value2);
         value3(value3);
         value3(value3);
@@ -790,6 +837,7 @@ public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> impl
         value13(value13);
         value13(value13);
         value14(value14);
         value14(value14);
         value15(value15);
         value15(value15);
+        value16(value16);
         return this;
         return this;
     }
     }
 
 
@@ -807,7 +855,7 @@ public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> impl
     /**
     /**
      * Create a detached, initialised ParttysignRecord
      * Create a detached, initialised ParttysignRecord
      */
      */
-    public ParttysignRecord(Integer pk, Integer parttypk, Integer memberpk, Timestamp enrolldate, String people, String tel, Integer pcount, BigDecimal fee, Integer issign, Timestamp signdate, Integer accflag, String pic, String video, String text, Integer view) {
+    public ParttysignRecord(Integer pk, Integer parttypk, Integer memberpk, Timestamp enrolldate, String people, String tel, Integer pcount, BigDecimal fee, Integer issign, Timestamp signdate, Integer accflag, String pic, String video, String text, Integer view, Integer out) {
         super(Parttysign.PARTTYSIGN);
         super(Parttysign.PARTTYSIGN);
 
 
         set(0, pk);
         set(0, pk);
@@ -825,5 +873,6 @@ public class ParttysignRecord extends UpdatableRecordImpl<ParttysignRecord> impl
         set(12, video);
         set(12, video);
         set(13, text);
         set(13, text);
         set(14, view);
         set(14, view);
+        set(15, out);
     }
     }
 }
 }

+ 1 - 0
src/main/java/com/thmodel/util/DBRecordsPack.java

@@ -75,6 +75,7 @@ public class DBRecordsPack {
     }
     }
 
 
     public static JSONObject Pack(Record record) {
     public static JSONObject Pack(Record record) {
+        if (record == null) return null;
         JSONObject jsonObject = new JSONObject();
         JSONObject jsonObject = new JSONObject();
         for (Field field : record.fields()) {
         for (Field field : record.fields()) {
             jsonObject.put(field.getName(), field.getValue(record));
             jsonObject.put(field.getName(), field.getValue(record));

+ 2 - 2
src/main/webapp/dancer/component/player.jsp

@@ -59,10 +59,10 @@
         border-radius: 11px;
         border-radius: 11px;
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
-        justify-content: center;
+
     }
     }
 
 
-    .player .title .btn:active {
+    .player .title .btn:active{
         opacity: 0.8;
         opacity: 0.8;
     }
     }
 
 

+ 28 - 29
src/main/webapp/dancer/component/ranking.jsp

@@ -1,49 +1,52 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <style>
 <style>
-    .ranking-item{
+    .ranking-item {
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
     }
     }
 
 
-    .ranking-item .num{
-        font-size:14px;
-        color:rgba(0,0,0,1);
-        line-height:20px;
+    .ranking-item .num {
+        font-size: 14px;
+        color: rgba(0, 0, 0, 1);
+        line-height: 20px;
     }
     }
-    .ranking-item .image{
+
+    .ranking-item .image {
         min-width: 44px;
         min-width: 44px;
         min-height: 44px;
         min-height: 44px;
-        width:44px;
-        height:44px;
-        border-radius:23px;
+        width: 44px;
+        height: 44px;
+        border-radius: 23px;
         background-size: cover;
         background-size: cover;
         background-position: center;
         background-position: center;
         background-repeat: no-repeat;
         background-repeat: no-repeat;
         margin-left: 20px;
         margin-left: 20px;
 
 
     }
     }
-    .ranking-item .name{
+
+    .ranking-item .name {
         flex-grow: 1;
         flex-grow: 1;
-        font-size:15px;
+        font-size: 15px;
         font-weight: bold;
         font-weight: bold;
-        color:rgba(0,0,0,1);
-        line-height:21px;
+        color: rgba(0, 0, 0, 1);
+        line-height: 21px;
         margin: 0 14px;
         margin: 0 14px;
         overflow: hidden;
         overflow: hidden;
-        text-overflow:ellipsis;
+        text-overflow: ellipsis;
         white-space: nowrap;
         white-space: nowrap;
     }
     }
 
 
-    .icon{
+    .icon {
         min-width: 20px;
         min-width: 20px;
         width: 20px;
         width: 20px;
         height: 20px;
         height: 20px;
     }
     }
-    .gift{
-        font-size:14px;
+
+    .gift {
+        font-size: 14px;
         font-weight: bold;
         font-weight: bold;
-        color:rgba(255,64,149,1);
-        line-height:20px;
+        color: rgba(255, 64, 149, 1);
+        line-height: 20px;
         margin-left: 2px;
         margin-left: 2px;
     }
     }
 
 
@@ -51,18 +54,14 @@
 
 
 <script>
 <script>
     var rankingItem = {
     var rankingItem = {
-        props: {
-
-        },
+        props: ['rank', 'icon', 'name', 'gift'],
         template: ` <div class="ranking-item">
         template: ` <div class="ranking-item">
-                <div class="num">1</div>
-                <div class="image" style="background-image: url('http://img2.imgtn.bdimg.com/it/u=2689129216,994344352&fm=15&gp=0.jpg')"></div>
-                <div class="name">粉条</div>
+                <div class="num">{{rank}}</div>
+                <div class="image" :style="{backgroundImage: 'url(${pageContext.request.contextPath}/'+icon+')'}"></div>
+                <div class="name">{{name}}</div>
                 <img class="icon" src="${pageContext.request.contextPath}/image/dancer/icon_paimingfen.png" alt="">
                 <img class="icon" src="${pageContext.request.contextPath}/image/dancer/icon_paimingfen.png" alt="">
-                <span class="gift">3928</span>
+                <span class="gift">{{gift}}</span>
             </div>`,
             </div>`,
-        methods:{
-
-        }
+        methods: {}
     }
     }
 </script>
 </script>

+ 2 - 3
src/main/webapp/dancer/index.jsp

@@ -15,7 +15,7 @@
     session.setAttribute("activitypk", activitypk);
     session.setAttribute("activitypk", activitypk);
 
 
     int modelpk = JspUtils.getInt(request, "modelpk");
     int modelpk = JspUtils.getInt(request, "modelpk");
-    int memberpk = JspUtils.getInt(request, "memberpk");
+    int memberpk = JspUtils.getInt(request, session, "memberpk");
     String operator = request.getParameter("operator");
     String operator = request.getParameter("operator");
     DSLContext ctx = DSL.using(DbConnection.getPara("MySQLURL"));
     DSLContext ctx = DSL.using(DbConnection.getPara("MySQLURL"));
     if ("signList".equals(operator)) {
     if ("signList".equals(operator)) {
@@ -271,10 +271,9 @@
                 <player-item v-for="item in 2"></player-item>
                 <player-item v-for="item in 2"></player-item>
             </div>
             </div>
         </div>
         </div>
-        <a href="rankingList.jsp">
+        <a href="rankingList.jsp?activitypk=<%=activitypk%>&memberpk=<%=memberpk%>">
             <img src="${pageContext.request.contextPath}/image/dancer/icon_paihang.png" class="ranking" alt="">
             <img src="${pageContext.request.contextPath}/image/dancer/icon_paihang.png" class="ranking" alt="">
         </a>
         </a>
-
     </template>
     </template>
 </div>
 </div>
 
 

+ 0 - 9
src/main/webapp/dancer/meta.jsp

@@ -21,12 +21,3 @@
         height: 100%;
         height: 100%;
     }
     }
 </style>
 </style>
-
-
-<script>
-    var scale = (window.screen.width / 375).toFixed(2)
-    var meta = document.createElement('meta')
-    meta.name = 'viewport'
-    meta.content = 'width=375,initial-scale=' + scale + ',user-scalable=no'
-    document.head.appendChild(meta)
-</script>

+ 5 - 6
src/main/webapp/dancer/modelDetail.jsp

@@ -80,6 +80,8 @@
             .fetch();
             .fetch();
     pageContext.setAttribute("moreList", DBRecordsPack.Pack(more));
     pageContext.setAttribute("moreList", DBRecordsPack.Pack(more));
 
 
+    List<JSONObject> ads = DBRecordsPack.Pack(ctx.select().from(ADS).where(ADS.PARTTYPK.equal(activitypk)).fetch());
+
     boolean isFollow = false;
     boolean isFollow = false;
     if (memberpk > 0) {
     if (memberpk > 0) {
         isFollow = ctx.selectCount().from(MODELFAN)
         isFollow = ctx.selectCount().from(MODELFAN)
@@ -515,12 +517,8 @@
 <div id="app">
 <div id="app">
     <div class="swiper-wrapper">
     <div class="swiper-wrapper">
         <swiper class="swiper" :options="swiperOption">
         <swiper class="swiper" :options="swiperOption">
-            <swiper-slide class="swiper-slide"
-                          style="background-image: url(https://ws1.sinaimg.cn/large/0065oQSqgy1fy58bi1wlgj30sg10hguu.jpg)"></swiper-slide>
-            <swiper-slide class="swiper-slide"
-                          style="background-image: url(https://ws1.sinaimg.cn/large/0065oQSqgy1fy58bi1wlgj30sg10hguu.jpg)"></swiper-slide>
-            <swiper-slide class="swiper-slide"
-                          style="background-image: url(https://ws1.sinaimg.cn/large/0065oQSqgy1fy58bi1wlgj30sg10hguu.jpg)"></swiper-slide>
+            <swiper-slide v-for="item in ads" class="swiper-slide"
+                          :style="{backgroundImage: 'url(${pageContext.request.contextPath}/'+item.pic+')'}"></swiper-slide>
         </swiper>
         </swiper>
         <div class="swiper-pagination"></div>
         <div class="swiper-pagination"></div>
     </div>
     </div>
@@ -651,6 +649,7 @@
     new Vue({
     new Vue({
         el: '#app',
         el: '#app',
         data: {
         data: {
+            ads: <%=ads%>,
             swiperOption: {
             swiperOption: {
                 autoplay: true,
                 autoplay: true,
                 loop: true,
                 loop: true,

+ 88 - 27
src/main/webapp/dancer/rankingList.jsp

@@ -1,26 +1,83 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: 15293
-  Date: 2018/12/26
-  Time: 11:41
-  To change this template use File | Settings | File Templates.
---%>
+<%@ page import="com.thmodel.dbconnection.DbConnection" %>
+<%@ page import="org.jooq.impl.DSL" %>
+<%@ page import="org.jooq.DSLContext" %>
+<%@ page import="com.thmodel.util.JspUtils" %>
+<%@ page import="static com.thmodel.jooq.Tables.PARTTYSIGN" %>
+<%@ page import="org.jooq.Result" %>
+<%@ page import="static com.thmodel.jooq.Tables.MEMBERINFO" %>
+<%@ page import="static com.thmodel.jooq.Tables.MODELINFO" %>
+<%@ page import="org.jooq.Field" %>
+<%@ page import="static com.thmodel.jooq.Tables.*" %>
+<%@ page import="com.thmodel.util.DBRecordsPack" %>
+<%@ page import="net.sf.json.JSONObject" %>
+<%@ page import="org.jooq.Record6" %>
+<%@ page import="java.util.List" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    int activitypk = JspUtils.getInt(request, session, "activitypk");
+    session.setAttribute("activitypk", activitypk);
+
+    int modelpk = JspUtils.getInt(request, "modelpk");
+    int memberpk = JspUtils.getInt(request, "memberpk");
+
+    String operator = request.getParameter("operator");
+    DSLContext ctx = DSL.using(DbConnection.getPara("MySQLURL"));
+
+    Field<Object> gift = ctx.select(DSL.ifnull(DSL.sum(GIFT_RECORD.COIN), 0))
+            .from(GIFT_RECORD)
+            .where(GIFT_RECORD.MODELPK.equal(MODELINFO.PK))
+            .and(GIFT_RECORD.ACTIVITYPK.equal(activitypk))
+            .and(GIFT_RECORD.ACCFLAG.equal(9))
+            .asField("gift");
+    Result list = ctx.select(PARTTYSIGN.PK, PARTTYSIGN.PIC, MEMBERINFO.HPHOTO, MEMBERINFO.PET, MODELINFO.PK.as("modelpk"), gift)
+            .from(PARTTYSIGN)
+            .join(MEMBERINFO).on(PARTTYSIGN.MEMBERPK.equal(MEMBERINFO.PK))
+            .join(MODELINFO).on(MODELINFO.MEMBERPK.equal(PARTTYSIGN.MEMBERPK))
+            .where(PARTTYSIGN.PARTTYPK.equal(activitypk))
+            .orderBy(gift.desc())
+            .limit(20)
+            .fetch();
+    List<JSONObject> rankList = DBRecordsPack.Pack(list);
+    pageContext.setAttribute("rankList", rankList);
+    JSONObject myInfo = null;
+    if (memberpk > 0) {
+        myInfo = DBRecordsPack.Pack(ctx.select(PARTTYSIGN.PK, MEMBERINFO.PET, MEMBERINFO.HPHOTO, gift)
+                .from(MODELINFO)
+                .join(PARTTYSIGN).on(PARTTYSIGN.MEMBERPK.equal(MODELINFO.MEMBERPK))
+                .join(MEMBERINFO).on(MEMBERINFO.PK.equal(MODELINFO.MEMBERPK))
+                .where(MODELINFO.MEMBERPK.equal(memberpk))
+                .fetchAny());
+        if (myInfo != null) {
+            myInfo.put("rank", "未上榜");
+            for (int i = 0; i < list.size(); i++) {
+                if (myInfo.get("PK").equals(rankList.get(i).get("PK"))) {
+                    myInfo.put("rank", i + 1);
+                    break;
+                }
+            }
+        }
+    }
+    pageContext.setAttribute("myInfo", myInfo == null ? "null" : myInfo);
+
+
+    ctx.close();
+%>
 <html>
 <html>
 <head>
 <head>
     <title>排行榜</title>
     <title>排行榜</title>
     <jsp:include page="meta.jsp"/>
     <jsp:include page="meta.jsp"/>
     <style>
     <style>
-        .container{
-            background:linear-gradient(180deg,rgba(251,92,163,1) 0%,rgba(253,127,141,1) 97%);
-            display:flex;
+        .container {
+            background: linear-gradient(180deg, rgba(251, 92, 163, 1) 0%, rgba(253, 127, 141, 1) 97%);
+            display: flex;
             flex-direction: column;
             flex-direction: column;
         }
         }
-        .content{
+
+        .content {
             flex-grow: 1;
             flex-grow: 1;
-            overflow:auto;
-            background:rgba(255,255,255,1);
-            border-radius:12px 12px 0 0;
+            overflow: auto;
+            background: rgba(255, 255, 255, 1);
+            border-radius: 12px 12px 0 0;
             margin: 0 20px;
             margin: 0 20px;
             padding: 0 15px;
             padding: 0 15px;
             display: flex;
             display: flex;
@@ -29,19 +86,18 @@
             position: relative;
             position: relative;
         }
         }
 
 
-        .mine{
+        .mine {
             position: fixed;
             position: fixed;
             bottom: 0;
             bottom: 0;
             left: 20px;
             left: 20px;
-            padding:6px 15px ;
-            background:rgba(255,255,255,1);
-            box-shadow:0px -4px 4px 0px rgba(0,0,0,0.1);
-            border-radius:8px 8px 0px 0px;
-            width: 305px;
+            right: 20px;
+            padding: 6px 15px;
+            background: rgba(255, 255, 255, 1);
+            box-shadow: 0px -4px 4px 0px rgba(0, 0, 0, 0.1);
+            border-radius: 8px 8px 0px 0px;
         }
         }
 
 
 
 
-
     </style>
     </style>
 </head>
 </head>
 <body>
 <body>
@@ -49,9 +105,12 @@
     <template>
     <template>
         <tabber :tab-list="tabList" :now-tab="nowTab" :tab-width="90" @choose-tab="chooseTab"></tabber>
         <tabber :tab-list="tabList" :now-tab="nowTab" :tab-width="90" @choose-tab="chooseTab"></tabber>
         <div class="content">
         <div class="content">
-            <ranking-item v-for="item in 100" style="padding:10px 0;border-bottom: 1px solid #f2f4f5;min-height:44px"></ranking-item>
-            <div class="mine">
-                <ranking-item ></ranking-item>
+            <ranking-item v-for="(item, i) in rankList" :rank="i+1" :key="i" :icon="item.hPhoto" :name="item.Pet"
+                          :gift="item.gift"
+                          style="padding:10px 0;border-bottom: 1px solid #f2f4f5;min-height:44px"></ranking-item>
+            <div class="mine" v-if="myInfo">
+                <ranking-item :rank="myInfo.rank" :icon="myInfo.hPhoto" :name="myInfo.Pet"
+                              :gift="myInfo.gift"></ranking-item>
             </div>
             </div>
         </div>
         </div>
     </template>
     </template>
@@ -66,6 +125,8 @@
             return {
             return {
                 tabList: ['个人', '战队'],
                 tabList: ['个人', '战队'],
                 nowTab: 0,
                 nowTab: 0,
+                rankList: ${rankList},
+                myInfo: ${myInfo}
             }
             }
         },
         },
         mounted() {
         mounted() {
@@ -76,9 +137,9 @@
                 this.nowTab = index
                 this.nowTab = index
             }
             }
         },
         },
-        components:{
-            'tabber':tabContent,
-            'ranking-item':rankingItem
+        components: {
+            'tabber': tabContent,
+            'ranking-item': rankingItem
         },
         },
     })
     })
 </script>
 </script>

BIN
src/main/webapp/upload/activity/2018-06-15/451123138753678023.jpg


BIN
src/main/webapp/upload/activity/2018-06-15/632648482744828567.jpg


BIN
src/main/webapp/upload/hphoto/2018-07-13/h1.png


BIN
src/main/webapp/upload/hphoto/2018-07-13/h2.png


BIN
src/main/webapp/upload/logo/2018-06-14/151433619925078671.png


BIN
src/main/webapp/upload/logo/2018-06-14/514545182007297920.png


BIN
src/main/webapp/upload/logo/2018-06-14/563623058827878337.png


BIN
src/main/webapp/upload/photo/2018-06-11/165506282189714005.png


BIN
src/main/webapp/upload/photo/2018-06-11/354727579990910245.png


BIN
src/main/webapp/upload/photo/2018-06-11/460971478136359524.png


BIN
src/main/webapp/upload/photo/2018-06-11/493452113473660865.jpg


BIN
src/main/webapp/upload/photo/2018-06-11/861537846612330270.png


BIN
src/main/webapp/upload/photo/2018-06-11/864906035870622763.png


BIN
src/main/webapp/upload/photo/2018-06-11/900857256939806662.png