update 管理系统用户算力曲线，在离线柱状图

m2pool-modules/m2pool-manage/src/main/resources/bootstrap-prod.yml

@@ -6,6 +6,42 @@ server:
     mime-types: application/json
 
 spring:
+  #邮箱基本配置
+  mail:
+    #    配置在limit_time内，用户可以发送limit次验证码
+    limit: 2 这个是我额外的配置，结合邮箱服务用的
+    limitTime: 10 这个是我额外的配置
+    #配置smtp服务主机地址
+    # sina    smtp.sina.cn
+    # aliyun  smtp.aliyun.com
+    # 163     smtp.163.com       端口号465或994
+    host: mail.privateemail.com
+    #发送者邮箱
+    username: do.not.reply@m2pool.com
+    #配置密码,注意不是真正的密码，而是刚刚申请到的授权码
+    #    password:
+    #    password: M2202401!
+    #    password: axvm-zfgx-cgcg-qhhu
+    password: M2202401!
+
+    #端口号
+    port: 587
+    #    port: 465
+    #默认的邮件编码为UTF-8
+    default-encoding: UTF-8
+    #其他参数
+    properties:
+      mail:
+        #配置SSL 加密工厂
+        smtp:
+          ssl:
+            #本地测试，先放开ssl
+            enable: false
+            required: false
+          #开启debug模式，这样邮件发送过程的日志会在控制台打印出来，方便排查错误
+        debug: false
+        socketFactory:
+          class: javax.net.ssl.SSLSocketFactory
   mvc:
     pathmatch:
       matching-strategy: ant-path-matcher
@@ -20,7 +56,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 127.0.0.1:8808
-        namespace: m2_test
+        namespace: m2_prod
         group: m2_prod_group
       #        server-addr: 127.0.0.1:8808
       config:

m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml

@@ -19,7 +19,7 @@
             user_account_balance uab
                 LEFT JOIN user_miner_account uma ON uab.ma_id = uma.id
         <where>
-            uma.coin = #{coin} AND uma.status = 0
+            uma.coin = #{coin} AND uma.status = 0 AND uab.status = 0
             <if test="user != null and user != ''">
                 AND uma.user like CONCAT('%',#{user},'%')
             </if>
@@ -46,4 +46,57 @@
           AND `user` = #{user};
 
     </select>
+    <select id="getHistoryBalance" resultType="com.m2pool.manage.dto.HistoryBalanceDto">
+        SELECT
+            uab.balance
+        FROM
+            user_account_balance uab
+                LEFT JOIN user_miner_account uma ON uab.ma_id = uma.id
+        WHERE
+            uma.coin = #{coin} AND uma.miner_user=#{user} AND uab.status = 99
+    </select>
+    <select id="getMiningUserInfo" resultType="com.m2pool.manage.dto.ManageMiningUserDto">
+        SELECT
+            coin,
+            `user`,
+            miner_user as minerUser
+        FROM
+            user_miner_account
+        WHERE
+          `user` = #{user} and status = 0
+    </select>
+    <select id="getMiningPowerInfo" resultType="com.m2pool.manage.dto.ManageMiningUserPowerDto">
+      SELECT
+            `user` as minerUser,
+            `date`,
+             mhs as pv
+        FROM
+            ${coin}_users_30m
+        <where>
+            `user` = #{minerUser}
+            <if test="startDate != null and endDate != null">
+                and `date` >= #{startDate} AND `date`<![CDATA[ <= ]]>  #{endDate}
+            </if>
+        </where>
+
+    </select>
+    <select id="getMinerUserOnlineStatus" resultType="com.m2pool.manage.dto.ManageMiningUserOnlineDto">
+        select
+            `date`,
+            sum(case when `state` = "online" then 1 else 0 end) as onlineNum,
+            sum(case when `state` = "offline" then 1 else 0 end) as offlineNum
+        from
+            ${coin}_mhsv2
+        <where>
+            `user` = #{minerUser}
+            <if test="startDate != null and endDate != null">
+                and `date` >= #{startDate} AND `date`<![CDATA[ <= ]]>  #{endDate}
+            </if>
+        </where>
+        group by `date`
+    </select>
+    <select id="getAllMinerUserByCoin" resultType="java.lang.String">
+        select miner_user from  user_miner_account where coin = #{coin} and `user` = #{user} and status = 0;
+    </select>
+
 </mapper>