From 2070c06b8cc7b370c3a149669017f4f183f0f172 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期四, 26 九月 2024 11:15:31 +0800
Subject: [PATCH] 测点列表接口修改
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java | 2
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/admin/TagController.java | 4
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 10 +-
iailab-module-data/iailab-module-data-biz/src/main/resources/logback-spring.xml | 140 +++++++++++++++++++++++++---------------------
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java | 6 +-
5 files changed, 86 insertions(+), 76 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java
index f9727ad..cb2b7e3 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/entity/HttpApiEntity.java
@@ -54,7 +54,7 @@
/**
* 是否认证
*/
- private Boolean isAuth;
+ private Integer isAuth;
/**
* 认证地址
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/TagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/admin/TagController.java
similarity index 98%
rename from iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/TagController.java
rename to iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/admin/TagController.java
index a946b31..22d3e8c 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/TagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/tag/controller/admin/TagController.java
@@ -1,4 +1,4 @@
-package com.iailab.module.data.channel.tag.controller;
+package com.iailab.module.data.channel.tag.controller.admin;
import com.iailab.module.data.channel.kio.entity.ChannelKioDeviceEntity;
import com.iailab.module.data.channel.kio.entity.ChannelKioTagEntity;
@@ -35,7 +35,7 @@
* @createTime 2024年05月16日
*/
@RestController
-@RequestMapping("/channel/tag")
+@RequestMapping("/data/channel/tag")
public class TagController {
@Resource
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
index 24e7fc5..53a5e34 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
@@ -61,7 +61,7 @@
}
@PreAuthorize("@ss.hasPermission('data:point:create')")
- @PostMapping("/data:point")
+ @PostMapping("create")
public CommonResult<Boolean> create(@RequestBody DaPointDTO daPointDTO){
String id = UUID.randomUUID().toString();
daPointDTO.setId(id);
@@ -78,8 +78,8 @@
@PreAuthorize("@ss.hasPermission('data:point:delete')")
@DeleteMapping("/delete")
- public CommonResult<Boolean> delete(String[] ids) {
- daPointService.delete(ids);
+ public CommonResult<Boolean> delete(String id) {
+ daPointService.delete(new String[]{id});
return success(true);
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
index 20a6779..83af85f 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
@@ -125,17 +125,17 @@
measurePoint.setSourceId(dataPoint.getSourceOption().get(1));
measurePoint.setTagNo(dataPoint.getSourceOption().get(2));
daMeasurePointService.update(measurePoint);
- } else if (PointTypeEnum.CALCULATE_POINT.equals(dataPoint.getPointType())) {
+ } else if (PointTypeEnum.CALCULATE_POINT.getName().equals(dataPoint.getPointType())) {
daMathPointService.update(dataPoint.getMathPoint());
}
}
@Override
@DSTransactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- daPointDao.deleteBatchIds(Arrays.asList(ids));
- daMeasurePointService.deleteByPoint(ids);
- daMathPointService.deleteByPoint(ids);
+ public void delete(String[] id) {
+ daPointDao.deleteBatchIds(Arrays.asList(id));
+ daMeasurePointService.deleteByPoint(id);
+ daMathPointService.deleteByPoint(id);
}
@Override
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/logback-spring.xml b/iailab-module-data/iailab-module-data-biz/src/main/resources/logback-spring.xml
index db8f353..3ac202f 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/logback-spring.xml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/logback-spring.xml
@@ -1,76 +1,86 @@
-<configuration>
- <!-- 引用 Spring Boot 的 logback 基础配置 -->
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true">
+ <property name="LOG_TEMP" value="./logs"/>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
- <!-- 变量 iailab.info.base-package，基础业务包 -->
- <springProperty scope="context" name="iailab.info.base-package" source="iailab.info.base-package"/>
- <!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
- <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread [%tid]) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+ <!-- <include resource="org/springframework/boot/logging/logback/base.xml" /> -->
+ <logger name="org.springframework.web" level="INFO"/>
+ <logger name="org.springboot.sample" level="TRACE" />
- <!-- 控制台 Appender -->
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
- <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
- <pattern>${PATTERN_DEFAULT}</pattern>
- </layout>
+ <!-- 开发、测试环境 -->
+ <springProfile name="dev,test,prod">
+ <logger name="org.springframework.web" level="INFO"/>
+ <logger name="org.springboot.sample" level="INFO" />
+ <logger name="com.iailab" level="DEBUG" />
+ </springProfile>
+
+ <!-- 生产环境 -->
+ <!--<springProfile name="prod">-->
+ <!--<logger name="org.springframework.web" level="ERROR"/>-->
+ <!--<logger name="org.springboot.sample" level="ERROR" />-->
+ <!--<logger name="io.renren" level="ERROR" />-->
+ <!--</springProfile>-->
+
+ <!-- 日志文件存放路径 -->
+ <property name="log_home" value="./logs" />
+ <!-- 日志输出格式 -->
+ <!--生产用-->
+ <property name="log.pattern" value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] | [%thread][%-5level] | [%logger{20}.%method,line : %line] %msg%n" />
+ <!--本地测试使用-->
+ <!--<property name="log.pattern" value="[%boldGreen(%d{yyyy-MM-dd HH:mm:ss.SSS})] | [%highlight(%thread][%-5level)] | [%boldYellow(%logger{20}.%method,%line)] %msg%n" />-->
+ <!-- 日志输出格式【控制台】 -->
+ <!--<property name="log.pattern" value="%date{yyyy-MM-dd HH:mm:ss} | [ line: %line ] | %boldGreen(%thread) | %highlight(%-5level) | %boldYellow(%logger).%method | %msg%n"/>-->
+
+ <!-- 控制台输出 -->
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <!--<pattern>${logPatternConsoleLog}</pattern>-->
+ <pattern>${log.pattern}</pattern>
</encoder>
</appender>
- <!-- 文件 Appender -->
- <!-- 参考 Spring Boot 的 file-appender.xml 编写 -->
- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
- <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
- <pattern>${PATTERN_DEFAULT}</pattern>
- </layout>
- </encoder>
- <!-- 日志文件名 -->
- <file>${LOG_FILE}</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <!-- 滚动后的日志文件名 -->
- <fileNamePattern>${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}</fileNamePattern>
- <!-- 启动服务时，是否清理历史日志，一般不建议清理 -->
- <cleanHistoryOnStart>${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}</cleanHistoryOnStart>
- <!-- 日志文件，到达多少容量，进行滚动 -->
- <maxFileSize>${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}</maxFileSize>
- <!-- 日志文件的总大小，0 表示不限制 -->
- <totalSizeCap>${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}</totalSizeCap>
- <!-- 日志文件的保留天数 -->
- <maxHistory>${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}</maxHistory>
+ <logger name="m-shop-mybatis-sql" level="debug"></logger>
+
+ <!-- debug级别设置 -->
+ <appender name="file_debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <prudent>true</prudent>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <!--过滤 DEBUG-->
+ <level>DEBUG</level>
+ <!--匹配到就禁止-->
+ <!--<onMatch>ACCEPT</onMatch>-->
+ <!--没有匹配到就允许-->
+ <!--<onMismatch>DENY</onMismatch>-->
+ </filter>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">-->
+ <!--日志文件输出的文件名-->
+ <!--<FileNamePattern>${log_home}/log-info.%d{yyyy-MM-dd}.%i.log</FileNamePattern>-->
+ <FileNamePattern>${log_home}/log-debug.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <!--<maxFileSize>100MB</maxFileSize>-->
+ <!-- 日志最大的历史 7天 -->
+ <maxHistory>7</maxHistory>
+ <totalSizeCap>2GB</totalSizeCap>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
- </appender>
- <!-- 异步写入日志，提升性能 -->
- <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
- <!-- 不丢失日志。默认的，如果队列的 80% 已满,则会丢弃 TRACT、DEBUG、INFO 级别的日志 -->
- <discardingThreshold>0</discardingThreshold>
- <!-- 更改默认的队列的深度，该值会影响性能。默认值为 256 -->
- <queueSize>256</queueSize>
- <appender-ref ref="FILE"/>
- </appender>
-
- <!-- SkyWalking GRPC 日志收集，实现日志中心。注意：SkyWalking 8.4.0 版本开始支持 -->
- <appender name="GRPC" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
- <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
- <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
- <pattern>${PATTERN_DEFAULT}</pattern>
- </layout>
+ <!--<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
+ <!--<!– 单文件最大50MB –>-->
+ <!--<maxFileSize>50MB</maxFileSize>-->
+ <!--</triggeringPolicy>-->
+ <encoder>
+ <pattern>${log.pattern}</pattern>
</encoder>
</appender>
- <!-- 本地环境 -->
- <springProfile name="local">
- <root level="INFO">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="GRPC"/> <!-- 本地环境下，如果不想接入 SkyWalking 日志服务，可以注释掉本行 -->
- <appender-ref ref="ASYNC"/> <!-- 本地环境下，如果不想打印日志，可以注释掉本行 -->
- </root>
- </springProfile>
- <!-- 其它环境 -->
- <springProfile name="dev,test,stage,prod,default">
- <root level="INFO">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="ASYNC"/>
- <appender-ref ref="GRPC"/>
- </root>
- </springProfile>
+ <!-- 系统模块日志级别控制 -->
+ <!--<logger name="com.btrh" level="info" />-->
+
+ <!-- Spring日志级别控制 -->
+ <!--<logger name="org.springframework" level="info" />-->
+
+ <!--系统操作日志-->
+ <root level="INFO">
+ <appender-ref ref="console" />
+ <appender-ref ref="file_debug" />
+ </root>
</configuration>
--
Gitblit v1.9.3