diff --git a/kicc-auth/src/main/resources/bootstrap.yml b/kicc-auth/src/main/resources/bootstrap.yml index 8f2e80d3..230d051a 100644 --- a/kicc-auth/src/main/resources/bootstrap.yml +++ b/kicc-auth/src/main/resources/bootstrap.yml @@ -7,7 +7,8 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} + #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr} diff --git a/kicc-gateway/src/main/resources/bootstrap.yml b/kicc-gateway/src/main/resources/bootstrap.yml index 41c98e5a..23c5ec83 100644 --- a/kicc-gateway/src/main/resources/bootstrap.yml +++ b/kicc-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,8 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} + #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/constant/EquipConstants.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/constant/EquipConstants.java index 24633eea..84cd7d46 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/constant/EquipConstants.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.constant; +package com.cloud.kicc.commonbiz.api.constant; /** * @Author: TangSheng diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/EquipTemperatureRecordParam.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/dto/EquipTemperatureRecordParam.java similarity index 87% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/EquipTemperatureRecordParam.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/dto/EquipTemperatureRecordParam.java index 998a052d..73360a0c 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/EquipTemperatureRecordParam.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/dto/EquipTemperatureRecordParam.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.dto; +package com.cloud.kicc.commonbiz.api.dto; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeper.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeper.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeper.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeper.java index 8e21d0ec..2a10b9ec 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeper.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeper.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity.beeper; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeperRecord.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeperRecord.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeperRecord.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeperRecord.java index 4ac2ac74..d81d2e2b 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeperRecord.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeperRecord.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity.beeper; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBox.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBox.java similarity index 97% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBox.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBox.java index cd515cfd..d576b318 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBox.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBox.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity.box; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; /** * 标本箱设备信息(EquipBox)表实体类 diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxCard.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxCard.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxCard.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxCard.java index f0df3558..314dddad 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxCard.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxCard.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity.box; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxLog.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxLog.java similarity index 97% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxLog.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxLog.java index 81db3fe2..2fb6838a 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxLog.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxLog.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity.box; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRecord.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRecord.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRecord.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRecord.java index bc069be1..14569602 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRecord.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRecord.java @@ -1,11 +1,10 @@ -package com.cloud.kicc.equip.api.entity.box; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * 标本箱操作记录(EquipBoxRecord)表实体类 diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRfidLog.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRfidLog.java similarity index 91% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRfidLog.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRfidLog.java index d10de4fe..f3f19667 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRfidLog.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRfidLog.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity.box; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -6,7 +6,6 @@ import com.cloud.kicc.common.data.entity.CommonEntity; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * 标本箱RFIDj记录信息(EquipBoxRfidLog)表实体类 diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxUser.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxUser.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxUser.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxUser.java index 9215f91e..37565bdd 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxUser.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxUser.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity.box; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipSpecimen.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipSpecimen.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipSpecimen.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipSpecimen.java index 45854acb..e098f8ed 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipSpecimen.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipSpecimen.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperature.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperature.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperature.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperature.java index 0af78bba..cc5fc9ea 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperature.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperature.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperatureRecord.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperatureRecord.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperatureRecord.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperatureRecord.java index 3dc93e9d..53adb1ff 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperatureRecord.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperatureRecord.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity; +package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableId; @@ -7,7 +7,6 @@ import com.cloud.kicc.common.data.entity.CommonEntity; import lombok.Data; import java.io.Serializable; -import java.util.Date; @Data @TableName("equip_temperature_record") diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/BoxStatusEnum.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/BoxStatusEnum.java index d47c9b6e..3ff09277 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/BoxStatusEnum.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.enums; +package com.cloud.kicc.commonbiz.api.enums; public enum BoxStatusEnum { //设备状态 (0.未连接 1.已连接 2.已断开 3.已休眠) diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdEnum.java similarity index 97% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdEnum.java index 5c741e8f..8f4d1362 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdEnum.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.enums; +package com.cloud.kicc.commonbiz.api.enums; public enum CmdEnum { /** diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdStatusEnum.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdStatusEnum.java index edd7fe46..897a8e85 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdStatusEnum.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.enums; +package com.cloud.kicc.commonbiz.api.enums; public enum CmdStatusEnum { //指令响应状态（0.未响应 1.成功 2.失败） diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/WarnStatusEnum.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/WarnStatusEnum.java index 209f89ea..f53b116f 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/WarnStatusEnum.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.enums; +package com.cloud.kicc.commonbiz.api.enums; public enum WarnStatusEnum { //报警状态（0. 正常 1.低温报警 2.高温报警 3.倾斜报警 4.锁未关报警） diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenListVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenListVo.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenListVo.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenListVo.java index 878a02ed..9e1a5a22 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenListVo.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenListVo.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.vo; +package com.cloud.kicc.commonbiz.api.vo; import com.fasterxml.jackson.annotation.JsonFormat; @@ -6,7 +6,6 @@ import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; @Data @@ -44,4 +43,4 @@ public class EquipSpecimenListVo implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") protected LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenUsageVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenUsageVo.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenUsageVo.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenUsageVo.java index 57511e1b..80e2aa99 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenUsageVo.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenUsageVo.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.vo; +package com.cloud.kicc.commonbiz.api.vo; import lombok.Data; @@ -41,4 +41,4 @@ public class EquipSpecimenUsageVo implements Serializable { /**设备最新上报时间*/ private String latestTime; -} \ No newline at end of file +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipTempSelectVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipTempSelectVo.java similarity index 85% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipTempSelectVo.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipTempSelectVo.java index 08f310b9..079db76a 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipTempSelectVo.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipTempSelectVo.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.vo; +package com.cloud.kicc.commonbiz.api.vo; import lombok.Data; @@ -15,4 +15,4 @@ public class EquipTempSelectVo implements Serializable { /**设备编号*/ private String equipCode; -} \ No newline at end of file +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java deleted file mode 100644 index 99232044..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cloud.kicc.equip.api.dto.box; - - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author: Mak - * @Description: 下行指令返回值 - * @Date: 2021/9/23 - * @Modified by: - */ -@Data -public class DownCmdParam implements Serializable { - - // 当前指令操作序号 - private String ts; - - // 下行指令 - private Integer cmd; - - // 指令执行的结果状态(0.成功 1.失败) - private Integer status; - - // 指纹ID / 指纹IDs，多个指纹以英文逗号隔开 - private String data; - - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java deleted file mode 100644 index 6a5fbf10..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cloud.kicc.equip.api.dto.box; - - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author: Mak - * @Description: 变动rfids参数 - * @Date: 2021/9/23 - * @Modified by: - */ -@Data -public class RfidsParam implements Serializable { - - // 上报的RFID标签 - private String rfid; - - // 变动类型（1.进 2.出） - private Integer type; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java deleted file mode 100644 index 49a1e624..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cloud.kicc.equip.api.dto.box; - - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author: Mak - * @Description: 上行指令参数 - * @Date: 2021/9/23 - * @Modified by: - */ -@Data -public class UpCmdParam implements Serializable { - - // 设备编号 - private String code; - // 上行指令代码 - private Integer cmd; - - // 4G卡唯一标识号iccid - private String iccid; - - // 指纹ID - private String fid; - - // 元件异常类型（1.指纹锁 2.制冷片 3.温湿度 4.4G通讯 5.倾斜度 6.语音） - private Integer wrong; - - // 上报的RFID标签，多个以英文逗号隔开 - private String rfids; - - /** - * 以下为心跳上报数据 - */ - /*//设备温度 - private String temp; - //设备湿度 - private String damp; - //经度 - private String lng; - //纬度 - private String lat; - //剩余电量 - private String power; - //倾斜角度（x轴） - private String tiltX; - //倾斜角度（y轴） - private String tiltY; - //震动能量值（值越大倾斜越大） - private String energy;*/ - - //设备温度 - private String tp; - //设备湿度 - private String dp; - //经度 - private String lg; - //纬度 - private String lt; - //剩余电量 - private String pw; - //倾斜角度（x轴） - private String tx; - //倾斜角度（y轴） - private String ty; - //震动能量值（值越大倾斜越大） - private String eg; - //锁状态 (0.关 1.开) - private Integer os; - //制冷状态（0.未制冷 1.已制冷） - private Integer cs; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java deleted file mode 100644 index d16c96d4..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cloud.kicc.equip.api.vo.box; - - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class DownCmdVo implements Serializable { - - // 时间戳 - 用于下行指令的唯一标识 - private String ts; - - // 下行指令代码 - private Integer cmd; - - // 指纹id - //private String fid; - - // 指纹id/语音播报内容 - private String data; - - //温度最低警报值 - private Double tempMin; - //温度最高警报值 - private Double tempMax; - //rfid每隔多少分钟上报一次所有标签 - private Integer rfidMin; - //每隔多少秒上报一次数据 - private Integer beat; - //设备状态 (1.已连接 2.已断开 3.已休眠) - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxCardVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxCardVo.java deleted file mode 100644 index 353b115d..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxCardVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cloud.kicc.equip.api.vo.box; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 物联网卡管理(EquipBoxCard)表实体类 - * - * @author Mak - * @since 2022-02-13 12:06:29 - */ -@Data -public class EquipBoxCardVo implements Serializable { - - private Integer cardId; - - private String iccid; - - private String card; - - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxConfigVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxConfigVo.java deleted file mode 100644 index 2bb3eaa6..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxConfigVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cloud.kicc.equip.api.vo.box; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 标本箱设备信息(EquipBox)表实体类 - * - * @author Mak - * @since 2021-09-14 19:07:07 - */ -@Data -public class EquipBoxConfigVo implements Serializable { - - //温度最低警报值 - private Double tempMin; - //温度最高警报值 - private Double tempMax; - //rfid每隔多少分钟上报一次所有标签 - private Integer rfidMin; - //每隔多少秒上报一次数据 - private Integer beat; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-template-api/pom.xml b/kicc-platform/kicc-platform-api/kicc-template-api/pom.xml index 3ddca45c..99ee4a6d 100644 --- a/kicc-platform/kicc-platform-api/kicc-template-api/pom.xml +++ b/kicc-platform/kicc-platform-api/kicc-template-api/pom.xml @@ -10,7 +10,7 @@ kicc-template-api - pom + jar kicc 新建api模块模板,只提供基础依赖 diff --git a/kicc-platform/kicc-platform-api/pom.xml b/kicc-platform/kicc-platform-api/pom.xml index 66b68337..d49fb7d0 100644 --- a/kicc-platform/kicc-platform-api/pom.xml +++ b/kicc-platform/kicc-platform-api/pom.xml @@ -19,9 +19,6 @@ kicc-common-api kicc-monitor-api kicc-template-api - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/AmqpDemo.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/AmqpDemo.java deleted file mode 100644 index 203f60e2..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/AmqpDemo.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.cloud.kicc.amqp; - -import org.apache.qpid.jms.JmsConnection; -import org.apache.qpid.jms.JmsConnectionFactory; -import org.apache.qpid.jms.JmsConnectionListener; -import org.apache.qpid.jms.message.JmsInboundMessageDispatch; -import org.apache.qpid.jms.transports.TransportOptions; -import org.apache.qpid.jms.transports.TransportSupport; - -import javax.jms.*; -import javax.naming.Context; -import javax.naming.InitialContext; -import java.net.URI; -import java.util.Hashtable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 15:34 2022/6/17 - */ -public class AmqpDemo { - //异步线程池，参数可以根据业务特点作调整，也可以用其他异步方式来处理。 - private final static ExecutorService executorService = new ThreadPoolExecutor( - Runtime.getRuntime().availableProcessors(), Runtime.getRuntime().availableProcessors() * 2, - 60, TimeUnit.SECONDS, new LinkedBlockingQueue<>(5000)); - - public static void main(String[] args) throws Exception { - //连接凭证接入键值。 - String accessKey = "JUOtPLi9"; - long timeStamp = System.currentTimeMillis(); - //UserName组装方法，请参见文档：AMQP客户端接入说明。 - String userName = "accessKey=" + accessKey + "|timestamp=" + timeStamp; - //连接凭证接入码。 - String password = "N8cNjNIR52Qg6UF8ysKFHdfZWqdMyEhS"; - //按照qpid-jms的规范，组装连接URL。 - String baseUrl = "4cbb346a33.iot-amqps.cn-north-4.myhuaweicloud.com"; - String connectionUrl = "amqps://" + baseUrl + ":5671?amqp.vhost=default&amqp.idleTimeout=8000&amqp.saslMechanisms=PLAIN"; - Hashtable hashtable = new Hashtable<>(); - hashtable.put("connectionfactory.HwConnectionURL", connectionUrl); - //队列名，可以使用默认队列DefaultQueue - String queueName = "DefaultQueue"; - hashtable.put("queue.HwQueueName", queueName); - hashtable - .put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.qpid.jms.jndi.JmsInitialContextFactory"); - Context context = new InitialContext(hashtable); - JmsConnectionFactory cf = (JmsConnectionFactory) context.lookup("HwConnectionURL"); - //同一个链接可创建多个queue,与前面queue.HwQueueName作好配对就行 - Destination queue = (Destination) context.lookup("HwQueueName"); - - //信任服务端 - TransportOptions to = new TransportOptions(); - to.setTrustAll(true); - cf.setSslContext(TransportSupport.createJdkSslContext(to)); - - // 创建连接 - Connection connection = cf.createConnection(userName, password); - ((JmsConnection) connection).addConnectionListener(myJmsConnectionListener); - // 创建 Session - // Session.CLIENT_ACKNOWLEDGE: 收到消息后，需要手动调用message.acknowledge()。 - // Session.AUTO_ACKNOWLEDGE: SDK自动ACK（推荐）。 - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - connection.start(); - // 创建 Receiver Link - MessageConsumer consumer = session.createConsumer(queue); - //处理消息有两种方式 - // 1，主动拉数据（推荐），参照receiveMessage(consumer) - // 2, 添加监听，参照consumer.setMessageListener(messageListener), 服务端主动推数据给客户端，但得考虑接受的数据速率是客户能力能够承受住的 - receiveMessage(consumer); - // consumer.setMessageListener(messageListener); - } - - private static void receiveMessage(MessageConsumer consumer) throws JMSException { - while (true) { - try { - // 建议异步处理收到的消息，确保receiveMessage函数里没有耗时逻辑。 - Message message = consumer.receive(); - processMessage(message); - } catch (Exception e) { - System.out.println("receiveMessage hand an exception: " + e.getMessage()); - e.printStackTrace(); - } - } - - } - - private static MessageListener messageListener = message -> { - try { - // 建议异步处理收到的消息，确保onMessage函数里没有耗时逻辑。 - // 如果业务处理耗时过程过长阻塞住线程，可能会影响SDK收到消息后的正常回调。 - executorService.submit(() -> processMessage(message)); - } catch (Exception e) { - System.out.println("submit task occurs exception: " + e.getMessage()); - e.printStackTrace(); - } - }; - - /** - * 在这里处理您收到消息后的具体业务逻辑。 - */ - private static void processMessage(Message message) { - try { - String body = message.getBody(String.class); - String content = new String(body); - System.out.println("receive an message, the content is " + content); - } catch (Exception e) { - System.out.println("processMessage occurs error: " + e.getMessage()); - e.printStackTrace(); - } - } - - private static JmsConnectionListener myJmsConnectionListener = new JmsConnectionListener() { - /** - * 连接成功建立。 - */ - @Override - public void onConnectionEstablished(URI remoteURI) { - System.out.println("onConnectionEstablished, remoteUri:" + remoteURI); - } - - /** - * 尝试过最大重试次数之后，最终连接失败。 - */ - @Override - public void onConnectionFailure(Throwable error) { - System.out.println("onConnectionFailure, " + error.getMessage()); - } - - /** - * 连接中断。 - */ - @Override - public void onConnectionInterrupted(URI remoteURI) { - System.out.println("onConnectionInterrupted, remoteUri:" + remoteURI); - } - - /** - * 连接中断后又自动重连上。 - */ - @Override - public void onConnectionRestored(URI remoteURI) { - System.out.println("onConnectionRestored, remoteUri:" + remoteURI); - } - - @Override - public void onInboundMessage(JmsInboundMessageDispatch envelope) { - System.out.println("onInboundMessage, " + envelope); - } - - @Override - public void onSessionClosed(Session session, Throwable cause) { - System.out.println("onSessionClosed, session=" + session + ", cause =" + cause); - } - - @Override - public void onConsumerClosed(MessageConsumer consumer, Throwable cause) { - System.out.println("MessageConsumer, consumer=" + consumer + ", cause =" + cause); - } - - @Override - public void onProducerClosed(MessageProducer producer, Throwable cause) { - System.out.println("MessageProducer, producer=" + producer + ", cause =" + cause); - } - }; - - - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/testDemo.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/testDemo.java deleted file mode 100644 index 5d7f35fc..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/testDemo.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cloud.kicc.amqp; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 9:56 2022/6/21 - */ -public class testDemo { - public static void main(String[] args) { - - } -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java deleted file mode 100644 index 4bc0189b..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -/** - *

- * 地图任务 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName(value = "common_map_task", excludeProperty = { "remarks", "delFlag" }) -public class MapTask extends CommonEntity { - - private static final long serialVersionUID = 1L; - - @TableId - private String id; - - private String name; - - private String smallHospitalId; - - private String largeHospitalId; - - private String takeSpecimenId; - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBeeperController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBeeperController.java similarity index 90% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBeeperController.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBeeperController.java index ae7cdc9a..777f60be 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBeeperController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBeeperController.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.commonbiz.controller.equip; +package com.cloud.kicc.commonbiz.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.commonbiz.service.beeper.EquipBeeperRecordService; -import com.cloud.kicc.commonbiz.service.beeper.EquipBeeperService; -import com.cloud.kicc.equip.api.entity.beeper.EquipBeeper; +import com.cloud.kicc.commonbiz.service.EquipBeeperRecordService; +import com.cloud.kicc.commonbiz.service.EquipBeeperService; +import com.cloud.kicc.commonbiz.api.entity.EquipBeeper; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxCardController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxCardController.java similarity index 95% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxCardController.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxCardController.java index 05686771..eed534a0 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxCardController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxCardController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.controller.equip; +package com.cloud.kicc.commonbiz.controller; @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.commonbiz.service.box.EquipBoxCardService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxCard; +import com.cloud.kicc.commonbiz.service.EquipBoxCardService; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxCard; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxController.java similarity index 89% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxController.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxController.java index 6fbb0ad8..9f573ede 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxController.java @@ -1,13 +1,13 @@ -package com.cloud.kicc.commonbiz.controller.equip; +package com.cloud.kicc.commonbiz.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.commonbiz.service.box.BoxDownCmdService; -import com.cloud.kicc.commonbiz.service.box.EquipBoxLogService; -import com.cloud.kicc.commonbiz.service.box.EquipBoxRecordService; -import com.cloud.kicc.commonbiz.service.box.EquipBoxService; -import com.cloud.kicc.equip.api.entity.box.EquipBox; +import com.cloud.kicc.commonbiz.service.BoxDownCmdService; +import com.cloud.kicc.commonbiz.service.EquipBoxLogService; +import com.cloud.kicc.commonbiz.service.EquipBoxRecordService; +import com.cloud.kicc.commonbiz.service.EquipBoxService; +import com.cloud.kicc.commonbiz.api.entity.EquipBox; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxUserController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxUserController.java similarity index 90% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxUserController.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxUserController.java index 32af9447..8aeb8568 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxUserController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxUserController.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.equip.controller; +package com.cloud.kicc.commonbiz.controller; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.commonbiz.service.box.BoxDownCmdService; -import com.cloud.kicc.commonbiz.service.box.EquipBoxUserService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxUser; +import com.cloud.kicc.commonbiz.service.BoxDownCmdService; +import com.cloud.kicc.commonbiz.service.EquipBoxUserService; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxUser; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -91,4 +91,4 @@ public class EquipBoxUserController { -} \ No newline at end of file +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipSpecimenController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipSpecimenController.java similarity index 93% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipSpecimenController.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipSpecimenController.java index b3b977ec..d6e522f1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipSpecimenController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipSpecimenController.java @@ -1,12 +1,12 @@ -package com.cloud.kicc.equip.controller; +package com.cloud.kicc.commonbiz.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.commonbiz.service.EquipSpecimenService; -import com.cloud.kicc.equip.api.entity.EquipSpecimen; -import com.cloud.kicc.equip.api.vo.EquipSpecimenUsageVo; +import com.cloud.kicc.commonbiz.api.entity.EquipSpecimen; +import com.cloud.kicc.commonbiz.api.vo.EquipSpecimenUsageVo; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -96,4 +96,4 @@ public class EquipSpecimenController { return R.ok(); } -} \ No newline at end of file +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipTemperatureController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipTemperatureController.java similarity index 93% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipTemperatureController.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipTemperatureController.java index 8b0f1b4d..e95ddc8d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipTemperatureController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipTemperatureController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.controller; +package com.cloud.kicc.commonbiz.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,9 +7,9 @@ import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.commonbiz.service.EquipTemperatureRecordService; import com.cloud.kicc.commonbiz.service.EquipTemperatureService; -import com.cloud.kicc.equip.api.constant.EquipConstants; -import com.cloud.kicc.equip.api.dto.EquipTemperatureRecordParam; -import com.cloud.kicc.equip.api.entity.EquipTemperature; +import com.cloud.kicc.commonbiz.api.constant.EquipConstants; +import com.cloud.kicc.commonbiz.api.dto.EquipTemperatureRecordParam; +import com.cloud.kicc.commonbiz.api.entity.EquipTemperature; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -123,4 +123,4 @@ public class EquipTemperatureController { } -} \ No newline at end of file +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBeeperMapper.java similarity index 87% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBeeperMapper.java index 64e7c6e4..1989f99a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBeeperMapper.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cloud.kicc.equip.api.entity.beeper.EquipBeeper; +import com.cloud.kicc.commonbiz.api.entity.EquipBeeper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperRecordMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBeeperRecordMapper.java similarity index 74% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperRecordMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBeeperRecordMapper.java index f8d77aa7..ee2ccca5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperRecordMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBeeperRecordMapper.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.equip.api.entity.beeper.EquipBeeperRecord; +import com.cloud.kicc.commonbiz.api.entity.EquipBeeperRecord; import org.apache.ibatis.annotations.Mapper; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxCardMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxCardMapper.java similarity index 74% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxCardMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxCardMapper.java index 45741c2a..7315b167 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxCardMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxCardMapper.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.equip.api.entity.box.EquipBoxCard; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxCard; import org.apache.ibatis.annotations.Mapper; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxLogMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxLogMapper.java similarity index 74% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxLogMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxLogMapper.java index d8f674ce..6042d956 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxLogMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxLogMapper.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.equip.api.entity.box.EquipBoxLog; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxLog; import org.apache.ibatis.annotations.Mapper; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxMapper.java similarity index 87% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxMapper.java index d3dba66c..bbf2fc1d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxMapper.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cloud.kicc.equip.api.entity.box.EquipBox; +import com.cloud.kicc.commonbiz.api.entity.EquipBox; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRecordMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxRecordMapper.java similarity index 74% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRecordMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxRecordMapper.java index 3a0b6516..33c4c2a6 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRecordMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxRecordMapper.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.equip.api.entity.box.EquipBoxRecord; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxRecord; import org.apache.ibatis.annotations.Mapper; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRfidLogMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxRfidLogMapper.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRfidLogMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxRfidLogMapper.java index 5924ba03..38252515 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRfidLogMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxRfidLogMapper.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.equip.api.entity.box.EquipBoxRfidLog; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxRfidLog; import org.apache.ibatis.annotations.Mapper; /** @@ -14,6 +14,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface EquipBoxRfidLogMapper extends BaseMapper { - + } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxUserMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxUserMapper.java similarity index 78% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxUserMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxUserMapper.java index 70c9accf..d50b5853 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxUserMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipBoxUserMapper.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.equip.api.entity.box.EquipBoxUser; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxUser; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipSpecimenMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipSpecimenMapper.java similarity index 81% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipSpecimenMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipSpecimenMapper.java index 03cf82d8..65e3e118 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipSpecimenMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipSpecimenMapper.java @@ -1,10 +1,10 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cloud.kicc.equip.api.entity.EquipSpecimen; -import com.cloud.kicc.equip.api.vo.EquipSpecimenListVo; +import com.cloud.kicc.commonbiz.api.entity.EquipSpecimen; +import com.cloud.kicc.commonbiz.api.vo.EquipSpecimenListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipTemperatureMapper.java similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipTemperatureMapper.java index 3cfcfe8a..83139ee6 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipTemperatureMapper.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.equip.api.entity.EquipTemperature; +import com.cloud.kicc.commonbiz.api.entity.EquipTemperature; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureRecordMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipTemperatureRecordMapper.java similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureRecordMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipTemperatureRecordMapper.java index c25f41b7..a8e75694 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureRecordMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/EquipTemperatureRecordMapper.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.mapper.equip; +package com.cloud.kicc.commonbiz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.equip.api.entity.EquipTemperatureRecord; +import com.cloud.kicc.commonbiz.api.entity.EquipTemperatureRecord; import org.apache.ibatis.annotations.Mapper; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxDownCmdService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/BoxDownCmdService.java similarity index 91% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxDownCmdService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/BoxDownCmdService.java index a76a0efc..d10c6351 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxDownCmdService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/BoxDownCmdService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.commonbiz.service.box; +package com.cloud.kicc.commonbiz.service; -import com.cloud.kicc.equip.api.dto.box.DownCmdParam; +import com.cloud.kicc.commonbiz.api.dto.DownCmdParam; /** * 标本箱下行指令服务接口 diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxUpCmdService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/BoxUpCmdService.java similarity index 87% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxUpCmdService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/BoxUpCmdService.java index f25cba45..8790e807 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxUpCmdService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/BoxUpCmdService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.commonbiz.service.box; +package com.cloud.kicc.commonbiz.service; -import com.cloud.kicc.equip.api.dto.box.UpCmdParam; -import com.cloud.kicc.equip.api.vo.box.EquipBoxConfigVo; +import com.cloud.kicc.commonbiz.api.dto.UpCmdParam; +import com.cloud.kicc.commonbiz.api.vo.EquipBoxConfigVo; /** * 标本箱上行指令服务接口 diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/DownCmdService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/DownCmdService.java similarity index 76% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/DownCmdService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/DownCmdService.java index d7ab5632..ec6c2185 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/DownCmdService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/DownCmdService.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.commonbiz.service.box; +package com.cloud.kicc.commonbiz.service; -import com.cloud.kicc.equip.api.vo.box.DownCmdVo; +import com.cloud.kicc.commonbiz.api.vo.DownCmdVo; /** * 标本箱下行指令服务接口 diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperRecordService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBeeperRecordService.java similarity index 80% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperRecordService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBeeperRecordService.java index 0e4c207d..8c01a452 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperRecordService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBeeperRecordService.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.service.beeper; +package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.entity.beeper.EquipBeeperRecord; +import com.cloud.kicc.commonbiz.api.entity.EquipBeeperRecord; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBeeperService.java similarity index 91% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBeeperService.java index 4d609847..9384c7b7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBeeperService.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.commonbiz.service.beeper; +package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.entity.beeper.EquipBeeper; +import com.cloud.kicc.commonbiz.api.entity.EquipBeeper; import java.util.Map; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxCardService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxCardService.java similarity index 71% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxCardService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxCardService.java index 4d73bbb8..26c07819 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxCardService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxCardService.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.commonbiz.service.box; +package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxCard; -import com.cloud.kicc.equip.api.vo.box.EquipBoxCardVo; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxCard; +import com.cloud.kicc.commonbiz.api.vo.EquipBoxCardVo; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxLogService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxLogService.java similarity index 76% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxLogService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxLogService.java index ffa07e79..37a3ba2b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxLogService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxLogService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.commonbiz.service.box; +package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxLog; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxLog; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRecordService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxRecordService.java similarity index 68% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRecordService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxRecordService.java index 7745a474..09a4e6c3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRecordService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxRecordService.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.commonbiz.service.box; +package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.dto.box.UpCmdParam; -import com.cloud.kicc.equip.api.entity.box.EquipBoxRecord; -import com.cloud.kicc.equip.api.vo.box.DownCmdVo; +import com.cloud.kicc.commonbiz.api.dto.UpCmdParam; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxRecord; +import com.cloud.kicc.commonbiz.api.vo.DownCmdVo; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRfidLogService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxRfidLogService.java similarity index 70% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRfidLogService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxRfidLogService.java index c64b6391..ccc1573c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRfidLogService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxRfidLogService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.commonbiz.service.box; +package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxRfidLog; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxRfidLog; /** * 标本箱RFIDj记录信息(EquipBoxRfidLog)表服务接口 diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxService.java similarity index 88% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxService.java index e324316c..910a2b9d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxService.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.commonbiz.service.box; +package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.entity.box.EquipBox; +import com.cloud.kicc.commonbiz.api.entity.EquipBox; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxUserService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxUserService.java similarity index 78% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxUserService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxUserService.java index d15154ac..674e8983 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxUserService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipBoxUserService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.commonbiz.service.box; +package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxUser; +import com.cloud.kicc.commonbiz.api.entity.EquipBoxUser; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipSpecimenService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipSpecimenService.java index 8276458b..237b6c86 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipSpecimenService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipSpecimenService.java @@ -3,9 +3,9 @@ package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.entity.EquipSpecimen; -import com.cloud.kicc.equip.api.vo.EquipSpecimenListVo; -import com.cloud.kicc.equip.api.vo.EquipSpecimenUsageVo; +import com.cloud.kicc.commonbiz.api.entity.EquipSpecimen; +import com.cloud.kicc.commonbiz.api.vo.EquipSpecimenListVo; +import com.cloud.kicc.commonbiz.api.vo.EquipSpecimenUsageVo; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureRecordService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureRecordService.java index 203c14f3..e5d13991 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureRecordService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureRecordService.java @@ -1,11 +1,8 @@ package com.cloud.kicc.commonbiz.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.dto.EquipTemperatureRecordParam; -import com.cloud.kicc.equip.api.entity.EquipTemperatureRecord; - -import java.util.List; +import com.cloud.kicc.commonbiz.api.dto.EquipTemperatureRecordParam; +import com.cloud.kicc.commonbiz.api.entity.EquipTemperatureRecord; /** * @Author: Mak diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureService.java index d8153933..0634bed0 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureService.java @@ -4,10 +4,8 @@ package com.cloud.kicc.commonbiz.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.equip.api.entity.EquipTemperature; -import com.cloud.kicc.equip.api.vo.EquipTempSelectVo; - -import java.util.List; +import com.cloud.kicc.commonbiz.api.entity.EquipTemperature; +import com.cloud.kicc.commonbiz.api.vo.EquipTempSelectVo; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperRecordServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBeeperRecordServiceImpl.java similarity index 78% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperRecordServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBeeperRecordServiceImpl.java index 5aac5205..c0537c82 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperRecordServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBeeperRecordServiceImpl.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.commonbiz.service.impl.beeper; +package com.cloud.kicc.commonbiz.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.commonbiz.mapper.equip.EquipBeeperRecordMapper; -import com.cloud.kicc.commonbiz.service.beeper.EquipBeeperRecordService; -import com.cloud.kicc.equip.api.entity.beeper.EquipBeeperRecord; +import com.cloud.kicc.commonbiz.mapper.EquipBeeperRecordMapper; +import com.cloud.kicc.commonbiz.service.EquipBeeperRecordService; +import com.cloud.kicc.commonbiz.api.entity.EquipBeeperRecord; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBeeperServiceImpl.java similarity index 84% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBeeperServiceImpl.java index 611f6d68..90cc0df0 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBeeperServiceImpl.java @@ -1,15 +1,15 @@ -package com.cloud.kicc.commonbiz.service.impl.beeper; +package com.cloud.kicc.commonbiz.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.cloud.kicc.commonbiz.mapper.equip.EquipBeeperMapper; -import com.cloud.kicc.commonbiz.service.beeper.EquipBeeperRecordService; -import com.cloud.kicc.commonbiz.service.beeper.EquipBeeperService; -import com.cloud.kicc.equip.api.constant.EquipConstants; -import com.cloud.kicc.equip.api.entity.beeper.EquipBeeper; -import com.cloud.kicc.equip.api.entity.beeper.EquipBeeperRecord; +import com.cloud.kicc.commonbiz.mapper.EquipBeeperMapper; +import com.cloud.kicc.commonbiz.service.EquipBeeperRecordService; +import com.cloud.kicc.commonbiz.service.EquipBeeperService; +import com.cloud.kicc.commonbiz.api.constant.EquipConstants; +import com.cloud.kicc.commonbiz.api.entity.EquipBeeper; +import com.cloud.kicc.commonbiz.api.entity.EquipBeeperRecord; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipSpecimenServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipSpecimenServiceImpl.java index 8f0b61e1..0ebcbfc6 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipSpecimenServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipSpecimenServiceImpl.java @@ -5,25 +5,22 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; 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.cloud.kicc.commonbiz.mapper.equip.EquipSpecimenMapper; +import com.cloud.kicc.commonbiz.mapper.EquipSpecimenMapper; import com.cloud.kicc.commonbiz.service.EquipSpecimenService; import com.cloud.kicc.commonbiz.service.EquipTemperatureService; -import com.cloud.kicc.equip.api.entity.EquipSpecimen; -import com.cloud.kicc.equip.api.entity.EquipTemperature; -import com.cloud.kicc.equip.api.vo.EquipSpecimenListVo; -import com.cloud.kicc.equip.api.vo.EquipSpecimenUsageVo; +import com.cloud.kicc.commonbiz.api.entity.EquipSpecimen; +import com.cloud.kicc.commonbiz.api.entity.EquipTemperature; +import com.cloud.kicc.commonbiz.api.vo.EquipSpecimenListVo; +import com.cloud.kicc.commonbiz.api.vo.EquipSpecimenUsageVo; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureRecordServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureRecordServiceImpl.java index 29f4598e..dd148268 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureRecordServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureRecordServiceImpl.java @@ -1,16 +1,12 @@ package com.cloud.kicc.commonbiz.service.impl; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.commonbiz.mapper.equip.EquipTemperatureRecordMapper; +import com.cloud.kicc.commonbiz.mapper.EquipTemperatureRecordMapper; import com.cloud.kicc.commonbiz.service.EquipSpecimenService; import com.cloud.kicc.commonbiz.service.EquipTemperatureRecordService; -import com.cloud.kicc.equip.api.dto.EquipTemperatureRecordParam; -import com.cloud.kicc.equip.api.entity.EquipTemperatureRecord; +import com.cloud.kicc.commonbiz.api.dto.EquipTemperatureRecordParam; +import com.cloud.kicc.commonbiz.api.entity.EquipTemperatureRecord; import com.cloud.kicc.system.api.feign.RemoteUserService; import lombok.RequiredArgsConstructor; @@ -19,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.List; - @RequiredArgsConstructor @Service @Slf4j diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureServiceImpl.java index ad1089a6..77fff18f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureServiceImpl.java @@ -1,36 +1,26 @@ package com.cloud.kicc.commonbiz.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.cloud.kicc.commonbiz.config.KiccProperties; -import com.cloud.kicc.commonbiz.mapper.equip.EquipTemperatureMapper; +import com.cloud.kicc.commonbiz.mapper.EquipTemperatureMapper; import com.cloud.kicc.commonbiz.service.EquipSpecimenService; import com.cloud.kicc.commonbiz.service.EquipTemperatureRecordService; import com.cloud.kicc.commonbiz.service.EquipTemperatureService; -import com.cloud.kicc.equip.api.constant.EquipConstants; -import com.cloud.kicc.equip.api.entity.EquipSpecimen; -import com.cloud.kicc.equip.api.entity.EquipTemperature; -import com.cloud.kicc.equip.api.entity.EquipTemperatureRecord; -import com.cloud.kicc.equip.api.vo.EquipTempSelectVo; +import com.cloud.kicc.commonbiz.api.constant.EquipConstants; +import com.cloud.kicc.commonbiz.api.entity.EquipSpecimen; +import com.cloud.kicc.commonbiz.api.entity.EquipTemperature; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; @Service @Slf4j diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxDownCmdServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxDownCmdServiceImpl.java deleted file mode 100644 index 78c236c8..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxDownCmdServiceImpl.java +++ /dev/null @@ -1,224 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl.box; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.cloud.kicc.commonbiz.service.box.*; -import com.cloud.kicc.equip.api.constant.EquipConstants; -import com.cloud.kicc.equip.api.dto.box.DownCmdParam; -import com.cloud.kicc.equip.api.entity.box.EquipBox; -import com.cloud.kicc.equip.api.entity.box.EquipBoxRecord; -import com.cloud.kicc.equip.api.entity.box.EquipBoxUser; -import com.cloud.kicc.equip.api.enums.CmdEnum; -import com.cloud.kicc.equip.api.enums.CmdStatusEnum; -import com.cloud.kicc.equip.api.vo.box.DownCmdVo; - -import lombok.AllArgsConstructor; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - - -/** - * 标本箱下行指令服务实现类 - * - * @author Mak - * @since 2021-09-14 19:07:07 - */ - -@Service -@Slf4j -@AllArgsConstructor - -public class BoxDownCmdServiceImpl implements BoxDownCmdService { - - private final EquipBoxService equipBoxService; - - private final EquipBoxUserService equipBoxUserService; - - private final EquipBoxRecordService equipBoxRecordService; - - private final DownCmdService downCmdService; - -/* public BoxDownCmdServiceImpl(DownCmdService downCmdService,EquipBoxRecordService equipBoxRecordService, - EquipBoxUserService equipBoxUserService,EquipBoxService equipBoxService){ - - this.downCmdService = downCmdService; - this.equipBoxRecordService=equipBoxRecordService; - this.equipBoxUserService=equipBoxUserService; - this.equipBoxService=equipBoxService; - }*/ - - - @Override - public boolean sendVoiceToEquipBox(String boxId, String data) { - EquipBox equipBox = equipBoxService.getById(boxId); - // 发送语音消息给标本箱 - DownCmdVo vo = new DownCmdVo(); - vo.setCmd(CmdEnum.VOICE_D.getCode()); - vo.setData(data); - String rtn = downCmdService.downCmdToBox(equipBox.getBoxCode(), vo); - if (rtn != null){ - // 记录操作日志 - vo.setTs(rtn); - equipBoxRecordService.addData(equipBox.getBoxId(),vo,null); - } - return rtn != null; - //return false; - } - - @Override - public boolean changeEquipUser(String boxUserId, Integer cmd) { - EquipBoxUser boxUser = equipBoxUserService.getById(boxUserId); - - EquipBox equipBox = equipBoxService.getById(boxUser.getBoxId()); - - // 新增/删除指纹 - DownCmdVo vo = new DownCmdVo(); - vo.setCmd(cmd); - if (cmd == CmdEnum.DEL_FID_D.getCode() || cmd == CmdEnum.DISABLE_FID_D.getCode() - || cmd == CmdEnum.ENABLE_FID_D.getCode()){ - vo.setData(boxUser.getFid()); - } - String rtn = downCmdService.downCmdToBox(equipBox.getBoxCode(), vo); - if (rtn != null){ - // 记录操作日志 - vo.setTs(rtn); - equipBoxRecordService.addData(equipBox.getBoxId(),vo,boxUserId); - } - return rtn != null; - //return false; - } - - @Override - public boolean downCmdToEquipBox(String boxId, Integer cmd, String data) { - EquipBox equipBox = equipBoxService.getById(boxId); - - // 下发参数 - DownCmdVo vo = new DownCmdVo(); - vo.setCmd(cmd); - - // 不同指令的参数解析 - if (cmd == CmdEnum.RESET_D.getCode()){ - // 重置标本箱配置信息 - vo.setTempMax(equipBox.getTempMax()); - vo.setTempMin(equipBox.getTempMin()); - vo.setRfidMin(equipBox.getRfidMin()); - vo.setBeat(equipBox.getBeat()); - }else if(cmd == CmdEnum.VOICE_D.getCode() || cmd == CmdEnum.DEL_FID_D.getCode() - || cmd == CmdEnum.DISABLE_FID_D.getCode() || cmd == CmdEnum.ENABLE_FID_D.getCode()){ - vo.setData(data); - } - - String rtn = downCmdService.downCmdToBox(equipBox.getBoxCode(), vo); - if (rtn != null){ - // 记录操作日志 - vo.setTs(rtn); - equipBoxRecordService.addData(equipBox.getBoxId(),vo,null); - } - return rtn != null; - //return false; - } - - - - @Override - public boolean handleDownCmdResult(DownCmdParam downParam) { - // 查询当前记录是否存在 - 状态为正常且指令状态不等于成功的记录 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(EquipBoxRecord::getTimestamp,downParam.getTs()) - .eq(EquipBoxRecord::getCmd,downParam.getCmd()) - .ne(EquipBoxRecord::getCmdStatus, CmdStatusEnum.SUCCESS.getCode()); - EquipBoxRecord boxRecord = equipBoxRecordService.getOne(wrapper); - if (boxRecord == null){ - return false; - } - - // 修改指令记录执行成功与否 - EquipBoxRecord updateRecord = new EquipBoxRecord(); - updateRecord.setId(boxRecord.getId()); - - // 判断客户端返回的指令执行状态是否成功 - if (downParam.getStatus() == 1){ - // 执行失败 - updateRecord.setCmdStatus(CmdStatusEnum.FAIL.getCode()); - return equipBoxRecordService.updateById(updateRecord); - } - - // 修改标本箱状态 - EquipBox updateBox = null; - - boolean rtn = true; - Integer cmd = downParam.getCmd(); - if (cmd == CmdEnum.ADD_FID_D.getCode()){ - // 新增指纹 - EquipBoxUser updateUser = new EquipBoxUser(); - updateUser.setId(boxRecord.getRelationId()); - updateUser.setFid(downParam.getData()); - rtn = equipBoxUserService.updateById(updateUser); - - }else if (cmd == CmdEnum.DEL_FID_D.getCode()){ - // 删除指纹 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(EquipBoxUser::getFid,null).eq(EquipBoxUser::getId,boxRecord.getRelationId()); - rtn = equipBoxUserService.update(updateWrapper); - }else if (cmd == CmdEnum.ALL_FID_D.getCode()){ - // 获取所有指纹 - log.info("获取所有指纹，返回值"+downParam.getData()); - - }else if (cmd == CmdEnum.DEL_ALL_FID_D.getCode()){ - // 删除所有指纹 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(EquipBoxUser::getFid,null).eq(EquipBoxUser::getBoxId,boxRecord.getBoxId()); - rtn = equipBoxUserService.update(updateWrapper); - }else if (cmd == CmdEnum.DISABLE_FID_D.getCode()){ - // 禁用指纹 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(EquipBoxUser::getStatus, EquipConstants.NO_CODE).eq(EquipBoxUser::getId,boxRecord.getRelationId()); - rtn = equipBoxUserService.update(updateWrapper); - }else if (cmd == CmdEnum.ENABLE_FID_D.getCode()){ - // 启用指纹 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(EquipBoxUser::getStatus, EquipConstants.YES_CODE).eq(EquipBoxUser::getId,boxRecord.getRelationId()); - rtn = equipBoxUserService.update(updateWrapper); - }else if (cmd == CmdEnum.OPEN_DATA_D.getCode()){ - // 开启数据上报 - updateBox = new EquipBox(); - updateBox.setBoxStatus(1); - - }else if (cmd == CmdEnum.CLOSE_DATA_D.getCode()){ - // 关闭数据上报 - updateBox = new EquipBox(); - updateBox.setBoxStatus(3); - - }else if (cmd == CmdEnum.OPEN_COLD_D.getCode()){ - // 开启制冷 - updateBox = new EquipBox(); - updateBox.setColdStatus(1); - - }else if (cmd == CmdEnum.CLOSE_COLD_D.getCode()){ - // 关闭制冷 - updateBox = new EquipBox(); - updateBox.setColdStatus(0); - - }else if (cmd == CmdEnum.OPEN_D.getCode()){ - // 开锁 - updateBox = new EquipBox(); - updateBox.setOpenStatus(1); - - }else { - } - - // 修改标本箱各种状态 - if (updateBox != null){ - updateBox.setBoxId(boxRecord.getBoxId()); - rtn = equipBoxService.updateById(updateBox); - } - - // 修改指令记录执行成功与否 - updateRecord.setCmdStatus(rtn?1:2); - return equipBoxRecordService.updateById(updateRecord); - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxUpCmdServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxUpCmdServiceImpl.java deleted file mode 100644 index 930a22d8..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxUpCmdServiceImpl.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl.box; - - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.cloud.kicc.common.core.constant.CommonConstants; -import com.cloud.kicc.commonbiz.config.KiccProperties; -import com.cloud.kicc.commonbiz.service.box.BoxUpCmdService; -import com.cloud.kicc.commonbiz.service.box.EquipBoxLogService; -import com.cloud.kicc.commonbiz.service.box.EquipBoxRfidLogService; -import com.cloud.kicc.commonbiz.service.box.EquipBoxService; -import com.cloud.kicc.commonbiz.util.BaiduMapUtils; -import com.cloud.kicc.commonbiz.util.GpsGaoAndBaidu; -import com.cloud.kicc.commonbiz.util.Point; -import com.cloud.kicc.equip.api.constant.EquipConstants; -import com.cloud.kicc.equip.api.dto.box.UpCmdParam; -import com.cloud.kicc.equip.api.entity.box.EquipBox; -import com.cloud.kicc.equip.api.entity.box.EquipBoxLog; -import com.cloud.kicc.equip.api.entity.box.EquipBoxRfidLog; -import com.cloud.kicc.equip.api.enums.BoxStatusEnum; -import com.cloud.kicc.equip.api.enums.CmdEnum; -import com.cloud.kicc.equip.api.vo.box.EquipBoxConfigVo; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Date; - -/** - * 标本箱上行指令服务实现类 - * - * @author Mak - * @since 2021-09-14 19:07:07 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class BoxUpCmdServiceImpl implements BoxUpCmdService { - - private final EquipBoxService equipBoxService; - - private final EquipBoxLogService equipBoxLogService; - - private final EquipBoxRfidLogService equipBoxRfidLogService; - - private final KiccProperties kiccProperties; - - @Override - public String beginTelnet(String iccid) { - EquipBox box = equipBoxService.getByIccid(iccid); - - // 修改箱子状态 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.lambda().set(EquipBox::getBoxStatus, BoxStatusEnum.TELNET.getCode()) - .set(EquipBox::getConnectTime,new Date()).eq(EquipBox::getBoxId,box.getBoxId()); - boolean rtn = equipBoxService.update(updateWrapper); - if (rtn){ - return box.getBoxCode(); - } - return null; - } - - @Override - public EquipBoxConfigVo getBoxConfig(String boxCode) throws Exception{ - EquipBox box = equipBoxService.getByCode(boxCode); - - return Convert.convert(EquipBoxConfigVo.class, box); - } - - @Override - public boolean beatBoxInfo(UpCmdParam param) throws Exception { - EquipBox equipBox = equipBoxService.getByCode(param.getCode()); - - // 更新主表信息 - EquipBox updateBox = new EquipBox(); - updateBox.setBoxId(equipBox.getBoxId()); - // 温度计算 - 临时处理 - if (StrUtil.isNotBlank(param.getTp())){ - // 他说如果拔了一根，那根默认就会是-60℃，现在拔了2根，说明系统默认是2个-60℃，原先的技算方式是三个加一起÷3， - // 也就是｛-60+（-60）+实际温度｝÷3=现在显示温度（现在显示是-32.73），倒推实际温度就是，21.83℃ - // 目前仅有第一版的温度有问题 - if(equipBox.getBoxId() == "1"){ - double ttp = NumberUtil.mul(Double.parseDouble(param.getTp()),3) + 120; - updateBox.setTemp(String.valueOf(NumberUtil.round(ttp,1))); - }else{ - updateBox.setTemp(String.valueOf(NumberUtil.round(Double.parseDouble(param.getTp()),1))); - } - } - updateBox.setDamp(param.getDp()); - // 详细地址 - if (StrUtil.isNotBlank(param.getLg()) && StrUtil.isNotBlank(param.getLt())){ - // 如果箱子定位一直未变，为避免重复调用百度api - if (StrUtil.isNotBlank(equipBox.getLng()) || StrUtil.isNotBlank(equipBox.getLat()) - || !equipBox.getLng().equals(param.getLg()) || !equipBox.getLat().equals(param.getLt())){ - updateBox.setLng(param.getLg()); - updateBox.setLat(param.getLt()); - try { - Point point = GpsGaoAndBaidu.gpsAddPrecision(param.getLg(), param.getLt()); - updateBox.setAddr(BaiduMapUtils.getAddress(String.valueOf(point.getLng()),String.valueOf(point.getLat()),kiccProperties.getMapAk())); - }catch (Exception e){ - log.error("标本箱心跳上报经纬度转详细地址失败："+e.getMessage()); - } - } - } - updateBox.setPower(String.valueOf(NumberUtil.round(Double.parseDouble(param.getPw()),1))); - - // 计算倾斜度 - - updateBox.setOpenStatus(param.getOs()); - updateBox.setColdStatus(param.getCs()); - boolean ret = equipBoxService.updateById(updateBox); - if (ret){ - // 记录心跳日志 - EquipBoxLog boxLog = Convert.convert(EquipBoxLog.class, updateBox); - boxLog.setBoxId(equipBox.getBoxId()); - if(StrUtil.isNotBlank(updateBox.getLng()) || StrUtil.isNotBlank(updateBox.getLat()) - || StrUtil.isNotBlank(updateBox.getAddr())){ - boxLog.setLng(param.getLg()); - boxLog.setLat(param.getLt()); - boxLog.setAddr(equipBox.getAddr()); - } - boxLog.setTiltX(param.getTx()); - boxLog.setTiltY(param.getTy()); - boxLog.setEnergy(param.getEg()); - boxLog.setErrorStatus(equipBox.getErrorStatus()); - equipBoxLogService.save(boxLog); - } - return ret; - } - - @Override - public boolean updateBoxState(UpCmdParam param) { - EquipBox equipBox = equipBoxService.getByCode(param.getCode()); - - EquipBox updateBox = new EquipBox(); - updateBox.setBoxId(equipBox.getBoxId()); - - if (param.getCmd() == CmdEnum.OPEN_U.getCode()){ - //设置开关状态 - updateBox.setOpenStatus(EquipConstants.YES_CODE); - }else if (param.getCmd() == CmdEnum.CLOSE_U.getCode()){ - updateBox.setOpenStatus(EquipConstants.NO_CODE); - }else if (param.getCmd() == CmdEnum.ERROR_U.getCode()){ - updateBox.setErrorStatus(CommonConstants.FAIL); - } - - return equipBoxService.updateById(updateBox); - } - - @Override - public boolean addBoxRfidLog(UpCmdParam param, Integer rfidType) { - EquipBox equipBox = equipBoxService.getByCode(param.getCode()); - EquipBoxRfidLog data = new EquipBoxRfidLog(); - data.setBoxId(equipBox.getBoxId()); - data.setRfids(param.getRfids()); - data.setRfidType(rfidType); - return equipBoxRfidLogService.save(data); - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/DownCmdServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/DownCmdServiceImpl.java deleted file mode 100644 index 41475dd7..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/DownCmdServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl.box; - - -import com.alibaba.fastjson.JSONObject; -import com.cloud.kicc.commonbiz.service.box.DownCmdService; -import com.cloud.kicc.equip.api.vo.box.DownCmdVo; - -import lombok.AllArgsConstructor; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import java.util.logging.SocketHandler; - -/** - * 标本箱下行指令服务实现类 - * - * @author Mak - * @since 2021-09-14 19:07:07 - */ -@AllArgsConstructor -@Service -@Slf4j -public class DownCmdServiceImpl implements DownCmdService { - private final Logger logger = LoggerFactory.getLogger(ThreadLocal.class); - - @Override - public String downCmdToBox(String boxCode, DownCmdVo vo){ - String ts = null; - try { -// new Thread().sleep(100); -// ClientSocket socket = SocketPool.get(boxCode); -// if (socket != null){ -// ts = System.currentTimeMillis()+""; -// vo.setTs(ts); -// String msg = JSONObject.toJSONString(vo); -// SocketHandler.sendMessage(socket,msg); -// } - }catch (Exception e){ - e.printStackTrace(); - ts = null; - } - return ts; - } - -} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxCardServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxCardServiceImpl.java deleted file mode 100644 index b08d1908..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxCardServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl.box; - - - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.commonbiz.mapper.equip.EquipBoxCardMapper; -import com.cloud.kicc.commonbiz.service.box.EquipBoxCardService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxCard; -import com.cloud.kicc.equip.api.vo.box.EquipBoxCardVo; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * 物联网卡管理(EquipBoxCard)表服务实现类 - * - * @author Mak - * @since 2022-02-13 12:06:30 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class EquipBoxCardServiceImpl extends ServiceImpl implements EquipBoxCardService { - - - @Override - public List listCardForSelect(Integer isUsed) throws Exception{ - List list = this.lambdaQuery() - .eq(StrUtil.isNotBlank(isUsed.toString()),EquipBoxCard::getIsUsed, isUsed) - .list(); - - return list.stream().map(item -> { - return Convert.convert(EquipBoxCardVo.class, item); - }).collect(Collectors.toList()); - } - - - @Override - public EquipBoxCard getByIccid(String iccid) { - return this.lambdaQuery().eq(StrUtil.isNotBlank(iccid),EquipBoxCard::getIccid, iccid).one(); - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxLogServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxLogServiceImpl.java deleted file mode 100644 index cca2e6a6..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxLogServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl.box; - - -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.commonbiz.mapper.equip.EquipBoxLogMapper; -import com.cloud.kicc.commonbiz.service.box.EquipBoxLogService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxLog; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 标本箱心跳日志记录(EquipBoxLog)表服务实现类 - * - * @author Mak - * @since 2021-09-17 10:25:07 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class EquipBoxLogServiceImpl extends ServiceImpl implements EquipBoxLogService { - - @Override - public List listBoxLogs(Integer boxId) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - - //todo: limit 100 ??? - wrapper.eq(EquipBoxLog::getBoxId,boxId) - .orderByDesc(EquipBoxLog::getBoxLogId).last("limit 100"); - return baseMapper.selectList(wrapper); - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRecordServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRecordServiceImpl.java deleted file mode 100644 index c8198fc2..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRecordServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl.box; - - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.commonbiz.mapper.equip.EquipBoxRecordMapper; -import com.cloud.kicc.commonbiz.service.box.EquipBoxRecordService; -import com.cloud.kicc.commonbiz.service.box.EquipBoxService; -import com.cloud.kicc.equip.api.dto.box.UpCmdParam; -import com.cloud.kicc.equip.api.entity.box.EquipBox; -import com.cloud.kicc.equip.api.entity.box.EquipBoxRecord; -import com.cloud.kicc.equip.api.vo.box.DownCmdVo; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 标本箱操作记录(EquipBoxRecord)表服务实现类 - * - * @author Mak - * @since 2021-09-15 09:39:47 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class EquipBoxRecordServiceImpl extends ServiceImpl implements EquipBoxRecordService { - - @Autowired - EquipBoxService equipBoxService; - - @Override - public boolean addData(UpCmdParam param, boolean rtn) { - EquipBox equipBox = equipBoxService.getByCode(param.getCode()); - EquipBoxRecord record = new EquipBoxRecord(); - record.setBoxId(equipBox.getBoxId()); - record.setCmd(param.getCmd()); - record.setFid(param.getFid()); - record.setErrorStatus(param.getWrong()); - record.setDataJson(JSONObject.toJSONString(param)); - record.setCmdStatus(rtn?1:2); - record.setTimestamp(System.currentTimeMillis()+""); - return this.save(record); - } - - @Override - public boolean addData(String boxId, DownCmdVo vo, String relationId) { - EquipBoxRecord record = new EquipBoxRecord(); - record.setBoxId(boxId); - record.setCmd(vo.getCmd()); - record.setTimestamp(vo.getTs()); - record.setRelationId(relationId); - record.setDataJson(JSONObject.toJSONString(vo)); - return this.save(record); - } - - @Override - public List listBoxRecords(String boxId) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - //todo: limit 100 ??? - wrapper.eq(EquipBoxRecord::getBoxId,boxId) - .orderByDesc(EquipBoxRecord::getId).last("limit 100"); - return baseMapper.selectList(wrapper); - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRfidLogServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRfidLogServiceImpl.java deleted file mode 100644 index 593896e5..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRfidLogServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl.box; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.commonbiz.mapper.equip.EquipBoxRfidLogMapper; -import com.cloud.kicc.commonbiz.service.box.EquipBoxRfidLogService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxRfidLog; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 标本箱RFIDj记录信息(EquipBoxRfidLog)表服务实现类 - * - * @author Mak - * @since 2021-09-25 15:10:34 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class EquipBoxRfidLogServiceImpl extends ServiceImpl implements EquipBoxRfidLogService { - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxServiceImpl.java deleted file mode 100644 index 95679187..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl.box; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -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.cloud.kicc.commonbiz.mapper.equip.EquipBoxMapper; -import com.cloud.kicc.commonbiz.service.box.EquipBoxCardService; -import com.cloud.kicc.commonbiz.service.box.EquipBoxService; -import com.cloud.kicc.equip.api.constant.EquipConstants; -import com.cloud.kicc.equip.api.entity.box.EquipBox; -import com.cloud.kicc.equip.api.entity.box.EquipBoxCard; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * 标本箱设备信息(EquipBox)表服务实现类 - * - * @author Mak - * @since 2021-09-14 19:07:07 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class EquipBoxServiceImpl extends ServiceImpl implements EquipBoxService { - - - @Autowired - EquipBoxCardService equipBoxCardService; - - @Override - public EquipBox getByCode(String boxCode) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(EquipBox::getBoxCode, boxCode); - return baseMapper.selectOne(wrapper); - } - - @Override - public EquipBox getByIccid(String iccid) { - EquipBoxCard card = equipBoxCardService.getByIccid(iccid); - if (card == null){ - return null; - } - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(EquipBox::getCardId, card.getId()); - return baseMapper.selectOne(wrapper); - } - - @Override - public EquipBox getData(String id) { - EquipBox box = baseMapper.selectData(id); - return box; - } - - @Override - public boolean addData(EquipBox param) { - // 自定义code - 标本箱已限制最长15位 - boolean rtn = this.save(param); - param.setBoxCode("B"+param.getBoxId()); - if (rtn){ - // 修改物联网卡状态 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper - .set(EquipBoxCard::getIsUsed, EquipConstants.YES_CODE) - .eq(EquipBoxCard::getId, param.getCardId()); - equipBoxCardService.update(updateWrapper); - } - return rtn; - } - - @Override - public boolean updateStatusByCode(String boxCode, Integer boxStatus, Integer openStatus, Integer coldStatus, Integer warnStatus, Integer errorStatus) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - - wrapper.set(StrUtil.isNotBlank(boxStatus.toString()),EquipBox::getBoxStatus,boxStatus) - .set(StrUtil.isNotBlank(openStatus.toString()),EquipBox::getOpenStatus,openStatus) - .set(StrUtil.isNotBlank(coldStatus.toString()),EquipBox::getColdStatus,coldStatus) - .set(StrUtil.isNotBlank(warnStatus.toString()),EquipBox::getWarnStatus,warnStatus) - .set(StrUtil.isNotBlank(errorStatus.toString()),EquipBox::getErrorStatus,errorStatus) - .eq(StrUtil.isNotBlank(boxCode),EquipBox::getBoxCode,boxCode); - - return this.update(wrapper); - } - - - @Override - public IPage pageData(Page page, EquipBox param) { - IPage rtn = baseMapper.pageQuery(page,param); - return rtn; - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxUserServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxUserServiceImpl.java deleted file mode 100644 index d45ce668..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxUserServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl.box; - - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.commonbiz.mapper.equip.EquipBoxUserMapper; -import com.cloud.kicc.commonbiz.service.box.EquipBoxUserService; -import com.cloud.kicc.equip.api.entity.box.EquipBoxUser; - -import com.cloud.kicc.system.api.entity.User; -import com.cloud.kicc.system.api.feign.RemoteUserService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 标本箱指纹用户信息(EquipBoxUser)表服务实现类 - * - * @author Mak - * @since 2021-09-15 09:40:50 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class EquipBoxUserServiceImpl extends ServiceImpl implements EquipBoxUserService { - - - private final RemoteUserService remoteUserService; - - @Override - public boolean addData(EquipBoxUser param) { - if (StrUtil.isNotBlank(param.getUserId()) && StrUtil.isBlank(param.getUserName())){ - R byId = remoteUserService.getById(param.getUserId()); - if (byId.getCode() == 200) { - param.setUserName(byId.getData().getUserName()); - } - } - return this.save(param); - } - - @Override - public List listBoxUser(String boxId, String userName) { - EquipBoxUser param = new EquipBoxUser(); - param.setBoxId(boxId); - param.setUserName(userName); - return baseMapper.listQuery(param); - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/mqtt/MqttDemo.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/mqtt/MqttDemo.java deleted file mode 100644 index 77623a94..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/mqtt/MqttDemo.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.cloud.kicc.mqtt; - -import org.eclipse.paho.client.mqttv3.*; -import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; - -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; -import javax.net.SocketFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.security.KeyStore; -import java.security.SecureRandom; -import java.time.Instant; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 15:31 2022/6/17 - */ -public class MqttDemo { - //IoT平台mqtt对接地址 - private String serverIp = "4cbb346a33.iot-mqtts.cn-north-4.myhuaweicloud.com"; - private int qosLevel = 1; - private MqttAsyncClient client; - // 创建设备时获得的deviceId，密钥（要替换为自己注册的设备ID与密钥） - static String deviceId = "62abefe0538e623c428797f2_test123"; - static String secret = "caf9acadf03b02e1729267166eac7fdc"; - private long minBackoff = 1000; - private long maxBackoff = 30 * 1000; //30 seconds - private long defaultBackoff = 1000; - private static int retryTimes = 0; - private SecureRandom random = new SecureRandom(); - - public static void main(String[] args) throws MqttException { - MqttDemo mqttDemo = new MqttDemo(); -// mqttDemo.connect(false); //false：mqtt连接示例 - mqttDemo.connect(true); //true：mqtts连接示例 - } - - /** - * mqtt建链 - * - * @param isSSL true：Mqtts加密连接 - * false：Mqtt不加密连接 - */ - private void connect(boolean isSSL) { - String url; - if (isSSL) { - url = "ssl://" + serverIp + ":" + 8883; //mqtts连接 - } else { - url = "tcp://" + serverIp + ":" + 1883; //mqtt连接 - } - try { - MqttConnectOptions options = new MqttConnectOptions(); - if (isSSL) { - options.setSocketFactory(getOptionSocketFactory(MqttDemo.class.getClassLoader().getResource("ca.jks").getPath())); - options.setHttpsHostnameVerificationEnabled(false); - } - options.setCleanSession(false); - options.setKeepAliveInterval(120); - options.setConnectionTimeout(5000); - options.setAutomaticReconnect(true); - options.setUserName(deviceId); - options.setPassword(getPassword().toCharArray()); - - System.out.println("Start mqtt connect, url:" + url); - //设置MqttClient - client = new MqttAsyncClient(url, getClientId(), new MemoryPersistence()); - client.setCallback(callback); - //建立连接 - client.connect(options, null, new IMqttActionListener() { - @Override - public void onSuccess(IMqttToken iMqttToken) { - retryTimes = 0; - System.out.println("Mqtt connect success."); - publishMessage(); - } - - @Override - public void onFailure(IMqttToken iMqttToken, Throwable throwable) { - System.out.println("Mqtt connect fail."); - - //退避重连 - int lowBound = (int) (defaultBackoff * 0.8); - int highBound = (int) (defaultBackoff * 1.2); - long randomBackOff = random.nextInt(highBound - lowBound); - long backOffWithJitter = (int) (Math.pow(2.0, (double) retryTimes)) * (randomBackOff + lowBound); - long waitTImeUntilNextRetry = (int) (minBackoff + backOffWithJitter) > maxBackoff ? maxBackoff : (minBackoff + backOffWithJitter); - System.out.println("---- " + waitTImeUntilNextRetry); - try { - Thread.sleep(waitTImeUntilNextRetry); - } catch (InterruptedException e) { - System.out.println("sleep failed, the reason is" + e.getMessage().toString()); - } - retryTimes++; - MqttDemo.this.connect(true); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - - } - - /** - * Mqtt回调 - */ - private MqttCallback callback = new MqttCallbackExtended() { - @Override - public void connectComplete(boolean reconnect, String serviceURI) { - System.out.println("Mqtt client connected, address:" + serviceURI); - subScribeTopic(); - } - - @Override - public void connectionLost(Throwable throwable) { - System.out.println("Connection lost."); - //可在此处实现重连 - } - - @Override - public void messageArrived(String topic, MqttMessage message) throws Exception { - System.out.println("Receive mqtt topic:" + topic + ", message:" + message); - } - - @Override - public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) { - System.out.println("Mqtt message deliver complete."); - } - }; - - /** - * 订阅接收命令topic - */ - private void subScribeTopic() { - try { - client.subscribe(getCmdRequestTopic(), qosLevel, null, new IMqttActionListener() { - @Override - public void onSuccess(IMqttToken iMqttToken) { - System.out.println("Subscribe mqtt topic success"); - } - - @Override - public void onFailure(IMqttToken iMqttToken, Throwable throwable) { - System.out.println("Subscribe mqtt topic fail"); - } - }); - } catch (MqttException e) { - e.printStackTrace(); - } - } - - /** - * 上报json数据，注意serviceId要与Profile中的定义对应 - */ - private void publishMessage() { - String jsonMsg = "{\"services\":[{\"service_id\":\"BasicData\",\"properties\":{\"luminance\":30},\"eventTime\":null}]}"; - MqttMessage message = new MqttMessage(jsonMsg.getBytes()); - try { - client.publish(getReportTopic(), message, qosLevel, new IMqttActionListener() { - @Override - public void onSuccess(IMqttToken iMqttToken) { - System.out.println("Publish mqtt message success"); - } - - @Override - public void onFailure(IMqttToken iMqttToken, Throwable throwable) { - System.out.println("Publish mqtt message fail"); - } - }); - } catch (MqttException e) { - e.printStackTrace(); - } - } - - - /** - * 属性上报topic - * - * @return - */ - private String getReportTopic() { - return "$oc/devices/" + deviceId + "/sys/properties/report"; - } - - /** - * 订阅命令下发topic - * - * @return - */ - private String getCmdRequestTopic() { - return "$oc/devices/" + deviceId + "/sys/commands/#"; - } - - /** - * 加载SSL证书 - * - * @param certPath 证书存放的相对路径 - * @return - */ - private SocketFactory getOptionSocketFactory(String certPath) { - SSLContext sslContext; - - InputStream stream = null; - try { - stream = new FileInputStream(certPath); - sslContext = SSLContext.getInstance("TLS"); - KeyStore ts = KeyStore.getInstance("JKS"); - ts.load(stream, null); - TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - tmf.init(ts); - TrustManager[] tm = tmf.getTrustManagers(); - sslContext.init(null, tm, new SecureRandom()); - } catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (stream != null) { - try { - stream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return sslContext.getSocketFactory(); - } - - - /*** - * 调用sha256算法进行哈希 - * - * @param message - * @param tStamp - * @return - */ - private String sha256_mac(String message, String tStamp) { - String passWord = null; - try { - Mac sha256_HMAC = Mac.getInstance("HmacSHA256"); - SecretKeySpec secret_key = new SecretKeySpec(tStamp.getBytes(), "HmacSHA256"); - sha256_HMAC.init(secret_key); - byte[] bytes = sha256_HMAC.doFinal(message.getBytes()); - passWord = byteArrayToHexString(bytes); - } catch (Exception e) { - e.printStackTrace(); - } - return passWord; - } - - /*** - * byte数组转16进制字符串 - * - * @param b - * @return - */ - private String byteArrayToHexString(byte[] b) { - StringBuilder hs = new StringBuilder(); - String stmp; - for (int n = 0; b != null && n < b.length; n++) { - stmp = Integer.toHexString(b[n] & 0XFF); - if (stmp.length() == 1) { - hs.append('0'); - } - hs.append(stmp); - } - return hs.toString().toLowerCase(); - } - - /*** - * 要求：10位数字 - * - * @return - */ - private String getTimeStamp() { - String timeStamp = ZonedDateTime.ofInstant(Instant.now(), ZoneId.of("UTC")) - .format(DateTimeFormatter.ofPattern("yyyyMMddHH")); - return timeStamp; - } - - private String getClientId() { - return deviceId + "_0_0_" + getTimeStamp(); - } - - private String getPassword() { - return sha256_mac(secret, getTimeStamp()); - } - - private void close() { - try { - client.disconnect(); - client.close(); - } catch (MqttException e) { - e.printStackTrace(); - } - } -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml index 3116bd1b..a9c3ce32 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml @@ -7,7 +7,8 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} + #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/ca.jks b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/ca.jks deleted file mode 100644 index 9a54948a..00000000 Binary files a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/ca.jks and /dev/null differ diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperMapper.xml index be4cbb6c..a1cba3ce 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -27,7 +27,7 @@ equip_beeper - SELECT a.id,a.beeper_name,a.beeper_code,a.beeper_type,a.wifi_name,a.wifi_pwd,a.wifi_pwd,a.status,a.create_time ,(select ins.hospital_name from t_hospital ins where ins.hospital_id = a.hospital_id) as hospital_name @@ -61,7 +61,7 @@ ORDER BY a.id DESC - SELECT a.id,a.beeper_name,a.beeper_code,a.beeper_type,a.wifi_name,a.wifi_pwd,a.wifi_pwd ,a.hospital_id,a.office_id,a.doctor_id,a.remarks,a.status,a.create_time @@ -73,4 +73,4 @@ where a.id=#{id} - \ No newline at end of file + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperRecordMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperRecordMapper.xml index aa143e6e..507d3a38 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperRecordMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperRecordMapper.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxCardMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxCardMapper.xml index 0e5481dc..9fa96264 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxCardMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxCardMapper.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxLogMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxLogMapper.xml index ea128d74..829679e8 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxLogMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxLogMapper.xml @@ -1,4 +1,4 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxMapper.xml index eeb456d6..4f4ce5e4 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -28,7 +28,7 @@ ,a.connect_time,a.close_time,a.latest_time,a.remarks,a.status,a.create_by_id,a.create_by_name,a.create_time,a.status - SELECT ,(select s.user_name from t_sys_admin s where s.user_id = a.sy_user_id) as sy_user_name @@ -66,7 +66,7 @@ ORDER BY a.id DESC - SELECT ,(select s.user_name from t_sys_admin s where s.user_id = a.sy_user_id) as sy_user_name @@ -76,4 +76,4 @@ where a.id=#{id} - \ No newline at end of file + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRecordMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRecordMapper.xml index b3fec516..99e0ce85 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRecordMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRecordMapper.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRfidLogMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRfidLogMapper.xml index 9fb4890a..809771f7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRfidLogMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRfidLogMapper.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxUserMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxUserMapper.xml index d66b4b5e..f4878646 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxUserMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxUserMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -27,7 +27,7 @@ a.status,a.create_by_id,a.create_by_name,a.create_by_id - SELECT ,b.box_name FROM @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipSpecimenMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipSpecimenMapper.xml index 43830f43..7f811f9a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipSpecimenMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipSpecimenMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -21,7 +21,7 @@ equip_temperature sys_user - SELECT a.id,a.box_name,a.box_code,a.box_type,a.et_id,a.sy_user_id,a.state,a.create_time, b.equip_code,b.equip_temperature,b.equip_power,b.latest_time,c.user_name @@ -46,7 +46,7 @@ ORDER BY a.es_id DESC - SELECT a.es_id,a.box_name,a.box_code,a.box_type,a.et_id,a.sy_user_id,a.state,a.create_date, b.equip_code,b.equip_temperature,b.equip_power,b.temperature_min_warn,b.temperature_max_warn,b.power_min_warn,c.user_name diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureMapper.xml index f8f06831..d10d3f1c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureRecordMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureRecordMapper.xml index eab29bf3..46ab70df 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureRecordMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureRecordMapper.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml index 3fb820f3..9efeafe2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml @@ -7,7 +7,8 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} + #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml index 7ee73a86..cd6bf267 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml @@ -7,7 +7,8 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} + #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr} diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java index f1581a52..68a3ff41 100644 --- a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java @@ -4,7 +4,6 @@ import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml b/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml index 7475a289..165261d7 100644 --- a/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml +++ b/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr} diff --git a/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml b/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml index 304f8fb3..d256777f 100644 --- a/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml +++ b/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr} diff --git a/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml b/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml index af704606..de91f0b1 100644 --- a/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml +++ b/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml @@ -10,7 +10,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr} diff --git a/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml b/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml index 9d9c799e..7480bb9a 100644 --- a/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml +++ b/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml @@ -9,7 +9,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} metadata: management.context-path: ${server.servlet.context-path}/actuator namespace: @profiles.namespace@