From 7b718fe865ebb6cbf6998c83203c8568f7714f81 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 13 May 2021 19:28:39 +0800
Subject: [PATCH] =?UTF-8?q?20210513=E4=BF=AE=E6=94=B9=E8=B7=B3=E7=BB=B3?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-test.yml   |   4 +-
 mt/src/main/resources/application-prod.yml    |   3 +-
 mt/src/main/resources/application.yml         |   4 +-
 mt/src/main/resources/druid-dev.yml           |   2 +-
 mt/src/main/resources/druid-prod.yml          |   5 +-
 .../mapper_dao/CompeteCompanyDao.xml          | 105 ++++++++++++------
 tall/src/main/resources/application.yml       |   4 +-
 tcm/src/main/resources/application-test.yml   |   6 +-
 tcm/src/main/resources/application.yml        |   4 +-
 9 files changed, 87 insertions(+), 50 deletions(-)

diff --git a/beneficiation/src/main/resources/application-test.yml b/beneficiation/src/main/resources/application-test.yml
index ede1cd93..c077f939 100644
--- a/beneficiation/src/main/resources/application-test.yml
+++ b/beneficiation/src/main/resources/application-test.yml
@@ -9,9 +9,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
     host: 127.0.0.1
-    password: 111111
+    password: guest
     port: 5672
-    username: admin
+    username: guest
   redis:
     database: 0
     host: 127.0.0.1
diff --git a/mt/src/main/resources/application-prod.yml b/mt/src/main/resources/application-prod.yml
index b9201455..689fc4c1 100644
--- a/mt/src/main/resources/application-prod.yml
+++ b/mt/src/main/resources/application-prod.yml
@@ -29,7 +29,8 @@ swagger:
   enable: true
 eureka:
   instance:
-    ip-address: 119.3.214.36
+    ip-address: 127.0.0.1
+#    ip-address: 119.3.214.36
 
 gatewayUrl: https://www.tall.wiki/gateway/
 notGatewayUrl: https://www.tall.wiki/
diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml
index 1ac895fc..a47f2a7b 100644
--- a/mt/src/main/resources/application.yml
+++ b/mt/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
+    active: dev
+    include: common, util-dev
 
 
diff --git a/mt/src/main/resources/druid-dev.yml b/mt/src/main/resources/druid-dev.yml
index cf6c32d9..0069ab94 100644
--- a/mt/src/main/resources/druid-dev.yml
+++ b/mt/src/main/resources/druid-dev.yml
@@ -29,7 +29,7 @@ spring:
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
       url: jdbc:mysql://49.233.89.188:3306/mt?useUnicode=true&characterEncoding=UTF-8
-#      url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8
+#      url: jdbc:mysql://www.tall.wiki/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
 #      env: CCSENS_GAME
diff --git a/mt/src/main/resources/druid-prod.yml b/mt/src/main/resources/druid-prod.yml
index 195e029c..830bde7f 100644
--- a/mt/src/main/resources/druid-prod.yml
+++ b/mt/src/main/resources/druid-prod.yml
@@ -15,7 +15,8 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+      password:
+#      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -27,7 +28,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://www.tall.wiki/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL
\ No newline at end of file
diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
index 40ee8dff..04222a8d 100644
--- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
@@ -401,41 +401,76 @@
 
 
     <select id="selectCompeteJoinCountList" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteOverview">
-        select t3.companyId,t3.companyName as companyName , t1.coachNum, t2.guideNum, t3.playerNum , IFNULL(t1.coachNum,0) + IFNULL(t2.guideNum,0) + IFNULL(t3.playerNum,0) as sum from
-        (select t.companyId, t.companyName,count(t.id) as playerNum from
-        (SELECT
-        DISTINCT(tcp.id) as id, tcc.id as companyId,tcc.`name` as companyName
+        select t3.companyId,t3.companyName as companyName , t1.coachNum, t2.guideNum, t3.playerNum , IFNULL(t1.coachNum,0) + IFNULL(t2.guideNum,0) + IFNULL(t3.playerNum,0) as sum
         FROM
-        t_compete_company tcc
-        left join
-        t_compete_player tcp on tcc.id = tcp.company_id
-        LEFT JOIN t_compete_project_player tcpp ON tcp.id = tcpp.player_id
-        WHERE
-        tcc.type = 0
-        AND	tcp.company_id = tcc.id
-        AND tcc.rec_status = 0
-        AND tcp.rec_status = 0
-        AND tcpp.rec_status = 0
-        UNION
-        SELECT
-        DISTINCT(tcp.id)  as id,tcc.id as companyId,tcc.`name` as companyName
-        FROM
-        t_compete_company tcc
-        LEFT JOIN t_compete_team tct ON tcc.id = tct.company_id
-        LEFT JOIN t_compete_team_member tctm on tct.id = tctm.compete_team_id
-        LEFT JOIN t_compete_player tcp ON tctm.player_id = tcp.id
-        WHERE
-        tcc.type = 0
-        AND tct.rec_status = 0
-        AND tctm.rec_status = 0
-        And tcc.rec_status = 0
-        AND tcp.rec_status = 0) t
-        group by t.companyId
-        having count(t.id) > 0
-        ) t3
-        left join
-        (SELECT tcc.id as companyId,tcc.`name` as companyName ,count(tcca.id) as coachNum FROM t_compete_company tcc left join (select * from t_compete_coach where rec_status = 0) tcca on tcc.id = tcca.company_id where tcc.type = 0 AND identity = 1 and tcc.rec_status = 0 GROUP BY tcc.id) t1 on t1.companyId = t3.companyId
-        left join
-        (SELECT tcc.id as companyId,tcc.`name` as companyName , count(tcca.id) as guideNum FROM t_compete_company tcc left join (select * from t_compete_coach where rec_status = 0)  tcca on tcc.id = tcca.company_id where tcc.type = 0 AND identity = 0 and tcc.rec_status = 0 GROUP BY tcc.id) t2 on t2.companyId = t3.companyId
+	(
+	SELECT
+		t.companyId,
+		t.companyName,
+		count( t.id ) AS playerNum
+	FROM
+		(
+		SELECT DISTINCT
+			( tcp.id ) AS id,
+			tcc.id AS companyId,
+			tcc.`name` AS companyName
+		FROM
+			t_compete_company tcc
+			LEFT JOIN t_compete_player tcp ON tcc.id = tcp.company_id AND tcp.rec_status = 0
+			LEFT JOIN t_compete_project_player tcpp ON tcp.id = tcpp.player_id AND tcpp.rec_status = 0
+		WHERE
+			tcc.type = #{competeTimeId}
+			AND tcc.rec_status = 0
+			UNION
+		SELECT DISTINCT
+			( tcp.id ) AS id,
+			tcc.id AS companyId,
+			tcc.`name` AS companyName
+		FROM
+			t_compete_company tcc
+			LEFT JOIN t_compete_team tct ON tcc.id = tct.company_id AND tct.rec_status = 0
+			LEFT JOIN t_compete_team_member tctm ON tct.id = tctm.compete_team_id AND tctm.rec_status = 0
+			LEFT JOIN t_compete_player tcp ON tctm.player_id = tcp.id AND tcp.rec_status = 0
+		WHERE
+			tcc.type = #{competeTimeId}
+			AND tct.rec_status = 0
+		) t
+	GROUP BY
+		t.companyId
+	HAVING
+		count( t.id ) > 0
+	) t3
+	LEFT JOIN (
+	SELECT
+		tcc.id AS companyId,
+		tcc.`name` AS companyName,
+		count( tcca.id ) AS coachNum
+	FROM
+		t_compete_company tcc
+		LEFT JOIN ( SELECT * FROM t_compete_coach WHERE rec_status = 0 ) tcca ON tcc.id = tcca.company_id
+		AND tcca.rec_status = 0
+	WHERE
+		tcc.type = #{competeTimeId}
+		AND identity = 1
+		AND tcc.rec_status = 0
+	GROUP BY
+		tcc.id
+	) t1 ON t1.companyId = t3.companyId
+	LEFT JOIN (
+	SELECT
+		tcc.id AS companyId,
+		tcc.`name` AS companyName,
+		count( tcca.id ) AS guideNum
+	FROM
+		t_compete_company tcc
+		LEFT JOIN ( SELECT * FROM t_compete_coach WHERE rec_status = 0 ) tcca ON tcc.id = tcca.company_id
+		AND tcca.rec_status = 0
+	WHERE
+		tcc.type = #{competeTimeId}
+		AND identity = 0
+		AND tcc.rec_status = 0
+	GROUP BY
+	tcc.id
+	) t2 ON t2.companyId = t3.companyId
     </select>
 </mapper>
\ No newline at end of file
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index ebc544af..b5408a3a 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common
 
diff --git a/tcm/src/main/resources/application-test.yml b/tcm/src/main/resources/application-test.yml
index 2d244cc8..7c02d8d8 100644
--- a/tcm/src/main/resources/application-test.yml
+++ b/tcm/src/main/resources/application-test.yml
@@ -9,9 +9,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
     host: 127.0.0.1
-    password: 111111
+    password: guest
     port: 5672
-    username: admin
+    username: guest
   redis:
     database: 0
     host: 127.0.0.1
@@ -28,7 +28,7 @@ swagger:
   enable: true
 eureka:
   instance:
-    ip-address: 192.168.0.99
+    ip-address: 127.0.0.1
 file:
   path: /home/cloud/tcm/uploads/
   domain: https://www.sxwikionline.com/gateway/tcm/
diff --git a/tcm/src/main/resources/application.yml b/tcm/src/main/resources/application.yml
index b9b264a7..f59084b0 100644
--- a/tcm/src/main/resources/application.yml
+++ b/tcm/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
+    active: test
+    include: common, util-test