From 892285b09b99f4db2b018445065ebd45a3fc2528 Mon Sep 17 00:00:00 2001 From: lizhi <1370025557@qq.com> Date: Wed, 29 Jun 2022 14:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/AppConstants.java | 1 + .../cloud/kicc/equip/api/vo/DownCmdVo.java | 33 ------------- .../kicc/equip/api/vo/EquipBoxCardVo.java | 23 --------- .../kicc/equip/api/vo/EquipBoxConfigVo.java | 25 ---------- .../equip/api/vo/EquipSpecimenListVo.java | 47 +++++++++++++++++++ .../equip/api/vo/EquipSpecimenUsageVo.java | 44 +++++++++++++++++ .../kicc/equip/api/vo/EquipTempSelectVo.java | 18 +++++++ .../kicc-platform-biz/kicc-common-biz/pom.xml | 7 +-- .../equip/EquipBoxUserController.java | 9 ++-- .../equip/EquipSpecimenController.java | 6 +-- .../equip/EquipTemperatureController.java | 6 +-- .../src/main/test/testDemo.java | 22 +++++++++ .../kicc-template-biz/pom.xml | 7 +-- 13 files changed, 145 insertions(+), 103 deletions(-) delete mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/DownCmdVo.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipBoxCardVo.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipBoxConfigVo.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenListVo.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenUsageVo.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipTempSelectVo.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/testDemo.java diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java index c24c6df8..44489d55 100644 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java +++ b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java @@ -16,4 +16,5 @@ public interface AppConstants { String APP_COMMON = "/common"; + String APP_EQUIP = "/equip"; } diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/DownCmdVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/DownCmdVo.java deleted file mode 100644 index 3ce88f08..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/DownCmdVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cloud.kicc.equip.api.vo; - - -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/EquipBoxCardVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipBoxCardVo.java deleted file mode 100644 index 6aa7a22d..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipBoxCardVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cloud.kicc.equip.api.vo; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 物联网卡管理(EquipBoxCard)表实体类 - * - * @author Mak - * @since 2022-02-13 12:06:29 - */ -@Data -public class EquipBoxCardVo implements Serializable { - - private String id; - - 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/EquipBoxConfigVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipBoxConfigVo.java deleted file mode 100644 index 3b5dc180..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipBoxConfigVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cloud.kicc.equip.api.vo; - -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-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/equip/api/vo/EquipSpecimenListVo.java new file mode 100644 index 00000000..878a02ed --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenListVo.java @@ -0,0 +1,47 @@ +package com.cloud.kicc.equip.api.vo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + + +@Data +public class EquipSpecimenListVo implements Serializable { + + /**ID*/ + private String id; + /**设备编号*/ + private String boxCode; + /**设备名称*/ + private String boxName; + /**设备类型*/ + private String boxType; + /**温控设备id*/ + private String etId; + /**温控设备编号*/ + private String equipCode; + /**设备温度*/ + private Integer equipTemperature; + /**剩余电量*/ + private String equipPower; + /**温度最高警报值*/ + private Integer temperatureMaxWarn; + /**温度最低警报值*/ + private Integer temperatureMinWarn; + /**收样员用户id*/ + private String syUserId; + /**收样员用户名称*/ + private String syUserName; + /**标记（0.禁用 1.启用）*/ + private String status; + /**设备最新上报时间*/ + private String latestTime; + /**创建时间*/ + @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/equip/api/vo/EquipSpecimenUsageVo.java new file mode 100644 index 00000000..57511e1b --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenUsageVo.java @@ -0,0 +1,44 @@ +package com.cloud.kicc.equip.api.vo; + + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EquipSpecimenUsageVo implements Serializable { + + /**ID*/ + private String id; + /**设备编号*/ + private String boxCode; + /**设备名称*/ + private String boxName; + /**温控设备ID*/ + private String etId; + /**标本箱用户ID*/ + private String syUserId; + /**设备编号*/ + private String equipCode; + /**设备名称*/ + private String equipName; + /**设备温度*/ + private String equipTemperature; + /**设备湿度*/ + private String equipHumidity; + /**经度*/ + private String longitude; + /**纬度*/ + private String latitude; + /**设备位置*/ + private String equipAddr; + /**剩余电量*/ + private String equipPower; + /**设备状态*/ + private String equipStatus; + /**设备类型*/ + private String equipType; + /**设备最新上报时间*/ + 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/equip/api/vo/EquipTempSelectVo.java new file mode 100644 index 00000000..08f310b9 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipTempSelectVo.java @@ -0,0 +1,18 @@ +package com.cloud.kicc.equip.api.vo; + + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EquipTempSelectVo implements Serializable { + + /**ID*/ + private String etId; + /**设备名称*/ + private String equipName; + /**设备编号*/ + private String equipCode; + +} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml index 5b48544c..6b9d69b3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml @@ -66,12 +66,7 @@ qpid-jms-client 0.50.0 - - com.cloud - kicc-equip-api - 1.0.0 - compile - + 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/equip/EquipBoxUserController.java index f512861d..32af9447 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/equip/EquipBoxUserController.java @@ -1,7 +1,8 @@ -package com.cloud.kicc.commonbiz.controller.equip; +package com.cloud.kicc.equip.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; @@ -20,7 +21,7 @@ import java.util.Arrays; */ @RestController @RequiredArgsConstructor -@RequestMapping("/equip/box/user") +@RequestMapping(AppConstants.APP_EQUIP + "/box/user") public class EquipBoxUserController { @@ -60,7 +61,7 @@ public class EquipBoxUserController { */ @GetMapping("/list") public R listEquipBoxUser(@RequestParam("boxId") String boxId, - @RequestParam(value = "userName", required = false) String userName) { + @RequestParam(value = "userName", required = false) String userName) { return R.ok(equipBoxUserService.listBoxUser(boxId, userName)); } @@ -90,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/equip/EquipSpecimenController.java index 65fe1de7..b3b977ec 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/equip/EquipSpecimenController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.controller.equip; +package com.cloud.kicc.equip.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +15,7 @@ import java.util.Arrays; @RequiredArgsConstructor @RestController -@RequestMapping("/equip/specimen") +@RequestMapping(AppConstants.APP_EQUIP + "/specimen") public class EquipSpecimenController { @@ -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/equip/EquipTemperatureController.java index cc450055..8b0f1b4d 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/equip/EquipTemperatureController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.controller.equip; +package com.cloud.kicc.equip.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -19,7 +19,7 @@ import java.util.Arrays; @RequiredArgsConstructor @RestController -@RequestMapping("/equip/temperature") +@RequestMapping(AppConstants.APP_EQUIP + "/temperature") public class EquipTemperatureController { @@ -123,4 +123,4 @@ public class EquipTemperatureController { } -} +} \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/testDemo.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/testDemo.java new file mode 100644 index 00000000..1b50e2f2 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/testDemo.java @@ -0,0 +1,22 @@ +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.IdcardUtil; + + +/** + * @Author: lizhi + * @Description: + * @Since 1.0 + * @Date Created in 11:04 2022/6/29 + */ +public class testDemo { + public static void main(String[] args) { + String IdCard18 = "523485241251412521"; + String IdCard15 = "135248524214562"; + boolean valid18 = IdcardUtil.isValidCard(IdCard18); + boolean valid15 = IdcardUtil.isValidCard(IdCard15); + System.out.println(valid18); + System.out.println(valid15); + } +} diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml index b70bb096..6ab3c833 100644 --- a/kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml @@ -54,12 +54,7 @@ com.cloud kicc-common-mock - - com.cloud - kicc-equip-api - 1.0.0 - compile - +