From 55778e856231ef97645fbd64fa2ed83c7a2b2d8b Mon Sep 17 00:00:00 2001 From: yj <913944315@qq.com> Date: Mon, 1 Jul 2024 09:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=8C=975=E4=B8=AA=E7=AB=99=E9=87=87?= =?UTF-8?q?=E9=9B=86=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceCameraController.java | 14 +- .../controller/SubstationController.java | 98 ++ .../modules/analysis/entity/DeviceCamera.java | 5 + .../modules/analysis/entity/MeterConfig.java | 5 + .../modules/analysis/entity/Substation.java | 82 ++ .../analysis/mapper/DeviceCameraMapper.java | 5 + .../analysis/mapper/SubstationMapper.java | 18 + .../analysis/service/DeviceCameraService.java | 5 + .../analysis/service/SubstationService.java | 13 + .../service/impl/DeviceCameraServiceImpl.java | 8 + .../service/impl/SubstationServiceImpl.java | 24 + .../src/main/resources/application-dev.yml | 2 +- .../modules/analysis/DeviceCameraMapper.xml | 7 + .../modules/analysis/MeterConfigMapper.xml | 1 + .../modules/analysis/SubstationMapper.xml | 28 + .../xr/device/common/utils/CharsetKit.java | 85 ++ .../com/xr/device/common/utils/Convert.java | 1000 +++++++++++++++++ .../xr/device/common/utils/StrFormatter.java | 90 ++ ...ication-dev.yml => application-jc-dev.yml} | 0 ...ation-prod.yml => application-jc-prod.yml} | 0 .../src/main/resources/application.yml | 2 +- 21 files changed, 1484 insertions(+), 8 deletions(-) create mode 100644 device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/SubstationController.java create mode 100644 device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/Substation.java create mode 100644 device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/SubstationMapper.java create mode 100644 device_cars/src/main/java/com/xr/device_car/modules/analysis/service/SubstationService.java create mode 100644 device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/SubstationServiceImpl.java create mode 100644 device_cars/src/main/resources/modules/analysis/SubstationMapper.xml create mode 100644 device_gather/src/main/java/com/xr/device/common/utils/CharsetKit.java create mode 100644 device_gather/src/main/java/com/xr/device/common/utils/Convert.java create mode 100644 device_gather/src/main/java/com/xr/device/common/utils/StrFormatter.java rename device_gather/src/main/resources/{application-dev.yml => application-jc-dev.yml} (100%) rename device_gather/src/main/resources/{application-prod.yml => application-jc-prod.yml} (100%) diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/DeviceCameraController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/DeviceCameraController.java index 90df665..1f490b1 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/DeviceCameraController.java +++ b/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.system.entity.UserInfo; import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; @@ -46,13 +47,10 @@ import java.util.concurrent.locks.ReentrantLock; @RestController @RequestMapping("/deviceCamera") @CrossOrigin(origins = "*") +@RequiredArgsConstructor public class DeviceCameraController { - @Autowired - private DeviceCameraService deviceCameraService; - -// @Autowired -// private DeviceCameraMapper cameraMapper; + private final DeviceCameraService deviceCameraService; private Lock lock = new ReentrantLock(); @@ -89,7 +87,11 @@ public class DeviceCameraController { } } - IPage 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 deviceCameraList = deviceCameraService.pageList(pg, wrapper); System.out.println(deviceCameraList); return Result.OK(deviceCameraList); } diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/SubstationController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/SubstationController.java new file mode 100644 index 0000000..b6a17a6 --- /dev/null +++ b/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 pageList(Substation substation, HttpServletRequest req){ + Page page= StringFormatterUtil.returnPage(req); + QueryWrapper query=new QueryWrapper<>(); + if(StringUtils.isNotEmpty(substation.getSubstationName())){ + query.like("substation_name",substation.getSubstationName()); + } + IPage substationIPage= substationService.page(page,query); + return substationIPage; + } + + @RequestMapping("/getStationList") + public Result getStationList(){ + List 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 query1=new QueryWrapper<>(); + query1.eq("station_id",id); + List 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 query2 = new QueryWrapper<>(); + query2.eq("station_id",id); + List 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("删除成功！"); + } +} diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DeviceCamera.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DeviceCamera.java index 32577bc..652df1a 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/DeviceCamera.java +++ b/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 stationId; + + @TableField(exist = false) + private String substationName; + @TableField(exist = false) @ExcelIgnore private List ids; diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java index 5c8b1a4..56779cc 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java +++ b/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 Integer stationId; + /** * 修改时间 */ private Date updateTime; + @TableField(exist = false) + private String substation; + @TableField(exist = false) private String ip; diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/Substation.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/Substation.java new file mode 100644 index 0000000..8177729 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/DeviceCameraMapper.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/DeviceCameraMapper.java index f32981d..4f370da 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/DeviceCameraMapper.java +++ b/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; 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.entity.DeviceCamera; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -25,6 +29,7 @@ public interface DeviceCameraMapper extends BaseMapper { List getRelevanceMeterList(@Param("cameraId") Integer cameraId); + IPage pageList(@Param("page") Page page, @Param(Constants.WRAPPER)Wrapper wrapper); } diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/SubstationMapper.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/SubstationMapper.java new file mode 100644 index 0000000..850643c --- /dev/null +++ b/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 { + +} + + + + diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/DeviceCameraService.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/DeviceCameraService.java index 45f9aa6..d85dc63 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/DeviceCameraService.java +++ b/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; +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.entity.DeviceCamera; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,4 +32,6 @@ public interface DeviceCameraService extends IService { List getAllDeviceCamera(); + IPage pageList(Page page, QueryWrapper query); + } diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/SubstationService.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/SubstationService.java new file mode 100644 index 0000000..33f4c9e --- /dev/null +++ b/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 { + +} diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/DeviceCameraServiceImpl.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/DeviceCameraServiceImpl.java index fd03d4b..3f1da9c 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/DeviceCameraServiceImpl.java +++ b/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.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.xr.device_car.modules.analysis.dto.DeviceRelevanceMeterQueryDto; import com.xr.device_car.modules.analysis.entity.DeviceCamera; @@ -36,6 +39,11 @@ public class DeviceCameraServiceImpl extends ServiceImpl list = list(); return list; } + + @Override + public IPage pageList(Page page, QueryWrapper query) { + return ((DeviceCameraMapper)this.baseMapper).pageList(page,query); + } } diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/SubstationServiceImpl.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/SubstationServiceImpl.java new file mode 100644 index 0000000..f30e889 --- /dev/null +++ b/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 + implements SubstationService{ + +} + + + + diff --git a/device_cars/src/main/resources/application-dev.yml b/device_cars/src/main/resources/application-dev.yml index a86a2b4..4fd6c63 100644 --- a/device_cars/src/main/resources/application-dev.yml +++ b/device_cars/src/main/resources/application-dev.yml @@ -19,7 +19,7 @@ spring: db2: driver-class-name: com.mysql.cj.jdbc.Driver 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 password: 5ea47c0bdd7146ebbd53020eca@672307 #Hikari连接池配置 diff --git a/device_cars/src/main/resources/modules/analysis/DeviceCameraMapper.xml b/device_cars/src/main/resources/modules/analysis/DeviceCameraMapper.xml index 72e2c90..0d495da 100644 --- a/device_cars/src/main/resources/modules/analysis/DeviceCameraMapper.xml +++ b/device_cars/src/main/resources/modules/analysis/DeviceCameraMapper.xml @@ -47,4 +47,11 @@ ON mc.type_id = mt.id WHERE mc.camera_id = #{cameraId} + + + diff --git a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml index 8dc1a49..372976d 100644 --- a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml +++ b/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 left join device_camera b on a.camera_id = b.id left join meter_type c on a.type_id=c.id + left join substation d on a.station_id = d.id ${ew.customSqlSegment} diff --git a/device_cars/src/main/resources/modules/analysis/SubstationMapper.xml b/device_cars/src/main/resources/modules/analysis/SubstationMapper.xml new file mode 100644 index 0000000..e4fffdc --- /dev/null +++ b/device_cars/src/main/resources/modules/analysis/SubstationMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + id,substation_name,voltage_classes, + location,longitude,latitude, + linkman,contact_number,create_user, + create_time,update_user,update_time + + diff --git a/device_gather/src/main/java/com/xr/device/common/utils/CharsetKit.java b/device_gather/src/main/java/com/xr/device/common/utils/CharsetKit.java new file mode 100644 index 0000000..f8fccbd --- /dev/null +++ b/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(); + } +} diff --git a/device_gather/src/main/java/com/xr/device/common/utils/Convert.java b/device_gather/src/main/java/com/xr/device/common/utils/Convert.java new file mode 100644 index 0000000..3853bda --- /dev/null +++ b/device_gather/src/main/java/com/xr/device/common/utils/Convert.java @@ -0,0 +1,1000 @@ +package com.xr.device.common.utils; + +import org.apache.commons.lang3.ArrayUtils; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.text.NumberFormat; +import java.util.Set; + +/** + * 类型转换器 + * + * @author ruoyi + */ +public class Convert +{ + /** + * 转换为字符串
+ * 如果给定的值为null，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static String toStr(Object value, String defaultValue) + { + if (null == value) + { + return defaultValue; + } + if (value instanceof String) + { + return (String) value; + } + return value.toString(); + } + + /** + * 转换为字符串
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static String toStr(Object value) + { + return toStr(value, null); + } + + /** + * 转换为字符
+ * 如果给定的值为null，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Character toChar(Object value, Character defaultValue) + { + if (null == value) + { + return defaultValue; + } + if (value instanceof Character) + { + return (Character) value; + } + + final String valueStr = toStr(value, null); + return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0); + } + + /** + * 转换为字符
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Character toChar(Object value) + { + return toChar(value, null); + } + + /** + * 转换为byte
+ * 如果给定的值为null，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Byte toByte(Object value, Byte defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Byte) + { + return (Byte) value; + } + if (value instanceof Number) + { + return ((Number) value).byteValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Byte.parseByte(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为byte
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Byte toByte(Object value) + { + return toByte(value, null); + } + + /** + * 转换为Short
+ * 如果给定的值为null，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Short toShort(Object value, Short defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Short) + { + return (Short) value; + } + if (value instanceof Number) + { + return ((Number) value).shortValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Short.parseShort(valueStr.trim()); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Short
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Short toShort(Object value) + { + return toShort(value, null); + } + + /** + * 转换为Number
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Number toNumber(Object value, Number defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Number) + { + return (Number) value; + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return NumberFormat.getInstance().parse(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Number
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Number toNumber(Object value) + { + return toNumber(value, null); + } + + /** + * 转换为int
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Integer toInt(Object value, Integer defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Integer) + { + return (Integer) value; + } + if (value instanceof Number) + { + return ((Number) value).intValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Integer.parseInt(valueStr.trim()); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为int
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Integer toInt(Object value) + { + return toInt(value, null); + } + + /** + * 转换为Integer数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static Integer[] toIntArray(String str) + { + return toIntArray(",", str); + } + + /** + * 转换为Long数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static Long[] toLongArray(String str) + { + return toLongArray(",", str); + } + + /** + * 转换为Integer数组
+ * + * @param split 分隔符 + * @param split 被转换的值 + * @return 结果 + */ + public static Integer[] toIntArray(String split, String str) + { + if (StringUtils.isEmpty(str)) + { + return new Integer[] {}; + } + String[] arr = str.split(split); + final Integer[] ints = new Integer[arr.length]; + for (int i = 0; i < arr.length; i++) + { + final Integer v = toInt(arr[i], 0); + ints[i] = v; + } + return ints; + } + + /** + * 转换为Long数组
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static Long[] toLongArray(String split, String str) + { + if (StringUtils.isEmpty(str)) + { + return new Long[] {}; + } + String[] arr = str.split(split); + final Long[] longs = new Long[arr.length]; + for (int i = 0; i < arr.length; i++) + { + final Long v = toLong(arr[i], null); + longs[i] = v; + } + return longs; + } + + /** + * 转换为String数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static String[] toStrArray(String str) + { + return toStrArray(",", str); + } + + /** + * 转换为String数组
+ * + * @param split 分隔符 + * @param split 被转换的值 + * @return 结果 + */ + public static String[] toStrArray(String split, String str) + { + return str.split(split); + } + + /** + * 转换为long
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Long toLong(Object value, Long defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Long) + { + return (Long) value; + } + if (value instanceof Number) + { + return ((Number) value).longValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + // 支持科学计数法 + return new BigDecimal(valueStr.trim()).longValue(); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为long
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Long toLong(Object value) + { + return toLong(value, null); + } + + /** + * 转换为double
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Double toDouble(Object value, Double defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Double) + { + return (Double) value; + } + if (value instanceof Number) + { + return ((Number) value).doubleValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + // 支持科学计数法 + return new BigDecimal(valueStr.trim()).doubleValue(); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为double
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Double toDouble(Object value) + { + return toDouble(value, null); + } + + /** + * 转换为Float
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Float toFloat(Object value, Float defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Float) + { + return (Float) value; + } + if (value instanceof Number) + { + return ((Number) value).floatValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Float.parseFloat(valueStr.trim()); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Float
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Float toFloat(Object value) + { + return toFloat(value, null); + } + + /** + * 转换为boolean
+ * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Boolean toBool(Object value, Boolean defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Boolean) + { + return (Boolean) value; + } + String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + valueStr = valueStr.trim().toLowerCase(); + switch (valueStr) + { + case "true": + case "yes": + case "ok": + case "1": + return true; + case "false": + case "no": + case "0": + return false; + default: + return defaultValue; + } + } + + /** + * 转换为boolean
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Boolean toBool(Object value) + { + return toBool(value, null); + } + + /** + * 转换为Enum对象
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * + * @param clazz Enum的Class + * @param value 值 + * @param defaultValue 默认值 + * @return Enum + */ + public static > E toEnum(Class clazz, Object value, E defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (clazz.isAssignableFrom(value.getClass())) + { + @SuppressWarnings("unchecked") + E myE = (E) value; + return myE; + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Enum.valueOf(clazz, valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Enum对象
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * + * @param clazz Enum的Class + * @param value 值 + * @return Enum + */ + public static > E toEnum(Class clazz, Object value) + { + return toEnum(clazz, value, null); + } + + /** + * 转换为BigInteger
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static BigInteger toBigInteger(Object value, BigInteger defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof BigInteger) + { + return (BigInteger) value; + } + if (value instanceof Long) + { + return BigInteger.valueOf((Long) value); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return new BigInteger(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为BigInteger
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static BigInteger toBigInteger(Object value) + { + return toBigInteger(value, null); + } + + /** + * 转换为BigDecimal
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof BigDecimal) + { + return (BigDecimal) value; + } + if (value instanceof Long) + { + return new BigDecimal((Long) value); + } + if (value instanceof Double) + { + return BigDecimal.valueOf((Double) value); + } + if (value instanceof Integer) + { + return new BigDecimal((Integer) value); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return new BigDecimal(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为BigDecimal
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static BigDecimal toBigDecimal(Object value) + { + return toBigDecimal(value, null); + } + + /** + * 将对象转为字符串
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 + * + * @param obj 对象 + * @return 字符串 + */ + public static String utf8Str(Object obj) + { + return str(obj, CharsetKit.CHARSET_UTF_8); + } + + /** + * 将对象转为字符串
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 + * + * @param obj 对象 + * @param charsetName 字符集 + * @return 字符串 + */ + public static String str(Object obj, String charsetName) + { + return str(obj, Charset.forName(charsetName)); + } + + /** + * 将对象转为字符串
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 + * + * @param obj 对象 + * @param charset 字符集 + * @return 字符串 + */ + public static String str(Object obj, Charset charset) + { + if (null == obj) + { + return null; + } + + if (obj instanceof String) + { + return (String) obj; + } + else if (obj instanceof byte[]) + { + return str((byte[]) obj, charset); + } + else if (obj instanceof Byte[]) + { + byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj); + return str(bytes, charset); + } + else if (obj instanceof ByteBuffer) + { + return str((ByteBuffer) obj, charset); + } + return obj.toString(); + } + + /** + * 将byte数组转为字符串 + * + * @param bytes byte数组 + * @param charset 字符集 + * @return 字符串 + */ + public static String str(byte[] bytes, String charset) + { + return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset)); + } + + /** + * 解码字节码 + * + * @param data 字符串 + * @param charset 字符集，如果此字段为空，则解码的结果取决于平台 + * @return 解码后的字符串 + */ + public static String str(byte[] data, Charset charset) + { + if (data == null) + { + return null; + } + + if (null == charset) + { + return new String(data); + } + return new String(data, charset); + } + + /** + * 将编码的byteBuffer数据转换为字符串 + * + * @param data 数据 + * @param charset 字符集，如果为空使用当前系统字符集 + * @return 字符串 + */ + public static String str(ByteBuffer data, String charset) + { + if (data == null) + { + return null; + } + + return str(data, Charset.forName(charset)); + } + + /** + * 将编码的byteBuffer数据转换为字符串 + * + * @param data 数据 + * @param charset 字符集，如果为空使用当前系统字符集 + * @return 字符串 + */ + public static String str(ByteBuffer data, Charset charset) + { + if (null == charset) + { + charset = Charset.defaultCharset(); + } + return charset.decode(data).toString(); + } + + // ----------------------------------------------------------------------- 全角半角转换 + /** + * 半角转全角 + * + * @param input String. + * @return 全角字符串. + */ + public static String toSBC(String input) + { + return toSBC(input, null); + } + + /** + * 半角转全角 + * + * @param input String + * @param notConvertSet 不替换的字符集合 + * @return 全角字符串. + */ + public static String toSBC(String input, Set notConvertSet) + { + char[] c = input.toCharArray(); + for (int i = 0; i < c.length; i++) + { + if (null != notConvertSet && notConvertSet.contains(c[i])) + { + // 跳过不替换的字符 + continue; + } + + if (c[i] == ' ') + { + c[i] = '\u3000'; + } + else if (c[i] < '\177') + { + c[i] = (char) (c[i] + 65248); + + } + } + return new String(c); + } + + /** + * 全角转半角 + * + * @param input String. + * @return 半角字符串 + */ + public static String toDBC(String input) + { + return toDBC(input, null); + } + + /** + * 替换全角为半角 + * + * @param text 文本 + * @param notConvertSet 不替换的字符集合 + * @return 替换后的字符 + */ + public static String toDBC(String text, Set notConvertSet) + { + char[] c = text.toCharArray(); + for (int i = 0; i < c.length; i++) + { + if (null != notConvertSet && notConvertSet.contains(c[i])) + { + // 跳过不替换的字符 + continue; + } + + if (c[i] == '\u3000') + { + c[i] = ' '; + } + else if (c[i] > '\uFF00' && c[i] < '\uFF5F') + { + c[i] = (char) (c[i] - 65248); + } + } + String returnString = new String(c); + + return returnString; + } + + /** + * 数字金额大写转换 先写个完整的然后将如零拾替换成零 + * + * @param n 数字 + * @return 中文大写数字 + */ + public static String digitUppercase(double n) + { + String[] fraction = { "角", "分" }; + String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" }; + String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } }; + + String head = n < 0 ? "负" : ""; + n = Math.abs(n); + + String s = ""; + for (int i = 0; i < fraction.length; i++) + { + s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""); + } + if (s.length() < 1) + { + s = "整"; + } + int integerPart = (int) Math.floor(n); + + for (int i = 0; i < unit[0].length && integerPart > 0; i++) + { + String p = ""; + for (int j = 0; j < unit[1].length && n > 0; j++) + { + p = digit[integerPart % 10] + unit[1][j] + p; + integerPart = integerPart / 10; + } + s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s; + } + return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); + } +} diff --git a/device_gather/src/main/java/com/xr/device/common/utils/StrFormatter.java b/device_gather/src/main/java/com/xr/device/common/utils/StrFormatter.java new file mode 100644 index 0000000..40ebf67 --- /dev/null +++ b/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 = '}'; + + /** + * 格式化字符串
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例：
+ * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
+ * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @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(); + } +} diff --git a/device_gather/src/main/resources/application-dev.yml b/device_gather/src/main/resources/application-jc-dev.yml similarity index 100% rename from device_gather/src/main/resources/application-dev.yml rename to device_gather/src/main/resources/application-jc-dev.yml diff --git a/device_gather/src/main/resources/application-prod.yml b/device_gather/src/main/resources/application-jc-prod.yml similarity index 100% rename from device_gather/src/main/resources/application-prod.yml rename to device_gather/src/main/resources/application-jc-prod.yml diff --git a/device_gather/src/main/resources/application.yml b/device_gather/src/main/resources/application.yml index 1d8bf05..c3d0e0e 100644 --- a/device_gather/src/main/resources/application.yml +++ b/device_gather/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: profiles: #active: dev #开发环境 # active: test #测试环境5 - active: dev #生产环境 + active: jc-dev # active: prod #生产环境 application: name: gather