Merge branch 'master' into energy-manage-chy

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldPageDto.java

@@ -22,6 +22,11 @@ public class WindFieldPageDto extends BaseDto {
     @ApiModelProperty("企业编号")
     private String companyCode;
     /**
+     * 所属公司名称
+     */
+    @ApiModelProperty("所属公司名称")
+    private String companyName;
+    /**
      * 省编号
      */
     @ApiModelProperty("省编号")

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/homepage/WaitTaskVo.java

@@ -17,8 +17,10 @@ public class WaitTaskVo {
      */
     private Integer errCount = 0;
 
-
-
+    /**
+     * 排队数量
+     */
+    private Integer queueNumber = 0;
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginegroup/WindEngineGroupPageVo.java

@@ -25,6 +25,9 @@ public class WindEngineGroupPageVo {
 
     @ApiModelProperty("风场名称")
     private String fieldName;
+
+    @ApiModelProperty("所属公司")
+    private String companyName;
     /**
      * 风机编号
      */

energy-manage-service/src/main/resources/logback/logback-tidb.xml

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<included>
+    <!-- 定义日志文件 输入位置 -->
+    <springProperty name="log_dir" source="logging.path" defaultValue="./logs"/>
+    <property name="log.pattern"
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %X{THREAD_NOTE} [%thread] %-5level %logger - %msg%n"/>
+    <property name="log.maxHistory" value="90" />
+
+    <!--# Console -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- 典型的日志pattern -->
+        <encoder>
+            <pattern>[%-5level %d{HH:mm:ss.SSS} | %X{THREAD_NOTE} | %thread | %logger.%method] [%L] - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+    </appender>
+
+    <!-- ERROR级别日志 -->
+    <!-- 滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件 RollingFileAppender-->
+    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 过滤器，只记录WARN级别的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <!-- 此处设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+
+        <!-- 最常用的滚动策略，它根据时间来制定滚动策略.既负责滚动也负责出发滚动 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志输出位置  可相对、和绝对路径 -->
+            <fileNamePattern>${log_dir}/%d{yyyy-MM-dd}/error.log</fileNamePattern>
+            <!-- 可选节点，控制保留的归档文件的最大数量，超出数量就删除旧文件假设设置每个月滚动，且<maxHistory>是6，
+            则只保存最近6个月的文件，删除之前的旧文件。注意，删除旧文件是，那些为了归档而创建的目录也会被删除-->
+            <maxHistory>${log.maxHistory}</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <!-- WARN级别日志 appender -->
+    <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 过滤器，只记录WARN级别的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+
+
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <!-- 此处设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log_dir}/%d{yyyy-MM-dd}/warn.log
+            </fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>${log.maxHistory}</maxHistory>
+        </rollingPolicy>
+
+    </appender>
+
+    <!-- INFO级别日志 appender -->
+    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 过滤器，只记录INFO级别的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log_dir}/%d{yyyy-MM-dd}/info.log
+            </fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>${log.maxHistory}</maxHistory>
+        </rollingPolicy>
+
+
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <!-- 此处设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- DEBUG级别日志 appender -->
+    <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 过滤器，只记录DEBUG级别的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <!-- 此处设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log_dir}/%d{yyyy-MM-dd}/debug.log
+            </fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>${log.maxHistory}</maxHistory>
+            >
+        </rollingPolicy>
+
+    </appender>
+
+    <!-- TRACE级别日志 appender -->
+    <appender name="TRACE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 过滤器，只记录ERROR级别的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>TRACE</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <!-- 此处设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log_dir}/%d{yyyy-MM-dd}/trace.log
+            </fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>${log.maxHistory}</maxHistory>
+
+        </rollingPolicy>
+        >
+    </appender>
+
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="TRACE"/>
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
+    <!-- root级别   DEBUG -->
+    <root level="INFO">
+        <!-- 控制台输出 STDOUT-->
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="DEBUG"/>
+        <!-- 文件输出 -->
+        <appender-ref ref="ERROR"/>
+        <appender-ref ref="INFO"/>
+        <appender-ref ref="WARN"/>
+        <appender-ref ref="DEBUG"/>
+        <appender-ref ref="TRACE"/>
+    </root>
+
+</included>

energy-manage-service/src/main/resources/mybatis/system/OrganizationAuthMapper.xml

@@ -161,7 +161,8 @@
         <select id="selectFieldAnalysisResultByroleId" resultType="com.energy.manage.service.domain.vo.homepage.WaitTaskVo">
             select
             sum(uncorrelatedCount) as uncorrelatedCount,
-            sum(errCount) as errCount
+            sum(errCount) as errCount,
+            sum(qCount) as queueNumber
             from
             (select
             soa.role_id as roleId,
@@ -170,7 +171,8 @@
             soa.code_type as codeType,
             wf.field_name as fieldName,
             uar.uncorrelatedCount as uncorrelatedCount,
-            uer.errCount as errCount
+            uer.errCount as errCount,
+            uqr.qCount as qCount
             from
             (select a.role_id,
             wr.code_number,
@@ -185,7 +187,10 @@
             on soa.code_number = uar.fieldCode
             left join
             (select field_code as fieldCode,count(1) as errCount from analysis_result where 	err_state = 1  group by field_code) uer
-            on soa.code_number = uer.fieldCode) wait_task
+            on soa.code_number = uer.fieldCode
+            left join
+            (select field_code as fieldCode,count(1) as qCount from analysis_result where 	analysis_state = 10  group by field_code) uqr
+            on soa.code_number = uqr.fieldCode) wait_task
         </select>
 
 

energy-manage-service/src/main/resources/mybatis/windenginegroup/WindEngineGroupMapper.xml

@@ -7,6 +7,7 @@
         SELECT
         wf.field_code as fieldCode,
         wf.field_name as fieldName,
+        wc.company_name as companyName,
         weg.engine_code AS engineCode,
         weg.engine_name as engineName,
         weg.rated_capacity as ratedCapacity,
@@ -20,6 +21,9 @@
         wem.manufacturer_name as manufacturerName,
         weg.create_time as createTime
         from
+        wind_company wc
+        inner join
+        wind_field wf on wc.company_code = wf.company_code
         wind_field wf
         inner join
         wind_engine_group weg on wf.field_code = weg.field_code

energy-manage-service/src/main/resources/mybatis/windfield/WindFieldMapper.xml

@@ -41,18 +41,30 @@
             and
             wf.field_name like CONCAT("%", #{item.fieldName} ,"%")
         </if>
+        <if test="item.companyName!=null">
+            and
+            wc.company_name like CONCAT("%", #{item.companyName} ,"%")
+        </if>
+        <if test="item.provinceId!=null">
+            and
+            wf.province_id = #{item.provinceId}
+        </if>
+        <if test="item.cityId!=null">
+            and
+            wf.city_id = #{item.cityId}
+        </if>
         <if test="item.beginTime != null and item.beginTime != ''">
             and wf.create_time  <![CDATA[>= ]]>  #{item.beginTime}
         </if>
         <if test="item.endTime != null and item.endTime != ''">
             and wf.create_time <![CDATA[<= ]]> #{item.endTime}
         </if>
-        <if test="item.fieldName!=null or item.beginTime != null or item.endTime!=null">
+        <if test="item.fieldName!=null or item.beginTime != null or item.endTime!=null or item.companyName != null or item.provinceId != null  ">
             and
             wf.field_code in (select code_number from sys_organization_auth where role_id =#{item.roleId} and code_type
             = 'field')
         </if>
-        <if test="item.fieldName == null and item.beginTime == null and item.beginTime == null">
+        <if test="item.fieldName == null and item.beginTime == null and item.beginTime == null and item.companyName == null and item.provinceId == null ">
             and
             wf.create_by = #{item.userId}
             or

pom.xml

@@ -348,6 +348,12 @@
                 <profiles.active>prod</profiles.active>
             </properties>
         </profile>
+        <profile>
+            <id>tidb</id>
+            <properties>
+                <profiles.active>tidb</profiles.active>
+            </properties>
+        </profile>
     </profiles>
 
 </project>