Ver Código Fonte

修改日志配置文件

konghl 4 anos atrás
pai
commit
d4eaa332a1

+ 6 - 12
ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/AreaInOutRecordDaoImpl.java

@ -95,19 +95,13 @@ public class AreaInOutRecordDaoImpl extends AbstractBizDao implements AreaInOutR
95 95
	@Override
96 96
	public boolean updateSameOutTimeAreaOutRecord(String outDate, List<String> recordIdList) throws Exception {
97 97
		Map<String, Object> dataMap = new HashMap<String, Object>();
98
		ArrayList<Object> dataList = new ArrayList<>();
99
		for (String recordId : recordIdList) {
100
			Map<String, Object> paramsMap = new HashMap<String, Object>();
101
			paramsMap.put("recordId", recordId);// 进入围栏记录ID
102
			paramsMap.put("outDate", outDate); // 离开围栏时间
98
		dataMap.put("recordIdList", recordIdList); //围栏ID集合
99
		dataMap.put("outDate", outDate); // 离开围栏时间
103 100
104
			// TODO 操作人的编号和部门
105
			paramsMap.put("doneDate", TimeUtil.getSysTime());
106
			paramsMap.put("opId", "");
107
			paramsMap.put("orgId", "");
108
			dataList.add(paramsMap);
109
		}
110
		dataMap.put("dataList", dataList);
101
		// TODO 操作人的编号和部门
102
		dataMap.put("doneDate", TimeUtil.getSysTime());
103
		dataMap.put("opId", "");
104
		dataMap.put("orgId", "");
111 105
112 106
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
113 107
		int num = mgmtDao.executeUpdate("ipu.AreaInOutRecordDao", "updateSameOutTimeRecordDao", dataMap);

+ 5 - 2
ebc-sea-platform/src/main/java/com/ai/ipu/server/enums/IotUrlEnums.java

@ -1,6 +1,6 @@
1 1
package com.ai.ipu.server.enums;
2 2
3
import com.ai.ipu.server.util.UrlAddressUtil;
3
import org.springframework.beans.factory.annotation.Value;
4 4
5 5
/**
6 6
 * iot 北向接口业务数据的地址枚举
@ -22,12 +22,15 @@ public enum IotUrlEnums {
22 22
23 23
	private String url;
24 24
25
	@Value("${url.iot.service}")
26
	private String iotServiceUrl;
27
25 28
	private IotUrlEnums(String url) {
26 29
		this.url = url;
27 30
	}
28 31
29 32
	public String getUrl() {
30
		return UrlAddressUtil.IOT_URL1 + "/" + url;
33
		return iotServiceUrl + "/" + url;
31 34
	}
32 35
33 36
}

+ 4 - 2
ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/GisTokenServiceImpl.java

@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
11 11
12 12
import com.ai.ipu.server.service.interfaces.GisTokenService;
13 13
import com.ai.ipu.server.util.HttpServiceUtil;
14
import com.ai.ipu.server.util.UrlAddressUtil;
15 14
import com.alibaba.fastjson.JSON;
16 15
17 16
@Service
@ -23,6 +22,9 @@ public class GisTokenServiceImpl implements GisTokenService {
23 22
24 23
	@Value("${aap.gis.passwd}")
25 24
	private String gisPasswd;
25
	
26
	@Value("${url.gis.token}")
27
	private String tokenUrl;
26 28
27 29
	@Override
28 30
	public Map<String, Object> queryGisToken() {
@ -31,7 +33,7 @@ public class GisTokenServiceImpl implements GisTokenService {
31 33
		mapParams.put("passwd", gisPasswd);
32 34
33 35
		Charset charset = Charset.forName("utf-8");
34
		String resultJson = HttpServiceUtil.sendPost(UrlAddressUtil.GIS_TOKEN, mapParams, charset);
36
		String resultJson = HttpServiceUtil.sendPost(tokenUrl, mapParams, charset);
35 37
36 38
		Map<String, Object> resultMap = JSON.parseObject(resultJson, Map.class);
37 39
		return resultMap;

+ 4 - 4
ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/ReceiveSubscribeServiceImpl.java

@ -303,8 +303,8 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
303 303
		if (maxMapTagGrade == 5) {
304 304
			logger.info("镜屏推送进入电子围栏的信息");
305 305
			// 进入电子围栏(禁区),需显示进入时间
306
			params.put("inDate", sendDataAreaInfo.get("inAreaDate"));
307
			params.put("locationStatus", EbcConstant.location_status_exclusion);
306
			params.put("inDate", simpleDateFormat.format(sendDataAreaInfo.get("inAreaDate"))); //进入时间
307
			params.put("locationStatus", EbcConstant.location_status_exclusion); //定位状态
308 308
309 309
		} else if (maxMapTagGrade == 3) {
310 310
			// 进入定点(限时),需计算是否超时
@ -318,10 +318,10 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
318 318
				if (residenceTimeLength <= fixedLong) {
319 319
					// 已超时
320 320
					logger.info("镜屏推送进入定点(限时)的信息:已超时");
321
					params.put("locationStatus", EbcConstant.location_status_overtime);
321
					params.put("locationStatus", EbcConstant.location_status_overtime);//定位状态
322 322
				}
323 323
			}
324
			params.put("fixedLong", fixedLong);
324
			params.put("fixedLong", fixedLong);//停留时长
325 325
		}
326 326
327 327
		String jingpingData = JSON.toJSONString(params);

+ 7 - 11
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/NorthboundInterfaceUtil.java

@ -23,22 +23,18 @@ public class NorthboundInterfaceUtil {
23 23
24 24
	private static final ILogger logger = IpuLoggerFactory.createLogger(NorthboundInterfaceUtil.class);
25 25
26
	@Value("${aap.iot.userCode}")
26 27
	private static String userCode;
28
	
29
	@Value("${aap.iot.passWord}")
27 30
	private static String passWord;
31
	
32
	@Value("${url.iot.login}")
33
	private static String iotLoginUrl;
28 34
29 35
	// 调用成功标识
30 36
	public static final String resultCode_succeed = "0";
31 37
32
	@Value("${aap.iot.userCode}")
33
	public void setUserCode(String userCode) {
34
		NorthboundInterfaceUtil.userCode = userCode;
35
	}
36
37
	@Value("${aap.iot.passWord}")
38
	public void setPassWord(String passWord) {
39
		NorthboundInterfaceUtil.passWord = passWord;
40
	}
41
42 38
	// 定义静态存储map空间存放sign与sessionId
43 39
	private volatile static Map<String, String> cacheMap = new ConcurrentHashMap<String, String>();// 缓存map
44 40
@ -195,7 +191,7 @@ public class NorthboundInterfaceUtil {
195 191
		Map mapType = null;
196 192
		try {
197 193
			// 调用登录接口
198
			String loginResult = HttpServiceUtil.sendPost(UrlAddressUtil.IOT_LOGIN, loginParamMap, charset);
194
			String loginResult = HttpServiceUtil.sendPost(iotLoginUrl, loginParamMap, charset);
199 195
			mapType = JSON.parseObject(loginResult, Map.class);
200 196
		} catch (Exception e) {
201 197
			logger.error("登录北向接口失败: " + e.getMessage());

+ 0 - 13
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/UrlAddressUtil.java

@ -1,13 +0,0 @@
1
package com.ai.ipu.server.util;
2
3
public interface UrlAddressUtil {
4
	// gis的token地址
5
	public static final String GIS_TOKEN = "http://192.168.74.189:9999/gisIntf/account/gettoken";
6
7
	// iot的北向接口注册地址
8
	public static final String IOT_LOGIN = "http://60.205.219.67:80/sso/login";
9
10
	// iot的北向接口统一地址
11
	public static final String IOT_URL1 = "http://60.205.219.67:80/dmp/terminalNorthApi";
12
13
}

+ 20 - 13
ebc-sea-platform/src/main/resources/dev/application.properties

@ -1,34 +1,41 @@
1
######设置服务器端口
2
######也可以通过启动命令行参数实现:java -jar myproject.jar --server.port=9084
1
######\u8bbe\u7f6e\u670d\u52a1\u5668\u7aef\u53e3
2
######\u4e5f\u53ef\u4ee5\u901a\u8fc7\u542f\u52a8\u547d\u4ee4\u884c\u53c2\u6570\u5b9e\u73b0\uff1ajava -jar myproject.jar --server.port=9084
3 3
server.port=unknown
4 4
5
#会影响拦截器的配置exclude-mapping
5
#\u4f1a\u5f71\u54cd\u62e6\u622a\u5668\u7684\u914d\u7f6eexclude-mapping
6 6
spring.mvc.static-path-pattern=/**
7 7
8
######context-path默认/
8
######context-path\u9ed8\u8ba4/
9 9
server.context-path=/ipu
10
######注册DispatcherServlet对应path,亦可通过dispatcherRegistration方法配置
10
######\u6ce8\u518cDispatcherServlet\u5bf9\u5e94path\uff0c\u4ea6\u53ef\u901a\u8fc7dispatcherRegistration\u65b9\u6cd5\u914d\u7f6e
11 11
#server.servlet-path=/ipu1
12
#使用maven中的变量替换
12
#\u4f7f\u7528maven\u4e2d\u7684\u53d8\u91cf\u66ff\u6362
13 13
logging.file=target/logs/${project.artifactId}.log
14 14
spring.application.name=${project.artifactId}
15 15
16
######查看spring错误日志
16
######\u67e5\u770bspring\u9519\u8bef\u65e5\u5fd7
17 17
#logging.level.org.springframework=DEBUG
18 18
19
######session使用默认
19
######session\u4f7f\u7528\u9ed8\u8ba4
20 20
spring.session.store-type=none
21 21
22
#设置开启热部署
22
#\u8bbe\u7f6e\u5f00\u542f\u70ed\u90e8\u7f72
23 23
spring.devtools.restart.enabled=true
24
#重启目录
24
#\u91cd\u542f\u76ee\u5f55
25 25
spring.devtools.restart.additional-paths=src/main/java
26 26
spring.devtools.restart.exclude=WEB-INF/**
27 27
28
#北向登录账号和密码
28
#\u5317\u5411\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
29 29
aap.iot.userCode=IOT_ADMIN
30 30
aap.iot.passWord=123456
31 31
32
#gis登录账号和密码
32
#gis\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
33 33
aap.gis.userName=EBC_PPRS
34
aap.gis.passwd=ITBS93wMYHosT
34
aap.gis.passwd=ITBS93wMYHosT
35
36
#gis\u7684token\u5730\u5740
37
url.gis.token = http://192.168.74.189:9999/gisIntf/account/gettoken
38
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
39
url.iot.login = http://60.205.219.67:8300/sso/login
40
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
41
url.iot.service = http://60.205.219.67:8300/dmp/terminalNorthApi

+ 27 - 0
ebc-sea-platform/src/main/resources/dev/log4j.properties

@ -0,0 +1,27 @@
1
### set log levels ###
2
log4j.rootLogger=DEBUG, Console
3
4
### direct log messages to stdout ###
5
log4j.appender.Console=org.apache.log4j.ConsoleAppender
6
log4j.appender.Console.Target=System.out
7
log4j.appender.Console.layout=org.apache.log4j.PatternLayout
8
log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
9
#log4j.appender.Console.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n  
10
#log4j.appender.Console.layout.ConversionPattern=%-5p(%10c{1}) %m%n
11
12
### direct messages to file framework.log ###
13
log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
14
log4j.appender.File.File=${log.path}/ebc-sea-platform.log
15
log4j.appender.File.DatePattern='.'yyyy-MM-dd
16
log4j.appender.File.layout=org.apache.log4j.PatternLayout
17
log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
18
19
### error log file ###
20
log4j.appender.Error=org.apache.log4j.DailyRollingFileAppender
21
log4j.appender.Error.DatePattern='.'yyyy-MM-dd
22
log4j.appender.Error.File=${log.path}/ebc-sea-platform-error.log
23
log4j.appender.Error.layout=org.apache.log4j.PatternLayout
24
log4j.appender.Error.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p(%10c{1}) %m%n
25
26
### application log config ###
27
log4j.logger.com.ai.ipu=DEBUG, Console

+ 21 - 8
ebc-sea-platform/src/main/resources/dev/log4j2.xml

@ -1,29 +1,42 @@
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<Configuration status="WARN">
3 3
    <Properties>
4
        <!-- 配置日志文件输出目录,此配置将日志输出到tomcat根目录下的指定文件夹 -->
4
        <!-- 配置日志文件输出目录和名称 -->
5 5
        <Property name="LOG_HOME">${sys:log.path:-target}</Property>
6
        <Property name="PROCESS_NAME">ebc-sea-platform</Property>
6 7
    </Properties>
7 8
    <Appenders>
8 9
        <Console name="Console" target="SYSTEM_OUT">
9 10
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
10 11
        </Console>
11
        <RollingFile name="File" fileName="${LOG_HOME}/ebc-sea-platform.log" filePattern="${LOG_HOME}/ebc-sea-platform-%d{yyyy-MM-dd}.log">
12
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
12
        <RollingFile name="RollingFileDebug" fileName="${LOG_HOME}/${PROCESS_NAME}.log"
13
                     filePattern="${LOG_HOME}/$${date:yyyy-MM}/${PROCESS_NAME}-%d{yyyy-MM-dd}-%i.log">
14
            <!--控制台只输出level及以上级别的信息(onMatch),其他的直接拒绝(onMismatch)-->
15
            <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
16
            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} - [%-5p]  %m%n"/>
13 17
            <Policies>
14
                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
18
                <TimeBasedTriggeringPolicy/>
19
                <SizeBasedTriggeringPolicy size="100 MB"/>
15 20
            </Policies>
21
            <DefaultRolloverStrategy max="30"/>
16 22
        </RollingFile>
17
        <RollingFile name="FileError" fileName="${LOG_HOME}/ebc-sea-platform-error.log" filePattern="${LOG_HOME}/ebc-sea-platform-error-%d{yyyy-MM-dd}.log">
18
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
23
        <RollingFile name="RollingFileError" fileName="${LOG_HOME}/${PROCESS_NAME}-error.log"
24
                     filePattern="${LOG_HOME}/$${date:yyyy-MM}/${PROCESS_NAME}-error-%d{yyyy-MM-dd}-%i.log">
25
            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
26
            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} - [%-5p]  %m%n"/>
19 27
            <Policies>
20
                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
28
                <TimeBasedTriggeringPolicy/>
29
                <SizeBasedTriggeringPolicy size="100 MB"/>
21 30
            </Policies>
31
            <!-- DefaultRolloverStrategy属性如不设置,则默认为最多同一文件夹下7个文件,这里设置了20 -->
32
            <DefaultRolloverStrategy max="20"/>
22 33
        </RollingFile>
23 34
    </Appenders>
24 35
    <Loggers>
25
        <Root level="all">
36
        <Root level="DEBUG">
26 37
            <AppenderRef ref="Console"/>
38
            <AppenderRef ref="RollingFileDebug"/>
39
            <AppenderRef ref="RollingFileError"/>
27 40
        </Root>
28 41
        <logger name="com.ai.ipu" level="DEBUG"></logger>
29 42
        <logger name="org" level="WARN"></logger>

+ 22 - 6
ebc-sea-platform/src/main/resources/pro/log4j.properties

@ -1,11 +1,27 @@
1 1
### set log levels ###
2
log4j.rootLogger=DEBUG
2
log4j.rootLogger=ERROR, File
3 3
4 4
### direct log messages to stdout ###
5
log4j.appender.A1=org.apache.log4j.ConsoleAppender
6
log4j.appender.A1.Target=System.out
7
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
8
log4j.appender.A1.layout.ConversionPattern=%-5p(%10c{1}) %m%n
5
log4j.appender.Console=org.apache.log4j.ConsoleAppender
6
log4j.appender.Console.Target=System.out
7
log4j.appender.Console.layout=org.apache.log4j.PatternLayout
8
log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
9
#log4j.appender.Console.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n  
10
#log4j.appender.Console.layout.ConversionPattern=%-5p(%10c{1}) %m%n
11
12
### direct messages to file framework.log ###
13
log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
14
log4j.appender.File.File=${log.path}/ebc-sea-platform.log
15
log4j.appender.File.DatePattern='.'yyyy-MM-dd
16
log4j.appender.File.layout=org.apache.log4j.PatternLayout
17
log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
18
19
### error log file ###
20
log4j.appender.Error=org.apache.log4j.DailyRollingFileAppender
21
log4j.appender.Error.DatePattern='.'yyyy-MM-dd
22
log4j.appender.Error.File=${log.path}/ebc-sea-platform.log
23
log4j.appender.Error.layout=org.apache.log4j.PatternLayout
24
log4j.appender.Error.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p(%10c{1}) %m%n
9 25
10 26
### application log config ###
11
log4j.logger.com.ai.ipu=DEBUG,A1
27
log4j.logger.com.ai.ipu=ERROR, File

+ 21 - 8
ebc-sea-platform/src/main/resources/pro/log4j2.xml

@ -1,29 +1,42 @@
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<Configuration status="WARN">
3 3
    <Properties>
4
        <!-- 配置日志文件输出目录,此配置将日志输出到tomcat根目录下的指定文件夹 -->
4
        <!-- 配置日志文件输出目录和名称 -->
5 5
        <Property name="LOG_HOME">${sys:log.path:-target}</Property>
6
        <Property name="PROCESS_NAME">ebc-sea-platform</Property>
6 7
    </Properties>
7 8
    <Appenders>
8 9
        <Console name="Console" target="SYSTEM_OUT">
9 10
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
10 11
        </Console>
11
        <RollingFile name="File" fileName="${LOG_HOME}/ebc-sea-platform.log" filePattern="${LOG_HOME}/ebc-sea-platform-%d{yyyy-MM-dd}.log">
12
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
12
        <RollingFile name="RollingFileDebug" fileName="${LOG_HOME}/${PROCESS_NAME}.log"
13
                     filePattern="${LOG_HOME}/$${date:yyyy-MM}/${PROCESS_NAME}-%d{yyyy-MM-dd}-%i.log">
14
            <!--控制台只输出level及以上级别的信息(onMatch),其他的直接拒绝(onMismatch)-->
15
            <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
16
            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} - [%-5p]  %m%n"/>
13 17
            <Policies>
14
                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
18
                <TimeBasedTriggeringPolicy/>
19
                <SizeBasedTriggeringPolicy size="100 MB"/>
15 20
            </Policies>
21
            <DefaultRolloverStrategy max="30"/>
16 22
        </RollingFile>
17
        <RollingFile name="FileError" fileName="${LOG_HOME}/ebc-sea-platform-error.log" filePattern="${LOG_HOME}/ebc-sea-platform-error-%d{yyyy-MM-dd}.log">
18
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
23
        <RollingFile name="RollingFileError" fileName="${LOG_HOME}/${PROCESS_NAME}-error.log"
24
                     filePattern="${LOG_HOME}/$${date:yyyy-MM}/${PROCESS_NAME}-error-%d{yyyy-MM-dd}-%i.log">
25
            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
26
            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} - [%-5p]  %m%n"/>
19 27
            <Policies>
20
                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
28
                <TimeBasedTriggeringPolicy/>
29
                <SizeBasedTriggeringPolicy size="100 MB"/>
21 30
            </Policies>
31
            <!-- DefaultRolloverStrategy属性如不设置,则默认为最多同一文件夹下7个文件,这里设置了20 -->
32
            <DefaultRolloverStrategy max="20"/>
22 33
        </RollingFile>
23 34
    </Appenders>
24 35
    <Loggers>
25
        <Root level="all">
36
        <Root level="INFO">
26 37
            <AppenderRef ref="Console"/>
38
            <AppenderRef ref="RollingFileDebug"/>
39
            <AppenderRef ref="RollingFileError"/>
27 40
        </Root>
28 41
        <logger name="com.ai.ipu" level="DEBUG"></logger>
29 42
        <logger name="org" level="WARN"></logger>

+ 13 - 13
ebc-sea-platform/src/main/resources/sql/ipu/AreaInOutRecordDao.xml

@ -1,8 +1,9 @@
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<sqls>
3
3 4
	<sql name="addSameInTimeRecordDao">
4 5
		<![CDATA[
5
			<insert id="addSameInTimeRecordDao" parameterType="ai.ipu.data.JMap" useGeneratedKeys="true" keyProperty="RECORD_ID">
6
			<insert id="addSameInTimeRecordDao" parameterType="java.util.Map" useGeneratedKeys="true" keyProperty="RECORD_ID">
6 7
			
7 8
	      	INSERT INTO LR_AREA_IN_OUT_RECORD (
8 9
			MAP_TAG_ID,EMPLOYEE_ID,DEVICE_ID,LONGITUDE,LATITUDE,RECORD_LOCATION,IN_DATE,REMARKS,
@ -34,25 +35,24 @@
34 35
		]]>
35 36
	</sql>
36 37
37
38 38
	<sql name="updateSameOutTimeRecordDao">
39 39
		<![CDATA[
40
		<update id="updateSameOutTimeRecordDao" parameterType="ai.ipu.data.JMap">
41
		UPDATE LR_AREA_IN_OUT_RECORD
40
		<update id="updateSameOutTimeRecordDao" parameterType="java.util.Map">
41
			UPDATE LR_AREA_IN_OUT_RECORD
42 42
			<set>
43
				<foreach collection="dataList" item="item" separator=",">
44
					OUT_DATE = #{item.outDate},
45
					DONE_DATE = #{item.doneDate},
46
					OP_ID = #{item.opId},
47
					ORG_ID = #{item.orgId}
48
				</foreach>
43
				OUT_DATE = #{outDate},
44
				DONE_DATE = #{doneDate},
45
				OP_ID = #{opId},
46
				ORG_ID = #{orgId}
49 47
			</set>
50 48
			
51
			WHERE RECORD_ID IN
49
			WHERE RECORD_ID IN (
52 50
			
53
    		<foreach collection="dataList" item="item" separator="," open="(" close=")">
54
        		#{item.recordId}
51
    		<foreach collection="recordIdList" item="item" separator=",">
52
        		#{item,jdbcType=BIGINT}
55 53
    		</foreach>
54
    		
55
    		)
56 56
		</update>
57 57
		]]>
58 58
	</sql>

+ 22 - 6
ebc-sea-platform/src/main/resources/test/log4j.properties

@ -1,11 +1,27 @@
1 1
### set log levels ###
2
log4j.rootLogger=DEBUG
2
log4j.rootLogger=ERROR, File
3 3
4 4
### direct log messages to stdout ###
5
log4j.appender.A1=org.apache.log4j.ConsoleAppender
6
log4j.appender.A1.Target=System.out
7
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
8
log4j.appender.A1.layout.ConversionPattern=%-5p(%10c{1}) %m%n
5
log4j.appender.Console=org.apache.log4j.ConsoleAppender
6
log4j.appender.Console.Target=System.out
7
log4j.appender.Console.layout=org.apache.log4j.PatternLayout
8
log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
9
#log4j.appender.Console.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n  
10
#log4j.appender.Console.layout.ConversionPattern=%-5p(%10c{1}) %m%n
11
12
### direct messages to file framework.log ###
13
log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
14
log4j.appender.File.File=${log.path}/ebc-sea-platform.log
15
log4j.appender.File.DatePattern='.'yyyy-MM-dd
16
log4j.appender.File.layout=org.apache.log4j.PatternLayout
17
log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
18
19
### error log file ###
20
log4j.appender.Error=org.apache.log4j.DailyRollingFileAppender
21
log4j.appender.Error.DatePattern='.'yyyy-MM-dd
22
log4j.appender.Error.File=${log.path}/ebc-sea-platform.log
23
log4j.appender.Error.layout=org.apache.log4j.PatternLayout
24
log4j.appender.Error.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p(%10c{1}) %m%n
9 25
10 26
### application log config ###
11
log4j.logger.com.ai.ipu=DEBUG,A1
27
log4j.logger.com.ai.ipu=ERROR, File

+ 21 - 8
ebc-sea-platform/src/main/resources/test/log4j2.xml

@ -1,29 +1,42 @@
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<Configuration status="WARN">
3 3
    <Properties>
4
        <!-- 配置日志文件输出目录,此配置将日志输出到tomcat根目录下的指定文件夹 -->
4
        <!-- 配置日志文件输出目录和名称 -->
5 5
        <Property name="LOG_HOME">${sys:log.path:-target}</Property>
6
        <Property name="PROCESS_NAME">ebc-sea-platform</Property>
6 7
    </Properties>
7 8
    <Appenders>
8 9
        <Console name="Console" target="SYSTEM_OUT">
9 10
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
10 11
        </Console>
11
        <RollingFile name="File" fileName="${LOG_HOME}/ebc-sea-platform.log" filePattern="${LOG_HOME}/ebc-sea-platform-%d{yyyy-MM-dd}.log">
12
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
12
        <RollingFile name="RollingFileDebug" fileName="${LOG_HOME}/${PROCESS_NAME}.log"
13
                     filePattern="${LOG_HOME}/$${date:yyyy-MM}/${PROCESS_NAME}-%d{yyyy-MM-dd}-%i.log">
14
            <!--控制台只输出level及以上级别的信息(onMatch),其他的直接拒绝(onMismatch)-->
15
            <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
16
            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} - [%-5p]  %m%n"/>
13 17
            <Policies>
14
                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
18
                <TimeBasedTriggeringPolicy/>
19
                <SizeBasedTriggeringPolicy size="100 MB"/>
15 20
            </Policies>
21
            <DefaultRolloverStrategy max="30"/>
16 22
        </RollingFile>
17
        <RollingFile name="FileError" fileName="${LOG_HOME}/ebc-sea-platform-error.log" filePattern="${LOG_HOME}/ebc-sea-platform-error-%d{yyyy-MM-dd}.log">
18
            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
23
        <RollingFile name="RollingFileError" fileName="${LOG_HOME}/${PROCESS_NAME}-error.log"
24
                     filePattern="${LOG_HOME}/$${date:yyyy-MM}/${PROCESS_NAME}-error-%d{yyyy-MM-dd}-%i.log">
25
            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
26
            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} - [%-5p]  %m%n"/>
19 27
            <Policies>
20
                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
28
                <TimeBasedTriggeringPolicy/>
29
                <SizeBasedTriggeringPolicy size="100 MB"/>
21 30
            </Policies>
31
            <!-- DefaultRolloverStrategy属性如不设置,则默认为最多同一文件夹下7个文件,这里设置了20 -->
32
            <DefaultRolloverStrategy max="20"/>
22 33
        </RollingFile>
23 34
    </Appenders>
24 35
    <Loggers>
25
        <Root level="all">
36
        <Root level="DEBUG">
26 37
            <AppenderRef ref="Console"/>
38
            <AppenderRef ref="RollingFileDebug"/>
39
            <AppenderRef ref="RollingFileError"/>
27 40
        </Root>
28 41
        <logger name="com.ai.ipu" level="DEBUG"></logger>
29 42
        <logger name="org" level="WARN"></logger>