modify

atms-api/src/main/java/pwc/taxtech/atms/service/impl/ProjectServiceImpl.java

 package pwc.taxtech.atms.service.impl;
 
-import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,12 +8,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.OperateLogType;
-import pwc.taxtech.atms.dao.OrganizationServiceTemplateGroupMapper;
-import pwc.taxtech.atms.dao.ProjectClientMapper;
-import pwc.taxtech.atms.dao.ProjectMapper;
-import pwc.taxtech.atms.dao.ProjectServiceTypeMapper;
-import pwc.taxtech.atms.dao.ServiceTypeMapper;
-import pwc.taxtech.atms.dao.TemplateGroupMapper;
+import pwc.taxtech.atms.dao.*;
 import pwc.taxtech.atms.dpo.ProjectDisplayDto;
 import pwc.taxtech.atms.dto.FieldsMapper;
 import pwc.taxtech.atms.dto.ProjectClientDto;
@@ -25,13 +19,7 @@ import pwc.taxtech.atms.dto.taxadmin.ProjectYearParam;
 import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.entity.ProjectClientExample.Criteria;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -140,7 +128,7 @@ public class ProjectServiceImpl {
 
         orgList.forEach(p -> {
             List<ProjectDisplayDto> fixList = data.stream()
-                    .filter((Predicate<ProjectDisplayDto>) x -> x.getOrganizationId().equals(p.getOrganizationId())
+                    .filter(x -> x.getOrganizationId().equals(p.getOrganizationId())
                             && x.getEnterpriseAccountSetId().equals(p.getEnterpriseAccountSetId())
                             && x.getServiceTypeId().equals(p.getServiceTypeId())
                             && x.getYear().equals(p.getYear())
@@ -278,7 +266,7 @@ public class ProjectServiceImpl {
                     //判断是否已经创建过该项目
                     //对于VAT，只创建今年及之后年份的项目(2018.1.2经Michelle确定，已放开vat限制)
                     //if ((projectList != null && projectList.Count > 0) || (int.Parse(orgDto.ServiceTypeId) == 2 && orgDto.Year < DateTime.Now.Year))
-                    if (!pList.stream().anyMatch((Predicate<ProjectDisplayDto>) t -> t.getYear().equals(orgDto.getYear())
+                    if (pList.stream().noneMatch(t -> t.getYear().equals(orgDto.getYear())
                             && t.getServiceTypeId().equals(orgDto.getServiceTypeId())
                             && t.getOrganizationId().equals(orgDto.getOrganizationId())
                             && t.getEnterpriseAccountSetId().equals(orgDto.getEnterpriseAccountSetId())

atms-api/src/main/resources/conf/conf.properties

@@ -37,4 +37,8 @@ api.url=${api.url}
 # Longi config
 longi_api_basic_user=${longi_api_basic_user}
 longi_api_basic_pwd=${longi_api_basic_pwd}
-longi_api_gl_balance=${longi_api_gl_balance}
\ No newline at end of file
+longi_api_gl_balance=${longi_api_gl_balance}
+
+#log
+log.level=${log.level}
+log.debug=${log.debug}
\ No newline at end of file

atms-api/src/main/resources/conf/conf_profile_pub.properties

@@ -39,3 +39,7 @@ api.url=http://etms.longi-silicon.com:8181
 longi_api_basic_user=
 longi_api_basic_pwd=
 longi_api_gl_balance=http://soa.longi-silicon.com:8011/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
+
+#log
+log.level=INFO
+log.debug=false

atms-api/src/main/resources/conf/conf_profile_staging.properties

@@ -39,3 +39,7 @@ api.url=http://etms.longi-silicon.com:8182
 longi_api_basic_user=
 longi_api_basic_pwd=
 longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
+
+#log
+log.level=DEBUG
+log.debug=true

atms-api/src/main/resources/log4j.properties

-log4j.debug = true
+log4j.debug = ${log.debug}
 log4j.rootLogger=INFO,stdout,fileoutall,fileoutwarn,fileouterror
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -28,7 +28,7 @@ log4j.appender.fileouterror.MaxFileSize=40000KB
 log4j.appender.fileouterror.MaxBackupIndex=8
 log4j.appender.fileouterror.layout=org.apache.log4j.PatternLayout
 
-log4j.logger.pwc.taxtech.atms=DEBUG
-log4j.logger.org.nutz=DEBUG
-log4j.logger.org.apache.ibatis=DEBUG
-log4j.logger.org.springframework.aop.framework.CglibAopProxy=DEBUG
\ No newline at end of file
+log4j.logger.pwc.taxtech.atms=${log.level}
+log4j.logger.org.nutz=${log.level}
+log4j.logger.org.apache.ibatis=${log.level}
+log4j.logger.org.springframework.aop.framework.CglibAopProxy=${log.level}
\ No newline at end of file

atms-web/src/main/resources/conf.properties

@@ -5,4 +5,7 @@ cookie.maxAgeSeconds=${cookie.maxAgeSeconds}
 jwt.base64Secret=${jwt.base64Secret}
 jwt.powerToken=${jwt.powerToken}
 jwt.expireSecond=${jwt.expireSecond}
-jwt.refreshSecond=${jwt.refreshSecond}
\ No newline at end of file
+jwt.refreshSecond=${jwt.refreshSecond}
+
+#log
+log.level=${log.level}
\ No newline at end of file

atms-web/src/main/resources/conf_profile_dev.properties

-api.url=http://10.158.230.144:8181/
+api.url=http://etms.longi-silicon.com:8180/
 
 cookie.maxAgeSeconds=86400
 
@@ -6,3 +6,5 @@ jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
 jwt.expireSecond=180000
 jwt.refreshSecond=600
+
+log.level=DEBUG

atms-web/src/main/resources/conf_profile_pub.properties

@@ -6,3 +6,5 @@ jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
 jwt.expireSecond=180000
 jwt.refreshSecond=600
+
+log.level=INFO

atms-web/src/main/resources/conf_profile_staging.properties

@@ -6,3 +6,5 @@ jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
 jwt.expireSecond=180000
 jwt.refreshSecond=600
+
+log.level=DEBUG

atms-web/src/main/resources/log4j.properties

@@ -28,6 +28,6 @@ log4j.appender.fileouterror.MaxFileSize=40000KB
 log4j.appender.fileouterror.MaxBackupIndex=8
 log4j.appender.fileouterror.layout=org.apache.log4j.PatternLayout
 
-log4j.logger.pwc.taxtech.atms=DEBUG
-log4j.logger.org.nutz=DEBUG
-log4j.logger.org.apache.ibatis=DEBUG
+log4j.logger.pwc.taxtech.atms=${log.level}
+log4j.logger.org.nutz=${log.level}
+log4j.logger.org.apache.ibatis=${log.level}