From fa193614fe5e0e2dc6b786afbb2a3fbc193df789 Mon Sep 17 00:00:00 2001 From: lizhi <1370025557@qq.com> Date: Fri, 24 Jun 2022 11:21:23 +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 --- .../core/constant/SecurityConstants.java | 2 +- .../equip/api/constant/EquipConstants.java | 35 ++ .../api/dto/EquipTemperatureRecordParam.java | 17 + .../kicc/equip/api/dto/box/DownCmdParam.java | 30 ++ .../kicc/equip/api/dto/box/RfidsParam.java | 23 ++ .../kicc/equip/api/dto/box/UpCmdParam.java | 75 +++++ .../kicc/equip/api/entity/EquipSpecimen.java | 32 ++ .../equip/api/entity/EquipTemperature.java | 55 ++++ .../api/entity/EquipTemperatureRecord.java | 46 +++ .../equip/api/entity/beeper}/EquipBeeper.java | 10 +- .../api/entity/beeper}/EquipBeeperRecord.java | 11 +- .../kicc/equip/api/entity/box/EquipBox.java | 12 +- .../equip/api/entity/box/EquipBoxCard.java | 10 +- .../equip/api/entity/box/EquipBoxLog.java | 11 +- .../equip/api/entity/box/EquipBoxRecord.java | 10 +- .../equip/api/entity/box/EquipBoxRfidLog.java | 10 +- .../equip/api/entity/box/EquipBoxUser.java | 9 +- .../kicc/equip/api/enums/BoxStatusEnum.java | 46 +++ .../cloud/kicc/equip/api/enums/CmdEnum.java | 87 +++++ .../kicc/equip/api/enums/CmdStatusEnum.java | 44 +++ .../kicc/equip/api/enums/WarnStatusEnum.java | 48 +++ .../cloud/kicc/equip/api/vo/DownCmdVo.java | 33 ++ .../kicc/equip/api/vo/EquipBoxCardVo.java | 23 ++ .../kicc/equip/api/vo/EquipBoxConfigVo.java | 25 ++ .../kicc/equip/api/vo/box/DownCmdVo.java | 33 ++ .../kicc/equip/api/vo/box/EquipBoxCardVo.java | 13 +- .../equip/api/vo/box/EquipBoxConfigVo.java | 10 +- .../kicc-platform-api/kicc-equip-api/pom.xml | 35 -- .../equip/api/constant/EquipConstants.java | 13 - .../kicc/equip/api/dto/box/DownCmdParam.java | 26 -- .../kicc/equip/api/dto/box/RfidsParam.java | 20 -- .../kicc/equip/api/dto/box/UpCmdParam.java | 72 ----- .../kicc/equip/api/enums/BoxStatusEnum.java | 51 --- .../cloud/kicc/equip/api/enums/CmdEnum.java | 91 ------ .../kicc/equip/api/enums/CmdStatusEnum.java | 50 --- .../kicc/equip/api/enums/WarnStatusEnum.java | 54 ---- .../kicc/equip/api/vo/box/DownCmdVo.java | 36 --- .../system/api/feign/RemoteUserService.java | 7 + .../kicc-template-api/pom.xml | 5 +- kicc-platform/kicc-platform-api/pom.xml | 4 +- .../kicc-platform-biz/kicc-common-biz/pom.xml | 18 ++ .../java/com/cloud/kicc/amqp/AmqpDemo.java | 173 ++++++++++ .../java/com/cloud/kicc/amqp/testDemo.java | 13 + .../kicc/commonbiz/config/KiccProperties.java | 21 ++ .../equip/EquipBeeperController.java | 100 ++++++ .../equip/EquipBoxCardController.java | 105 ++++++ .../controller/equip/EquipBoxController.java | 130 ++++++++ .../equip/EquipBoxUserController.java | 93 ++++++ .../equip/EquipSpecimenController.java | 99 ++++++ .../equip/EquipTemperatureController.java | 126 ++++++++ .../mapper/equip/EquipBeeperMapper.java | 34 ++ .../mapper/equip/EquipBeeperRecordMapper.java | 17 + .../mapper/equip/EquipBoxCardMapper.java | 17 + .../mapper/equip/EquipBoxLogMapper.java | 17 + .../mapper/equip/EquipBoxMapper.java | 34 ++ .../mapper/equip/EquipBoxRecordMapper.java | 17 + .../mapper/equip/EquipBoxRfidLogMapper.java | 19 ++ .../mapper/equip/EquipBoxUserMapper.java | 21 ++ .../mapper/equip/EquipSpecimenMapper.java | 28 ++ .../mapper/equip/EquipTemperatureMapper.java | 11 + .../equip/EquipTemperatureRecordMapper.java | 13 + .../service/EquipSpecimenService.java | 62 ++++ .../EquipTemperatureRecordService.java | 35 ++ .../service/EquipTemperatureService.java | 49 +++ .../beeper/EquipBeeperRecordService.java | 24 ++ .../service/beeper/EquipBeeperService.java | 60 ++++ .../service/box/BoxDownCmdService.java | 47 +++ .../service/box/BoxUpCmdService.java | 54 ++++ .../commonbiz/service/box/DownCmdService.java | 23 ++ .../service/box/EquipBoxCardService.java | 22 ++ .../service/box/EquipBoxLogService.java | 18 ++ .../service/box/EquipBoxRecordService.java | 24 ++ .../service/box/EquipBoxRfidLogService.java | 14 + .../service/box/EquipBoxService.java | 34 ++ .../service/box/EquipBoxUserService.java | 21 ++ .../impl/EquipSpecimenServiceImpl.java | 190 +++++++++++ .../EquipTemperatureRecordServiceImpl.java | 109 +++++++ .../impl/EquipTemperatureServiceImpl.java | 179 ++++++++++ .../beeper/EquipBeeperRecordServiceImpl.java | 35 ++ .../impl/beeper/EquipBeeperServiceImpl.java | 90 ++++++ .../impl/box/BoxDownCmdServiceImpl.java | 224 +++++++++++++ .../service/impl/box/BoxUpCmdServiceImpl.java | 164 ++++++++++ .../service/impl/box/DownCmdServiceImpl.java | 48 +++ .../impl/box/EquipBoxCardServiceImpl.java | 50 +++ .../impl/box/EquipBoxLogServiceImpl.java | 38 +++ .../impl/box/EquipBoxRecordServiceImpl.java | 71 ++++ .../impl/box/EquipBoxRfidLogServiceImpl.java | 24 ++ .../service/impl/box/EquipBoxServiceImpl.java | 98 ++++++ .../impl/box/EquipBoxUserServiceImpl.java | 53 +++ .../kicc/commonbiz/util/BaiduMapUtils.java | 103 ++++++ .../kicc/commonbiz/util/GpsGaoAndBaidu.java | 200 ++++++++++++ .../com/cloud/kicc/commonbiz/util/Point.java | 39 +++ .../java/com/cloud/kicc/mqtt/MqttDemo.java | 305 ++++++++++++++++++ .../kicc-common-biz/src/main/resources/ca.jks | Bin 0 -> 1009 bytes .../resources/mapper/EquipBeeperMapper.xml | 76 +++++ .../mapper/EquipBeeperRecordMapper.xml | 4 + .../resources/mapper/EquipBoxCardMapper.xml | 4 + .../resources/mapper/EquipBoxLogMapper.xml | 4 + .../main/resources/mapper/EquipBoxMapper.xml | 79 +++++ .../resources/mapper/EquipBoxRecordMapper.xml | 4 + .../mapper/EquipBoxRfidLogMapper.xml | 4 + .../resources/mapper/EquipBoxUserMapper.xml | 55 ++++ .../resources/mapper/EquipSpecimenMapper.xml | 60 ++++ .../mapper/EquipTemperatureMapper.xml | 6 + .../mapper/EquipTemperatureRecordMapper.xml | 4 + .../kicc-equip-biz/Dockerfile | 15 - .../kicc-platform-biz/kicc-equip-biz/pom.xml | 72 ----- .../kicc/commonbiz/KiccCommonApplication.java | 29 -- .../kicc/commonbiz/api/entity/MapTask.java | 36 --- .../controller/MapTaskController.java | 44 --- .../kicc/commonbiz/mapper/MapTaskMapper.java | 16 - .../commonbiz/service/MapTaskService.java | 20 -- .../service/impl/MapTaskServiceImpl.java | 33 -- .../src/main/resources/bootstrap.yml | 17 - .../src/main/resources/logback-spring.xml | 57 ---- .../main/resources/mapper/MapTaskMapper.xml | 24 -- .../kicc-template-biz/pom.xml | 8 +- .../template/KiccTemplateApplication.java | 1 + kicc-platform/kicc-platform-biz/pom.xml | 4 +- 119 files changed, 4651 insertions(+), 862 deletions(-) create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/EquipTemperatureRecordParam.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipSpecimen.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperature.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperatureRecord.java rename kicc-platform/kicc-platform-api/{kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer => kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper}/EquipBeeper.java (86%) rename kicc-platform/kicc-platform-api/{kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer => kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper}/EquipBeeperRecord.java (79%) rename kicc-platform/kicc-platform-api/{kicc-equip-api => kicc-common-api}/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBox.java (95%) rename kicc-platform/kicc-platform-api/{kicc-equip-api => kicc-common-api}/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxCard.java (84%) rename kicc-platform/kicc-platform-api/{kicc-equip-api => kicc-common-api}/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxLog.java (90%) rename kicc-platform/kicc-platform-api/{kicc-equip-api => kicc-common-api}/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRecord.java (90%) rename kicc-platform/kicc-platform-api/{kicc-equip-api => kicc-common-api}/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRfidLog.java (82%) rename kicc-platform/kicc-platform-api/{kicc-equip-api => kicc-common-api}/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxUser.java (86%) create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/DownCmdVo.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipBoxCardVo.java create 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/box/DownCmdVo.java rename kicc-platform/kicc-platform-api/{kicc-equip-api => kicc-common-api}/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxCardVo.java (50%) rename kicc-platform/kicc-platform-api/{kicc-equip-api => kicc-common-api}/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxConfigVo.java (81%) delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/pom.xml delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/AmqpDemo.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/testDemo.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/config/KiccProperties.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBeeperController.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxCardController.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxController.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxUserController.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipSpecimenController.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipTemperatureController.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperRecordMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxCardMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxLogMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRecordMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRfidLogMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxUserMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipSpecimenMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureRecordMapper.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipSpecimenService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureRecordService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperRecordService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxDownCmdService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxUpCmdService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/DownCmdService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxCardService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxLogService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRecordService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRfidLogService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxUserService.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipSpecimenServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureRecordServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperRecordServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxDownCmdServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxUpCmdServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/DownCmdServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxCardServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxLogServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRecordServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRfidLogServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxUserServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/BaiduMapUtils.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/GpsGaoAndBaidu.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/Point.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/mqtt/MqttDemo.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/ca.jks create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperRecordMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxCardMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxLogMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRecordMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRfidLogMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxUserMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipSpecimenMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureMapper.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureRecordMapper.xml delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/Dockerfile delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/pom.xml delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/MapTaskService.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/bootstrap.yml delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/logback-spring.xml delete mode 100644 kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/mapper/MapTaskMapper.xml diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/SecurityConstants.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/SecurityConstants.java index 30039f12..70379d25 100644 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/SecurityConstants.java +++ b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/SecurityConstants.java @@ -106,5 +106,5 @@ public interface SecurityConstants { * 客户端ID */ String CLIENT_ID = "clientId"; - + } 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/equip/api/constant/EquipConstants.java new file mode 100644 index 00000000..24633eea --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java @@ -0,0 +1,35 @@ +package com.cloud.kicc.equip.api.constant; + +/** + * @Author: TangSheng + * @Description: 设备常量 + * @Since 1.0 + * @Date Created in 15:09 2022/4/18 + */ +public interface EquipConstants { + + int NO_CODE = 0; + int YES_CODE = 1; + int SECOND_CODE = 2; + + /** + * 中集智冷平台 + */ + /**温控设备请求地址*/ + String TEMP_URL = "http://ccsc58.com/json/01_00_tb_history_data.php"; + /**访问前缀*/ + String ADMIN_PERMIT = "zjly8888"; + /**固定值*/ + String USER_P = "A"; + /**默认账号密码*/ + String ADMIN_USER = "18569407322"; + String ADMIN_PWD = "123yjf1992"; + /**前缀*/ + String TEMP_NAME_PREFIX = "KLTEMP-"; + int PERIOD = 5; + int SUCCESS_CODE = 10000; + + String OSS_URL = "https://image.kanglailab.com/"; + String OSS_UPLOAD_REPORT_PATH = "upload/report/"; // 第三方上传报告结果路径 + +} 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/equip/api/dto/EquipTemperatureRecordParam.java new file mode 100644 index 00000000..998a052d --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/EquipTemperatureRecordParam.java @@ -0,0 +1,17 @@ +package com.cloud.kicc.equip.api.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EquipTemperatureRecordParam implements Serializable { + + private String etId; + private String beginTime; + private String endTime; + private String status; + private String reportId; + private String syUserId; + +} 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 new file mode 100644 index 00000000..99232044 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java @@ -0,0 +1,30 @@ +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 new file mode 100644 index 00000000..6a5fbf10 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java @@ -0,0 +1,23 @@ +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 new file mode 100644 index 00000000..49a1e624 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java @@ -0,0 +1,75 @@ +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/entity/EquipSpecimen.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipSpecimen.java new file mode 100644 index 00000000..45854acb --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipSpecimen.java @@ -0,0 +1,32 @@ +package com.cloud.kicc.equip.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 java.io.Serializable; + +@Data +@TableName("equip_specimen") +public class EquipSpecimen extends CommonEntity implements Serializable { + + /**ID*/ + @TableId + private String id; + /**设备编号*/ + private String boxCode; + /**设备名称*/ + private String boxName; + /**设备类型*/ + private String boxType; + /**温控设备id*/ + private String etId; + /**收样员用户id*/ + private String syUserId; + /**状态 0:启用，1:禁用*/ + private String status; + + +} 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/equip/api/entity/EquipTemperature.java new file mode 100644 index 00000000..0af78bba --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperature.java @@ -0,0 +1,55 @@ +package com.cloud.kicc.equip.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 java.io.Serializable; + +@Data +@TableName("equip_temperature") +public class EquipTemperature extends CommonEntity implements Serializable { + + /**ID*/ + @TableId + private String id; + /**设备编号*/ + private String equipCode; + /**设备名称*/ + private String equipName; + /**设备登录账号*/ + private String adminUser; + /**设备登录密码*/ + private String adminPwd; + /**电量最低警报值*/ + private String powerMinWarn; + /**温度最低警报值*/ + private Integer temperatureMinWarn; + /**温度最高警报值*/ + private Integer temperatureMaxWarn; + /**设备温度*/ + 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; + /**0：启用，1禁用*/ + private String status; + + + +} 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/equip/api/entity/EquipTemperatureRecord.java new file mode 100644 index 00000000..3dc93e9d --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/EquipTemperatureRecord.java @@ -0,0 +1,46 @@ +package com.cloud.kicc.equip.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 java.io.Serializable; +import java.util.Date; + +@Data +@TableName("equip_temperature_record") +public class EquipTemperatureRecord extends CommonEntity implements Serializable { + + /**id*/ + @TableId + private String id; + /**et_id 温控设备id*/ + private String etId; + /**电量最低警报值*/ + private String powerMinWarn; + /**温度最低警报值*/ + private Integer temperatureMinWarn; + /**温度最高警报值*/ + private Integer temperatureMaxWarn; + /**设备温度*/ + private String equipTemperature; + /**设备湿度*/ + private String equipHumidity; + /**经度*/ + private String longitude; + /**纬度*/ + private String latitude; + /**设备位置*/ + private String equipAddr; + /**剩余电量*/ + private String equipPower; + /**设备状态*/ + private String equipStatus; + /**设备最新上报时间*/ + private String latestTime; + /**删除标记（0.启用 1.禁用*/ + private String status; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer/EquipBeeper.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeper.java similarity index 86% rename from kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer/EquipBeeper.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeper.java index 389dd621..8e21d0ec 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer/EquipBeeper.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeper.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity.beer; +package com.cloud.kicc.equip.api.entity.beeper; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,11 +9,10 @@ import lombok.Data; import java.io.Serializable; /** - * @Author: lizhi - * @Description: 呼叫器设备信息(EquipBeeper)表实体类 - * @Since 1.0 - * @Date Created in 14:55 2022/6/16 + * 呼叫器设备信息(EquipBeeper)表实体类 * + * @author Mak + * @since 2021-09-06 14:18:37 */ @Data @TableName("equip_beeper") @@ -48,4 +47,5 @@ public class EquipBeeper extends CommonEntity implements Serializable { /**医生名称*/ @TableField(exist = false) private String doctorName; + } diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer/EquipBeeperRecord.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeperRecord.java similarity index 79% rename from kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer/EquipBeeperRecord.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeperRecord.java index 71b8bac4..4ac2ac74 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer/EquipBeeperRecord.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/beeper/EquipBeeperRecord.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.equip.api.entity.beer; +package com.cloud.kicc.equip.api.entity.beeper; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -8,10 +8,10 @@ import lombok.Data; import java.io.Serializable; /** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 14:56 2022/6/16 + * 呼叫器设备呼叫记录(EquipBeeperRecord)表实体类 + * + * @author Mak + * @since 2021-09-06 14:20:39 */ @Data @TableName("equip_beeper_record") @@ -25,4 +25,5 @@ public class EquipBeeperRecord extends CommonEntity implements Serializable { private Integer recordType; /** 状态：(0.启用 1.禁用) 默认为0启用 */ private String status; + } diff --git a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBox.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBox.java index cac2b1fd..cd515cfd 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBox.java @@ -9,12 +9,13 @@ import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; /** - * @Author: lizhi - * @Description:标本箱设备信息(EquipBox)表实体类 - * @Since 1.0 - * @Date Created in 14:58 2022/6/16 + * 标本箱设备信息(EquipBox)表实体类 + * + * @author Mak + * @since 2021-09-14 19:07:07 */ @Data @TableName("equip_box") @@ -22,7 +23,7 @@ public class EquipBox extends CommonEntity implements Serializable { /**主键ID*/ @TableId - private String id; + private String boxId; /**设备名称*/ private String boxName; /**设备编号*/ @@ -93,4 +94,5 @@ public class EquipBox extends CommonEntity implements Serializable { /**物联网卡唯一标识号iccid*/ @TableField(exist = false) private String iccid; + } diff --git a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxCard.java similarity index 84% rename from kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxCard.java index 7f57832d..1d45a70d 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxCard.java @@ -8,10 +8,10 @@ import lombok.Data; import java.io.Serializable; /** - * @Author: lizhi - * @Description:物联网卡管理(EquipBoxCard)表实体类 - * @Since 1.0 - * @Date Created in 15:00 2022/6/16 + * 物联网卡管理(EquipBoxCard)表实体类 + * + * @author Mak + * @since 2022-02-13 12:06:29 */ @Data @TableName("equip_box_card") @@ -31,4 +31,6 @@ public class EquipBoxCard extends CommonEntity implements Serializable { /**卡是否已使用在标本箱上（0.否 1.是）*/ private Integer isUsed; + + } diff --git a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxLog.java similarity index 90% rename from kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxLog.java index 15d23161..81db3fe2 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxLog.java @@ -8,17 +8,17 @@ import lombok.Data; import java.io.Serializable; /** - * @Author: lizhi - * @Description:标本箱心跳日志记录(EquipBoxLog)表实体类 - * @Since 1.0 - * @Date Created in 15:02 2022/6/16 + * 标本箱心跳日志记录(EquipBoxLog)表实体类 + * + * @author Mak + * @since 2021-09-17 10:25:07 */ @Data @TableName("equip_box_log") public class EquipBoxLog extends CommonEntity implements Serializable { /**主键ID*/ @TableId - private String id; + private String boxLogId; /**标本箱id*/ private String boxId; /**设备温度*/ @@ -51,4 +51,5 @@ public class EquipBoxLog extends CommonEntity implements Serializable { private Integer errorStatus; /**状态：(0.启用 1.禁用)*/ private String status; + } diff --git a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxRecord.java similarity index 90% rename from kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxRecord.java index cf0d763f..bc069be1 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxRecord.java @@ -5,12 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** - * @Author: lizhi - * @Description:标本箱操作记录(EquipBoxRecord)表实体类 - * @Since 1.0 - * @Date Created in 15:22 2022/6/16 + * 标本箱操作记录(EquipBoxRecord)表实体类 + * + * @author Mak + * @since 2021-09-15 09:39:47 */ @Data @TableName("equip_box_record") @@ -52,4 +53,5 @@ public class EquipBoxRecord implements Serializable { private String timestamp; /**状态：(0.禁用 1.启用)*/ private String status; + } diff --git a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxRfidLog.java similarity index 82% rename from kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxRfidLog.java index b73bd4c3..d10de4fe 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxRfidLog.java @@ -6,12 +6,13 @@ import com.cloud.kicc.common.data.entity.CommonEntity; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** - * @Author: lizhi - * @Description:标本箱RFIDj记录信息(EquipBoxRfidLog)表实体类 - * @Since 1.0 - * @Date Created in 15:23 2022/6/16 + * 标本箱RFIDj记录信息(EquipBoxRfidLog)表实体类 + * + * @author Mak + * @since 2021-09-25 15:10:33 */ @Data @TableName("equip_box_rfid_log") @@ -27,4 +28,5 @@ public class EquipBoxRfidLog extends CommonEntity implements Serializable { private Integer rfidType; /**状态：(0.启用 1.禁用)*/ private String status; + } diff --git a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxUser.java similarity index 86% rename from kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxUser.java index 7bf795a4..9215f91e 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-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/equip/api/entity/box/EquipBoxUser.java @@ -9,10 +9,10 @@ import lombok.Data; import java.io.Serializable; /** - * @Author: lizhi - * @Description:标本箱指纹用户信息(EquipBoxUser)表实体类 - * @Since 1.0 - * @Date Created in 15:24 2022/6/16 + * 标本箱指纹用户信息(EquipBoxUser)表实体类 + * + * @author Mak + * @since 2021-09-15 09:40:50 */ @Data @TableName("equip_box_user") @@ -35,4 +35,5 @@ public class EquipBoxUser extends CommonEntity implements Serializable { @TableField(exist = false) private String boxName; + } 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/equip/api/enums/BoxStatusEnum.java new file mode 100644 index 00000000..d47c9b6e --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java @@ -0,0 +1,46 @@ +package com.cloud.kicc.equip.api.enums; + +public enum BoxStatusEnum { + //设备状态 (0.未连接 1.已连接 2.已断开 3.已休眠) + + INIT(0,"未连接"), + + TELNET(1,"已连接"), + + CLOSE(2,"已断开"), + + SLEEP(3,"已休眠"), + + OTHER(100,""); + private int code; + private String value; + + private BoxStatusEnum(int code, String value) { + this.setCode(code); + this.setValue(value); + } + + public int getCode() { + return code; + } + public void setCode(int code) { + this.code = code; + } + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + + //根据key获取枚举 + public static BoxStatusEnum getEnumByKey(Integer key){ + for(BoxStatusEnum temp: BoxStatusEnum.values()){ + if(temp.getCode() == key.intValue()){ + return temp; + } + } + return null; + } + +} 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/equip/api/enums/CmdEnum.java new file mode 100644 index 00000000..5c741e8f --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java @@ -0,0 +1,87 @@ +package com.cloud.kicc.equip.api.enums; + +public enum CmdEnum { + /** + * 上行指令 1.连接 2.获取设备配置 3.心跳上报数据 4.开锁 5.关锁 6.元件异常 7.上报变动RFID 8.上报所有RFID + * + * 下行指令 100.重置配置 105.语音播报 110.新增指纹 111.删除指纹 112.获取所有指纹 113.删除所有指纹 114.禁用指纹 115.启用指纹 + * 120.开启数据上报 121.关闭数据上报 122.开启制冷 123.关闭制冷 124.开锁 + */ + + TELNET_U(1,"连接"), + + CONFIG_U(2,"获取设备配置信息"), + + DATA_U(3,"心跳上报数据"), + + OPEN_U(4,"开锁"), + + CLOSE_U(5,"关锁"), + + ERROR_U(6,"元件异常"), + + RFID_CHANGE_U(7,"上报变动蓝牙"), + + RFID_ALL_U(8,"上报所有蓝牙"), + + + RESET_D(100,"更新配置信息"), + + VOICE_D(105,"语音播报"), + + ADD_FID_D(110,"新增指纹"), + + DEL_FID_D(111,"删除指纹"), + + ALL_FID_D(112,"获取所有指纹"), + + DEL_ALL_FID_D(113,"删除所有指纹"), + + DISABLE_FID_D(114,"禁用指纹"), + + ENABLE_FID_D(115,"启用指纹"), + + OPEN_DATA_D(120,"开启数据上报"), + + CLOSE_DATA_D(121,"关闭数据上报"), + + OPEN_COLD_D(122,"开启制冷"), + + CLOSE_COLD_D(123,"关闭制冷"), + + OPEN_D(124,"开锁"), + + + OTHER(1000,""); + private int code; + private String value; + + private CmdEnum(int code, String value) { + this.setCode(code); + this.setValue(value); + } + + public int getCode() { + return code; + } + public void setCode(int code) { + this.code = code; + } + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + + //根据key获取枚举 + public static CmdEnum getEnumByKey(Integer key){ + for(CmdEnum temp: CmdEnum.values()){ + if(temp.getCode() == key.intValue()){ + return temp; + } + } + return null; + } + +} 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/equip/api/enums/CmdStatusEnum.java new file mode 100644 index 00000000..edd7fe46 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java @@ -0,0 +1,44 @@ +package com.cloud.kicc.equip.api.enums; + +public enum CmdStatusEnum { + //指令响应状态（0.未响应 1.成功 2.失败） + + NOT(0,"未响应"), + + SUCCESS(1,"成功"), + + FAIL(2,"失败"), + + OTHER(100,""); + private int code; + private String value; + + private CmdStatusEnum(int code, String value) { + this.setCode(code); + this.setValue(value); + } + + public int getCode() { + return code; + } + public void setCode(int code) { + this.code = code; + } + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + + //根据key获取枚举 + public static CmdStatusEnum getEnumByKey(Integer key){ + for(CmdStatusEnum temp: CmdStatusEnum.values()){ + if(temp.getCode() == key.intValue()){ + return temp; + } + } + return null; + } + +} 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/equip/api/enums/WarnStatusEnum.java new file mode 100644 index 00000000..209f89ea --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java @@ -0,0 +1,48 @@ +package com.cloud.kicc.equip.api.enums; + +public enum WarnStatusEnum { + //报警状态（0. 正常 1.低温报警 2.高温报警 3.倾斜报警 4.锁未关报警） + + NORMAL(0,"正常"), + + TEMP_MIN(1,"低温报警"), + + TEMP_MAX(2,"高温报警"), + + TILT(3,"倾斜报警"), + + CLOSE(4,"锁未关报警"), + + OTHER(100,""); + private int code; + private String value; + + private WarnStatusEnum(int code, String value) { + this.setCode(code); + this.setValue(value); + } + + public int getCode() { + return code; + } + public void setCode(int code) { + this.code = code; + } + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + + //根据key获取枚举 + public static WarnStatusEnum getEnumByKey(Integer key){ + for(WarnStatusEnum temp: WarnStatusEnum.values()){ + if(temp.getCode() == key.intValue()){ + return temp; + } + } + return null; + } + +} 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 new file mode 100644 index 00000000..3ce88f08 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/DownCmdVo.java @@ -0,0 +1,33 @@ +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 new file mode 100644 index 00000000..6aa7a22d --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipBoxCardVo.java @@ -0,0 +1,23 @@ +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 new file mode 100644 index 00000000..3b5dc180 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipBoxConfigVo.java @@ -0,0 +1,25 @@ +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/box/DownCmdVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java new file mode 100644 index 00000000..d16c96d4 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java @@ -0,0 +1,33 @@ +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-equip-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 similarity index 50% rename from kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxCardVo.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxCardVo.java index c549a1cf..353b115d 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-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 @@ -5,16 +5,19 @@ import lombok.Data; import java.io.Serializable; /** - * @Author: lizhi - * @Description:物联网卡管理(EquipBoxCard)表实体类 - * @Since 1.0 - * @Date Created in 15:28 2022/6/16 + * 物联网卡管理(EquipBoxCard)表实体类 + * + * @author Mak + * @since 2022-02-13 12:06:29 */ @Data -public class EquipBoxCardVo implements Serializable { +public class EquipBoxCardVo implements Serializable { + private Integer cardId; private String iccid; private String card; + + } diff --git a/kicc-platform/kicc-platform-api/kicc-equip-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 similarity index 81% rename from kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxConfigVo.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxConfigVo.java index 273694cb..2bb3eaa6 100644 --- a/kicc-platform/kicc-platform-api/kicc-equip-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 @@ -5,13 +5,14 @@ import lombok.Data; import java.io.Serializable; /** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 15:29 2022/6/16 + * 标本箱设备信息(EquipBox)表实体类 + * + * @author Mak + * @since 2021-09-14 19:07:07 */ @Data public class EquipBoxConfigVo implements Serializable { + //温度最低警报值 private Double tempMin; //温度最高警报值 @@ -20,4 +21,5 @@ public class EquipBoxConfigVo implements Serializable { private Integer rfidMin; //每隔多少秒上报一次数据 private Integer beat; + } diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/pom.xml b/kicc-platform/kicc-platform-api/kicc-equip-api/pom.xml deleted file mode 100644 index f856c396..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - kicc-platform-api - com.cloud - 1.0.0 - - 4.0.0 - - kicc-equip-api - - jar - kicc的iot接口api模块 - - - - - com.cloud - kicc-common-feign - - - - com.cloud - kicc-common-data - - - - com.pig4cloud.excel - excel-spring-boot-starter - - - - \ No newline at end of file diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java b/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java deleted file mode 100644 index 74f33f73..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cloud.kicc.equip.api.constant; - -/** - * @Author: lizhi - * @Description:设备常量 - * @Since 1.0 - * @Date Created in 14:50 2022/6/16 - */ -public interface EquipConstants { - int NO_CODE = 0; - int YES_CODE = 1; - int SECOND_CODE = 2; -} diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java b/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java deleted file mode 100644 index f16b6efc..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cloud.kicc.equip.api.dto.box; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author: lizhi - * @Description:下行指令返回值 - * @Since 1.0 - * @Date Created in 14:51 2022/6/16 - */ -@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-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java b/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java deleted file mode 100644 index 31a3965d..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cloud.kicc.equip.api.dto.box; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author: lizhi - * @Description:变动rfids参数 - * @Since 1.0 - * @Date Created in 14:52 2022/6/16 - */ -@Data -public class RfidsParam implements Serializable { - // 上报的RFID标签 - private String rfid; - - // 变动类型（1.进 2.出） - private Integer type; -} diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java b/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java deleted file mode 100644 index 283bc4da..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.cloud.kicc.equip.api.dto.box; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author: lizhi - * @Description:上行指令参数 - * @Since 1.0 - * @Date Created in 14:53 2022/6/16 - */ -@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-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java deleted file mode 100644 index 7f75ac8f..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cloud.kicc.equip.api.enums; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 15:25 2022/6/16 - */ -public enum BoxStatusEnum { - //设备状态 (0.未连接 1.已连接 2.已断开 3.已休眠) - - INIT(0,"未连接"), - - TELNET(1,"已连接"), - - CLOSE(2,"已断开"), - - SLEEP(3,"已休眠"), - - OTHER(100,""); - private int code; - private String value; - - private BoxStatusEnum(int code, String value) { - this.setCode(code); - this.setValue(value); - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - //根据key获取枚举 - public static BoxStatusEnum getEnumByKey(Integer key){ - for(BoxStatusEnum temp: BoxStatusEnum.values()){ - if(temp.getCode() == key.intValue()){ - return temp; - } - } - return null; - } -} diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java b/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java deleted file mode 100644 index 4767d83c..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.cloud.kicc.equip.api.enums; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 15:26 2022/6/16 - */ -/** - * 上行指令 1.连接 2.获取设备配置 3.心跳上报数据 4.开锁 5.关锁 6.元件异常 7.上报变动RFID 8.上报所有RFID - * - * 下行指令 100.重置配置 105.语音播报 110.新增指纹 111.删除指纹 112.获取所有指纹 113.删除所有指纹 114.禁用指纹 115.启用指纹 - * 120.开启数据上报 121.关闭数据上报 122.开启制冷 123.关闭制冷 124.开锁 - */ -public enum CmdEnum { - TELNET_U(1,"连接"), - - CONFIG_U(2,"获取设备配置信息"), - - DATA_U(3,"心跳上报数据"), - - OPEN_U(4,"开锁"), - - CLOSE_U(5,"关锁"), - - ERROR_U(6,"元件异常"), - - RFID_CHANGE_U(7,"上报变动蓝牙"), - - RFID_ALL_U(8,"上报所有蓝牙"), - - - RESET_D(100,"更新配置信息"), - - VOICE_D(105,"语音播报"), - - ADD_FID_D(110,"新增指纹"), - - DEL_FID_D(111,"删除指纹"), - - ALL_FID_D(112,"获取所有指纹"), - - DEL_ALL_FID_D(113,"删除所有指纹"), - - DISABLE_FID_D(114,"禁用指纹"), - - ENABLE_FID_D(115,"启用指纹"), - - OPEN_DATA_D(120,"开启数据上报"), - - CLOSE_DATA_D(121,"关闭数据上报"), - - OPEN_COLD_D(122,"开启制冷"), - - CLOSE_COLD_D(123,"关闭制冷"), - - OPEN_D(124,"开锁"), - - - OTHER(1000,""); - private int code; - private String value; - - private CmdEnum(int code, String value) { - this.setCode(code); - this.setValue(value); - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - //根据key获取枚举 - public static CmdEnum getEnumByKey(Integer key){ - for(CmdEnum temp: CmdEnum.values()){ - if(temp.getCode() == key.intValue()){ - return temp; - } - } - return null; - } -} diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java deleted file mode 100644 index f5129ad9..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cloud.kicc.equip.api.enums; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 15:27 2022/6/16 - */ -public enum CmdStatusEnum { - //指令响应状态（0.未响应 1.成功 2.失败） - - NOT(0,"未响应"), - - SUCCESS(1,"成功"), - - FAIL(2,"失败"), - - OTHER(100,""); - private int code; - private String value; - - private CmdStatusEnum(int code, String value) { - this.setCode(code); - this.setValue(value); - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - //根据key获取枚举 - public static CmdStatusEnum getEnumByKey(Integer key){ - for(CmdStatusEnum temp: CmdStatusEnum.values()){ - if(temp.getCode() == key.intValue()){ - return temp; - } - } - return null; - } - -} diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java deleted file mode 100644 index d0b47ddc..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.cloud.kicc.equip.api.enums; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 15:27 2022/6/16 - */ -public enum WarnStatusEnum { - //报警状态（0. 正常 1.低温报警 2.高温报警 3.倾斜报警 4.锁未关报警） - - NORMAL(0,"正常"), - - TEMP_MIN(1,"低温报警"), - - TEMP_MAX(2,"高温报警"), - - TILT(3,"倾斜报警"), - - CLOSE(4,"锁未关报警"), - - OTHER(100,""); - private int code; - private String value; - - private WarnStatusEnum(int code, String value) { - this.setCode(code); - this.setValue(value); - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - //根据key获取枚举 - public static WarnStatusEnum getEnumByKey(Integer key){ - for(WarnStatusEnum temp: WarnStatusEnum.values()){ - if(temp.getCode() == key.intValue()){ - return temp; - } - } - return null; - } - -} diff --git a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java b/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java deleted file mode 100644 index d43485a6..00000000 --- a/kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cloud.kicc.equip.api.vo.box; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author: lizhi - * @Description: - * @Since 1.0 - * @Date Created in 15:28 2022/6/16 - */ -@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-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java index e329d75b..a105e9c5 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java @@ -39,4 +39,11 @@ public interface RemoteUserService { @GetMapping(AppConstants.APP_SYSTEM + "/user/selectByPhone/{phone}") R selectByPhone(@PathVariable("phone") String phone, @RequestHeader(SecurityConstants.FROM) String from); + /** + * 通过id查询 + * @param userId + * @return + */ + @GetMapping(AppConstants.APP_SYSTEM + "/user/selectByUserName/{userId}") + R getById(@PathVariable("userId") String userId); } 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 835cdedf..3ddca45c 100644 --- a/kicc-platform/kicc-platform-api/kicc-template-api/pom.xml +++ b/kicc-platform/kicc-platform-api/kicc-template-api/pom.xml @@ -2,14 +2,15 @@ 4.0.0 - + + com.cloud kicc-platform-api 1.0.0 kicc-template-api - jar + pom kicc 新建api模块模板,只提供基础依赖 diff --git a/kicc-platform/kicc-platform-api/pom.xml b/kicc-platform/kicc-platform-api/pom.xml index 53505d01..66b68337 100644 --- a/kicc-platform/kicc-platform-api/pom.xml +++ b/kicc-platform/kicc-platform-api/pom.xml @@ -19,7 +19,9 @@ kicc-common-api kicc-monitor-api kicc-template-api - kicc-equip-api + + + 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 1879c5a3..5b48544c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml @@ -54,6 +54,24 @@ com.cloud kicc-common-mock + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.1 + + + + org.apache.qpid + 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/amqp/AmqpDemo.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/AmqpDemo.java new file mode 100644 index 00000000..203f60e2 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/AmqpDemo.java @@ -0,0 +1,173 @@ +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 new file mode 100644 index 00000000..5d7f35fc --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/amqp/testDemo.java @@ -0,0 +1,13 @@ +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/config/KiccProperties.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/config/KiccProperties.java new file mode 100644 index 00000000..292bd5a3 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/config/KiccProperties.java @@ -0,0 +1,21 @@ +package com.cloud.kicc.commonbiz.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +/** + * @Author: TangSheng + * @Description: + * @Since 1.0 + * @Date Created in 14:59 2022/4/18 + */ +@Data +@Configuration +@ConfigurationProperties("kicc") +public class KiccProperties { + + /**百度地图appKey*/ + private String mapAk; + +} 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/equip/EquipBeeperController.java new file mode 100644 index 00000000..ae7cdc9a --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBeeperController.java @@ -0,0 +1,100 @@ +package com.cloud.kicc.commonbiz.controller.equip; + + +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 lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +/** + * 呼叫器设备信息(EquipBeeper)表控制层 + * + * @author Mak + * @since 2021-09-06 14:18:38 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/equip/beeper") +public class EquipBeeperController { + + private final EquipBeeperService equipBeeperService; + + + private final EquipBeeperRecordService equipBeeperRecordService; + + /** + * 获取呼叫器信息 + * @param id + * @return + */ + @GetMapping(value = "/getById") + public R getEquipBeeperInfo(@RequestParam("id") String id) { + return R.ok(equipBeeperService.getData(id)); + } + + /** + * 新增呼叫器信息 + * @param param + * @return + * @throws Exception + */ + @PostMapping(value = "/add") + public R add(@RequestBody EquipBeeper param) { + boolean save = equipBeeperService.save(param); + // 自定义code + param.setBeeperCode("H"+ param.getId()); + return R.ok(); + } + + /** + * 编辑呼叫器信息 + * @param param + * @return + */ + @PutMapping(value = "/update") + public R update(@RequestBody EquipBeeper param) { + equipBeeperService.updateById(param); + return R.ok(); + } + + /** + * 获取呼叫器列表 + * @return + * @throws Exception + */ + @GetMapping(value = "/list") + public R list(Page page, EquipBeeper equipBeeper) { + return R.ok(equipBeeperService.pageData(page, equipBeeper)); + } + + /** + * @Author: Mak + * @Description: 删除呼叫器 + * @Date: 2021/9/27 + * @Modified by: + */ + @DeleteMapping(value = "/remove/{id:[\\w,]+}") + public R remove(@PathVariable("id") String[] id) { + this.equipBeeperService.removeByIds(Arrays.asList(id)); + return R.ok(); + } + + /** + * @Author: Mak + * @Description: 查询呼叫器呼叫记录列表 + * @Date: 2021/9/26 + * @Modified by: + */ + @GetMapping(value = "/record/list") + public R listEquipBeeperRecord(@RequestParam("beeperCode") String beeperCode) { + return R.ok(equipBeeperRecordService.listBeeperRecord(beeperCode)); + } + + +} 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/equip/EquipBoxCardController.java new file mode 100644 index 00000000..34a187c9 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxCardController.java @@ -0,0 +1,105 @@ +package com.cloud.kicc.commonbiz.controller.equip; + + + +import cn.hutool.core.util.StrUtil; +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.cloud.kicc.common.core.api.R; +import com.cloud.kicc.commonbiz.service.box.EquipBoxCardService; +import com.cloud.kicc.equip.api.entity.box.EquipBoxCard; + +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +/** + * 物联网卡管理(EquipBoxCard)表控制层 + * + * @author Mak + * @since 2022-02-13 12:06:30 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/equip/boxcard") +public class EquipBoxCardController { + + + private final EquipBoxCardService equipBoxCardService; + + /** + * 分页查询所有数据 + * @return 所有数据 + */ + @GetMapping("/page") + public R page(Page page, EquipBoxCard equipBoxCard) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StrUtil.isNotBlank(equipBoxCard.getStatus()),EquipBoxCard::getCard, equipBoxCard.getStatus()); + queryWrapper.like(StrUtil.isNotBlank(equipBoxCard.getIccid()),EquipBoxCard::getIccid, equipBoxCard.getIccid()); + queryWrapper.like(StrUtil.isNotBlank(equipBoxCard.getCard()),EquipBoxCard::getCard, equipBoxCard.getCard()); + + IPage iPage = this.equipBoxCardService.getBaseMapper().selectPage(page, queryWrapper); + + return R.ok(iPage.getRecords(), iPage.getSize()); + } + + /** + * @Author: Mak + * @Description: 获取卡列表，用于下拉选择 + * @Date: 2022/2/13 + * @Modified by: + */ + @GetMapping("/listForSelect") + public R listCardForSelect(@RequestParam("isUsed") Integer isUsed) throws Exception{ + return R.ok(equipBoxCardService.listCardForSelect(isUsed)); + } + + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/getById") + public R getById(@RequestParam("id") String id) { + return R.ok(this.equipBoxCardService.getById(id)); + } + + /** + * 新增数据 + * @param param 实体对象 + * @return 新增结果 + */ + @PostMapping("/add") + public R add(@RequestBody EquipBoxCard param) { + this.equipBoxCardService.save(param); + return R.ok(); + } + + /** + * 修改数据 + * + * @param param 实体对象 + * @return 修改结果 + */ + @PutMapping("/update") + public R update(@RequestBody EquipBoxCard param) { + return R.ok(this.equipBoxCardService.updateById(param)); + } + + /** + * 启用、禁用、删除数据 + * + * @param id 主键 + * @return 删除结果 + */ + @DeleteMapping("/remove/{id:[\\w,]+}") + public R remove(@PathVariable("id") String[] id) { + this.equipBoxCardService.removeByIds(Arrays.asList(id)); + return R.ok(); + } + +} 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/equip/EquipBoxController.java new file mode 100644 index 00000000..6fbb0ad8 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxController.java @@ -0,0 +1,130 @@ +package com.cloud.kicc.commonbiz.controller.equip; + + +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 lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +/** + * 标本箱设备信息(EquipBox)表控制层 + * + * @author Mak + * @since 2021-09-14 19:07:07 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/equip/box") +public class EquipBoxController { + + + private final EquipBoxService equipBoxService; + + private final EquipBoxLogService equipBoxLogService; + + private final EquipBoxRecordService equipBoxRecordService; + + private final BoxDownCmdService boxDownCmdService; + + + /** + * 获取标本箱信息 + * @param id + * @return + */ + @GetMapping("/getById") + public R getById(@RequestParam("id") String id) { + return R.ok(equipBoxService.getData(id)); + } + + /** + * 新增标本箱信息 + * @param param + * @return + */ + @PostMapping("/add") + public R add(@RequestBody EquipBox param) { + return R.ok(equipBoxService.addData(param)); + } + + /** + * 编辑标本箱信息 + * @param param + * @return + */ + @PutMapping + public R update(@RequestBody EquipBox param) { + return R.ok(equipBoxService.updateById(param)); + } + + /** + * 获取标本箱列表 + * @param page + * @param equipBox + * @return + */ + @GetMapping(value = "/list") + public R listEquipBox(Page page, EquipBox equipBox) { + return R.ok(equipBoxService.pageData(page, equipBox)); + } + + /** + * @Author: Mak + * @Description: 删除标本箱 + * @Date: 2021/9/27 + * @Modified by: + */ + @DeleteMapping("/remove/{id:[\\w,]+}") + public R remove(@PathVariable String[] id) { + this.equipBoxService.removeByIds(Arrays.asList(id)); + return R.ok(); + } + + /** + * @Author: Mak + * @Description: 查询标本箱心跳日志列表 + * @Date: 2021/9/26 + * @Modified by: + */ + @GetMapping("/log/list") + public R listEquipBoxLogs(@RequestParam("boxId") Integer boxId) { + return R.ok(equipBoxLogService.listBoxLogs(boxId)); + } + + /** + * @Author: Mak + * @Description: 查询标本箱操作日志列表 + * @Date: 2021/9/26 + * @Modified by: + */ + @GetMapping(value = "/record/list") + public R listEquipBoxRecords(@RequestParam("boxId") String boxId) { + return R.ok(equipBoxRecordService.listBoxRecords(boxId)); + } + + + + /** + * @Author: Mak + * @Description: 统一下发指令接口 + * @Date: 2021/9/24 + * @Modified by: + */ + @GetMapping(value = "/cmd") + public R cmdToEquipBox(@RequestParam("id") String id, + @RequestParam("cmd") Integer cmd, + @RequestParam(value = "data",required = false) String data){ + boxDownCmdService.downCmdToEquipBox(id, cmd,data); + return R.ok(); + } + + +} 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 new file mode 100644 index 00000000..f512861d --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxUserController.java @@ -0,0 +1,93 @@ +package com.cloud.kicc.commonbiz.controller.equip; + + +import com.cloud.kicc.common.core.api.R; +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 lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + + +/** + * 标本箱设备信息(EquipBox)表控制层 + * + * @author Mak + * @since 2021-09-14 19:07:07 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/equip/box/user") +public class EquipBoxUserController { + + + private final EquipBoxUserService equipBoxUserService; + + private final BoxDownCmdService boxDownCmdService; + + /** + * @Author: Mak + * @Description: 新增标本箱用户 + * @Date: 2021/9/26 + * @Modified by: + */ + @PostMapping("/add") + public R add(@RequestBody EquipBoxUser param) { + equipBoxUserService.addData(param); + return R.ok(); + } + + /** + * @Author: Mak + * @Description: 修改标本箱用户 + * @Date: 2021/9/26 + * @Modified by: + */ + @PutMapping("/update") + public R update(@RequestBody EquipBoxUser param) { + equipBoxUserService.updateById(param); + return R.ok(); + } + + /** + * @Author: Mak + * @Description: 查询标本箱用户列表 + * @Date: 2021/9/26 + * @Modified by: + */ + @GetMapping("/list") + public R listEquipBoxUser(@RequestParam("boxId") String boxId, + @RequestParam(value = "userName", required = false) String userName) { + return R.ok(equipBoxUserService.listBoxUser(boxId, userName)); + } + + /** + * @Author: Mak + * @Description: 删除标本箱用户 - 前提是已删除指纹 + * @Date: 2021/9/27 + * @Modified by: + */ + @DeleteMapping("/remove/{id:[\\w,]+}") + public R remove(@PathVariable String[] id) { + this.equipBoxUserService.removeByIds(Arrays.asList(id)); + return R.ok(); + } + + /** + * @Author: Mak + * @Description: 下发添加指纹指令 + * @Date: 2021/9/24 + * @Modified by: + */ + @GetMapping("/changeFid") + public R changeUserFid(@RequestParam("id") String id, @RequestParam("cmd") Integer cmd) { + boxDownCmdService.changeEquipUser(id, cmd); + return R.ok(); + } + + + +} 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 new file mode 100644 index 00000000..65fe1de7 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipSpecimenController.java @@ -0,0 +1,99 @@ +package com.cloud.kicc.commonbiz.controller.equip; + + +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 lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/equip/specimen") +public class EquipSpecimenController { + + + private final EquipSpecimenService equipSpecimenService; + + /** + * 新增标本箱信息 + * @param param + * @return + * @throws Exception + */ + @PostMapping("/add") + public R add(@RequestBody EquipSpecimen param) { + return R.ok(equipSpecimenService.save(param)); + } + + /** + * 获取标本箱信息 + * @param esId + * @return + */ + @GetMapping("/getById") + public R getEquipSpecimen(@RequestParam("esId") String esId) { + return R.ok(equipSpecimenService.getById(esId)); + } + + /** + * 获取标本箱详细信息 + * @param esId + * @return + */ + @GetMapping("/specimenDetail") + public R getEquipSpecimenDetail(@RequestParam("esId") String esId) { + EquipSpecimenUsageVo equip = equipSpecimenService.getDetailInfo(esId); + return R.ok(equip); + } + + /** + * 编辑标本箱信息 + * @param param + * @return + */ + @PutMapping("/specimen") + public R updateEquipSpecimen(@RequestBody EquipSpecimen param) { + return R.ok(equipSpecimenService.saveOrUpdate(param)); + } + + /** + * 获取标本箱列表 + * @param page + * @param specimen + * @return + */ + @GetMapping("/listSpecimen") + public R listEquipSpecimen(Page page, EquipSpecimen specimen) { + return R.ok(equipSpecimenService.pageData(page, specimen)); + } + + /** + * 查询标本箱当前使用情况 + * @param syUserId + * @return + */ + @GetMapping("/specimenUsage") + public R getEquipSpecimenUsage(@RequestParam("syUserId") String syUserId) { + EquipSpecimenUsageVo equip = equipSpecimenService.getEquipSpecimenUsage(syUserId); + return R.ok(equip); + } + + /** + * 删除 + * @param id + * @return + */ + @DeleteMapping("/remove/{id:[\\w,]+}") + public R remove(@PathVariable String[] id) { + this.equipSpecimenService.removeByIds(Arrays.asList(id)); + return R.ok(); + } + +} 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 new file mode 100644 index 00000000..cc450055 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipTemperatureController.java @@ -0,0 +1,126 @@ +package com.cloud.kicc.commonbiz.controller.equip; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.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 lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.Arrays; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/equip/temperature") +public class EquipTemperatureController { + + + private final EquipTemperatureService equipTemperatureService; + + private final EquipTemperatureRecordService equipTemperatureRecordService; + + /** + * 新增报告单信息 + * @param param + * @return + */ + @PostMapping(value = "/add") + public R add(@Valid @RequestBody EquipTemperature param) { + if (StrUtil.isNotBlank(param.getEquipName())){ + param.setEquipName(EquipConstants.TEMP_NAME_PREFIX+param.getEquipCode()); + } + return R.ok(equipTemperatureService.save(param)); + } + + /** + * 获取报告单信息 + * @param id + * @return + */ + @GetMapping("/getById") + public R getById(@RequestParam("etId") String id) { + return R.ok(equipTemperatureService.getById(id)); + } + + /** + * 编辑报告单信息 + * @param param + * @return + */ + @PutMapping(value = "/update") + public R update(@RequestBody EquipTemperature param) { + if (StrUtil.isNotBlank(param.getEquipName())){ + param.setEquipName(EquipConstants.TEMP_NAME_PREFIX+param.getEquipCode()); + } + return R.ok(equipTemperatureService.saveOrUpdate(param)); + } + + /** + * 获取可选择温控设备下拉列表 + * @param id + * @return + */ + @GetMapping("/listForSelect") + public R getEquipTempForSelect(@RequestParam(value = "id",required = false) String id) { + //List equipTemperature = equipTemperatureService.listEquipTempForSelect(esId); + return R.ok(); + } + + /** + * 获取温控设备list + * @param page + * @param equipTemperature + * @return + * @throws Exception + */ + @GetMapping(value = "/list") + public R listEquipTemperature(Page page, EquipTemperature equipTemperature) { + IPage iPage = equipTemperatureService.pageData(page, equipTemperature); + return R.ok(iPage.getRecords(), iPage.getTotal()); + } + + /** + * 删除温控设备 + * @param id + * @return + */ + @DeleteMapping("/remove/{id:[\\w,]+}") + public R remove(@PathVariable("id") String[] id){ + equipTemperatureService.removeByIds(Arrays.asList(id)); + return R.ok(); + } + + /** + * @Author: Mak + * @Description: 查询温控设备记录 + * @Date: 2021/12/6 + * @Modified by: + */ + @GetMapping("/records") + public R listEquipTemperatureRecord(Page page, EquipTemperatureRecordParam param) { + //equipTemperatureRecordService.listRecord(page, param) + return R.ok(); + } + + /** + * @Author: Mak + * @Description: 导出温控设备的数据 + * @Date: 2021/12/6 + * @Modified by: + */ + @GetMapping(value = "/export") + public R listEquipTemperatureRecord(EquipTemperatureRecordParam param) { + //equipTemperatureRecordService.exportRecordForPfd(param); + return R.ok(); + } + + +} 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/equip/EquipBeeperMapper.java new file mode 100644 index 00000000..64e7c6e4 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperMapper.java @@ -0,0 +1,34 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.cloud.kicc.equip.api.entity.beeper.EquipBeeper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 呼叫器设备信息(EquipBeeper)表数据库访问层 + * + * @author Mak + * @since 2021-09-06 14:18:37 + */ +@Mapper +public interface EquipBeeperMapper extends BaseMapper { + + /** + * 查询数据 + * @param id + * @return + */ + EquipBeeper selectData(@Param("id") String id); + + /** + * 查询分页树 + * @param page 分页 + * @param param 查询条件 + * @return + */ + IPage pageQuery(IPage page, @Param(value = "opm") EquipBeeper 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/equip/EquipBeeperRecordMapper.java new file mode 100644 index 00000000..f8d77aa7 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBeeperRecordMapper.java @@ -0,0 +1,17 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.equip.api.entity.beeper.EquipBeeperRecord; +import org.apache.ibatis.annotations.Mapper; + +/** + * 呼叫器设备呼叫记录(EquipBeeperRecord)表数据库访问层 + * + * @author Mak + * @since 2021-09-06 14:20:39 + */ +@Mapper +public interface EquipBeeperRecordMapper extends BaseMapper { + +} 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/equip/EquipBoxCardMapper.java new file mode 100644 index 00000000..45741c2a --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxCardMapper.java @@ -0,0 +1,17 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.equip.api.entity.box.EquipBoxCard; +import org.apache.ibatis.annotations.Mapper; + +/** + * 物联网卡管理(EquipBoxCard)表数据库访问层 + * + * @author Mak + * @since 2022-02-13 12:06:29 + */ +@Mapper +public interface EquipBoxCardMapper extends BaseMapper { + +} 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/equip/EquipBoxLogMapper.java new file mode 100644 index 00000000..d8f674ce --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxLogMapper.java @@ -0,0 +1,17 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.equip.api.entity.box.EquipBoxLog; +import org.apache.ibatis.annotations.Mapper; + +/** + * 标本箱心跳日志记录(EquipBoxLog)表数据库访问层 + * + * @author Mak + * @since 2021-09-17 10:25:07 + */ +@Mapper +public interface EquipBoxLogMapper extends BaseMapper { + +} 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/equip/EquipBoxMapper.java new file mode 100644 index 00000000..d3dba66c --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxMapper.java @@ -0,0 +1,34 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.cloud.kicc.equip.api.entity.box.EquipBox; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 标本箱设备信息(EquipBox)表数据库访问层 + * + * @author Mak + * @since 2021-09-14 19:07:07 + */ +@Mapper +public interface EquipBoxMapper extends BaseMapper { + + /** + * 根据标本箱id查询标本箱信息 + * @param id + * @return + */ + EquipBox selectData(String id); + + /** + * 分页条件查询标本箱信息 + * @param page + * @param param + * @return + */ + IPage pageQuery(IPage page, @Param(value = "opm") EquipBox 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/equip/EquipBoxRecordMapper.java new file mode 100644 index 00000000..3a0b6516 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRecordMapper.java @@ -0,0 +1,17 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.equip.api.entity.box.EquipBoxRecord; +import org.apache.ibatis.annotations.Mapper; + +/** + * 标本箱操作记录(EquipBoxRecord)表数据库访问层 + * + * @author Mak + * @since 2021-09-15 09:39:47 + */ +@Mapper +public interface EquipBoxRecordMapper extends BaseMapper { + +} 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/equip/EquipBoxRfidLogMapper.java new file mode 100644 index 00000000..5924ba03 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxRfidLogMapper.java @@ -0,0 +1,19 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.equip.api.entity.box.EquipBoxRfidLog; +import org.apache.ibatis.annotations.Mapper; + +/** + * 标本箱RFIDj记录信息(EquipBoxRfidLog)表数据库访问层 + * + * @author Mak + * @since 2021-09-25 15:10:33 + */ +@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/equip/EquipBoxUserMapper.java new file mode 100644 index 00000000..70c9accf --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipBoxUserMapper.java @@ -0,0 +1,21 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.equip.api.entity.box.EquipBoxUser; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 标本箱指纹用户信息(EquipBoxUser)表数据库访问层 + * + * @author Mak + * @since 2021-09-15 09:40:50 + */ +@Mapper +public interface EquipBoxUserMapper extends BaseMapper { + + List listQuery(EquipBoxUser param); + +} 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/equip/EquipSpecimenMapper.java new file mode 100644 index 00000000..03cf82d8 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipSpecimenMapper.java @@ -0,0 +1,28 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface EquipSpecimenMapper extends BaseMapper { + + /** + * 分页条件查询 + * @param page + * @param param + * @return + */ + IPage pageQuery(IPage page, @Param(value = "opm") EquipSpecimen param); + + /** + * 根据当前登录用户id获取其标本箱的信息以及温度信息 + * @param id 用户id + * @return EquipSpecimenListVo + */ + EquipSpecimenListVo getEquipSpecimenInfo(Integer id); +} 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/equip/EquipTemperatureMapper.java new file mode 100644 index 00000000..3cfcfe8a --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureMapper.java @@ -0,0 +1,11 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.equip.api.entity.EquipTemperature; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface EquipTemperatureMapper extends BaseMapper { + +} 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/equip/EquipTemperatureRecordMapper.java new file mode 100644 index 00000000..c25f41b7 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/equip/EquipTemperatureRecordMapper.java @@ -0,0 +1,13 @@ +package com.cloud.kicc.commonbiz.mapper.equip; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cloud.kicc.equip.api.entity.EquipTemperatureRecord; +import org.apache.ibatis.annotations.Mapper; + + + +@Mapper +public interface EquipTemperatureRecordMapper extends BaseMapper { + +} 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 new file mode 100644 index 00000000..8276458b --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipSpecimenService.java @@ -0,0 +1,62 @@ +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 java.util.List; + +/** + * @Author: Mak + * @Description: + * @Date: 2020/12/28 + * @Modified by: + */ +public interface EquipSpecimenService extends IService { + + /** + * @Author: Mak + * @Description: 查询收样员当前使用的标本箱情况 + * @Date: 2021/1/5 + * @Modified by: + */ + EquipSpecimenUsageVo getEquipSpecimenUsage(String syUserId); + + /** + * @Author: Mak + * @Description: 查询当前标本箱使用情况 + * @Date: 2021/1/5 + * @Modified by: + */ + EquipSpecimenUsageVo getDetailInfo(String esId); + + /** + * @Author: Mak + * @Description: 查询当前已有标本箱的收样员列表 + * @Date: 2021/1/5 + * @Modified by: + * @return + */ + List listSyUserId(); + + /** + * @Author: Mak + * @Description: 分页 + * @Date: 2021/1/5 + * @Modified by: + */ + IPage pageData(Page page, EquipSpecimen param); + + /** + * 查询当前设备箱的温控设备温度，若温度异常则插入消息 + * 若消息收样员超过十分钟没有读取消息则通知当前在线的客服 + * @param remindUserId 当前登录用户的id + * @param remindUserName 当前登录用户名 + * @param remindType 类型 + * @return RemindHourVo + */ + //RemindHourVo equipSpecimenList(String remindUserId,String remindUserName, Integer remindType); +} 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 new file mode 100644 index 00000000..203c14f3 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureRecordService.java @@ -0,0 +1,35 @@ +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; + +/** + * @Author: Mak + * @Description: + * @Date: 2020/12/28 + * @Modified by: + */ +public interface EquipTemperatureRecordService extends IService { + + /** + * @Author: Mak + * @Description: 获取可选择的温控设备下拉列表 + * @Date: 2020/12/29 + * @Modified by: + */ + //List listRecord(EquipTemperatureRecordParam param); + + /** + * @Author: Mak + * @Description: 导出标本箱温控数据，生成pdf + * @Date: 2021/12/6 + * @Modified by: + */ + //String exportRecordForPfd(EquipTemperatureRecordParam param); + + +} 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 new file mode 100644 index 00000000..d8153933 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/EquipTemperatureService.java @@ -0,0 +1,49 @@ +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; + + +/** + * @Author: Mak + * @Description: + * @Date: 2020/12/28 + * @Modified by: + */ +public interface EquipTemperatureService extends IService { + + + //EquipTemperature pullEquipmentDataByApi(String etId); + + + /** + * @Author: Mak + * @Description: 定时拉取温控设备最新数据 + * @Date: 2020/12/29 + * @Modified by: + */ + void taskToPullTemperatureEquipData(); + + /** + * @Author: Mak + * @Description: 获取可选择的温控设备下拉列表 + * @Date: 2020/12/29 + * @Modified by: + * @param esId + */ + //List listEquipTempForSelect(String esId) throws Exception; + + /** + * 分页条件查询 + * @param page + * @param param + * @return + */ + IPage pageData(Page page, EquipTemperature param); +} 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/beeper/EquipBeeperRecordService.java new file mode 100644 index 00000000..0e4c207d --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperRecordService.java @@ -0,0 +1,24 @@ +package com.cloud.kicc.commonbiz.service.beeper; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.equip.api.entity.beeper.EquipBeeperRecord; + +import java.util.List; + +/** + * 呼叫器设备呼叫记录(EquipBeeperRecord)表服务接口 + * + * @author Mak + * @since 2021-09-06 14:20:39 + */ +public interface EquipBeeperRecordService extends IService { + + /** + * 查询呼叫器呼叫记录列表 + * @param beeperCode 设备编码code + * @return 记录 + */ + List listBeeperRecord(String beeperCode); + +} 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/beeper/EquipBeeperService.java new file mode 100644 index 00000000..4d609847 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/beeper/EquipBeeperService.java @@ -0,0 +1,60 @@ +package com.cloud.kicc.commonbiz.service.beeper; + + + +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 java.util.Map; + +/** + * 呼叫器设备信息(EquipBeeper)表服务接口 + * + * @author Mak + * @since 2021-09-06 14:18:37 + */ +public interface EquipBeeperService extends IService { + + /** + * 根据设备编码查询 + * @param beeperCode + * @return + */ + EquipBeeper getByCode(String beeperCode); + + /** + * 根据id查询 + * @param id + * @return + */ + EquipBeeper getData(String id); + + + /** + * @Author: Mak + * @Description: 分页 + * @Date: 2021/1/5 + * @Modified by: + * @return + */ + IPage pageData(Page page, EquipBeeper param); + + /** + * 获取呼叫器无线 + * @param beeperCode + * @return + */ + Map getBeeperWifi(String beeperCode); + + /** + * 呼叫器新增呼叫记录 + * @param beeperCode + * @return + */ + boolean beeperToCall(String beeperCode); + + + +} 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/box/BoxDownCmdService.java new file mode 100644 index 00000000..a76a0efc --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxDownCmdService.java @@ -0,0 +1,47 @@ +package com.cloud.kicc.commonbiz.service.box; + + +import com.cloud.kicc.equip.api.dto.box.DownCmdParam; + +/** + * 标本箱下行指令服务接口 + * + * @author Mak + * @since 2021-09-14 19:07:07 + */ +public interface BoxDownCmdService { + + /** + * @Author: Mak + * @Description: 发送语音消息给标本箱 + * @Date: 2021/9/24 + * @Modified by: + */ + boolean sendVoiceToEquipBox(String boxId, String data); + + /** + * @Author: Mak + * @Description: 新增、删除标本箱指纹 + * @Date: 2021/9/24 + * @Modified by: + */ + boolean changeEquipUser(String boxUserId, Integer cmd); + + /** + * @Author: Mak + * @Description: 下行指令给标本箱 - 目前用于 重置标本箱配置信息/获取所有用户指纹/删除所有用户指纹/修改标本箱各种状态 + * @Date: 2021/9/24 + * @Modified by: + */ + boolean downCmdToEquipBox(String boxId, Integer cmd, String data); + + /** + * @Author: Mak + * @Description: 统一处理下发指令的返回值 + * @Date: 2021/9/25 + * @Modified by: + */ + boolean handleDownCmdResult(DownCmdParam downParam); + + +} 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/box/BoxUpCmdService.java new file mode 100644 index 00000000..f25cba45 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/BoxUpCmdService.java @@ -0,0 +1,54 @@ +package com.cloud.kicc.commonbiz.service.box; + +import com.cloud.kicc.equip.api.dto.box.UpCmdParam; +import com.cloud.kicc.equip.api.vo.box.EquipBoxConfigVo; + +/** + * 标本箱上行指令服务接口 + * + * @author Mak + * @since 2021-09-14 19:07:07 + */ +public interface BoxUpCmdService { + + /** + * @Author: Mak + * @Description: 开启socket连接 + * @Date: 2021/9/15 + * @Modified by: + */ + String beginTelnet(String iccid); + + /** + * @Author: Mak + * @Description: 获取标本箱配置信息 + * @Date: 2021/9/15 + * @Modified by: + */ + EquipBoxConfigVo getBoxConfig(String boxCode) throws Exception; + + /** + * @Author: Mak + * @Description: 心跳上报标本箱数据 + * @Date: 2021/9/16 + * @Modified by: + */ + boolean beatBoxInfo(UpCmdParam param) throws Exception; + + /** + * @Author: Mak + * @Description: 修改标本箱状态 + * @Date: 2021/9/17 + * @Modified by: + */ + boolean updateBoxState(UpCmdParam param) throws Exception; + + /** + * @Author: Mak + * @Description: 新增标本箱rfid上报记录 + * @Date: 2021/9/17 + * @Modified by: + */ + boolean addBoxRfidLog(UpCmdParam param, Integer rfidType) throws Exception; + +} 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/box/DownCmdService.java new file mode 100644 index 00000000..d7ab5632 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/DownCmdService.java @@ -0,0 +1,23 @@ +package com.cloud.kicc.commonbiz.service.box; + +import com.cloud.kicc.equip.api.vo.box.DownCmdVo; + +/** + * 标本箱下行指令服务接口 + * + * @author Mak + * @since 2021-09-14 19:07:07 + */ +public interface DownCmdService { + + /** + * @Author: Mak + * @Description: 下行指令给标本箱 + * @Date: 2021/9/24 + * @Modified by: + */ + String downCmdToBox(String boxCode, DownCmdVo vo); + + + +} 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/box/EquipBoxCardService.java new file mode 100644 index 00000000..4d73bbb8 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxCardService.java @@ -0,0 +1,22 @@ +package com.cloud.kicc.commonbiz.service.box; + + +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 java.util.List; + +/** + * 物联网卡管理(EquipBoxCard)表服务接口 + * + * @author Mak + * @since 2022-02-13 12:06:30 + */ +public interface EquipBoxCardService extends IService { + + + List listCardForSelect(Integer isUsed) throws Exception; + + EquipBoxCard getByIccid(String iccid); +} 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/box/EquipBoxLogService.java new file mode 100644 index 00000000..ffa07e79 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxLogService.java @@ -0,0 +1,18 @@ +package com.cloud.kicc.commonbiz.service.box; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.equip.api.entity.box.EquipBoxLog; + +import java.util.List; + +/** + * 标本箱心跳日志记录(EquipBoxLog)表服务接口 + * + * @author Mak + * @since 2021-09-17 10:25:07 + */ +public interface EquipBoxLogService extends IService { + + List listBoxLogs(Integer boxId); + +} 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/box/EquipBoxRecordService.java new file mode 100644 index 00000000..7745a474 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRecordService.java @@ -0,0 +1,24 @@ +package com.cloud.kicc.commonbiz.service.box; + +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 java.util.List; + +/** + * 标本箱操作记录(EquipBoxRecord)表服务接口 + * + * @author Mak + * @since 2021-09-15 09:39:47 + */ +public interface EquipBoxRecordService extends IService { + + boolean addData(UpCmdParam param, boolean rtn); + + boolean addData(String boxId, DownCmdVo vo, String relationId); + + List listBoxRecords(String boxId); + +} 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/box/EquipBoxRfidLogService.java new file mode 100644 index 00000000..c64b6391 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxRfidLogService.java @@ -0,0 +1,14 @@ +package com.cloud.kicc.commonbiz.service.box; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.equip.api.entity.box.EquipBoxRfidLog; + +/** + * 标本箱RFIDj记录信息(EquipBoxRfidLog)表服务接口 + * + * @author Mak + * @since 2021-09-25 15:10:33 + */ +public interface EquipBoxRfidLogService extends IService { + +} 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/box/EquipBoxService.java new file mode 100644 index 00000000..e324316c --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxService.java @@ -0,0 +1,34 @@ +package com.cloud.kicc.commonbiz.service.box; + +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; + + +/** + * 标本箱设备信息(EquipBox)表服务接口 + * + * @author Mak + * @since 2021-09-14 19:07:07 + */ +public interface EquipBoxService extends IService { + + EquipBox getByCode(String boxCode); + + EquipBox getByIccid(String iccid); + + /** + * 根据id查询标本箱信息 + * @param id + * @return + */ + EquipBox getData(String id); + + boolean addData(EquipBox param); + + boolean updateStatusByCode(String boxCode, Integer boxStatus, Integer openStatus, Integer coldStatus,Integer warnStatus,Integer errorStatus); + + IPage pageData(Page page, EquipBox equip); + +} 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/box/EquipBoxUserService.java new file mode 100644 index 00000000..d15154ac --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/box/EquipBoxUserService.java @@ -0,0 +1,21 @@ +package com.cloud.kicc.commonbiz.service.box; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.equip.api.entity.box.EquipBoxUser; + +import java.util.List; + +/** + * 标本箱指纹用户信息(EquipBoxUser)表服务接口 + * + * @author Mak + * @since 2021-09-15 09:40:50 + */ +public interface EquipBoxUserService extends IService { + + boolean addData(EquipBoxUser param); + + List listBoxUser(String boxId, String userName); + + +} 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 new file mode 100644 index 00000000..8f0b61e1 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipSpecimenServiceImpl.java @@ -0,0 +1,190 @@ +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.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.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 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; + +@Service +@Slf4j +public class EquipSpecimenServiceImpl extends ServiceImpl implements EquipSpecimenService { + + @Lazy + @Autowired + private EquipTemperatureService equipTemperatureService; + + //private final RemindService remindService; + + + @Override + public EquipSpecimenUsageVo getEquipSpecimenUsage(String syUserId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EquipSpecimen::getSyUserId, syUserId); + EquipSpecimen specimen = baseMapper.selectOne(queryWrapper); + if (ObjectUtil.isEmpty(specimen) && StrUtil.isNotBlank(specimen.getEtId())) { + EquipTemperature temperature = equipTemperatureService.getById(specimen.getEtId()); + if (ObjectUtil.isNotNull(temperature)) { + EquipSpecimenUsageVo usageVo = Convert.convert(EquipSpecimenUsageVo.class, temperature); + usageVo.setId(specimen.getId()); + usageVo.setBoxCode(specimen.getBoxCode()); + usageVo.setBoxName(specimen.getBoxName()); + return usageVo; + } + } + return null; + } + + @Override + public EquipSpecimenUsageVo getDetailInfo(String esId) { + EquipSpecimen specimen = baseMapper.selectById(esId); + if (ObjectUtil.isEmpty(specimen) && StrUtil.isNotBlank(specimen.getEtId())) { + EquipTemperature temperature = equipTemperatureService.getById(specimen.getEtId()); + if (ObjectUtil.isNotNull(temperature)) { + EquipSpecimenUsageVo usageVo = Convert.convert(EquipSpecimenUsageVo.class, temperature); + usageVo.setId(specimen.getId()); + usageVo.setBoxCode(specimen.getBoxCode()); + usageVo.setBoxName(specimen.getBoxName()); + usageVo.setSyUserId(specimen.getSyUserId()); + return usageVo; + } + } + return Convert.convert(EquipSpecimenUsageVo.class, specimen); + } + + @Override + public List listSyUserId() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.isNotNull(EquipSpecimen::getEtId).isNotNull(EquipSpecimen::getSyUserId); + List specimenList = baseMapper.selectList(queryWrapper); + if (ObjectUtil.isNotEmpty(specimenList)) { + List list = specimenList.stream().map(EquipSpecimen::getSyUserId).collect(Collectors.toList()); + return list; + } + return new ArrayList<>(); + } + + @Override + public IPage pageData(Page page, EquipSpecimen param) { + IPage rtn = baseMapper.pageQuery(page, param); + return rtn; + } + +// @Override +// public RemindHourVo equipSpecimenList(String remindUserId, String remindUserName, Integer remindType) { +// RemindHourVo rv = new RemindHourVo(); +// rv.setIsPlay(Constants.NO_CODE); +// //未读超时 +// int overTime = 10; +// //查出当前登录的用户的设备etId +// QueryWrapper query = new QueryWrapper<>(); +// query.select("et_id").eq("sy_user_id", remindUserId); +// EquipSpecimen one = equipSpecimenService.getOne(query); +// //当前登录用户没有温度设备时返回null，前端根据null判断是否继续监控 +// if (EmptyUtil.isNullOrEmpty(one)) { +// return null; +// } +// //查询是否有属于当前用户的温度异常未读消息 +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq("is_read", "0") +// .eq("remind_user_id", remindUserId) +// .eq("remind_type", "3") +// .eq("state", "1") +// .eq("mark", one.getEtId()); +// List list = remindService.list(wrapper); +// +// //根据当前登录用户id查出温控设备和标本箱信息 +// EquipSpecimenListVo es = baseMapper.getEquipSpecimenInfo(remindUserId); +// Integer equipTemperature = es.getEquipTemperature(); +// Integer height = es.getTemperatureMaxWarn(); +// Integer low = es.getTemperatureMinWarn(); +// if (equipTemperature > height || equipTemperature < low) { +// //若没有插入过消息并温控超标则插入消息 +// if (list.size() == 0) { +// //还没有插入消息的情况 +// Remind remind = new Remind(); +// remind.setRemindUserId(es.getSyUserId()); +// remind.setCreateUserId(remindUserId); +// remind.setCreateUserName(remindUserName); +// remind.setRemindType(3); +// remind.setRemindContent("【" + es.getBoxName() + "】温度异常，当前温度为" + es.getEquipTemperature() + "℃," + "请及时处理！"); +// remind.setRemindType(RemindTypeEnum.SPECIMEN_BOX.getCode()); +// remind.setSource(RemindSourceEnum.SPECIMEN_BOX_TEMPERATURE_ERROR.getCode()); +// remind.setSourceName(RemindSourceEnum.SPECIMEN_BOX_TEMPERATURE_ERROR.getValue()); +// remind.setMark(es.getEtId()); +// remindService.sendRemindToUserById(remind, es.getSyUserId()); +// //只要插入了信息就播报 +// rv.setIsPlay(Constants.YES_CODE); +// rv.setRemindType(3); +// +// } else { +// QueryWrapper wrapper1 = new QueryWrapper<>(); +// wrapper1.eq("is_read", "0") +//// .eq("remind_user_id",remindUserId) +// .eq("remind_type", "4") +// .eq("state", "1") +// .eq("mark", one.getEtId()); +// List list1 = remindService.list(wrapper1); +// //这里要判断当前已登录的客服，从中随机获取一个 +// List ids = roleService.listUserIdsByIsLogin(3, 1); +// ids.forEach(ls -> { +// System.out.println("在线客服id = " + ls); +// }); +// SecureRandom random = new SecureRandom(); +// int n = random.nextInt(ids.size()); +// Integer randomId = ids.get(n); +// System.out.println("随机 = " + randomId); +// List remindList = new ArrayList<>(); +// //已经插入过消息了，但是收样员没有已读的情况 +// //若有属于当前用户的温度异常消息则判断是否以及超过十分钟未读 +// list.forEach(li -> { +// //用当前时间减去入库时间，大于10分钟则提醒客服 +// long l = System.currentTimeMillis() - li.getCreateDate().getTime(); +// long minutes = l / 1000 / 60; +// //仅当超过十分钟并且没有插入过消息时插入新消息 +// if (minutes > overTime && list1.size() == 0) { +// Remind remind = new Remind(); +// remind.setRemindUserId(randomId); +// remind.setMark(es.getEtId()); +// remind.setRemindContent("【" + li.getCreateUserName() + "】有标本箱温度异常，请通知其及时处理！"); +// remind.setCreateUserId(remindUserId); +// remind.setCreateUserName(remindUserName); +// remind.setSource(RemindSourceEnum.SPECIMEN_BOX_TEMPERATURE_ERROR.getCode()); +// remind.setSourceName(RemindSourceEnum.SPECIMEN_BOX_TEMPERATURE_ERROR.getValue()); +// remind.setRemindType(RemindTypeEnum.SPECIMEN_BOX.getCode()); +// remindList.add(remind); +// rv.setIsPlay(Constants.YES_CODE); +// rv.setRemindType(RemindTypeEnum.SPECIMEN_BOX.getCode()); +// } +// }); +// if (CommonUtil.listIsNotNull(remindList)) { +// remindService.sendRemindsToUserById(remindList, RemindSourceEnum.SPECIMEN_BOX_TEMPERATURE_ERROR.getCode(), randomId); +// } +// } +// } +// return rv; +// } + +} 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 new file mode 100644 index 00000000..29f4598e --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureRecordServiceImpl.java @@ -0,0 +1,109 @@ +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.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.system.api.feign.RemoteUserService; +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.List; + +@RequiredArgsConstructor +@Service +@Slf4j +public class EquipTemperatureRecordServiceImpl extends ServiceImpl implements EquipTemperatureRecordService { + + @Lazy + @Autowired + private EquipSpecimenService equipSpecimenService; + + //private final ReportInfoService reportInfoService; + + private final RemoteUserService userService; + + + /** + * 查询温控设备记录列表 + * @param param + * @return + * @throws Exception + */ +// @Override +// public List listRecord(EquipTemperatureRecordParam param) { +// // 报告单信息 +// ReportInfo reportInfo = reportInfoService.getById(param.getReportId()); +// +// // 查询当前收样员关联的设备 +// EquipSpecimenUsageVo usageVo = equipSpecimenService.getEquipSpecimenUsage(reportInfo.getSyUserId()); +// if (ObjectUtil.isEmpty(usageVo)){ +// return null; +// } +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(EquipTemperatureRecord::getEtId,usageVo.getEtId()) +// .gt(EquipTemperatureRecord::getCreateTime,reportInfo.getReportBeginTime()) +// .lt(StrUtil.isNotBlank(reportInfo.getReportEndTime()),EquipTemperatureRecord::getCreateTime, reportInfo.getReportEndTime()) +// .orderByDesc(EquipTemperatureRecord::getId); +// +// List list = baseMapper.selectList(queryWrapper); +// if (ObjectUtil.isNotEmpty(list) && list.size() > 50){ +// list = list.subList(0,50); +// } +// return list; +// } + + /** + * @param param + * @Author: Mak + * @Description: 导出标本箱温控数据，生成pdf + * @Date: 2021/12/6 + * @Modified by: + */ +// @Override +// public String exportRecordForPfd(EquipTemperatureRecordParam param) { +// // 获取标本箱温控数据记录 +// List list = listRecord(param); +// if (ObjectUtil.isNotNull(list)){ +// return null; +// } +// // 获取标本箱信息 +// EquipSpecimenUsageVo vo = equipSpecimenService.getEquipSpecimenUsage(param.getSyUserId()); +// // 收样员信息 +// R res = userService.getById(param.getSyUserId()); +// User user = res.getData(); +// String[][] strings = new String[list.size()+1][]; +// strings[0] = new String[]{"序号","上报时间","温度","电量","位置"}; +// for (int i = 1; i <= list.size(); i++) { +// EquipTemperatureRecord record = list.get(i-1); +// parseToStringArr(strings, i, record); +// } +// String pdfUrl = SpirePdfUtil.createTempPdfForPrint(vo.getBoxCode(),user.getUserName(),strings); +// return pdfUrl; +// } + + /** + * 数据格式转化 + * @param strings + * @param i + * @param record + */ + private void parseToStringArr(String[][] strings, int i, EquipTemperatureRecord record){ + //转为前端需要的二维数组格式 + strings[i] = new String[]{String.valueOf(i),record.getLatestTime(),record.getEquipTemperature(),record.getEquipPower(),record.getEquipAddr()}; + } + + + +} 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 new file mode 100644 index 00000000..ad1089a6 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipTemperatureServiceImpl.java @@ -0,0 +1,179 @@ +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.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 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 +public class EquipTemperatureServiceImpl extends ServiceImpl implements EquipTemperatureService { + + @Lazy + @Autowired + private EquipSpecimenService equipSpecimenService; + + @Lazy + @Autowired + private EquipTemperatureRecordService equipTemperatureRecordService; + + @Autowired + private KiccProperties kiccProperties; + + + +// @Override +// public EquipTemperature pullEquipmentDataByApi(String etId) { +// EquipTemperature equip = baseMapper.selectById(etId); +// try { +// HttpResponse response = Unirest.post(EquipConstants.TEMP_URL) +// .field("admin_permit",EquipConstants.ADMIN_PERMIT) +// .field("UserP",EquipConstants.USER_P) +// .field("admin_user",EquipConstants.ADMIN_USER) +// .field("admin_pass",EquipConstants.ADMIN_PWD) +// .field("StartNo","0") +// .field("Length","1") +// .field("StartTime", DateUtils.getPastMinute(EquipConstants.PERIOD,null)) +// .field("EndTime",DateUtils.getDateTime()) +// .field("SheBeiBianHao",equip.getEquipCode()) +// .asJson(); +// +// JSONObject jsonObject = JSON.parseObject(response.getBody().toPrettyString()); +// log.info("==拉取温控设备最新数据，设备id："+etId+"，返回值=="+jsonObject.toJSONString()); +// +// int code = jsonObject.getInteger("code"); +// if (code == EquipConstants.SUCCESS_CODE){ +// JSONArray dataList = jsonObject.getJSONArray("resultCode"); +// if (dataList!=null || dataList.isEmpty()){ +// return equip; +// } +// JSONObject data = dataList.getJSONObject(0); +// equip.setEquipTemperature(data.getString("temperature01")); +// equip.setEquipHumidity(data.getString("humidity")); +// equip.setEquipPower(data.getString("power")); +// // 从拉取的数据结果显示来看，xiangzistate一直都为"close" +// //equip.setEquipStatus(data.getString("xiangzistate")); +// equip.setEquipStatus("open"); +// equip.setEquipType(data.getString("shebeineixing")); +// equip.setLatestTime(data.getString("servicetime")); +// +// //根据经纬度转换详细地址 +// String lng = data.getString("jingdu"); +// String lat = data.getString("weidu"); +// if (StrUtil.isNotBlank(lng) && StrUtil.isNotBlank(lat)){ +// boolean getAddr = false; +// if (ObjectUtil.isEmpty(equip.getEquipAddr()) || ObjectUtil.isEmpty(equip.getLongitude()) +// || ObjectUtil.isEmpty(equip.getLatitude())){ +// getAddr = true; +// } +// // 比较之前的经纬度，如果没有变，就不用请求百度api +// if (ObjectUtil.isNotEmpty(equip.getLongitude()) && ObjectUtil.isNotEmpty(equip.getLatitude())){ +// if (!lng.trim().equals(equip.getLongitude()) || !lat.trim().equals(equip.getLatitude())){ +// getAddr = true; +// } +// } +// +// if (getAddr){ +// String address = BaiduMapUtils.getAddress(lng,lat, kiccProperties.getMapAk()); +// equip.setEquipAddr(address); +// } +// equip.setLongitude(lng.trim()); +// equip.setLatitude(lat.trim()); +// } +// baseMapper.updateById(equip); +// +// // 插入一条上报记录 +// try { +// EquipTemperatureRecord record = Convert.convert(EquipTemperatureRecord.class, equip); +// equipTemperatureRecordService.save(record); +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("==拉取温控设备最新数据异常==设备id："+etId+",异常信息："+e.getMessage()); +// } +// } +// }catch (Exception e){ +// log.error("==拉取温控设备最新数据异常==设备id："+etId+",异常信息："+e.getMessage()); +// } +// return equip; +// } + + @Override + public void taskToPullTemperatureEquipData() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.isNotNull(EquipSpecimen::getSyUserId).isNotNull(EquipSpecimen::getEtId); + List equipList = equipSpecimenService.list(queryWrapper); + equipList.stream().forEach(a->{ + //pullEquipmentDataByApi(a.getEtId()); + }); + } + +// @Override +// public List listEquipTempForSelect(String esId){ +// List rtn = new ArrayList<>(); +// +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.eq(EquipTemperature::getState,Constants.YES_CODE); +// List tempList = baseMapper.selectList(query); +// if (CommonUtil.listIsNull(tempList)){ +// return rtn; +// } +// +// // 查询温控设备已被使用的记录 +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.ne(EquipSpecimen::getState, Constants.DEL_FLAG_DELETE) +// .isNotNull(EquipSpecimen::getSyUserId).isNotNull(EquipSpecimen::getEtId); +// if (CommonUtil.isNotNull(esId)){ +// queryWrapper.ne(EquipSpecimen::getEsId,esId); +// } +// List equipList = equipSpecimenService.list(queryWrapper); +// if (CommonUtil.listIsNotNull(equipList)){ +// List etIdList = equipList.stream().map(EquipSpecimen::getEtId).collect(Collectors.toList()); +// List temps = tempList.stream().filter(a->!etIdList.contains(a.getEtId())).collect(Collectors.toList()); +// rtn = Collections3.copyTo(temps,EquipTempSelectVo.class); +// }else{ +// rtn = Collections3.copyTo(tempList,EquipTempSelectVo.class); +// } +// return rtn; +// } + + @Override + public IPage pageData(Page page, EquipTemperature param) { + IPage rtn = this.lambdaQuery() + .eq(StrUtil.isNotBlank(param.getEquipStatus()), EquipTemperature::getEquipStatus, param.getEquipStatus()) + .eq(StrUtil.isNotBlank(param.getEquipCode()), EquipTemperature::getEquipCode, param.getEquipCode()) + .eq(StrUtil.isNotBlank(param.getEquipName()), EquipTemperature::getEquipName, param.getEquipName()) + .orderByDesc(EquipTemperature::getId) + .page(page); + return rtn; + } + + + +} 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/beeper/EquipBeeperRecordServiceImpl.java new file mode 100644 index 00000000..5aac5205 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperRecordServiceImpl.java @@ -0,0 +1,35 @@ +package com.cloud.kicc.commonbiz.service.impl.beeper; + + +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 lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 呼叫器设备呼叫记录(EquipBeeperRecord)表服务实现类 + * + * @author Mak + * @since 2021-09-06 14:20:39 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class EquipBeeperRecordServiceImpl extends ServiceImpl implements EquipBeeperRecordService { + + @Override + public List listBeeperRecord(String beeperCode) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(EquipBeeperRecord::getBeeperCode,beeperCode) + .orderByDesc(EquipBeeperRecord::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/beeper/EquipBeeperServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperServiceImpl.java new file mode 100644 index 00000000..611f6d68 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/beeper/EquipBeeperServiceImpl.java @@ -0,0 +1,90 @@ +package com.cloud.kicc.commonbiz.service.impl.beeper; + +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 lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +/** + * 呼叫器设备信息(EquipBeeper)表服务实现类 + * + * @author Mak + * @since 2021-09-06 14:18:38 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class EquipBeeperServiceImpl extends ServiceImpl implements EquipBeeperService { + + + private final EquipBeeperRecordService equipBeeperRecordService; + + + @Override + public EquipBeeper getByCode(String beeperCode) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(EquipBeeper::getBeeperCode,beeperCode); + return baseMapper.selectOne(wrapper); + } + + @Override + public EquipBeeper getData(String id) { + return baseMapper.selectData(id); + } + + @Override + public IPage pageData(Page page, EquipBeeper param) { + IPage rtn = baseMapper.pageQuery(page,param); + return rtn; + } + + /** + * 获取呼叫器wifi + * @param beeperCode + * @return + */ + @Override + public Map getBeeperWifi(String beeperCode){ + EquipBeeper beeper = this.getByCode(beeperCode); + + // 添加获取wifi记录 + EquipBeeperRecord record = new EquipBeeperRecord(); + record.setBeeperCode(beeperCode); + record.setRecordType(EquipConstants.SECOND_CODE); + equipBeeperRecordService.save(record); + + Map map = new HashMap<>(); + map.put("wifiName",beeper.getWifiName()); + map.put("wifiPwd",beeper.getWifiPwd()); + return map; + } + + /** + * 添加呼叫记录 + * @param beeperCode + * @return + */ + @Override + public boolean beeperToCall(String beeperCode) { + // 添加呼叫记录 + EquipBeeperRecord record = new EquipBeeperRecord(); + record.setBeeperCode(beeperCode); + record.setRecordType(EquipConstants.YES_CODE); + return equipBeeperRecordService.save(record); + } + + +} 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 new file mode 100644 index 00000000..78c236c8 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxDownCmdServiceImpl.java @@ -0,0 +1,224 @@ +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 new file mode 100644 index 00000000..930a22d8 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/BoxUpCmdServiceImpl.java @@ -0,0 +1,164 @@ +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 new file mode 100644 index 00000000..41475dd7 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/DownCmdServiceImpl.java @@ -0,0 +1,48 @@ +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 new file mode 100644 index 00000000..b08d1908 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxCardServiceImpl.java @@ -0,0 +1,50 @@ +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 new file mode 100644 index 00000000..cca2e6a6 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxLogServiceImpl.java @@ -0,0 +1,38 @@ +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 new file mode 100644 index 00000000..c8198fc2 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRecordServiceImpl.java @@ -0,0 +1,71 @@ +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 new file mode 100644 index 00000000..593896e5 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxRfidLogServiceImpl.java @@ -0,0 +1,24 @@ +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 new file mode 100644 index 00000000..95679187 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxServiceImpl.java @@ -0,0 +1,98 @@ +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 new file mode 100644 index 00000000..d45ce668 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/box/EquipBoxUserServiceImpl.java @@ -0,0 +1,53 @@ +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/commonbiz/util/BaiduMapUtils.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/BaiduMapUtils.java new file mode 100644 index 00000000..a0276102 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/BaiduMapUtils.java @@ -0,0 +1,103 @@ +package com.cloud.kicc.commonbiz.util; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpResponse; +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; + +import java.util.HashMap; +import java.util.Map; + +public class BaiduMapUtils { + + + /** + * 文档地址：http://lbsyun.baidu.com/index.php?title=webapi/guide/webservice-geocoding + * GET请求 + * callback 将json格式的返回值通过callback函数返回以实现jsonp功能 + * 示例：http://api.map.baidu.com/geocoding/v3/?address=北京市海淀区上地十街10号&output=json&ak=您的ak&callback=showLocation + */ + public static Map getLngAndLat(String address, String ak) { + HttpResponse res = null; + try { + res = HttpUtil + .createGet("http://api.map.baidu.com/geocoding/v3/?address=" + address + "&output=json&ak=" + ak) + .header("Content-Type", "application/json") + .execute().charset("UTF-8"); + + int code = res.getStatus(); + if (code == 200) { + String body = res.body(); + if (StrUtil.isNotBlank(body)) { + JSONObject jsonObject = JSONUtil.parseObj(body); + Map resultMap = new HashMap(); + resultMap.put("longitude", jsonObject.get("lng")); + resultMap.put("latitude", jsonObject.get("lat")); + return resultMap; + } + } + } catch (Exception e) { + System.out.println("==BaiduMap-Api-getLngAndLat,error==" + e.getMessage()); + } finally { + if (res != null) { + res.close(); + } + } + return null; + } + + + /** + * 根据GPS坐标获取定位位置 + * 文档地址：http://lbsyun.baidu.com/index.php?title=webapi/guide/webservice-geocoding-abroad + * GET请求 + * coordtype坐标的类型，目前支持的坐标类型包括：bd09ll（百度经纬度坐标）、bd09mc（百度米制坐标）、gcj02ll（国测局经纬度坐标，仅限中国）、wgs84ll（ GPS经纬度） 坐标系说明 + * 示例：http://api.map.baidu.com/reverse_geocoding/v3/?ak=您的ak&output=json&coordtype=wgs84ll&location=31.225696563611,121.49884033194 + */ + public static String getAddress(String lng, String lat, String ak) { + HttpResponse res = null; + try { + String location = lat + "," + lng; + res = HttpUtil + .createGet("http://api.map.baidu.com/reverse_geocoding/v3/?location=" + location + "&output=json&coordtype=wgs84ll&ak=" + ak) + .header("Content-Type", "application/json") + .execute().charset("UTF-8"); + + int code = res.getStatus(); + if (code == 200) { + String body = res.body(); + if (StrUtil.isNotBlank(body)) { + JSONObject jsonObject = JSONUtil.parseObj(body); + if (jsonObject.getInt("status") == 0) { + String addr = jsonObject.getJSONObject("result").getStr("formatted_address"); + return addr; + } + } + } + } catch (Exception e) { + System.out.println("==BaiduMap-Api-getAddress,error==" + e.getMessage()); + } finally { + if (res != null) { + res.close(); + } + } + return null; + + } + + public static void main(String[] args) { + //String addr = getAddress("112.917007","28.280622","WpNIUTCTrECQQyrGDv4x3Gx1CdNRCm5d"); + //String addr = getAddress("108.379051", "30.808975", "gIZFKgVkaqGOFTDSSrbklWjesguyrM8H"); + + //String addr = getAddress("112.92457569595736", "28.29473945087382", "WpNIUTCTrECQQyrGDv4x3Gx1CdNRCm5d"); + //String addr = getAddress("112.91276433", "28.29194017", "WpNIUTCTrECQQyrGDv4x3Gx1CdNRCm5d"); + String addr = getAddress("112.88416317", "28.22842167", "WpNIUTCTrECQQyrGDv4x3Gx1CdNRCm5d"); + + //String addr = getAddress("11254.76586", "28.21360333", "WpNIUTCTrECQQyrGDv4x3Gx1CdNRCm5d"); + System.out.println(addr); + /*Map address = getLngAndLat("湖南省长沙市望城区梅园路","WpNIUTCTrECQQyrGDv4x3Gx1CdNRCm5d"); + System.out.println(address.toString());*/ + } +} + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/GpsGaoAndBaidu.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/GpsGaoAndBaidu.java new file mode 100644 index 00000000..a7273ca7 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/GpsGaoAndBaidu.java @@ -0,0 +1,200 @@ +package com.cloud.kicc.commonbiz.util; + +/// + +/// 百度 高德 GPS地图坐标转换类 + +/// 地球坐标系(GPS坐标):WGS-84 + +//中国的火星坐标系：GCJ-02 使用者：高德、谷歌、腾讯搜搜、阿里云地图、灵图51ditu地图 + +//百度坐标系：BD-09 使用者：百度 + + +import java.math.BigDecimal; + + +public class GpsGaoAndBaidu { + + private static final double x_pi = 3.14159265358979324 * 3000.0 / 180.0; + + private static final double pi = 3.14159265358979324; + private static final double a = 6378245.0; + private static final double ee = 0.00669342162296594323; + + /** + * gg_lat 纬度 + * gg_lon 经度 + * GCJ-02转换BD-09 + * Google地图经纬度转百度地图经纬度 + * */ + public static Point google_bd_encrypt(double gg_lat, double gg_lon){ + Point point=new Point(); + double x = gg_lon, y = gg_lat; + double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi); + double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi); + double bd_lon = z * Math.cos(theta) + 0.0065; + double bd_lat = z * Math.sin(theta) + 0.006; + point.setLat(bd_lat); + point.setLng(bd_lon); + return point; + } + + /** + * wgLat 纬度 + * wgLon 经度 + * BD-09转换GCJ-02 + * 百度转google + * */ + public static Point bd_google_encrypt(double bd_lat, double bd_lon){ + Point point=new Point(); + double x = bd_lon - 0.0065, y = bd_lat - 0.006; + double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi); + double theta =Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi); + double gg_lon = z * Math.cos(theta); + double gg_lat = z * Math.sin(theta); + point.setLat(gg_lat); + point.setLng(gg_lon); + return point; + } + + + + /** + * wgLat 纬度 + * wgLon 经度 + * WGS-84 到 GCJ-02 的转换（即 GPS 加偏） + * */ + public static Point wgs_gcj_encrypts(double wgLat, double wgLon) { + Point point=new Point(); + if (outOfChina(wgLat, wgLon)) { + point.setLat(wgLat); + point.setLng(wgLon); + return point; + } + double dLat = transformLat(wgLon - 105.0, wgLat - 35.0); + double dLon = transformLon(wgLon - 105.0, wgLat - 35.0); + double radLat = wgLat / 180.0 * pi; + double magic = Math.sin(radLat); + magic = 1 - ee * magic * magic; + double sqrtMagic = Math.sqrt(magic); + dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi); + dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi); + double lat = wgLat + dLat; + double lon = wgLon + dLon; + point.setLat(lat); + point.setLng(lon); + return point; + } + + + public static void transform(double wgLat, double wgLon, double[] latlng) { + if (outOfChina(wgLat, wgLon)) { + latlng[0] = wgLat; + latlng[1] = wgLon; + return; + } + double dLat = transformLat(wgLon - 105.0, wgLat - 35.0); + double dLon = transformLon(wgLon - 105.0, wgLat - 35.0); + double radLat = wgLat / 180.0 * pi; + double magic = Math.sin(radLat); + magic = 1 - ee * magic * magic; + double sqrtMagic = Math.sqrt(magic); + dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi); + dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi); + latlng[0] = wgLat + dLat; + latlng[1] = wgLon + dLon; + } + + private static boolean outOfChina(double lat, double lon) { + if (lon < 72.004 || lon > 137.8347) + return true; + if (lat < 0.8293 || lat > 55.8271) + return true; + return false; + } + + private static double transformLat(double x, double y) { + double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x)); + ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0; + ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0; + return ret; + } + + private static double transformLon(double x, double y) { + double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x)); + ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0; + ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0 * pi)) * 2.0 / 3.0; + return ret; + } + + + public static Point gpsAddPrecision(String lng, String lat) { + //进行坐标偏移 + lng = lng.replace(",E",""); + lat = lat.replace(",N",""); + Point p = new Point(); + p.setLng(gpsCalculate(Double.parseDouble(lng))); + p.setLat(gpsCalculate(Double.parseDouble(lat))); + return p; + } + + /** + * gps转百度坐标 + * + * @param gg_lat + * @param gg_lon + * @return + */ + public static Point gpsTransformBaidu(double gg_lat, double gg_lon) { + //进行坐标偏移 + Point p = wgs_gcj_encrypts(gpsCalculate(gg_lat),gpsCalculate(gg_lon)); + p = google_bd_encrypt(p.getLat(),p.getLng()); + System.out.println(p); + return p; + } + + /** + * 将经纬度计算得到度分秒格式再转成度格式 + * + * @return + */ + public static double gpsCalculate(double num) { + int a = (int) num / 100; + double b = (num - a * 100); + int c = (int) (b); + double d = (b - c) * 60; + String e = a + "°" + c + "′" + d + "″"; + return Dms2D(e); + } + + public static double Dms2D(String dms_data) { + if (!dms_data.contains("°") || !dms_data.contains("′") || !dms_data.contains("″")) + return 0; + double d = Double.parseDouble(dms_data.split("°")[0]); + double m = Double.parseDouble(dms_data.split("°")[1].split("′")[0]); + double s = Double.parseDouble(dms_data.split("°")[1].split("′")[1].replace("″", "")); + return keep8Decimal(d + m / 60 + s / 60 / 60); + } + + //保留8位小数 + public static double keep8Decimal(double d) { + BigDecimal bd = new BigDecimal(d); + double d1 = bd.setScale(8, BigDecimal.ROUND_HALF_UP).doubleValue(); + System.out.println(d1); + return d1; + } + + public static void main(String[] args) { + //"lg": "11253.92844,E", + // "lt": "2813.70530,N", + //lg":"11253.04979,E","lt":"2812.81620,N" + + System.out.println(gpsCalculate(11253.04979)); + System.out.println(gpsCalculate(2812.81620)); + //GpsGaoAndBaidu.gpsTransformBaidu( 2817.51641,11254.76586); + } +} + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/Point.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/Point.java new file mode 100644 index 00000000..10125046 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/Point.java @@ -0,0 +1,39 @@ +package com.cloud.kicc.commonbiz.util; + +import lombok.Data; + +/** + * 用于构造地图中的坐标点 + * + * @author lw + **/ +@Data +public class Point { + + private double lat;// 纬度 + private double lng;// 经度 + + public Point() { + } + + public Point(double lng, double lat) { + this.lng = lng; + this.lat = lat; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof Point) { + Point bmapPoint = (Point) obj; + return (bmapPoint.getLng() == lng && bmapPoint.getLat() == lat) ? true : false; + } else { + return false; + } + } + + @Override + public String toString() { + return lng + "," + lat; + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000..77623a94 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/mqtt/MqttDemo.java @@ -0,0 +1,305 @@ +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/ca.jks b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/ca.jks new file mode 100644 index 0000000000000000000000000000000000000000..9a54948a28b13ec04041b5f04dc878cf421d3420 GIT binary patch literal 1009 zcmezO_TO6u1_mY|W(3o$xs}>$*#l46G4)rUsS_49uGinwZxcG%-zIz|6$R z#3aCB{UB_DliS9HrCBE zE~X|%Mutb$4+V?vtypq-arml$Mg8366HYE#`cCNFv}i_7g)@wkm-`uP5B~0aB$FY0 z?xS9%yX|Za42_)U&Pg}#zkk-c(CyK+wBxLs%hbjCtLMp0t$nxMV=>3AYwN3cEZI`) zy<+9}i2qo<@14f=lKQHOnUSp-c`?dH-uwLyyokzuT(G}fVE-S+Z>=|1xClfTtt^$e zdU4S{_ebhkUuGHq@Z?D7z7oI1s%8JeRbD=|cIW-$bIRftc$-h0cSq@2?l}>uzO2*# z&TbY-5kDTSInQYSr+2?Db30vGz1`917SEOUKN_#@?v1eDD*eJ!V^P5^LzcVWH;H}n z;qqf&@z%>WZfpJG35VCKGchwVFfL9uNHpLBMy4!3BjbM-7GMHuGvEjDg+Y8)17;v) zAPW-UV-aH!VZIk&8g|iVciM-=kEEp!Pv2yFG1NdFB(2OMVIbCkT>)zP14aWQ!|6HZ zt2~5-xPIMrnd2X{;miGXEMF@tITou({PEUqIiS1q>hXVH4$4QI-jO?}s^s|$&DDZi z9~UfGc-E(5=H#A<1&>zq%j}!H@_+KxC+rEA7w?}N&H3?a-{asfeaXM^YvCRe-4kV$GY9yEBYFn|ByT4jRRy)`fR&gQLg z5x3Cyy!Fu4PHU%G@Oi5Mw(oi`j)Z&WBq~Z=Wm#Kcqhr;Oz5MlhQIVH7IuGu&$ayp| zr|W;p&T`dog9Fkkiyz*3dEdQe>lPIbR)aUXd%5?!?hn|x^7HE%j6!QqbR3&u65q>Z ibL{2SsZ(?B2~Xc*S-!C0Q({BEVsnd literal 0 HcmV?d00001 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 new file mode 100644 index 00000000..be4cbb6c --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperMapper.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + equip_beeper + + + + + + \ 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 new file mode 100644 index 00000000..aa143e6e --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBeeperRecordMapper.xml @@ -0,0 +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 new file mode 100644 index 00000000..0e5481dc --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxCardMapper.xml @@ -0,0 +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 new file mode 100644 index 00000000..ea128d74 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxLogMapper.xml @@ -0,0 +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 new file mode 100644 index 00000000..eeb456d6 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + equip_box + equip_box_card + + + a.id,a.box_name,a.box_code,a.box_type,a.temp,a.damp,a.lng,a.lat,a.addr,a.power,a.tilt,a.card_id + ,a.sy_user_id,a.temp_min,a.temp_max,a.rfid_min,a.beat + ,a.box_status,a.open_status,a.cold_status,a.warn_status,a.error_status + ,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 + + + + + + + \ 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 new file mode 100644 index 00000000..b3fec516 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRecordMapper.xml @@ -0,0 +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 new file mode 100644 index 00000000..9fb4890a --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxRfidLogMapper.xml @@ -0,0 +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 new file mode 100644 index 00000000..d66b4b5e --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipBoxUserMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + equip_box_user + equip_box + + + a.id,a.box_id,a.user_id,a.user_name,a.fid,a.fid_type,a.fid_status, + a.status,a.create_by_id,a.create_by_name,a.create_by_id + + + + + + \ 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 new file mode 100644 index 00000000..43830f43 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipSpecimenMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + equip_specimen + equip_temperature + sys_user + + + + + + 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 new file mode 100644 index 00000000..f8f06831 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureMapper.xml @@ -0,0 +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 new file mode 100644 index 00000000..eab29bf3 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/EquipTemperatureRecordMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-equip-biz/Dockerfile deleted file mode 100644 index 3529c99c..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM moxm/java:1.8-full - -RUN mkdir -p /kicc-common-biz - -WORKDIR /kicc-common-biz - -ARG JAR_FILE=target/kicc-common-biz.jar - -COPY ${JAR_FILE} app.jar - -EXPOSE 5000 - -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" - -CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-equip-biz/pom.xml deleted file mode 100644 index 9828f227..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - 4.0.0 - - com.cloud - kicc-platform-biz - 1.0.0 - - - kicc-equip-biz - jar - - kicc 通用业务模块 - - - - - com.cloud - kicc-common-api - - - - com.cloud - kicc-common-security - - - - com.cloud - kicc-common-log - - - - com.cloud - kicc-common-swagger - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - org.springframework.boot - spring-boot-starter-undertow - - - - com.cloud - kicc-common-mock - - - - - - - io.fabric8 - docker-maven-plugin - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java b/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java deleted file mode 100644 index eb1fd76d..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cloud.kicc.commonbiz; - -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; - -/** - *

- * 通用业务模块 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/17 - */ -@EnableKiccSwagger2 -@EnableKiccResourceServer -@EnableKiccFeignClients -@SpringBootApplication -@EnableKiccJacksonAutoConvert -public class KiccCommonApplication { - - public static void main(String[] args) { - SpringApplication.run(KiccCommonApplication.class, args); - } - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java b/kicc-platform/kicc-platform-biz/kicc-equip-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-equip-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-equip-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java b/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java deleted file mode 100644 index 10ecf1d8..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cloud.kicc.commonbiz.controller; - -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.common.log.annotation.SysLog; -import com.cloud.kicc.commonbiz.api.entity.MapTask; -import com.cloud.kicc.commonbiz.service.MapTaskService; -import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - *

- * 地图任务信息 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping(AppConstants.APP_COMMON + "/mapTask") -public class MapTaskController { - - private final MapTaskService mapTaskService; - - @GetMapping("/list/{takeSpecimenId}") - public R list(@PathVariable String takeSpecimenId) { - List list = mapTaskService.list(Wrappers.lambdaQuery().eq(MapTask::getTakeSpecimenId, takeSpecimenId)); - return R.ok(list); - } - - @SysLog("用户修改") - @PutMapping("/update") - @PreAuthorize("@pms.hasPermission('user_edit')") - public R update(@RequestBody List mapTasks) { - mapTaskService.batchUpdate(mapTasks); - return R.ok(); - } - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java b/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java deleted file mode 100644 index 4eea9d3d..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cloud.kicc.commonbiz.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.entity.MapTask; - -/** - *

- * 地图任务 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 - */ -public interface MapTaskMapper extends BaseMapper { - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/MapTaskService.java b/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/MapTaskService.java deleted file mode 100644 index 21e5fe35..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/MapTaskService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cloud.kicc.commonbiz.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.entity.MapTask; - -import java.util.List; - -/** - *

- * 地图任务 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 - */ -public interface MapTaskService extends IService { - - void batchUpdate(List mapTasks); - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java deleted file mode 100644 index 3d50d189..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cloud.kicc.commonbiz.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.commonbiz.api.entity.MapTask; -import com.cloud.kicc.commonbiz.mapper.MapTaskMapper; -import com.cloud.kicc.commonbiz.service.MapTaskService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - *

- * 地图任务 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 - */ -@Service -@RequiredArgsConstructor -public class MapTaskServiceImpl extends ServiceImpl implements MapTaskService { - - @Transactional(noRollbackFor = Exception.class) - @Override - public void batchUpdate(List mapTasks) { - mapTasks.forEach(mapTask -> { - - }); - } - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/bootstrap.yml deleted file mode 100644 index 3116bd1b..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,17 +0,0 @@ -server: - port: 5000 - -spring: - application: - name: @artifactId@ - cloud: - nacos: - discovery: - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} - namespace: @profiles.namespace@ - config: - server-addr: ${spring.cloud.nacos.discovery.server-addr} - file-extension: yml - namespace: @profiles.namespace@ - shared-configs: - - application.${spring.cloud.nacos.config.file-extension} diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/logback-spring.xml b/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/logback-spring.xml deleted file mode 100644 index 9cd338b2..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - ${CONSOLE_LOG_PATTERN} - - - - - - ${log.path}/debug.log - - ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz - 50MB - 30 - - - %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n - - - - - - ${log.path}/error.log - - ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz - 50MB - 30 - - - %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n - - - ERROR - - - - - - - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/mapper/MapTaskMapper.xml b/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/mapper/MapTaskMapper.xml deleted file mode 100644 index cc9db036..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/mapper/MapTaskMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 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 d0d4214d..b70bb096 100644 --- a/kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml @@ -54,7 +54,13 @@ com.cloud kicc-common-mock - + + com.cloud + kicc-equip-api + 1.0.0 + compile + + 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 c6762fc7..4ccbd347 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,6 +4,7 @@ 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 com.cloud.kicc.equip.KiccEquipApplication; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/kicc-platform/kicc-platform-biz/pom.xml b/kicc-platform/kicc-platform-biz/pom.xml index 5d9707d6..70c30b2e 100644 --- a/kicc-platform/kicc-platform-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/pom.xml @@ -19,7 +19,9 @@ kicc-common-biz kicc-monitor-biz kicc-template-biz - kicc-equip-biz + + +