1

13693261870

2023-04-27 c13d62bed986535319da834d64ce15e4ca13c396

1

 src/main/java/com/yssh/config/DatFilePathConfig.java

@@ -12,5 +12,20 @@

    private String filePath2d;
    private String filePath3d;
	

    public String getFilePath2d() {
        return filePath2d;
    }

    public void setFilePath2d(String filePath2d) {
        this.filePath2d = filePath2d;
    }

    public String getFilePath3d() {
        return filePath3d;
    }

    public void setFilePath3d(String filePath3d) {
        this.filePath3d = filePath3d;
    }
}

 src/main/java/com/yssh/entity/FeedbackDetail.java

@@ -11,12 +11,26 @@
import lombok.NoArgsConstructor;
import lombok.ToString;

@NoArgsConstructor
@AllArgsConstructor
@ToString
@Data
@ApiModel(value = "溯源反馈",description = "溯源反馈")
public class FeedbackDetail implements Serializable{
    public FeedbackDetail() {
    }

    public FeedbackDetail(Long id, String tableName, String locationName, String detectionId, String detectionVocsName, Double detectionValue, String practicalId, String practicalVocsName, Double practicalValue, Date createTime) {
        this.id = id;
        this.tableName = tableName;
        this.locationName = locationName;
        this.detectionId = detectionId;
        this.detectionVocsName = detectionVocsName;
        this.detectionValue = detectionValue;
        this.practicalId = practicalId;
        this.practicalVocsName = practicalVocsName;
        this.practicalValue = practicalValue;
        this.createTime = createTime;
    }

    private static final long serialVersionUID = 6877008992053903605L;

    @ApiModelProperty(value = "主键")

 src/main/java/com/yssh/entity/vo/ForecastAnalyseVo.java

@@ -7,12 +7,18 @@
import lombok.NoArgsConstructor;
import lombok.ToString;

@NoArgsConstructor
@AllArgsConstructor
@ToString
@ApiModel(value="预测分析展示对象", description="预测分析展示对象")
@Data
public class ForecastAnalyseVo {
    public ForecastAnalyseVo() {
    }

    public ForecastAnalyseVo(Double forecastValue, Double practicalValue, Long time) {
        this.forecastValue = forecastValue;
        this.practicalValue = practicalValue;
        this.time = time;
    }

    @ApiModelProperty(value = "预测值")
    private Double forecastValue;

 src/main/java/com/yssh/scheduled/ReadCsvTask.java

@@ -94,7 +94,7 @@

            try {
                // 计算预警/报警,并且进行入库操作
                Thread.sleep(5000);
                Thread.sleep(60000);
            } catch (InterruptedException e) {
                logger.error("睡眠一分钟后执行预警/报警计算,并且进行入库操作出现异常，异常原因是：", e);
                e.printStackTrace();

 src/main/java/com/yssh/service/impl/ExpPointServerImpl.java

@@ -93,11 +93,12 @@
        
        int numPoints = geo.getNumPoints();
        
        List<Coordinate> cs = new ArrayList<>(Arrays.asList(geo.getCoordinates()));
        /*List<Coordinate> cs = new ArrayList<>(Arrays.asList(geo.getCoordinates()));
        cs.forEach(c -> {
            System.out.println(c.getY() + " " + c.getX() + " " + c.getZ());
        });
        });*/
        System.out.println(numPoints);

        /*String text = union.toText();
        System.out.println(text);*/
        

 src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java

@@ -36,27 +36,29 @@
import com.yssh.utils.StringUtils;
import com.yssh.utils.TableStrategy;

import javax.annotation.Resource;

@Service
public class SuYuanServiceImpl implements ISuYuanService {

    protected final Logger logger = LoggerFactory.getLogger(this.getClass());

    @Autowired
    @Resource
    private SuYuanMapper suYuanMapper;

    @Autowired
    @Resource
    private IAsyncService asyncService;

    @Autowired
    @Resource
    private DictRecordMapper dictRecordMapper;

    @Autowired
    @Resource
    private ICommonService commonService;

    @Autowired
    @Resource
    private FeedbackMapper feedbackMapper;

    private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHH");
    private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHH");

    //@Transactional
    @Override

 src/main/resources/logback.xml

@@ -1,53 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
    <!-- 日志存放路径 -->
    <property name="log.path" value="D:/yssh_data/logs" />
    <!-- 日志输出格式 -->
    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- scan 配置文件如果发生改变，将会被重新加载  scanPeriod 检测间隔时间-->
<configuration scan="true" scanPeriod="60 seconds" debug="false">
    <contextName>LFServer</contextName>

    <!-- 控制台输出 -->
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
    </appender>
	
    <appender name="file_debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/sys-debug.log</file>
    <!-- 文件名称 -->
    <property name="log.name.info" value="info" />
    <property name="log.name.error" value="error" />

    <!-- info 地址 -->
    <property name="log.path.info" value="logs/" />
    <property name="log.file.info" value="logs/info.log" />

    <!-- error,错误路径 -->
    <property name="log.path.error" value="logs/" />
    <property name="log.file.error" value="logs/error.log" />
    <include resource="org/springframework/boot/logging/logback/base.xml"/>

    <!-- 普通日志 -->
    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.file.info}</file>
        <!-- 循环政策：基于时间创建日志文件 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/sys-debug.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
            <maxHistory>60</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
            <level>DEBUG</level>
            <!-- 匹配时的操作：接收（记录） -->
            <onMatch>ACCEPT</onMatch>
            <!-- 不匹配时的操作：拒绝（不记录） -->
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
	
    <!-- 系统日志输出 -->
    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/sys-info.log</file>
        <!-- 循环政策：基于时间创建日志文件 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
            <maxHistory>60</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志命名:单个文件大于256MB 按照时间+自增i 生成log文件 -->
            <fileNamePattern>${log.path.info}${log.name.info}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>256MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <!-- 最大保存时间：30天-->
            <maxHistory>30</maxHistory>
        </rollingPolicy>
        <append>true</append>
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
            <charset>utf-8</charset>
        </encoder>
        <!-- 日志级别过滤器 -->
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
            <level>INFO</level>
            <!-- 匹配时的操作：接收（记录） -->
@@ -55,47 +43,62 @@
            <!-- 不匹配时的操作：拒绝（不记录） -->
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
	
    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/sys-error.log</file>
    </appender>

    <!-- 错误日志 -->
    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.file.error}</file>
        <!-- 循环政策：基于时间创建日志文件 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
            <maxHistory>60</maxHistory>
            <!-- 日志命名:单个文件大于128MB 按照时间+自增i 生成log文件 -->
            <fileNamePattern>${log.path.error}${log.name.error}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>128MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <!-- 最大保存时间：180天-->
            <maxHistory>180</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        <append>true</append>
        <!-- 日志格式 -->
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
            <charset>utf-8</charset>
        </encoder>
        <!-- 日志级别过滤器 -->
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
            <level>ERROR</level>
            <!-- 匹配时的操作：接收（记录） -->
            <!-- 匹配时的操作：接收（记录） -->
            <onMatch>ACCEPT</onMatch>
            <!-- 不匹配时的操作：拒绝（不记录） -->
            <!-- 不匹配时的操作：拒绝（不记录） -->
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
	
    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
        </encoder>
    </appender>
	
    <!-- 系统模块日志级别控制  -->
    <logger name="com.yssh.project" level="info" />
    <!-- Spring日志级别控制  -->
    <logger name="org.springframework" level="error" />

	
    <!--系统操作日志-->
    <root level="info">
        <appender-ref ref="file_info" />
        <appender-ref ref="file_error" />
        <appender-ref ref="console" />
    <!-- 控制台 -->
    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
        <!-- 日志格式 -->
        <encoder>
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
            <charset>utf-8</charset>
        </encoder>
        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <!-- 只有这个日志权限才能看，sql语句 -->
            <level>DEBUG</level>
        </filter>
    </appender>

    <!-- 输出sql日志:ERROR,INFO,DEBUG -->
    <logger name="com.apache.ibatis" level="INFO"/>

    <!-- additivity:是否在父(这里为root节点)输出, 默认 true; -->
    <logger name="com.yssh" level="INFO" additivity="true">
        <appender-ref ref="INFO_FILE"/>
        <appender-ref ref="ERROR_FILE"/>
    </logger>

    <root level="INFO">
        <appender-ref ref="STDOUT" />
    </root>
    
</configuration> 
</configuration>