20201028v1.4

cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java

@@ -98,9 +98,9 @@ public class LogAspect {
             log.info("保存日志，不进行记录");
             return null;
         }
-
         LogDto dto = new LogDto();
         dto.setUrl(url);
+        dto.setFacility("");
         //参数
         Object[] args = pjp.getArgs();
         StringBuilder param = new StringBuilder();
@@ -114,6 +114,7 @@ public class LogAspect {
                 String userId = claims == null ? null : ((Claims) claims).getSubject();
                 if (userId != null) {
                     param.append("userId:").append(userId).append("--");
+                    dto.setUserId(Long.parseLong(userId));
                 }
 
             } else if (args[i] instanceof Part) {

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/LogDto.java

@@ -24,4 +24,8 @@ public class LogDto {
     private String methodDesc;
     @ApiModelProperty("接口返回值(或异常)")
     private String result;
+    @ApiModelProperty("设备信息")
+    private String facility;
+    @ApiModelProperty("设备信息")
+    private Long userId;
 }

mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java

@@ -82,6 +82,8 @@ public class ProvinceCompeteVo {
         private int memberMin;
         @ApiModelProperty("最多人数")
         private int memberMax;
+        @ApiModelProperty("当前参赛人数")
+        private int joinNum;
     }
 
     @Data

mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

@@ -131,9 +131,14 @@ public class ProvinceService implements IProvinceService {
         }
     }
 
+    /**
+     * 查找所有选手
+     * @param param 单位id
+     * @param userId userId
+     * @return
+     */
     @Override
     public List<ProvinceCompeteVo.PlayerByCompanyId> queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) {
-
         return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId());
     }
 

mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@@ -121,12 +121,22 @@
 
     </select>
     <select id="queryProjectByFirstProject" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$CompeteSecondProject">
-       	SELECT
+
+        SELECT
         p.id as id,
         p.`name` as `name`,
         team,
         member_min as memberMin,
-        member_max as memberMax
+        member_max as memberMax,
+				if(
+					p.team = 0,
+					(SELECT count(id) FROM t_compete_project_player WHERE project_id = p.id
+					and rec_status = 0
+					),
+					(SELECT count(m.player_id) FROM t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id WHERE t.project_id = p.id
+					and t.rec_status = 0 and m.rec_status = 0
+					)
+				) as joinNum
         FROM
         t_compete_project p
         where

tall/src/main/java/com/ccsens/tall/bean/po/SysLog.java

@@ -20,6 +20,8 @@ public class SysLog implements Serializable {
 
     private Byte recStatus;
 
+    private String facility;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -86,6 +88,14 @@ public class SysLog implements Serializable {
         this.recStatus = recStatus;
     }
 
+    public String getFacility() {
+        return facility;
+    }
+
+    public void setFacility(String facility) {
+        this.facility = facility == null ? null : facility.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -100,6 +110,7 @@ public class SysLog implements Serializable {
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
+        sb.append(", facility=").append(facility);
         sb.append("]");
         return sb.toString();
     }

tall/src/main/java/com/ccsens/tall/bean/po/SysLogExample.java

@@ -624,6 +624,76 @@ public class SysLogExample {
             addCriterion("rec_status not between", value1, value2, "recStatus");
             return (Criteria) this;
         }
+
+        public Criteria andFacilityIsNull() {
+            addCriterion("facility is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityIsNotNull() {
+            addCriterion("facility is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityEqualTo(String value) {
+            addCriterion("facility =", value, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityNotEqualTo(String value) {
+            addCriterion("facility <>", value, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityGreaterThan(String value) {
+            addCriterion("facility >", value, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityGreaterThanOrEqualTo(String value) {
+            addCriterion("facility >=", value, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityLessThan(String value) {
+            addCriterion("facility <", value, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityLessThanOrEqualTo(String value) {
+            addCriterion("facility <=", value, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityLike(String value) {
+            addCriterion("facility like", value, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityNotLike(String value) {
+            addCriterion("facility not like", value, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityIn(List<String> values) {
+            addCriterion("facility in", values, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityNotIn(List<String> values) {
+            addCriterion("facility not in", values, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityBetween(String value1, String value2) {
+            addCriterion("facility between", value1, value2, "facility");
+            return (Criteria) this;
+        }
+
+        public Criteria andFacilityNotBetween(String value1, String value2) {
+            addCriterion("facility not between", value1, value2, "facility");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

tall/src/main/resources/mapper_raw/SysLogMapper.xml

@@ -10,6 +10,7 @@
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="facility" jdbcType="VARCHAR" property="facility" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -70,7 +71,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, url, method_desc, params, result, created_at, updated_at, rec_status
+    id, url, method_desc, params, result, created_at, updated_at, rec_status, facility
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample" resultMap="BaseResultMap">
     select
@@ -105,10 +106,12 @@
   <insert id="insert" parameterType="com.ccsens.tall.bean.po.SysLog">
     insert into t_sys_log (id, url, method_desc, 
       params, result, created_at, 
-      updated_at, rec_status)
+      updated_at, rec_status, facility
+      )
     values (#{id,jdbcType=BIGINT}, #{url,jdbcType=VARCHAR}, #{methodDesc,jdbcType=VARCHAR}, 
       #{params,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{facility,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.SysLog">
     insert into t_sys_log
@@ -137,6 +140,9 @@
       <if test="recStatus != null">
         rec_status,
       </if>
+      <if test="facility != null">
+        facility,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -163,6 +169,9 @@
       <if test="recStatus != null">
         #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="facility != null">
+        #{facility,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample" resultType="java.lang.Long">
@@ -198,6 +207,9 @@
       <if test="record.recStatus != null">
         rec_status = #{record.recStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.facility != null">
+        facility = #{record.facility,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -212,7 +224,8 @@
       result = #{record.result,jdbcType=VARCHAR},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{record.recStatus,jdbcType=TINYINT}
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      facility = #{record.facility,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -241,6 +254,9 @@
       <if test="recStatus != null">
         rec_status = #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="facility != null">
+        facility = #{facility,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -252,7 +268,8 @@
       result = #{result,jdbcType=VARCHAR},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{recStatus,jdbcType=TINYINT}
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      facility = #{facility,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>