Browse Source

市北5个站采集程序

dev-shibei
yj 1 year ago
parent
commit
55778e8562
  1. 14
      device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/DeviceCameraController.java
  2. 98
      device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/SubstationController.java
  3. 5
      device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DeviceCamera.java
  4. 5
      device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java
  5. 82
      device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/Substation.java
  6. 5
      device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/DeviceCameraMapper.java
  7. 18
      device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/SubstationMapper.java
  8. 5
      device_cars/src/main/java/com/xr/device_car/modules/analysis/service/DeviceCameraService.java
  9. 13
      device_cars/src/main/java/com/xr/device_car/modules/analysis/service/SubstationService.java
  10. 8
      device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/DeviceCameraServiceImpl.java
  11. 24
      device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/SubstationServiceImpl.java
  12. 2
      device_cars/src/main/resources/application-dev.yml
  13. 7
      device_cars/src/main/resources/modules/analysis/DeviceCameraMapper.xml
  14. 1
      device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml
  15. 28
      device_cars/src/main/resources/modules/analysis/SubstationMapper.xml
  16. 85
      device_gather/src/main/java/com/xr/device/common/utils/CharsetKit.java
  17. 1000
      device_gather/src/main/java/com/xr/device/common/utils/Convert.java
  18. 90
      device_gather/src/main/java/com/xr/device/common/utils/StrFormatter.java
  19. 0
      device_gather/src/main/resources/application-jc-dev.yml
  20. 0
      device_gather/src/main/resources/application-jc-prod.yml
  21. 2
      device_gather/src/main/resources/application.yml

14
device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/DeviceCameraController.java

@ -21,6 +21,7 @@ import com.xr.device_car.modules.analysis.entity.DeviceCamera;
import com.xr.device_car.modules.analysis.service.DeviceCameraService; import com.xr.device_car.modules.analysis.service.DeviceCameraService;
import com.xr.device_car.modules.system.entity.UserInfo; import com.xr.device_car.modules.system.entity.UserInfo;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.CrossOrigin;
@ -46,13 +47,10 @@ import java.util.concurrent.locks.ReentrantLock;
@RestController @RestController
@RequestMapping("/deviceCamera") @RequestMapping("/deviceCamera")
@CrossOrigin(origins = "*") @CrossOrigin(origins = "*")
@RequiredArgsConstructor
public class DeviceCameraController { public class DeviceCameraController {
@Autowired private final DeviceCameraService deviceCameraService;
private DeviceCameraService deviceCameraService;
// @Autowired
// private DeviceCameraMapper cameraMapper;
private Lock lock = new ReentrantLock(); private Lock lock = new ReentrantLock();
@ -89,7 +87,11 @@ public class DeviceCameraController {
} }
} }
IPage<DeviceCamera> deviceCameraList = deviceCameraService.page(pg, wrapper); if(com.xr.device_car.config.utils.StringUtils.isNotEmpty(deviceCamera.getStationId())){
wrapper.eq("station_id",deviceCamera.getStationId());
}
wrapper.orderByAsc("station_id");
IPage<DeviceCamera> deviceCameraList = deviceCameraService.pageList(pg, wrapper);
System.out.println(deviceCameraList); System.out.println(deviceCameraList);
return Result.OK(deviceCameraList); return Result.OK(deviceCameraList);
} }

98
device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/SubstationController.java

@ -0,0 +1,98 @@
package com.xr.device_car.modules.analysis.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.xr.device_car.config.common.Result;
import com.xr.device_car.config.utils.StringFormatterUtil;
import com.xr.device_car.config.utils.StringUtils;
import com.xr.device_car.config.utils.UserUtils;
import com.xr.device_car.modules.analysis.entity.DeviceCamera;
import com.xr.device_car.modules.analysis.entity.MeterConfig;
import com.xr.device_car.modules.analysis.entity.Substation;
import com.xr.device_car.modules.analysis.service.DeviceCameraService;
import com.xr.device_car.modules.analysis.service.MeterConfigService;
import com.xr.device_car.modules.analysis.service.SubstationService;
import com.xr.device_car.modules.system.entity.UserInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
@RestController
@RequestMapping("analysis/substation")
@RequiredArgsConstructor
public class SubstationController {
private final SubstationService substationService;
private final MeterConfigService meterConfigService;
private final DeviceCameraService deviceCameraService;
@RequestMapping("/pageList")
public IPage<Substation> pageList(Substation substation, HttpServletRequest req){
Page<Substation> page= StringFormatterUtil.returnPage(req);
QueryWrapper<Substation> query=new QueryWrapper<>();
if(StringUtils.isNotEmpty(substation.getSubstationName())){
query.like("substation_name",substation.getSubstationName());
}
IPage<Substation> substationIPage= substationService.page(page,query);
return substationIPage;
}
@RequestMapping("/getStationList")
public Result<?> getStationList(){
List<Substation> list1 = substationService.list();
return Result.OK(list1);
}
@RequestMapping("/getStation")
public Result<?> getStation(Integer id){
Substation substation = substationService.getById(id);
return Result.OK(substation);
}
@RequestMapping("/saveData")
public Result<?> saveData(Substation substation){
UserInfo userInfo = UserUtils.currentUser();
substation.setUpdateTime(new Date());
substation.setUpdateUser(userInfo.getUserName());
if(!StringUtils.isNotEmpty(substation.getId())){
substation.setCreateUser(userInfo.getUserName());
substation.setCreateTime(new Date());
}
substationService.saveOrUpdate(substation);
return Result.OK("保存成功。");
}
@RequestMapping("/delData")
public Result<?> delData(Integer id){
QueryWrapper<DeviceCamera> query1=new QueryWrapper<>();
query1.eq("station_id",id);
List<DeviceCamera> list1=deviceCameraService.list(query1);
if(!list1.isEmpty()){
String str = String.join(",",list1.stream().map(n->n.getDeviceIp()).collect(Collectors.toList()));
if(str.length()>100){
str=str.substring(0,100)+"·······";
}
return Result.error(str+"。摄像头已绑定该变电站请先解绑",list1);
}
QueryWrapper<MeterConfig> query2 = new QueryWrapper<>();
query2.eq("station_id",id);
List<MeterConfig> list2 = meterConfigService.list(query2);
if(!list2.isEmpty()){
String str = String.join(",",list1.stream().map(n->n.getId()+"").collect(Collectors.toList()));
if(str.length()>100){
str=str.substring(0,100)+"·······";
}
return Result.error(str+"。表计已绑定该变电站请先解绑",list1);
}
substationService.removeById(id);
return Result.OK("删除成功!");
}
}

5
device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DeviceCamera.java

@ -134,6 +134,11 @@ public class DeviceCamera implements Serializable {
*/ */
private Integer warmup; private Integer warmup;
private Integer stationId;
@TableField(exist = false)
private String substationName;
@TableField(exist = false) @TableField(exist = false)
@ExcelIgnore @ExcelIgnore
private List<String> ids; private List<String> ids;

5
device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java

@ -143,11 +143,16 @@ public class MeterConfig implements Serializable {
*/ */
private String updateUser; private String updateUser;
private Integer stationId;
/** /**
* 修改时间 * 修改时间
*/ */
private Date updateTime; private Date updateTime;
@TableField(exist = false)
private String substation;
@TableField(exist = false) @TableField(exist = false)
private String ip; private String ip;

82
device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/Substation.java

@ -0,0 +1,82 @@
package com.xr.device_car.modules.analysis.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 变电站表
* @TableName substation
*/
@TableName(value ="substation")
@Data
public class Substation implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.AUTO)
private Integer id;
/**
* 变电站名称
*/
private String substationName;
/**
* 电压等级
*/
private String voltageClasses;
/**
* 详细地址
*/
private String location;
/**
* 经度
*/
private String longitude;
/**
* 纬度
*/
private String latitude;
/**
* 联系人
*/
private String linkman;
/**
* 联系人电话
*/
private String contactNumber;
/**
* 创建人
*/
private String createUser;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改人
*/
private String updateUser;
/**
* 修改时间
*/
private Date updateTime;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}

5
device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/DeviceCameraMapper.java

@ -1,6 +1,10 @@
package com.xr.device_car.modules.analysis.mapper; package com.xr.device_car.modules.analysis.mapper;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xr.device_car.modules.analysis.dto.DeviceRelevanceMeterQueryDto; import com.xr.device_car.modules.analysis.dto.DeviceRelevanceMeterQueryDto;
import com.xr.device_car.modules.analysis.entity.DeviceCamera; import com.xr.device_car.modules.analysis.entity.DeviceCamera;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -25,6 +29,7 @@ public interface DeviceCameraMapper extends BaseMapper<DeviceCamera> {
List<DeviceRelevanceMeterQueryDto> getRelevanceMeterList(@Param("cameraId") Integer cameraId); List<DeviceRelevanceMeterQueryDto> getRelevanceMeterList(@Param("cameraId") Integer cameraId);
IPage<DeviceCamera> pageList(@Param("page") Page<DeviceCamera> page, @Param(Constants.WRAPPER)Wrapper<DeviceCamera> wrapper);
} }

18
device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/SubstationMapper.java

@ -0,0 +1,18 @@
package com.xr.device_car.modules.analysis.mapper;
import com.xr.device_car.modules.analysis.entity.Substation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author 范亚杰
* @description 针对表substation(变电站表)的数据库操作Mapper
* @createDate 2024-06-27 16:39:33
* @Entity com.xr.device_car.modules.analysis.entity.Substation
*/
public interface SubstationMapper extends BaseMapper<Substation> {
}

5
device_cars/src/main/java/com/xr/device_car/modules/analysis/service/DeviceCameraService.java

@ -1,5 +1,8 @@
package com.xr.device_car.modules.analysis.service; package com.xr.device_car.modules.analysis.service;
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.xr.device_car.modules.analysis.dto.DeviceRelevanceMeterQueryDto; import com.xr.device_car.modules.analysis.dto.DeviceRelevanceMeterQueryDto;
import com.xr.device_car.modules.analysis.entity.DeviceCamera; import com.xr.device_car.modules.analysis.entity.DeviceCamera;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
@ -29,4 +32,6 @@ public interface DeviceCameraService extends IService<DeviceCamera> {
List<DeviceCamera> getAllDeviceCamera(); List<DeviceCamera> getAllDeviceCamera();
IPage<DeviceCamera> pageList(Page<DeviceCamera> page, QueryWrapper<DeviceCamera> query);
} }

13
device_cars/src/main/java/com/xr/device_car/modules/analysis/service/SubstationService.java

@ -0,0 +1,13 @@
package com.xr.device_car.modules.analysis.service;
import com.xr.device_car.modules.analysis.entity.Substation;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author 范亚杰
* @description 针对表substation(变电站表)的数据库操作Service
* @createDate 2024-06-27 16:39:33
*/
public interface SubstationService extends IService<Substation> {
}

8
device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/DeviceCameraServiceImpl.java

@ -2,6 +2,9 @@ package com.xr.device_car.modules.analysis.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xr.device_car.modules.analysis.dto.DeviceRelevanceMeterQueryDto; import com.xr.device_car.modules.analysis.dto.DeviceRelevanceMeterQueryDto;
import com.xr.device_car.modules.analysis.entity.DeviceCamera; import com.xr.device_car.modules.analysis.entity.DeviceCamera;
@ -36,6 +39,11 @@ public class DeviceCameraServiceImpl extends ServiceImpl<DeviceCameraMapper, Dev
List<DeviceCamera> list = list(); List<DeviceCamera> list = list();
return list; return list;
} }
@Override
public IPage<DeviceCamera> pageList(Page<DeviceCamera> page, QueryWrapper<DeviceCamera> query) {
return ((DeviceCameraMapper)this.baseMapper).pageList(page,query);
}
} }

24
device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/SubstationServiceImpl.java

@ -0,0 +1,24 @@
package com.xr.device_car.modules.analysis.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xr.device_car.modules.analysis.entity.Substation;
import com.xr.device_car.modules.analysis.service.SubstationService;
import com.xr.device_car.modules.analysis.mapper.SubstationMapper;
import org.springframework.stereotype.Service;
/**
* @author 范亚杰
* @description 针对表substation(变电站表)的数据库操作Service实现
* @createDate 2024-06-27 16:39:33
*/
@Service
@DS("db2")
public class SubstationServiceImpl extends ServiceImpl<SubstationMapper, Substation>
implements SubstationService{
}

2
device_cars/src/main/resources/application-dev.yml

@ -19,7 +19,7 @@ spring:
db2: db2:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
url: jdbc:mysql://116.196.120.81:3306/image_analysis_zs?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
username: root username: root
password: 5ea47c0bdd7146ebbd53020eca@672307 password: 5ea47c0bdd7146ebbd53020eca@672307
#Hikari连接池配置 #Hikari连接池配置

7
device_cars/src/main/resources/modules/analysis/DeviceCameraMapper.xml

@ -47,4 +47,11 @@
ON mc.type_id = mt.id ON mc.type_id = mt.id
WHERE mc.camera_id = #{cameraId} WHERE mc.camera_id = #{cameraId}
</select> </select>
<select id="pageList" resultType="com.xr.device_car.modules.analysis.entity.DeviceCamera">
select a.*,b.substation_name from device_camera a left join substation b
on a.station_id = b.id
${ew.customSqlSegment}
</select>
</mapper> </mapper>

1
device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml

@ -49,6 +49,7 @@
b.device_type cameraType,b.position cameraName,c.type_alias,b.device_ip ip from meter_config a b.device_type cameraType,b.position cameraName,c.type_alias,b.device_ip ip from meter_config a
left join device_camera b on a.camera_id = b.id left join device_camera b on a.camera_id = b.id
left join meter_type c on a.type_id=c.id left join meter_type c on a.type_id=c.id
left join substation d on a.station_id = d.id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>

28
device_cars/src/main/resources/modules/analysis/SubstationMapper.xml

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xr.device_car.modules.analysis.mapper.SubstationMapper">
<resultMap id="BaseResultMap" type="com.xr.device_car.modules.analysis.entity.Substation">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="substationName" column="substation_name" jdbcType="VARCHAR"/>
<result property="voltageClasses" column="voltage_classes" jdbcType="VARCHAR"/>
<result property="location" column="location" jdbcType="VARCHAR"/>
<result property="longitude" column="longitude" jdbcType="VARCHAR"/>
<result property="latitude" column="latitude" jdbcType="VARCHAR"/>
<result property="linkman" column="linkman" jdbcType="VARCHAR"/>
<result property="contactNumber" column="contact_number" jdbcType="VARCHAR"/>
<result property="createUser" column="create_user" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
id,substation_name,voltage_classes,
location,longitude,latitude,
linkman,contact_number,create_user,
create_time,update_user,update_time
</sql>
</mapper>

85
device_gather/src/main/java/com/xr/device/common/utils/CharsetKit.java

@ -0,0 +1,85 @@
package com.xr.device.common.utils;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
/**
* 字符集工具类
*
* @author
*/
public class CharsetKit
{
/** ISO-8859-1 */
public static final String ISO_8859_1 = "ISO-8859-1";
/** UTF-8 */
public static final String UTF_8 = "UTF-8";
/** GBK */
public static final String GBK = "GBK";
/** ISO-8859-1 */
public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
/** UTF-8 */
public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
/** GBK */
public static final Charset CHARSET_GBK = Charset.forName(GBK);
/**
* 转换为Charset对象
*
* @param charset 字符集为空则返回默认字符集
* @return Charset
*/
public static Charset charset(String charset)
{
return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
}
/**
* 转换字符串的字符集编码
*
* @param source 字符串
* @param srcCharset 源字符集默认ISO-8859-1
* @param destCharset 目标字符集默认UTF-8
* @return 转换后的字符集
*/
public static String convert(String source, String srcCharset, String destCharset)
{
return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
}
/**
* 转换字符串的字符集编码
*
* @param source 字符串
* @param srcCharset 源字符集默认ISO-8859-1
* @param destCharset 目标字符集默认UTF-8
* @return 转换后的字符集
*/
public static String convert(String source, Charset srcCharset, Charset destCharset)
{
if (null == srcCharset)
{
srcCharset = StandardCharsets.ISO_8859_1;
}
if (null == destCharset)
{
destCharset = StandardCharsets.UTF_8;
}
if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
{
return source;
}
return new String(source.getBytes(srcCharset), destCharset);
}
/**
* @return 系统字符集编码
*/
public static String systemCharset()
{
return Charset.defaultCharset().name();
}
}

1000
device_gather/src/main/java/com/xr/device/common/utils/Convert.java

File diff suppressed because it is too large

90
device_gather/src/main/java/com/xr/device/common/utils/StrFormatter.java

@ -0,0 +1,90 @@
package com.xr.device.common.utils;
/**
* 字符串格式化
*
* @author ruoyi
*/
public class StrFormatter
{
public static final String EMPTY_JSON = "{}";
public static final char C_BACKSLASH = '\\';
public static final char C_DELIM_START = '{';
public static final char C_DELIM_END = '}';
/**
* 格式化字符串<br>
* 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
* 如果想输出 {} 使用 \\转义 { 即可如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
* <br>
* 通常使用format("this is {} for {}", "a", "b") -> this is a for b<br>
* 转义{} format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
* 转义\ format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
*
* @param strPattern 字符串模板
* @param argArray 参数列表
* @return 结果
*/
public static String format(final String strPattern, final Object... argArray)
{
if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
{
return strPattern;
}
final int strPatternLength = strPattern.length();
// 初始化定义好的长度以获得更好的性能
StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
int handledPosition = 0;
int delimIndex;// 占位符所在位置
for (int argIndex = 0; argIndex < argArray.length; argIndex++)
{
delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
if (delimIndex == -1)
{
if (handledPosition == 0)
{
return strPattern;
}
else
{ // 字符串模板剩余部分不再包含占位符,加入剩余部分后返回结果
sbuf.append(strPattern, handledPosition, strPatternLength);
return sbuf.toString();
}
}
else
{
if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
{
if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
{
// 转义符之前还有一个转义符,占位符依旧有效
sbuf.append(strPattern, handledPosition, delimIndex - 1);
sbuf.append(Convert.utf8Str(argArray[argIndex]));
handledPosition = delimIndex + 2;
}
else
{
// 占位符被转义
argIndex--;
sbuf.append(strPattern, handledPosition, delimIndex - 1);
sbuf.append(C_DELIM_START);
handledPosition = delimIndex + 1;
}
}
else
{
// 正常占位符
sbuf.append(strPattern, handledPosition, delimIndex);
sbuf.append(Convert.utf8Str(argArray[argIndex]));
handledPosition = delimIndex + 2;
}
}
}
// 加入最后一个占位符后所有的字符
sbuf.append(strPattern, handledPosition, strPattern.length());
return sbuf.toString();
}
}

0
device_gather/src/main/resources/application-dev.yml → device_gather/src/main/resources/application-jc-dev.yml

0
device_gather/src/main/resources/application-prod.yml → device_gather/src/main/resources/application-jc-prod.yml

2
device_gather/src/main/resources/application.yml

@ -2,7 +2,7 @@ spring:
profiles: profiles:
#active: dev #开发环境 #active: dev #开发环境
# active: test #测试环境5 # active: test #测试环境5
active: dev #生产环境 active: jc-dev
# active: prod #生产环境 # active: prod #生产环境
application: application:
name: gather name: gather

Loading…
Cancel
Save