1.日志实现由log4j->loggack

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/StatisticsErrorTypeEum.java

@@ -12,7 +12,7 @@ public enum StatisticsErrorTypeEum {
     /**
      * 巡检异常
      */
-    patrol("patrol", "巡检异常"),
+    check("check", "巡检异常"),
     /**
      * 设备故障
      */

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/constants/FasConstant.java

@@ -3,7 +3,8 @@
  */
 package com.yeejoin.amos.fas.business.constants;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 常量
@@ -14,7 +15,7 @@ public class FasConstant {
      * 构造方法
      */
     private FasConstant() {
-        Logger.getLogger(this.getClass()).debug(FasConstant.CONSTRUCTOR);
+        LoggerFactory.getLogger(this.getClass()).debug(FasConstant.CONSTRUCTOR);
     }
     
     /**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/DaoHelper.java

@@ -5,7 +5,8 @@ package com.yeejoin.amos.fas.business.dao;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * hql助手类
@@ -19,7 +20,7 @@ public class DaoHelper {
 	 * 构造方法
 	 */
 	private DaoHelper() {
-		Logger.getLogger(this.getClass()).debug("constructor");
+		LoggerFactory.getLogger(this.getClass()).debug("constructor");
 	}
 
 	/**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -248,8 +248,8 @@ public class View3dServiceImpl implements IView3dService {
         List<SafetyIndexDetailVo> resultList = Lists.newArrayList();
         String dateStr = DateUtil.getDateFormat(new Date(),DateUtil.DATE_DEFAULT_FORMAT);
         Map<String,Object> params = new HashMap<>();
-        params.put("orgCode",orgCode);
-//        params.put("orgCode","1*2");
+//        params.put("orgCode",orgCode);
+        params.put("orgCode","1*2");
         params.put("date",dateStr);
         if(StatisticsErrorTypeEum.risk.getCode().equals(type)){
             //1.按照日期+机构，查询出所有风险点
@@ -265,7 +265,7 @@ public class View3dServiceImpl implements IView3dService {
                 safetyIndexDetailVo.setContent(getErrorContentVos(v));
                 resultList.add(safetyIndexDetailVo);
             });
-        } else if(StatisticsErrorTypeEum.patrol.getCode().equals(type)){
+        } else if(StatisticsErrorTypeEum.check.getCode().equals(type)){
             //1.按照日期+机构，查询出异常巡检
             List<CheckErrorBo> checkErrorBoList = view3dMapper.getAllErrorPatrolPoint(params);
             //2.按照状态进行分组，加工返回数据

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/FileHelper.java

@@ -7,7 +7,6 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import com.yeejoin.amos.fas.exception.YeeException;
 import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.DVConstraint;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
@@ -29,6 +28,8 @@ import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -75,7 +76,7 @@ import java.util.zip.ZipOutputStream;
  */
 public class FileHelper {
 
-    private static final Logger log = Logger.getLogger(FileHelper.class);
+    private static final Logger log = LoggerFactory.getLogger(FileHelper.class);
 
     /**
      * @param file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/client/invoke/RsDataQueue.java

@@ -7,7 +7,8 @@ import com.yeejoin.amos.fas.business.util.CacheMap;
 import com.yeejoin.amos.fas.business.vo.Toke;
 import com.yeejoin.amos.fas.context.IotContext;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.concurrent.BlockingQueue;
@@ -101,7 +102,7 @@ public class RsDataQueue {
                         }
                     }
                 } catch (Exception e) {
-                    Logger.getLogger(this.getClass()).error(e.getMessage());
+                    LoggerFactory.getLogger(this.getClass()).error(e.getMessage());
                     e.printStackTrace();
                 }
             }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/context/IotContext.java

@@ -3,7 +3,8 @@
  */
 package com.yeejoin.amos.fas.context;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 
 import com.yeejoin.amos.fas.business.constants.FasConstant;
@@ -30,7 +31,7 @@ public class IotContext {
 	 * 构造方法
 	 */
 	private IotContext() {
-		Logger.getLogger(this.getClass()).debug(FasConstant.CONSTRUCTOR);
+		LoggerFactory.getLogger(this.getClass()).debug(FasConstant.CONSTRUCTOR);
 	}
 
 	/**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/core/threadpool/AmosThreadPool.java

 package com.yeejoin.amos.fas.core.threadpool;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
 
 import com.yeejoin.amos.fas.business.constants.FasConstant;
+import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -15,8 +16,7 @@ public class AmosThreadPool {
     /**
      * 日志记录器
      */
-    private static final Logger logger = Logger
-            .getLogger(AmosThreadPool.class);
+    private static final Logger logger = LoggerFactory.getLogger(AmosThreadPool.class);
 
     /**
      * 单例

YeeAmosFireAutoSysStart/src/main/java/com/yeejoin/amos/YeeAmosFireAutoSysStart.java

@@ -3,8 +3,9 @@ package com.yeejoin.amos;
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-import org.apache.log4j.Logger;
 import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -55,7 +56,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 public class YeeAmosFireAutoSysStart  implements ApplicationContextAware
 {
 
-	private static final Logger log = Logger.getLogger(YeeAmosFireAutoSysStart.class);
+	private static final Logger log = LoggerFactory.getLogger(YeeAmosFireAutoSysStart.class);
 
 	/**
 	 * 启动amosop-server

YeeAmosFireAutoSysStart/src/main/resources/log4j.properties

-log4j.rootLogger=info, stdout, logfile
-
-log4j.logger.io.netty=info
-log4j.logger.org.hibernate=info
-log4j.logger.com.mchange=info
-log4j.logger.org.springframework=info
-log4j.logger.com.mangofactory=info
-log4j.logger.com.yeejoin.amos.fas.business.dao.mapper=debug
-log4j.logger.org.apache=info
-log4j.logger.com.zaxxer.hikari.pool=info
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %t %-5p [%c{1}:%L] %m%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=logs/FireAutoSystem.log
-log4j.appender.logfile.MaxFileSize=10240KB
-log4j.appender.logfile.MaxBackupIndex=30
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=%d %t %-5p [%c{1}:%L] %m%n

YeeAmosFireAutoSysStart/src/main/resources/logback.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/fas.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>30mb</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.mybatis" level="DEBUG" />
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <logger name="org.springframework" level="DEBUG"/>
+
+    <!-- 日志输出级别 -->
+    <root level="DEBUG">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file

pom.xml

@@ -27,8 +27,6 @@
 		<liquibase.version>3.6.3</liquibase.version>
 		<swagger.version>2.7.0</swagger.version>
 		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
-		<YeeSecurity.version>2.1.0</YeeSecurity.version>
-		<YeeOp.version>2.0.1</YeeOp.version>
 		<maven-jar-plugin.version>3.0.0</maven-jar-plugin.version>
 	</properties>
 
@@ -81,31 +79,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<!-- <dependency>
-		    <groupId>org.springframework.boot</groupId>
-		    <artifactId>spring-boot-starter</artifactId>
-		    <exclusions>
-		        <exclusion>
-		            <artifactId>logback-classic</artifactId>
-		            <groupId>ch.qos.logback</groupId>
-		        </exclusion>
-		        <exclusion>
-		            <artifactId>log4j-over-slf4j</artifactId>
-		            <groupId>org.slf4j</groupId>
-		        </exclusion>
-		    </exclusions>
-		</dependency> -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j</artifactId>
-			<version>1.3.8.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -158,18 +131,6 @@
 			<artifactId>mapper</artifactId>
 			<version>3.0.1</version>
 		</dependency>
-		<!-- 添加commons-lang依赖包 -->
-<!--		<dependency>-->
-<!--			<groupId>commons-lang</groupId>-->
-<!--			<artifactId>commons-lang</artifactId>-->
-<!--			<version>2.4</version>-->
-<!--			<scope>compile</scope>-->
-<!--		</dependency>-->
-<!--		<dependency>-->
-<!--			<groupId>org.apache.commons</groupId>-->
-<!--			<artifactId>commons-lang3</artifactId>-->
-<!--			<version>3.3.1</version>-->
-<!--		</dependency>-->
 		<dependency>
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
@@ -207,11 +168,6 @@
 			<artifactId>apollo-client</artifactId>
 			<version>0.10.2</version>
 		</dependency>
-        <dependency> 
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-            <version>2.8.2</version>
-        </dependency>
     <!--     预案突发事件websocket -->
 		<dependency>
            <groupId>org.springframework.boot</groupId>