diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/data/entity/DevInfoVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/data/entity/DevInfoVo.java index 0977006..12799b3 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/data/entity/DevInfoVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/data/entity/DevInfoVo.java @@ -13,6 +13,8 @@ public class DevInfoVo implements Serializable { private String bdId; + private String relType; + /** * 设备id */ diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java index 268a50e..ba31638 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java @@ -88,4 +88,11 @@ public interface DataCenterMapper { * @return */ String getDevBdData(@Param("edgeId") String edgeId); + + /** + * 查询本系统设备类型 + * @param vo + * @return + */ + Integer getDevTypeId(DevInfoVo vo); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java index 2065d71..70576f6 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java @@ -45,6 +45,11 @@ public class DataCenterServiceImpl implements DataCenterService{ if (StringUtils.isNotEmpty(list)) { list.forEach(vo->{ vo.setBdId(bdId); + vo.setRelType(vo.getDeviceType()); + Integer devType=mapper.getDevTypeId(vo); + if(devType!=null && devType!=0){ + vo.setDeviceType(devType.toString()); + } int nums = mapper.getDevInfoNum(vo); if(nums>0){ //是否更新 diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml index eb09c72..cc16646 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml @@ -92,4 +92,11 @@ LEFT JOIN tb_bd_record tbr on tbr.id=bdr.record_id where tbr.audit_status=1 and bdr.dev_code=#{edgeId} + \ No newline at end of file diff --git a/bonus-modules/bonus-datacenter/pom.xml b/bonus-modules/bonus-data/pom.xml similarity index 97% rename from bonus-modules/bonus-datacenter/pom.xml rename to bonus-modules/bonus-data/pom.xml index f5b5ac9..3da46d3 100644 --- a/bonus-modules/bonus-datacenter/pom.xml +++ b/bonus-modules/bonus-data/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - bonus-datacenter + bonus-data - bonus-modules-datacenter 数据中心服务 + bonus-modules-data 数据中心服务 diff --git a/bonus-modules/bonus-datacenter/src/main/java/com/bonus/data/BonusDataCenterApplication.java b/bonus-modules/bonus-data/src/main/java/com/bonus/data/BonusDataApplication.java similarity index 91% rename from bonus-modules/bonus-datacenter/src/main/java/com/bonus/data/BonusDataCenterApplication.java rename to bonus-modules/bonus-data/src/main/java/com/bonus/data/BonusDataApplication.java index 05d777d..58e2129 100644 --- a/bonus-modules/bonus-datacenter/src/main/java/com/bonus/data/BonusDataCenterApplication.java +++ b/bonus-modules/bonus-data/src/main/java/com/bonus/data/BonusDataApplication.java @@ -16,9 +16,9 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class BonusDataCenterApplication { +public class BonusDataApplication { public static void main(String[] args) { - SpringApplication.run(BonusDataCenterApplication.class, args); + SpringApplication.run(BonusDataApplication.class, args); System.err.println("(♥◠‿◠)ノ゙ 数据中心服务启动成功 ლ(´ڡ`ლ)゙ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/bonus-modules/bonus-datacenter/src/main/resources/banner.txt b/bonus-modules/bonus-data/src/main/resources/banner.txt similarity index 100% rename from bonus-modules/bonus-datacenter/src/main/resources/banner.txt rename to bonus-modules/bonus-data/src/main/resources/banner.txt diff --git a/bonus-modules/bonus-datacenter/src/main/resources/bootstrap.yml b/bonus-modules/bonus-data/src/main/resources/bootstrap.yml similarity index 100% rename from bonus-modules/bonus-datacenter/src/main/resources/bootstrap.yml rename to bonus-modules/bonus-data/src/main/resources/bootstrap.yml diff --git a/bonus-modules/bonus-datacenter/src/main/resources/logback.xml b/bonus-modules/bonus-data/src/main/resources/logback.xml similarity index 100% rename from bonus-modules/bonus-datacenter/src/main/resources/logback.xml rename to bonus-modules/bonus-data/src/main/resources/logback.xml