From 796736ead7e2043bc64a52d3ee94fda9ac47d4c4 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 26 Sep 2024 15:52:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/base/config/ExceptionEnum.java | 1 + .../java/com/bonus/base/domain/TbPeople.java | 2 + .../java/com/bonus/base/domain/TbProject.java | 5 + .../com/bonus/base/mapper/TbDeviceMapper.java | 7 + .../com/bonus/base/mapper/TbPeopleMapper.java | 9 +- .../service/impl/TbDeviceServiceImpl.java | 5 + .../service/impl/TbPeopleServiceImpl.java | 11 -- .../base/service/impl/TbTeamServiceImpl.java | 9 +- .../impl/ProjectDetailsViewServiceImpl.java | 5 +- .../resources/mapper/base/TbDeviceMapper.xml | 6 + .../resources/mapper/base/TbPeopleMapper.xml | 39 +++--- .../resources/mapper/base/TbProjectMapper.xml | 5 + .../resources/mapper/base/TbTeamMapper.xml | 17 ++- .../screen/TbDeviceDataRecordMapper.xml | 24 ++-- .../resources/template/TbPeopleTemplate.xlsx | Bin 10579 -> 10974 bytes bonus-modules/bonus-data/pom.xml | 123 ------------------ .../com/bonus/data/BonusDataApplication.java | 33 ----- .../bonus-data/src/main/resources/banner.txt | 10 -- .../src/main/resources/bootstrap.yml | 29 ----- .../bonus-data/src/main/resources/logback.xml | 74 ----------- 20 files changed, 96 insertions(+), 318 deletions(-) delete mode 100644 bonus-modules/bonus-data/pom.xml delete mode 100644 bonus-modules/bonus-data/src/main/java/com/bonus/data/BonusDataApplication.java delete mode 100644 bonus-modules/bonus-data/src/main/resources/banner.txt delete mode 100644 bonus-modules/bonus-data/src/main/resources/bootstrap.yml delete mode 100644 bonus-modules/bonus-data/src/main/resources/logback.xml diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java index d31b9ad..df44374 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java @@ -23,6 +23,7 @@ public enum ExceptionEnum { UN_BIND_TO_DATABASE(500, "解散失败，请联系管理员"), EXISTENCE_OF_MEMBERS(1005, "班组中还存在成员，无法解散"), EXISTENCE_OF_HELMET(1008, "该班组人员绑定相关安全帽，无法解散"), + DELETE_BIND_DEVICE(1010, "该设备还绑定相关人员，无法删除"), EXISTENCE_OF_BIND(1006, "该人员还绑定相关设备，无法移出"), UPDATE_TO_DATABASE(500, "修改失败，请联系管理员"), BIND_TO_DATABASE(500, "人员设备绑定失败，请联系管理员"), diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbPeople.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbPeople.java index b54a354..9461f4b 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbPeople.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbPeople.java @@ -99,5 +99,7 @@ public class TbPeople implements Serializable { */ private String devName; + private Long relId; + } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProject.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProject.java index 71f25a7..1378934 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProject.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProject.java @@ -95,5 +95,10 @@ public class TbProject implements Serializable { */ private Long updateUser; + /** + * 工程编码 + */ + private String proCode; + } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDeviceMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDeviceMapper.java index 25206ee..6c7d58e 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDeviceMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDeviceMapper.java @@ -76,4 +76,11 @@ public interface TbDeviceMapper { DeviceTypeEnum leadStrainMonitor); List getDeviceModelDetailsPage(TbDevice tbDevice); + + /** + * 根据主键查询是否被人员绑定 + * @param id + * @return + */ + int getById(Long id); } \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbPeopleMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbPeopleMapper.java index 48aa3bd..0541ec4 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbPeopleMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbPeopleMapper.java @@ -65,8 +65,11 @@ public interface TbPeopleMapper { */ List queryPeoplePositionByProId(@Param("proId") Integer proId); - - - + /** + * 根据人员ID修改 + * @param id + * @return + */ + int updateById(Long id); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDeviceServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDeviceServiceImpl.java index 0ad954c..9c45e19 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDeviceServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDeviceServiceImpl.java @@ -30,6 +30,11 @@ public class TbDeviceServiceImpl implements TbDeviceService{ */ @Override public AjaxResult deleteByPrimaryKey(Long id) { + //根据id判断改设备是否被绑定，被绑定则不能删除 + int count = tbDeviceMapper.getById(id); + if (count > 0) { + return AjaxResult.error(ExceptionEnum.DELETE_BIND_DEVICE.getCode(), ExceptionEnum.DELETE_BIND_DEVICE.getMsg()); + } int result = tbDeviceMapper.deleteByPrimaryKey(id); if (result > 0) { return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java index bf6b795..72771ea 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java @@ -83,17 +83,6 @@ public class TbPeopleServiceImpl implements TbPeopleService { people.setRelPhone(Sm4Utils.decode(people.getRelPhone())); } }); - // 使用流对条件进行过滤 - Stream stream = peopleList.stream(); - if (tbPeople.getRelName() != null) { - stream = stream.filter(people -> StringUtils.contains(people.getRelName(), tbPeople.getRelName())); - } - if (tbPeople.getSex() != null) { - stream = stream.filter(people -> people.getSex().equals(tbPeople.getSex())); - } - - // 收集过滤后的结果 - peopleList = stream.collect(Collectors.toList()); } return peopleList; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java index 0d93a77..2625e91 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java @@ -128,6 +128,7 @@ public class TbTeamServiceImpl implements TbTeamService { tbTeam.setRelPhone(Sm4Utils.encode(tbTeam.getRelPhone())); } result += tbTeamDao.insert(tbTeam); + result += tbTeamDao.insertPeople(tbTeam.getTeamId(), tbTeam.getRelId()); if (CollectionUtils.isNotEmpty(tbTeam.getIdList())) { //将班组id插入到班组人员表 for (Long id : tbTeam.getIdList()) { @@ -165,7 +166,11 @@ public class TbTeamServiceImpl implements TbTeamService { result += tbTeamDao.updatePeople(tbTeam.getId()); //修改 tbTeam.setUpdateUser(SecurityUtils.getUserId()); + if (StringUtils.isNotBlank(tbTeam.getRelPhone())) { + tbTeam.setRelPhone(Sm4Utils.encode(tbTeam.getRelPhone())); + } result += tbTeamDao.update(tbTeam); + result += tbTeamDao.insertPeople(tbTeam.getId(), tbTeam.getRelId()); if (CollectionUtils.isNotEmpty(tbTeam.getIdList())) { //将班组id插入到班组人员表 for (Long id : tbTeam.getIdList()) { @@ -187,7 +192,7 @@ public class TbTeamServiceImpl implements TbTeamService { @Override public AjaxResult deleteById(Long id) { //根据id去查询班组中是否存在成员，存在则不能解散 - if (tbTeamDao.getList(id).size() > 0) { + if (tbTeamDao.getList(id).size() > 1) { return AjaxResult.error(ExceptionEnum.EXISTENCE_OF_MEMBERS.getCode(), ExceptionEnum.EXISTENCE_OF_MEMBERS.getMsg()); } //根据id查询该班组长是否绑定安全帽，绑定则不允许解散 @@ -196,6 +201,8 @@ public class TbTeamServiceImpl implements TbTeamService { return AjaxResult.error(ExceptionEnum.EXISTENCE_OF_HELMET.getCode(), ExceptionEnum.EXISTENCE_OF_HELMET.getMsg()); } int result = tbTeamDao.updateById(id); + //根据班组id去人员表中解绑班组长 + result += tbPeopleMapper.updateById(id); if (result > 0) { return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java index 179bfbe..63e1547 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.screen.service.impl; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.data.entity.DevAttributeVo; import com.bonus.screen.mapper.TbDeviceDataRecord; @@ -64,7 +65,7 @@ public class ProjectDetailsViewServiceImpl { public AjaxResult getTowerDevAttributeWarnRecord(Integer proId) { List records = tbDeviceDataRecordMapper.getTowerDevAttributeWarnRecord(proId); if (records.isEmpty()) { - return AjaxResult.error("暂无数据"); + return AjaxResult.success("暂无数据"); } return AjaxResult.success(records); } @@ -72,7 +73,7 @@ public class ProjectDetailsViewServiceImpl { public AjaxResult getPitDevAttributeWarnRecord(Integer proId) { List records = tbDeviceDataRecordMapper.getPitDevAttributeWarnRecord(proId); if (records.isEmpty()) { - return AjaxResult.error("暂无数据"); + return AjaxResult.success("暂无数据"); } return AjaxResult.success(records); } diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml index bac9025..8b16880 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml @@ -337,4 +337,10 @@ and td.dev_code like concat('%',#{devCode},'%') + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml index 1430cbd..1425add 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml @@ -11,21 +11,19 @@ SELECT - tp.id_card, - tp.rel_name, - tp.dev_id, + tp.id_card as idCard, + tp.rel_name as relName, + tp.dev_id as devId, tp.team_id AS teamId, - tt.team_name, - tt.pro_id, - project.pro_name, - device.dev_code, + tt.team_name as teamName, + tt.pro_id as proId, + project.pro_name as proName, + device.dev_code as devCode, MAX(CASE WHEN tda.jc_name = '经度' THEN tda.jc_value END) AS lon, MAX(CASE WHEN tda.jc_name = '纬度' THEN tda.jc_value END) AS lat diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml index 4850b61..b9b8d14 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml @@ -109,6 +109,7 @@ lat, create_time, create_user, + pro_code, del_flag @@ -122,6 +123,7 @@ #{lat}, NOW(), #{createUser}, + #{proCode}, 0 @@ -161,6 +163,9 @@ update_user = #{updateUser}, + + pro_code = #{proCode}, + where id = #{id} diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml index a0421be..cf3e64b 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml @@ -8,7 +8,7 @@ relName, tt.rel_phone as relPhone, tt.pro_id as proId, tt.pro_name as proName, tt.create_time as createTime, tt.create_user as createUser, tt.update_time as updateTime, tt.js_time as jsTime, tt.update_user as updateUser, tt.del_flag as delFlag, - (count(tp.team_id) + 1) as peopleCount, + count(tp.team_id) as peopleCount, CASE WHEN tt.js_time is null THEN '正常' ELSE '已解散' @@ -40,8 +40,19 @@ diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml index ead81c2..a20775b 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml @@ -4,8 +4,8 @@ SELECT - tddr.dev_id,tddr.dev_name,tddr.dev_type,tddr.attribute_name as jcName,tddr.attribute_val as jcValue, - tddr.is_warn,tddr.create_time as jcTime + tddr.dev_id as devId,tddr.dev_name as devName,tddr.dev_type as devType,tddr.attribute_name as jcName,tddr.attribute_val as jcValue, + tddr.is_warn as isWarn,tddr.create_time as jcTime FROM tb_dev_data_record AS tddr LEFT JOIN tb_device device ON device.id = tddr.dev_id LEFT JOIN tb_bd_device_record tbdr ON tbdr.id = device.bd_id @@ -84,8 +84,8 @@ SELECT - tddr.dev_id,tddr.dev_name,tddr.dev_type,tddr.attribute_name as jcName,tddr.attribute_val as jcValue, - tddr.is_warn,tddr.create_time as jcTime + tddr.dev_id as devId,tddr.dev_name as devName,tddr.dev_type as devType,tddr.attribute_name as jcName,tddr.attribute_val as jcValue, + tddr.is_warn as isWarn,tddr.create_time as jcTime FROM tb_dev_data_record AS tddr WHERE tddr.dev_id = #{devId} AND tddr.attribute_name IN ('一氧化碳', '可燃气体', '含氧量','硫化氢') @@ -117,8 +117,8 @@ SELECT - tddr.dev_id,tddr.dev_name,tddr.dev_type,tddr.attribute_name as jcName,tddr.attribute_val as jcValue, - tddr.is_warn,tddr.create_time as jcTime + tddr.dev_id as devId,tddr.dev_name as devName,tddr.dev_type as devType,tddr.attribute_name as jcName,tddr.attribute_val as jcValue, + tddr.is_warn as isWarn,tddr.create_time as jcTime FROM tb_dev_data_record AS tddr LEFT JOIN tb_device device ON device.id = tddr.dev_id diff --git a/bonus-modules/bonus-base/src/main/resources/template/TbPeopleTemplate.xlsx b/bonus-modules/bonus-base/src/main/resources/template/TbPeopleTemplate.xlsx index 9e5035bcf6748d742f428c2be9ad38cef670357a..f32b35f414afee7714c27a27d5245c30d87563b0 100644 GIT binary patch delta 5704 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 UVCMu|K>kU^IVf;MSpNe53&!oA+5i9m delta 4832 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 diff --git a/bonus-modules/bonus-data/pom.xml b/bonus-modules/bonus-data/pom.xml deleted file mode 100644 index 3da46d3..0000000 --- a/bonus-modules/bonus-data/pom.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - com.bonus - bonus-modules - 24.8.0 - - 4.0.0 - - bonus-data - - - bonus-modules-data 数据中心服务 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - - - com.mysql - mysql-connector-j - - - - - com.bonus - bonus-common-datasource - - - - com.bonus - bonus-common-core - - - - - com.bonus - bonus-common-datascope - - - com.bonus - bonus-common-swagger - - - com.bonus - bonus-common-log - - - - - com.bonus - bonus-common-log - - - - - com.bonus - bonus-common-swagger - - - com.google.guava - guava - 30.0-jre - compile - - - com.bonus - bonus-common-security - - - com.google.code.gson - gson - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - - \ No newline at end of file diff --git a/bonus-modules/bonus-data/src/main/java/com/bonus/data/BonusDataApplication.java b/bonus-modules/bonus-data/src/main/java/com/bonus/data/BonusDataApplication.java deleted file mode 100644 index 58e2129..0000000 --- a/bonus-modules/bonus-data/src/main/java/com/bonus/data/BonusDataApplication.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.bonus.data; - -import com.bonus.common.security.annotation.EnableCustomConfig; -import com.bonus.common.security.annotation.EnableRyFeignClients; -import com.bonus.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -/** - * base基础模块启动服务 - * @author ma_sh - */ - -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableRyFeignClients -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class BonusDataApplication { - public static void main(String[] args) { - SpringApplication.run(BonusDataApplication.class, args); - System.err.println("(♥◠‿◠)ﾉﾞ 数据中心服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } -} \ No newline at end of file diff --git a/bonus-modules/bonus-data/src/main/resources/banner.txt b/bonus-modules/bonus-data/src/main/resources/banner.txt deleted file mode 100644 index 27cacb9..0000000 --- a/bonus-modules/bonus-data/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ __ _ _ - (_) / _|(_)| | - _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___ -| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \ -| | | |_| || (_) || |_| || | | | | || || __/ -|_| \__,_| \___/ \__, ||_| |_| |_||_| \___| - __/ | - |___/ \ No newline at end of file diff --git a/bonus-modules/bonus-data/src/main/resources/bootstrap.yml b/bonus-modules/bonus-data/src/main/resources/bootstrap.yml deleted file mode 100644 index 66f2933..0000000 --- a/bonus-modules/bonus-data/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Tomcat -server: - port: 18089 -# Spring -spring: - application: - # 应用名称 - name: bonus-data - profiles: - # 环境配置 - active: dev - cloud: - nacos: - username: nacos - password: Jjsp@nacos2023 - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: bns-public - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: bns-public - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - diff --git a/bonus-modules/bonus-data/src/main/resources/logback.xml b/bonus-modules/bonus-data/src/main/resources/logback.xml deleted file mode 100644 index 7c7bf48..0000000 --- a/bonus-modules/bonus-data/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - -