人脸信息发送逻辑修改

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/DeviceInfoServiceImpl.java

@@ -87,6 +87,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
 
 	@Override
 	public void updateByDeviceNo(String deviceNo, String ip) {
+		try{
 		DeviceInfo deviceInfo= deviceInfoDAO.findByDeviceNo(deviceNo);
 		String oldIp = deviceInfo.getIpAddress();
 		if (deviceInfo.getIsAutoUpdate() && !deviceInfo.getIpAddress().equals(ip)){
@@ -94,6 +95,9 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
 			deviceInfoDAO.update(deviceInfo);
 			log.warn(deviceNo+"的ip由原来的："+oldIp+"自动更新为："+ip);
 		}
+		}catch (Exception e){
+			log.error(e.getMessage());
+		}
 
 	}
 }

lapi/pom.xml

@@ -33,6 +33,9 @@
             <scope>compile</scope>
         </dependency>
 
+
+
+
         <dependency>
             <groupId>com.jpsoft.smart</groupId>
             <artifactId>common</artifactId>

lapi/src/main/java/com/jpsoft/smart/LapiApplication.java

@@ -13,6 +13,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -81,4 +82,6 @@ public class LapiApplication implements CommandLineRunner {
             serverChannel.close();
         }
     }
+
+
 }

lapi/src/main/java/com/jpsoft/smart/lapi/handler/HeartReportHandler.java

@@ -25,13 +25,13 @@ public class HeartReportHandler extends SimpleChannelInboundHandler<HeartReportI
     @Override
     protected void channelRead0(ChannelHandlerContext channelHandlerContext, HeartReportInfo heartReportInfo) throws Exception {
 
-        log.warn(String.valueOf(channelHandlerContext.channel().remoteAddress()));
-        log.warn(heartReportInfo.toString());
+      //  log.warn(String.valueOf(channelHandlerContext.channel().remoteAddress()));
+     //   log.warn(heartReportInfo.toString());
         String ipAndPort = String.valueOf(channelHandlerContext.channel().remoteAddress());
         String deviceNo = heartReportInfo.getDeviceCode();
         String ip = ipAndPort.substring(ipAndPort.indexOf("/")+1,ipAndPort.indexOf(":"));
-        log.warn(deviceNo);
-        log.warn("ip =="+ip);
+     //   log.warn(deviceNo);
+    //    log.warn("ip =="+ip);
 
         deviceInfoService.updateByDeviceNo(deviceNo,ip);
 

lapi/src/main/java/com/jpsoft/smart/lapi/handler/ParseRequestHandler.java

@@ -29,7 +29,7 @@ public class ParseRequestHandler extends SimpleChannelInboundHandler<FullHttpReq
 
         byteBuf.resetReaderIndex();
 
-        log.warn(request.uri());
+     //   log.warn(request.uri());
      //   log.warn(String.valueOf(ctx.channel().remoteAddress()));
 
         String json = new String(buffer,"UTF-8");

lapi/src/main/java/com/jpsoft/smart/lapi/handler/PersonVerificationHandler.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 
 @Slf4j
 @Component
@@ -25,7 +26,10 @@ public class PersonVerificationHandler extends SimpleChannelInboundHandler<Perso
 
     @Override
     protected void channelRead0(ChannelHandlerContext channelHandlerContext, PersonVerification personVerification) throws Exception {
-     //   log.warn(personVerification.toString());
+
+
+
+        log.warn("人员记录");
         JSONObject jsonObject = personVerification.getJsonObject();
 
     //    log.warn("DeviceCode"+jsonObject.getStr("DeviceCode"));
@@ -35,6 +39,7 @@ public class PersonVerificationHandler extends SimpleChannelInboundHandler<Perso
 
 
         JSONObject faceJson = new JSONObject(jsonObject.getStr("FaceInfoList").substring(1,jsonObject.getStr("FaceInfoList").length()-1));
+
       //  log.warn(faceJson.getStr("FaceImage"));
 
      //   String  timestampStr = faceJson.getStr("Timestamp");
@@ -47,6 +52,7 @@ public class PersonVerificationHandler extends SimpleChannelInboundHandler<Perso
         log.warn(String.valueOf(timestamp));
         Date date = new Date(timestamp);
 
+      //  log.warn("测试");
 
 
 
@@ -77,6 +83,15 @@ public class PersonVerificationHandler extends SimpleChannelInboundHandler<Perso
 
       //  log.warn("准备写入");
 
+
+        HashMap map = new HashMap<>();
+        map.put("deviceNo",deviceNo);
+        map.put("temperature",temperature);
+        map.put("libMatInfoListJson",libMatInfoListJson);
+        map.put("matchPersonInfo",matchPersonInfo);
+        log.warn(map.toString());
+
+
         personDeviceLogService.deviceInsertLog(deviceNo,temperature,faceImageJson,libMatInfoListJson,matchPersonInfo,date);
 
 

lapi/src/main/resources/application-test.yml

@@ -11,6 +11,12 @@ spring:
     restart:
       enabled: true
 
+#logger:
+#  level: WARN
+#  dir: /opt/logs/smart-community-lapi/
+
 logger:
-  level: WARN
-  dir: /opt/logs/smart-community-lapi/
+  level1: WRAN
+  dir1: /opt/logs/smart-community-lapi/
+  level2: WRAN
+  dir2: /opt/logs/smart-community-lapi/personDevice

lapi/src/main/resources/logback-spring.xml

@@ -4,6 +4,10 @@
     <!--
     官方文档指明，需要使用<springProperty>,才可使用application.properties（或application.yml）中的值
     -->
+    <springProperty scope="context" name="loggerLevel" source="logger.level1"/>
+    <springProperty scope="context" name="loggerPath" source="logger.dir1"/>
+    <springProperty scope="context" name="loggerLevel2" source="logger.level2"/>
+    <springProperty scope="context" name="loggerPath2" source="logger.dir2"/>
     <property name="pattern" value="%date [%file : %line] %msg%n"></property>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -12,16 +16,64 @@
         </encoder>
     </appender>
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>D:\\Logs\\logfile.log</file>
+        <file>${loggerPath}/logfile.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>D:\\Logs\\logfile.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${loggerPath}/logfile.%d{yyyy-MM-dd}.log</fileNamePattern>
             <MaxHistory>30</MaxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${pattern}</pattern>
         </encoder>
     </appender>
-    <root level="WARN">
+    <appender name="PERSONDEVICEFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${loggerPath2}/logfile.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${loggerPath2}/logfile.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${pattern}</pattern>
+        </encoder>
+    </appender>
+    <!--<root level="WARN">
         <appender-ref ref="STDOUT" />
-    </root>
+    </root>-->
+
+    <!--
+    直接用maven的变量是@...@,用spring的变量是${...}
+    -->
+    <!--<springProfile name="dev">
+        &lt;!&ndash;root的level不能用变量&ndash;&gt;
+        <logger name="jdbc" additivity="false" level="WARN">
+            <appender-ref ref="STDOUT" />
+            <appender-ref ref="FILE" />
+        </logger>
+        <logger name="jdbc.sqltiming" additivity="false" level="ON">
+            <appender-ref ref="STDOUT" />
+        </logger>
+
+    </springProfile>-->
+    <springProfile name="dev">
+        <root level="WARN">
+            <appender-ref ref="STDOUT" />
+            <appender-ref ref="FILE" />
+            <appender-ref ref="PERSONDEVICEFILE" />
+        </root>
+
+    </springProfile>
+    <springProfile name="test">
+        <root level="WARN">
+            <appender-ref ref="STDOUT" />
+            <appender-ref ref="FILE" />
+            <appender-ref ref="PERSONDEVICEFILE" />
+        </root>
+    </springProfile>
+    <springProfile name="production">
+        <root level="WARN">
+            <appender-ref ref="STDOUT" />
+            <appender-ref ref="FILE" />
+            <appender-ref ref="PERSONDEVICEFILE" />
+        </root>
+    </springProfile>
+
 </configuration>