格式修改,分页查询,排查提交暂存,注释添加

master
Zangzhipeng 1 year ago
parent bca98bc9f7
commit 32f7283e89
  1. 7
      hiatmp-base/pom.xml
  2. 86
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/controller/HighDangerController.java
  3. 24
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/mapper/HighDangerMapper.java
  4. 7
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/service/HighDangerService.java
  5. 61
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/service/impl/HighDangerBaseServiceImpl.java
  6. 4
      hiatmp-base/src/main/resources/application.yml
  7. 111
      hiatmp-base/src/main/resources/sql-mapper/HighDangerMapper.xml
  8. 4
      hiatmp-base/target/classes/application.yml
  9. 16
      hiatmp-model/pom.xml
  10. 56
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java
  11. 10
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDataCollectConfig.java
  12. 7738
      log/error.log
  13. 10256
      log/info.log
  14. 99
      log/test.log
  15. 7839
      log/warn.log

@ -97,7 +97,12 @@
<version>1.5.21</version>
</dependency>
<!-- <dependency>-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-extension</artifactId>-->
<!-- <version>3.5.7</version>-->

@ -1,5 +1,8 @@
package com.hisense.hiatmp.base.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hisense.hiatmp.base.mapper.HighDangerMapper;
@ -9,12 +12,18 @@ import com.hisense.hiatmp.base.model.OperatorDTO;
import com.hisense.hiatmp.base.service.HighDangerService;
import com.hisense.hiatmp.model.common.*;
import com.hisense.hiatmp.model.dmr.Point;
import lombok.extern.slf4j.Slf4j;
import oracle.jdbc.proxy.annotation.Post;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.nio.file.Path;
import java.util.*;
@Slf4j
@RestController
@RequestMapping(value = "/highDanger")
public class HighDangerController {
@ -45,19 +54,19 @@ public class HighDangerController {
public ServerResponse<?> getHighDealt(@RequestBody HighDangerBaseVO highDangerBaseVO,
@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "10") Integer pageSize){
// 分页
PageHelper.startPage(pageNum, pageSize);
// // 分页
// PageHelper.startPage(pageNum, pageSize);
// 获取当前操作的对象,用于查找对应的部门
Operator operatorById = operatorMapper.getOperatorById(highDangerBaseVO.getCusername());
String cdepartmentid = operatorById.getCdepartmentid();
// 将要查询的状态和部门id查询数据库,获得隐患排查表
List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid);
Page<HighDangerBase> page = new Page<>(pageNum, pageSize);
PageInfo<HighDangerBase> pageInfo = new PageInfo<>(statusCounts);
// 将要查询的状态和部门id查询数据库,获得隐患排查表
List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page);
return ServerResponse.ok(pageInfo);
return ServerResponse.ok(statusCounts);
}
// 查询临期 & 超期任务
@ -236,6 +245,7 @@ public class HighDangerController {
}
}
// 获取基础数据(第一页)
@GetMapping("/getSectionInfo")
public ServerResponse<?> getSectionInfo(@RequestParam String businessId){
@ -247,7 +257,7 @@ public class HighDangerController {
}
}
// 获取统计数据(第二页)
@GetMapping("/getSectionTraffic")
public ServerResponse<?> getSectionTraffic(@RequestParam String businessId){
@ -274,13 +284,69 @@ public class HighDangerController {
// 保存人工排查
@Transactional
@PostMapping("/saveManualInvestigation")
public ServerResponse<?> saveManualInvestigation(@RequestBody String businessId){
public ServerResponse<?> saveManualInvestigation(@RequestBody ManualInvestigation manualInvestigation){
Date lastModDate = new Date();
manualInvestigation.setLastModeDate(lastModDate);
ThtSectionInfoDTO sectionInfo = highDangerMapper.getSectionInfo(manualInvestigation.getBusinessId());
if(sectionInfo != null){
// 更新基础数据(步骤1)
highDangerMapper.updateSectionInfo(manualInvestigation);
}else{
// 保存基础数据(步骤1)
highDangerMapper.insertSectionInfo(manualInvestigation);
}
return ServerResponse.ok("人工排查成功");
}
// 判断数据库是否存在统计数据
ThtSectionTrafficDTO sectionTraffic = highDangerMapper.getSectionTraffic(manualInvestigation.getBusinessId());
if(sectionTraffic != null){
// 更新统计数据(步骤1)
highDangerMapper.updateSectionTraffic(manualInvestigation);
}else{
// 保存统计数据(步骤2)
highDangerMapper.insertSectionTraffic(manualInvestigation);
}
Set<String> keys;
// 保存隐患排查二级页面数据
for (Map<String,List<ThtHiddenDataCollectConfig>> map: manualInvestigation.getKeyInvestigation()){
keys = map.keySet();
for (Map.Entry<String, List<ThtHiddenDataCollectConfig>> entry : map.entrySet()) {
String key = entry.getKey();
List<ThtHiddenDataCollectConfig> value = entry.getValue();
// 对key和value进行操作
for (ThtHiddenDataCollectConfig config : value) {
// 保存图片
List<MultipartFile> multipartFiles1 = config.getMultipartFiles1();
// 图片路径集合(来车方向1)
String path1 = highDangerService.saveMultipartFiles(multipartFiles1).toString();
List<MultipartFile> multipartFiles2 = config.getMultipartFiles1();
// 图片路径集合(来车方向2)
String path2 = highDangerService.saveMultipartFiles(multipartFiles2).toString();
config.setPic1Address(path1);
config.setPic2Address(path2);
// 插入重点排查二级页面数据
highDangerMapper.saveHiddenDataCollectConfig(config);
}
}
}
// 保存重点排查数据
highDangerMapper.saveDangerExtra(manualInvestigation);
// 暂存数据
if(manualInvestigation.getTemporary() == Boolean.FALSE){
highDangerMapper.updateTemporary(manualInvestigation.getBusinessId());
return ServerResponse.ok("数据已暂存");
}
return ServerResponse.ok(manualInvestigation);
}
}

@ -1,24 +1,22 @@
package com.hisense.hiatmp.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hisense.hiatmp.base.model.BisRoadVO;
import com.hisense.hiatmp.model.common.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
@Repository
public interface HighDangerMapper {
public interface HighDangerMapper extends BaseMapper<HighDangerBase>{
// String getHighDangerStatusNum(@Param("postId") String postId);
// 主页获取各类型数据
List<HighDangerBaseNum> getStatusCounts(String cdepartmentid);
//
List<HighDangerBase> getHigDangerDealt(String status, String cdepartmentid);
List<HighDangerBase> getHigDangerDealt(String status, String cdepartmentid, Page<HighDangerBase> page);
List<HighDangerBase> getHigDangerDying(String status, String cdepartmentid);
@ -44,6 +42,22 @@ public interface HighDangerMapper {
ThtSectionTrafficDTO getSectionTraffic(String businessId);
String insertSectionInfo(ManualInvestigation sectionInfo);
String updateSectionInfo(ManualInvestigation sectionInfo);
String insertSectionTraffic(ManualInvestigation sectionTraffic);
String updateSectionTraffic(ManualInvestigation sectionTraffic);
List<ThtDangerItems> getDangerItems();
String updateTemporary(String temporary);
String saveHiddenDataCollectConfig(ThtHiddenDataCollectConfig config);
String saveDangerExtra(ManualInvestigation manualInvestigation);
}

@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.hisense.hiatmp.model.common.HighDangerBase;
import com.hisense.hiatmp.model.common.ThtDangerItems;
import com.hisense.hiatmp.model.dmr.Point;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
@ -18,7 +21,7 @@ public interface HighDangerService {
Map<String, Double> sortByValue(Map<String, Double> unsortedMap);
Map<String, Double> saveRoadOrCross();
List<ThtDangerItems> listWithTree();
List<Path> saveMultipartFiles(List<MultipartFile> multipartFiles);
}

@ -9,17 +9,29 @@ import com.hisense.hiatmp.model.common.ThtDangerItems;
import com.hisense.hiatmp.model.dmr.Point;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class HighDangerBaseServiceImpl implements HighDangerService {
@Value("${file.path.local}")
private String fileLocalPath;
private static SimpleDateFormat sfFile = new SimpleDateFormat("yyyyMMddHHmmss");
@Autowired
private HighDangerMapper highDangerMapper;
@Override
public List<Map<String, String>> getHighDangerStatusNum(String nuserid) {
@ -58,11 +70,6 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
return sortedMap;
}
@Override
public Map<String, Double> saveRoadOrCross() {
return Collections.emptyMap();
}
/*
递归查找
*/
@ -85,6 +92,8 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
return list;
}
private List<ThtDangerItems> getChildrenData(ThtDangerItems root, List<ThtDangerItems> all) {
List<ThtDangerItems> children = all.stream().filter(items ->
root.getId().equals(items.getParentid())
@ -94,4 +103,46 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
}).collect(Collectors.toList());
return children;
}
// 保存图片
@Override
public List<Path> saveMultipartFiles(List<MultipartFile> multipartFiles) {
ArrayList<Path> paths = new ArrayList<>();
if(multipartFiles!= null &&!multipartFiles.isEmpty()){
for (MultipartFile multipartFile : multipartFiles) {
// 保存图片
try {
boolean add = paths.add(handleFileSave(fileLocalPath, multipartFile));
if(add){
continue;
}else{
throw new RuntimeException("图片保存失败");
}
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
return paths;
}
public static Path handleFileSave(String localPath, MultipartFile file) throws Exception {
// 处理传来的文件
String name = file.getOriginalFilename();
String saveName = "file-" + sfFile.format(new Date()) + UUID.randomUUID().toString().substring(0, 4) + name.substring(name.lastIndexOf("."));
File saveFile = new File(localPath + saveName);
file.transferTo(saveFile);
return saveFile.toPath();
// 判断文件是否是图片类型
// Path path = saveFile.toPath();
// String type = Files.probeContentType(path);
// if (Files.probeContentType(saveFile.toPath()) != null) {
// return new FileSaveDTO(name, saveName, Files.probeContentType(saveFile.toPath()).startsWith("image/"));
// } else {
// return new FileSaveDTO(name, saveName, false);
// }
}
}

@ -49,6 +49,10 @@ pagehelper:
expiration:
time: 60 * 60 * 24
file:
path:
local:
/www/wwwroot/hiatmp/pic
ssoUrl: http://10.16.3.178:801
# 下面部分为mybatis及log配置,一般不需修改
mybatis:

@ -122,7 +122,7 @@
AND et.enumvalue = hdb.status
WHERE hdb.handle_dept = #{cdepartmentid}
AND hdb.status = #{status}
ORDER BY hdb.PC_END_TIME DESC;
ORDER BY hdb.PC_END_TIME DESC
</select>
<select id="getHigDangerDying" resultType="com.hisense.hiatmp.model.common.HighDangerBase">
@ -177,7 +177,7 @@
</select>
<select id="getRoadInfo" resultType="com.hisense.hiatmp.base.model.BisRoadVO">
SELECT DISTINCT br.*,bs.section_name,bs.section_code
SELECT DISTINCT br.*, bs.section_name, bs.section_code
FROM bis_section bs
JOIN bis_road br ON bs.road_code = br.road_code
JOIN tht_hidden_danger_road thd ON bs.section_code = thd.section_code
@ -191,13 +191,14 @@
</select>
<select id="saveRoad" resultType="String">
insert into bis_section (section_code,section_name, up_crossing_code,down_crossing_code)
values (#{sectionCode},#{sectionName}, #{upCrossingCode}, #{downCrossingCode}) RETURNING bis_section.section_code;
insert into bis_section (section_code, section_name, up_crossing_code, down_crossing_code)
values (#{sectionCode}, #{sectionName}, #{upCrossingCode},
#{downCrossingCode}) RETURNING bis_section.section_code;
</select>
<select id="saveCrossing" resultType="String">
insert into bis_crossing (crossing_code,crossing_name,longitude,latitude)
values (#{crossingCode},#{crossingName},#{longitude},#{latitude}) RETURNING bis_crossing.crossing_code;
insert into bis_crossing (crossing_code, crossing_name, longitude, latitude)
values (#{crossingCode}, #{crossingName}, #{longitude}, #{latitude}) RETURNING bis_crossing.crossing_code;
</select>
<select id="getImportDangerInfo" resultType="com.hisense.hiatmp.model.common.ImportDangerInfoDTO">
@ -209,20 +210,110 @@
</select>
<select id="setApproval" resultType="String">
UPDATE tht_hidden_danger_base SET APPROVE_STATUS = 2 where business_id = #{businessId} RETURNING business_id;
UPDATE tht_hidden_danger_base
SET APPROVE_STATUS = 2
where business_id = #{businessId} RETURNING business_id;
</select>
<select id="getSectionInfo" resultType="com.hisense.hiatmp.model.common.ThtSectionInfoDTO">
SELECT * FROM tht_section_info where "BUSINESS_ID" = #{businessId}
SELECT *
FROM tht_section_info
where "BUSINESS_ID" = #{businessId}
</select>
<select id="getSectionTraffic" resultType="com.hisense.hiatmp.model.common.ThtSectionTrafficDTO">
SELECT * FROM tht_section_traffic where "BUSINESS_ID" = #{businessId}
SELECT *
FROM tht_section_traffic
where "BUSINESS_ID" = #{businessId}
</select>
<select id="getDangerItems" resultType="com.hisense.hiatmp.model.common.ThtDangerItems">
SELECT * FROM tht_danger_items
SELECT *
FROM tht_danger_items
</select>
<insert id="insertSectionInfo">
insert into tht_section_info
values (
nextval('test_id_seq'),
#{businessId},
#{roadType},
#{roadWidth},
#{laneCount},
#{roadStructure},
#{sideProtec},
#{centerSeparate},
#{designSpeed},
#{limitSpeed}
)
RETURNING #{businessId};
</insert>
<update id="updateSectionInfo">
update tht_section_info
set
"ROAD_TYPE" = #{roadType},
"ROAD_WIDTH" = #{roadWidth},
"LANE_COUNT" = #{laneCount},
"ROAD_STRUCTURE" = #{roadStructure},
"SIDE_PROTEC" = #{sideProtec},
"CENTER_SEPARATE" = #{centerSeparate},
"DESIGN_SPEED" = #{designSpeed},
"LIMIT_SPEED" = #{limitSpeed}
where
"BUSINESS_ID" = #{businessId}
</update>
<insert id="insertSectionTraffic">
insert into tht_section_traffic
values (
nextval('test_id_seq1'),
#{businessId},
#{passingTrend},
#{maxTraffic},
#{peakTraffic},
#{peakHours},
#{normalTraffic},
#{largeVehicleRate},
#{vehicleTraffic},
#{lastModeUser},
#{lastModeDate}
)
</insert>
<update id="updateSectionTraffic">
update tht_section_traffic
set
"PASSING_TREND" = #{passingTrend},
"MAX_TRAFFIC" = #{maxTraffic},
"PEAK_TRAFFIC" = #{peakTraffic},
"PEAK_HOURS" = #{peakHours},
"NORMAL_TRAFFIC" = #{normalTraffic},
"LARGE_VEHICLE_RATE" = #{largeVehicleRate},
"NONVEHICLE_TRAFFIC" = #{vehicleTraffic},
"LAST_MOD_USER" = #{lastModeUser},
"LAST_MOD_DATE" = #{lastModeDate}
where
"BUSINESS_ID" = #{businessId}
</update>
<update id="updateTemporary">
update tht_hidden_danger_base
set
status = '99'
where
business_id = #{businessId}
</update>
<insert id="saveHiddenDataCollectConfig">
INSERT INTO tht_hidden_data_collect_config_copy2 (nid, itemid, order, type, name, standar, unit, pic1_address, pic2_address)
VALUES (nextval('test_id_seq2'),, #{itemid}, #{order}, #{type}, #{name}, #{standar}, #{unit}, #{pic1Address}, #{pic2Address})
</insert>
<insert id="saveDangerExtra">
INSERT INTO tht_hidden_danger_extra (nid, key_investigation, danger_item, danger_desc, image_list, information, business_id)
VALUES (nextval('test_id_seq3'),, #{key_investigation}, #{danger_item}, #{danger_desc}, #{image_list}, #{information}, #{business_id})
</insert>
</mapper>

@ -49,6 +49,10 @@ pagehelper:
expiration:
time: 60 * 60 * 24
file:
path:
local:
/www/wwwroot/hiatmp/pic
ssoUrl: http://10.16.3.178:801
# 下面部分为mybatis及log配置,一般不需修改
mybatis:

@ -13,6 +13,10 @@
<version>0.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@ -41,5 +45,17 @@
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
</project>

@ -1,44 +1,52 @@
package com.hisense.hiatmp.model.common;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 排查保存 & 暂存数据
*/
@Data
public class ManualInvestigation implements Serializable {
private static final long serialVersionUID = 1L;
// 第一页,基本信息
String BUSINESS_ID;
String ROAD_TYPE;
String ROAD_WIDTH;
String LANE_COUNT;
String ROAD_STRUCTURE;
String SIDE_PROTEC;
String CENTER_SEPARATE;
String DESIGN_SPEED;
String LIMIT_SPEED;
String businessId;
String roadType;
String roadWidth;
String laneCount;
String roadStructure;
String sideProtec;
String centerSeparate;
String designSpeed;
String limitSpeed;
// 第二页,统计信息
String PASSING_TREND;
String MAX_TRAFFIC;
String PEAK_TRAFFIC;
String PEAK_HOURS;
String NORMAL_TRAFFIC;
String LARGE_VEHICLE_RATE;
String NONVEHICLE_TRAFFIC;
String LAST_MOD_USER;
String LAST_MOD_DATE;
String passingTrend;
String maxTraffic;
String peakTraffic;
String peakHours;
String normalTraffic;
String largeVehicleRate;
String vehicleTraffic;
String lastModeUser;
Date lastModeDate;
// 第三页,重点排查 & 存在隐患
List<HashMap<String,ThtHiddenDataCollectConfig>> configs;
List<Map<String, List<ThtHiddenDataCollectConfig>>> keyInvestigation;
String dangerItem;
String dangerDesc;
List<MultipartFile> imageList;
String information;
// 暂存标识 0暂存 1提交
Boolean temporary;
}

@ -3,8 +3,10 @@ package com.hisense.hiatmp.model.common;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import java.io.Serializable;
import java.util.List;
/**
* @description tht_hidden_data_collect_config
@ -52,5 +54,13 @@ public class ThtHiddenDataCollectConfig implements Serializable {
*/
private String unit;
private String pic1Address;
private String pic2Address;
// 图片地址
List<MultipartFile> multipartFiles1;
List<MultipartFile> multipartFiles2;
public ThtHiddenDataCollectConfig() {}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,48 +1,48 @@
2024-07-12 12:07:12,705 [main] INFO com.alibaba.boot.nacos.config.util.NacosConfigPropertiesUtils - nacosConfigProperties : NacosConfigProperties{serverAddr='127.0.0.1:8848', contextPath='null', encode='null', endpoint='null', namespace='null', accessKey='null', secretKey='null', ramRoleName='null', autoRefresh=false, dataId='null', dataIds='null', group='DEFAULT_GROUP', type=null, maxRetry='null', configLongPollTimeout='null', configRetryTime='null', enableRemoteSyncConfig=false, extConfig=[], bootstrap=Bootstrap{enable=false, logEnable=false}}
2024-07-12 12:07:12,709 [main] INFO com.alibaba.boot.nacos.config.autoconfigure.NacosConfigApplicationContextInitializer - [Nacos Config Boot] : The preload configuration is not enabled
2024-07-12 12:07:12,885 [main] INFO com.ulisesbocchio.jasyptspringboot.configuration.EnableEncryptablePropertiesBeanFactoryPostProcessor - Post-processing PropertySource instances
2024-07-12 12:07:12,925 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource configurationProperties [org.springframework.boot.context.properties.source.ConfigurationPropertySourcesPropertySource] to AOP Proxy
2024-07-12 12:07:12,926 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource bootstrap [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:12,926 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:12,926 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemEnvironment [org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor$OriginAwareSystemEnvironmentPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:12,927 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource random [org.springframework.boot.env.RandomValuePropertySource] to EncryptablePropertySourceWrapper
2024-07-12 12:07:12,927 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource springCloudClientHostInfo [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:12,954 [main] INFO com.ulisesbocchio.jasyptspringboot.filter.DefaultLazyPropertyFilter - Property Filter custom Bean not found with name 'encryptablePropertyFilter'. Initializing Default Property Filter
2024-07-12 12:07:12,974 [main] INFO com.ulisesbocchio.jasyptspringboot.resolver.DefaultLazyPropertyResolver - Property Resolver custom Bean not found with name 'encryptablePropertyResolver'. Initializing Default Property Resolver
2024-07-12 12:07:12,975 [main] INFO com.ulisesbocchio.jasyptspringboot.detector.DefaultLazyPropertyDetector - Property Detector custom Bean not found with name 'encryptablePropertyDetector'. Initializing Default Property Detector
2024-07-12 12:07:13,347 [main] INFO com.ulisesbocchio.jasyptspringboot.configuration.EnableEncryptablePropertiesConfiguration - Bootstraping jasypt-string-boot auto configuration in context: application-1
2024-07-12 12:07:13,348 [main] INFO com.alibaba.boot.nacos.config.util.NacosConfigPropertiesUtils - nacosConfigProperties : NacosConfigProperties{serverAddr='127.0.0.1:8848', contextPath='null', encode='null', endpoint='null', namespace='null', accessKey='null', secretKey='null', ramRoleName='null', autoRefresh=false, dataId='null', dataIds='null', group='DEFAULT_GROUP', type=null, maxRetry='null', configLongPollTimeout='null', configRetryTime='null', enableRemoteSyncConfig=false, extConfig=[], bootstrap=Bootstrap{enable=false, logEnable=false}}
2024-07-12 12:07:13,348 [main] INFO com.alibaba.boot.nacos.config.autoconfigure.NacosConfigApplicationContextInitializer - [Nacos Config Boot] : The preload configuration is not enabled
2024-07-12 12:07:13,348 [main] INFO com.hisense.hiatmp.base.BaseApplication - No active profile set, falling back to default profiles: default
2024-07-12 12:07:14,250 [main] INFO com.ulisesbocchio.jasyptspringboot.configuration.EnableEncryptablePropertiesBeanFactoryPostProcessor - Post-processing PropertySource instances
2024-07-12 12:07:14,266 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource configurationProperties [org.springframework.boot.context.properties.source.ConfigurationPropertySourcesPropertySource] to AOP Proxy
2024-07-12 12:07:14,266 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource servletConfigInitParams [org.springframework.core.env.PropertySource$StubPropertySource] to EncryptablePropertySourceWrapper
2024-07-12 12:07:14,268 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource servletContextInitParams [org.springframework.core.env.PropertySource$StubPropertySource] to EncryptablePropertySourceWrapper
2024-07-12 12:07:14,268 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:14,268 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemEnvironment [org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor$OriginAwareSystemEnvironmentPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:14,268 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource random [org.springframework.boot.env.RandomValuePropertySource] to EncryptablePropertySourceWrapper
2024-07-12 12:07:14,268 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource applicationConfig: [classpath:/application.properties] [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:14,268 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource applicationConfig: [classpath:/application.yml] [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:14,268 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource springCloudClientHostInfo [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:14,268 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource defaultProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 12:07:14,313 [main] INFO com.ulisesbocchio.jasyptspringboot.filter.DefaultLazyPropertyFilter - Property Filter custom Bean not found with name 'encryptablePropertyFilter'. Initializing Default Property Filter
2024-07-12 12:07:14,538 [main] INFO com.ulisesbocchio.jasyptspringboot.resolver.DefaultLazyPropertyResolver - Property Resolver custom Bean not found with name 'encryptablePropertyResolver'. Initializing Default Property Resolver
2024-07-12 12:07:14,538 [main] INFO com.ulisesbocchio.jasyptspringboot.detector.DefaultLazyPropertyDetector - Property Detector custom Bean not found with name 'encryptablePropertyDetector'. Initializing Default Property Detector
2024-07-12 12:07:14,776 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-1959"]
2024-07-12 12:07:14,782 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
2024-07-12 12:07:14,782 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.17]
2024-07-12 12:07:14,889 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/HiatmpPro/commond] - Initializing Spring embedded WebApplicationContext
2024-07-12 12:07:15,027 [main] INFO com.hisense.hiatmp.common.config.DataSourceConfig - 第一数据库连接池创建中.......
2024-07-12 12:07:16,092 [main] INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
2024-07-12 12:07:16,140 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2024-07-12 12:07:16,140 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2024-07-12 12:07:16,143 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2024-07-12 12:07:16,143 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2024-07-12 12:07:17,697 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper - Context refreshed
2024-07-12 12:07:17,710 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s)
2024-07-12 12:07:17,735 [main] INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references
2024-07-12 12:07:17,982 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-1959"]
2024-07-12 12:07:21,099 [main] ERROR com.alibaba.cloud.nacos.registry.NacosServiceRegistry - nacos registry, urbantraffic-hiatmp-base register failed...NacosRegistration{nacosDiscoveryProperties=NacosDiscoveryProperties{serverAddr='10.16.3.178:8848', endpoint='', namespace='', watchDelay=30000, logName='', service='urbantraffic-hiatmp-base', weight=1.0, clusterName='DEFAULT', namingLoadCacheAtStart='false', metadata={preserved.register.source=SPRING_CLOUD}, registerEnabled=true, ip='192.168.64.1', networkInterface='', port=1959, secure=false, accessKey='', secretKey=''}},
2024-07-12 17:15:43,491 [main] INFO com.alibaba.boot.nacos.config.util.NacosConfigPropertiesUtils - nacosConfigProperties : NacosConfigProperties{serverAddr='127.0.0.1:8848', contextPath='null', encode='null', endpoint='null', namespace='null', accessKey='null', secretKey='null', ramRoleName='null', autoRefresh=false, dataId='null', dataIds='null', group='DEFAULT_GROUP', type=null, maxRetry='null', configLongPollTimeout='null', configRetryTime='null', enableRemoteSyncConfig=false, extConfig=[], bootstrap=Bootstrap{enable=false, logEnable=false}}
2024-07-12 17:15:43,497 [main] INFO com.alibaba.boot.nacos.config.autoconfigure.NacosConfigApplicationContextInitializer - [Nacos Config Boot] : The preload configuration is not enabled
2024-07-12 17:15:43,734 [main] INFO com.ulisesbocchio.jasyptspringboot.configuration.EnableEncryptablePropertiesBeanFactoryPostProcessor - Post-processing PropertySource instances
2024-07-12 17:15:43,851 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource configurationProperties [org.springframework.boot.context.properties.source.ConfigurationPropertySourcesPropertySource] to AOP Proxy
2024-07-12 17:15:43,852 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource bootstrap [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:43,852 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:43,852 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemEnvironment [org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor$OriginAwareSystemEnvironmentPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:43,852 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource random [org.springframework.boot.env.RandomValuePropertySource] to EncryptablePropertySourceWrapper
2024-07-12 17:15:43,853 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource springCloudClientHostInfo [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:43,893 [main] INFO com.ulisesbocchio.jasyptspringboot.filter.DefaultLazyPropertyFilter - Property Filter custom Bean not found with name 'encryptablePropertyFilter'. Initializing Default Property Filter
2024-07-12 17:15:43,921 [main] INFO com.ulisesbocchio.jasyptspringboot.resolver.DefaultLazyPropertyResolver - Property Resolver custom Bean not found with name 'encryptablePropertyResolver'. Initializing Default Property Resolver
2024-07-12 17:15:43,922 [main] INFO com.ulisesbocchio.jasyptspringboot.detector.DefaultLazyPropertyDetector - Property Detector custom Bean not found with name 'encryptablePropertyDetector'. Initializing Default Property Detector
2024-07-12 17:15:44,526 [main] INFO com.ulisesbocchio.jasyptspringboot.configuration.EnableEncryptablePropertiesConfiguration - Bootstraping jasypt-string-boot auto configuration in context: application-1
2024-07-12 17:15:44,538 [main] INFO com.alibaba.boot.nacos.config.util.NacosConfigPropertiesUtils - nacosConfigProperties : NacosConfigProperties{serverAddr='127.0.0.1:8848', contextPath='null', encode='null', endpoint='null', namespace='null', accessKey='null', secretKey='null', ramRoleName='null', autoRefresh=false, dataId='null', dataIds='null', group='DEFAULT_GROUP', type=null, maxRetry='null', configLongPollTimeout='null', configRetryTime='null', enableRemoteSyncConfig=false, extConfig=[], bootstrap=Bootstrap{enable=false, logEnable=false}}
2024-07-12 17:15:44,539 [main] INFO com.alibaba.boot.nacos.config.autoconfigure.NacosConfigApplicationContextInitializer - [Nacos Config Boot] : The preload configuration is not enabled
2024-07-12 17:15:44,541 [main] INFO com.hisense.hiatmp.base.BaseApplication - No active profile set, falling back to default profiles: default
2024-07-12 17:15:45,792 [main] INFO com.ulisesbocchio.jasyptspringboot.configuration.EnableEncryptablePropertiesBeanFactoryPostProcessor - Post-processing PropertySource instances
2024-07-12 17:15:45,803 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource configurationProperties [org.springframework.boot.context.properties.source.ConfigurationPropertySourcesPropertySource] to AOP Proxy
2024-07-12 17:15:45,804 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource servletConfigInitParams [org.springframework.core.env.PropertySource$StubPropertySource] to EncryptablePropertySourceWrapper
2024-07-12 17:15:45,804 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource servletContextInitParams [org.springframework.core.env.PropertySource$StubPropertySource] to EncryptablePropertySourceWrapper
2024-07-12 17:15:45,804 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:45,804 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemEnvironment [org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor$OriginAwareSystemEnvironmentPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:45,804 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource random [org.springframework.boot.env.RandomValuePropertySource] to EncryptablePropertySourceWrapper
2024-07-12 17:15:45,804 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource applicationConfig: [classpath:/application.properties] [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:45,804 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource applicationConfig: [classpath:/application.yml] [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:45,804 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource springCloudClientHostInfo [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:45,804 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource defaultProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-12 17:15:45,842 [main] INFO com.ulisesbocchio.jasyptspringboot.filter.DefaultLazyPropertyFilter - Property Filter custom Bean not found with name 'encryptablePropertyFilter'. Initializing Default Property Filter
2024-07-12 17:15:46,097 [main] INFO com.ulisesbocchio.jasyptspringboot.resolver.DefaultLazyPropertyResolver - Property Resolver custom Bean not found with name 'encryptablePropertyResolver'. Initializing Default Property Resolver
2024-07-12 17:15:46,097 [main] INFO com.ulisesbocchio.jasyptspringboot.detector.DefaultLazyPropertyDetector - Property Detector custom Bean not found with name 'encryptablePropertyDetector'. Initializing Default Property Detector
2024-07-12 17:15:46,451 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-1959"]
2024-07-12 17:15:46,462 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
2024-07-12 17:15:46,463 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.17]
2024-07-12 17:15:46,599 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/HiatmpPro/commond] - Initializing Spring embedded WebApplicationContext
2024-07-12 17:15:46,807 [main] INFO com.hisense.hiatmp.common.config.DataSourceConfig - 第一数据库连接池创建中.......
2024-07-12 17:15:48,347 [main] INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
2024-07-12 17:15:48,433 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2024-07-12 17:15:48,433 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2024-07-12 17:15:48,438 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2024-07-12 17:15:48,439 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2024-07-12 17:15:50,788 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper - Context refreshed
2024-07-12 17:15:50,810 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s)
2024-07-12 17:15:50,842 [main] INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references
2024-07-12 17:15:51,188 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-1959"]
2024-07-12 17:15:54,470 [main] ERROR com.alibaba.cloud.nacos.registry.NacosServiceRegistry - nacos registry, urbantraffic-hiatmp-base register failed...NacosRegistration{nacosDiscoveryProperties=NacosDiscoveryProperties{serverAddr='10.16.3.178:8848', endpoint='', namespace='', watchDelay=30000, logName='', service='urbantraffic-hiatmp-base', weight=1.0, clusterName='DEFAULT', namingLoadCacheAtStart='false', metadata={preserved.register.source=SPRING_CLOUD}, registerEnabled=true, ip='192.168.64.1', networkInterface='', port=1959, secure=false, accessKey='', secretKey=''}},
java.lang.IllegalStateException: failed to req API:/nacos/v1/ns/instance after all servers([10.16.3.178:8848]) tried: failed to req API:10.16.3.178:8848/nacos/v1/ns/instance. code:500 msg: java.net.SocketTimeoutException: connect timed out
at com.alibaba.nacos.client.naming.net.NamingProxy.reqAPI(NamingProxy.java:464) ~[nacos-client-1.1.1.jar:?]
at com.alibaba.nacos.client.naming.net.NamingProxy.reqAPI(NamingProxy.java:386) ~[nacos-client-1.1.1.jar:?]
@ -70,6 +70,9 @@ java.lang.IllegalStateException: failed to req API:/nacos/v1/ns/instance after a
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1260) [spring-boot-2.1.4.RELEASE.jar:2.1.4.RELEASE]
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1248) [spring-boot-2.1.4.RELEASE.jar:2.1.4.RELEASE]
at com.hisense.hiatmp.base.BaseApplication.main(BaseApplication.java:25) [classes/:?]
2024-07-12 12:07:21,105 [main] INFO com.hisense.hiatmp.base.BaseApplication - Started BaseApplication in 8.898 seconds (JVM running for 9.901)
2024-07-12 12:07:21,108 [main] INFO com.hisense.hiatmp.common.encrypt.EncryptedDetector - ==============配置项自动加密已触发============
2024-07-12 12:07:21,108 [main] INFO com.hisense.hiatmp.common.encrypt.EncryptedDetector - ==============配置项自动加密已结束,未用脚本启动或者yml参数未配置正确,加密失败!============
2024-07-12 17:15:54,475 [main] INFO com.hisense.hiatmp.base.BaseApplication - Started BaseApplication in 11.66 seconds (JVM running for 13.342)
2024-07-12 17:15:54,477 [main] INFO com.hisense.hiatmp.common.encrypt.EncryptedDetector - ==============配置项自动加密已触发============
2024-07-12 17:15:54,477 [main] INFO com.hisense.hiatmp.common.encrypt.EncryptedDetector - ==============配置项自动加密已结束,未用脚本启动或者yml参数未配置正确,加密失败!============
2024-07-12 17:15:57,476 [http-nio-1959-exec-1] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/HiatmpPro/commond] - Initializing Spring DispatcherServlet 'dispatcherServlet'
2024-07-12 17:15:57,594 [http-nio-1959-exec-1] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
2024-07-12 17:15:57,890 [http-nio-1959-exec-1] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save