医生，机构，医院，科室

kicc-platform/kicc-platform-api/kicc-equip-api/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>kicc-platform-api</artifactId>
+        <groupId>com.cloud</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>kicc-equip-api</artifactId>
+
+    <packaging>jar</packaging>
+    <description>kicc的iot接口api模块</description>
+
+    <dependencies>
+        <!--断路器依赖-->
+        <dependency>
+            <groupId>com.cloud</groupId>
+            <artifactId>kicc-common-feign</artifactId>
+        </dependency>
+        <!--数据服务核心包-->
+        <dependency>
+            <groupId>com.cloud</groupId>
+            <artifactId>kicc-common-data</artifactId>
+        </dependency>
+        <!--excel 导入导出-->
+        <dependency>
+            <groupId>com.pig4cloud.excel</groupId>
+            <artifactId>excel-spring-boot-starter</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/constant/EquipConstants.java

@@ -0,0 +1,13 @@
+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;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/DownCmdParam.java

@@ -0,0 +1,26 @@
+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;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/RfidsParam.java

@@ -0,0 +1,20 @@
+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;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/dto/box/UpCmdParam.java

@@ -0,0 +1,72 @@
+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;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer/EquipBeeper.java

@@ -0,0 +1,51 @@
+package com.cloud.kicc.equip.api.entity.beer;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * @Author: lizhi
+ * @Description: 呼叫器设备信息(EquipBeeper)表实体类
+ * @Since 1.0
+ * @Date Created in 14:55 2022/6/16
+ *
+ */
+@Data
+@TableName("equip_beeper")
+public class EquipBeeper extends CommonEntity implements Serializable {
+    /**主键ID*/
+    @TableId
+    private String id;
+    /**设备名称*/
+    private String beeperName;
+    /**设备编号*/
+    private String beeperCode;
+    /**设备类型*/
+    private Integer beeperType;
+    /**wifi账号*/
+    private String wifiName;
+    /**wifi密码*/
+    private String wifiPwd;
+    /**医院id*/
+    private String hospitalId;
+    /**科室id*/
+    private String officeId;
+    /**医生id*/
+    private String doctorId;
+    /**状态，默认0：启用 ,1：禁用*/
+    private String status;
+    /**医院名称*/
+    @TableField(exist = false)
+    private String hospitalName;
+    /**科室名称*/
+    @TableField(exist = false)
+    private String officeName;
+    /**医生名称*/
+    @TableField(exist = false)
+    private String doctorName;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/beer/EquipBeeperRecord.java

@@ -0,0 +1,28 @@
+package com.cloud.kicc.equip.api.entity.beer;
+
+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;
+
+/**
+ * @Author: lizhi
+ * @Description:
+ * @Since 1.0
+ * @Date Created in 14:56 2022/6/16
+ */
+@Data
+@TableName("equip_beeper_record")
+public class EquipBeeperRecord extends CommonEntity implements Serializable {
+    /** 主键ID */
+    @TableId
+    private String id;
+    /** 设备编号 */
+    private String beeperCode;
+    /** 呼叫类型（1.收样 2.更新密码) */
+    private Integer recordType;
+    /** 状态：(0.启用 1.禁用)  默认为0启用 */
+    private String status;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBox.java

@@ -0,0 +1,96 @@
+package com.cloud.kicc.equip.api.entity.box;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @Author: lizhi
+ * @Description:标本箱设备信息(EquipBox)表实体类
+ * @Since 1.0
+ * @Date Created in 14:58 2022/6/16
+ */
+@Data
+@TableName("equip_box")
+public class EquipBox extends CommonEntity implements Serializable {
+
+    /**主键ID*/
+    @TableId
+    private String id;
+    /**设备名称*/
+    private String boxName;
+    /**设备编号*/
+    private String boxCode;
+    /**设备类型*/
+    private Integer boxType;
+    /**设备温度*/
+    private String temp;
+    /**设备湿度*/
+    private String damp;
+    /**经度*/
+    private String lng;
+    /**纬度*/
+    private String lat;
+    /**设备具体位置*/
+    private String addr;
+    /**剩余电量*/
+    private String power;
+    /**倾斜度(通过倾斜角度X/Y + 震动能量值分析计算出来的角度值)*/
+    private String tilt;
+    /**倾斜角度（x轴）*/
+    private String tiltX;
+    /**倾斜角度（y轴）*/
+    private String tiltY;
+    /**震动能量值（值越大倾斜越大）*/
+    private String energy;
+    //物联网卡号
+    //private String ipCard;
+    /**物联网卡id*/
+    private Integer cardId;
+
+    /**收样员用户id*/
+    private Integer syUserId;
+    /**温度最低警报值*/
+    private Double tempMin;
+    /**温度最高警报值*/
+    private Double tempMax;
+    /**rfid每隔多少分钟上报一次所有标签*/
+    private Integer rfidMin;
+    /**每隔多少秒上报一次数据*/
+    private Integer beat;
+    /**设备状态 (0.未连接 1.已连接 2.已断开 3.已休眠)*/
+    private Integer boxStatus;
+    /**锁状态 (0.关 1.开)*/
+    private Integer openStatus;
+    /**制冷状态（0.未制冷 1.已制冷）*/
+    private Integer coldStatus;
+    /**报警状态（0.正常 1.低温报警 2.高温报警 3.倾斜报警 4.锁未关报警）*/
+    private Integer warnStatus;
+    /**元件异常状态（0.正常 1.指纹锁 2.制冷片 3.温湿度 4.4G通讯 5.倾斜度 6.语音）*/
+    private Integer errorStatus;
+    /**设备最新连接时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime connectTime;
+    /**设备最新断开时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime closeTime;
+    /**设备最新上报时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime latestTime;
+    /**设备启用或警用：默认为0：启用，1禁用*/
+    private String status;
+
+    /**收样员名称*/
+    @TableField(exist = false)
+    private String syUserName;
+
+    /**物联网卡唯一标识号iccid*/
+    @TableField(exist = false)
+    private String iccid;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxCard.java

@@ -0,0 +1,34 @@
+package com.cloud.kicc.equip.api.entity.box;
+
+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;
+
+/**
+ * @Author: lizhi
+ * @Description:物联网卡管理(EquipBoxCard)表实体类
+ * @Since 1.0
+ * @Date Created in 15:00 2022/6/16
+ */
+@Data
+@TableName("equip_box_card")
+public class EquipBoxCard extends CommonEntity implements Serializable {
+    /**物联网卡ID*/
+    @TableId
+    private String id;
+
+    /**卡号*/
+    private String iccid;
+
+    /**厂家(1.中国移动,2.中国联通,3.中国电信)*/
+    private String card;
+
+    /**0:启用，1：禁用*/
+    private String status;
+
+    /**卡是否已使用在标本箱上（0.否 1.是）*/
+    private Integer isUsed;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxLog.java

@@ -0,0 +1,54 @@
+package com.cloud.kicc.equip.api.entity.box;
+
+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;
+
+/**
+ * @Author: lizhi
+ * @Description:标本箱心跳日志记录(EquipBoxLog)表实体类
+ * @Since 1.0
+ * @Date Created in 15:02 2022/6/16
+ */
+@Data
+@TableName("equip_box_log")
+public class EquipBoxLog extends CommonEntity implements Serializable {
+    /**主键ID*/
+    @TableId
+    private String id;
+    /**标本箱id*/
+    private String boxId;
+    /**设备温度*/
+    private String temp;
+    /**设备湿度*/
+    private String damp;
+    /**经度*/
+    private String lng;
+    /**纬度*/
+    private String lat;
+    /**设备具体位置*/
+    private String addr;
+    /**剩余电量*/
+    private String power;
+    /**倾斜度*/
+    private String tilt;
+    /**倾斜角度（x轴）*/
+    private String tiltX;
+    /**倾斜角度（y轴）*/
+    private String tiltY;
+    /**震动能量值（值越大倾斜越大）*/
+    private String energy;
+    /**锁状态 (0.关 1.开)*/
+    private Integer openStatus;
+    /**制冷状态（0.未制冷 1.已制冷）*/
+    private Integer coldStatus;
+    /**报警状态（0. 正常 1.低温报警 2.高温报警 3.倾斜报警 4.锁未关报警）*/
+    private Integer warnStatus;
+    /**元件异常状态（0. 正常 1.指纹锁 2.制冷片 3.温湿度 4.4G通讯 5.倾斜度 6.语音）*/
+    private Integer errorStatus;
+    /**状态：(0.启用 1.禁用)*/
+    private String status;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRecord.java

@@ -0,0 +1,55 @@
+package com.cloud.kicc.equip.api.entity.box;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: lizhi
+ * @Description:标本箱操作记录(EquipBoxRecord)表实体类
+ * @Since 1.0
+ * @Date Created in 15:22 2022/6/16
+ */
+@Data
+@TableName("equip_box_record")
+public class EquipBoxRecord implements Serializable {
+    /**主键ID*/
+    @TableId
+    private String id;
+    /**设备id*/
+    private String boxId;
+    /**指令编号(
+     * 1.连接
+     * 2.获取设备配置
+     * 4.开锁
+     * 5.关锁
+     * 6.元件异常
+     * 100.重置配置
+     * 105.语音播报
+     * 110.新增指纹
+     * 111.删除指纹
+     * 112.获取所有指纹
+     * 113.删除所有指纹
+     * 114.开锁
+     * 118.开启制冷
+     * 119.关闭制冷
+     * 123.开启数据上报
+     * 124.关闭数据上报)*/
+    private Integer cmd;
+    /**数据内容json格式*/
+    private String dataJson;
+    /**关联的业务主键id*/
+    private String relationId;
+    /**指纹ID*/
+    private String fid;
+    /**异常状态*/
+    private Integer errorStatus;
+    /**指令响应状态（0.未响应 1.成功 2.失败）*/
+    private Integer cmdStatus;
+    /**指令操作序号*/
+    private String timestamp;
+    /**状态：(0.禁用 1.启用)*/
+    private String status;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxRfidLog.java

@@ -0,0 +1,30 @@
+package com.cloud.kicc.equip.api.entity.box;
+
+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;
+
+/**
+ * @Author: lizhi
+ * @Description:标本箱RFIDj记录信息(EquipBoxRfidLog)表实体类
+ * @Since 1.0
+ * @Date Created in 15:23 2022/6/16
+ */
+@Data
+@TableName("equip_box_rfid_log")
+public class EquipBoxRfidLog extends CommonEntity implements Serializable {
+    /**主键ID*/
+    @TableId
+    private String id;
+    /**设备id*/
+    private String boxId;
+    /**RFID标签*/
+    private String rfids;
+    /**标签类型(1.变动 2.所有)*/
+    private Integer rfidType;
+    /**状态：(0.启用 1.禁用)*/
+    private String status;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxUser.java

@@ -0,0 +1,38 @@
+package com.cloud.kicc.equip.api.entity.box;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * @Author: lizhi
+ * @Description:标本箱指纹用户信息(EquipBoxUser)表实体类
+ * @Since 1.0
+ * @Date Created in 15:24 2022/6/16
+ */
+@Data
+@TableName("equip_box_user")
+public class EquipBoxUser extends CommonEntity implements Serializable {
+    /**主键ID*/
+    @TableId
+    private String id;
+    /**设备id*/
+    private String boxId;
+    /**系统用户id*/
+    private String userId;
+    /**用户名称*/
+    private String userName;
+    /**指纹ID*/
+    private String fid;
+    /**指纹类型(1.主指纹（系统用户） 2.客户)*/
+    private Integer fidType;
+    /**指纹状态(0.启用 1.禁用)*/
+    private String status;
+
+    @TableField(exist = false)
+    private String boxName;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/BoxStatusEnum.java

@@ -0,0 +1,51 @@
+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;
+    }
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdEnum.java

@@ -0,0 +1,91 @@
+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;
+    }
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/CmdStatusEnum.java

@@ -0,0 +1,50 @@
+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;
+    }
+
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/enums/WarnStatusEnum.java

@@ -0,0 +1,54 @@
+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;
+    }
+
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/vo/box/DownCmdVo.java

@@ -0,0 +1,36 @@
+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.已休眠)
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxCardVo.java

@@ -0,0 +1,20 @@
+package com.cloud.kicc.equip.api.vo.box;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: lizhi
+ * @Description:物联网卡管理(EquipBoxCard)表实体类
+ * @Since 1.0
+ * @Date Created in 15:28 2022/6/16
+ */
+@Data
+public class EquipBoxCardVo implements Serializable {
+    private Integer cardId;
+
+    private String iccid;
+
+    private String card;
+}

kicc-platform/kicc-platform-api/kicc-equip-api/src/main/java/com/cloud/kicc/equip/api/vo/box/EquipBoxConfigVo.java

@@ -0,0 +1,23 @@
+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:29 2022/6/16
+ */
+@Data
+public class EquipBoxConfigVo implements Serializable {
+    //温度最低警报值
+    private Double tempMin;
+    //温度最高警报值
+    private Double tempMax;
+    //rfid每隔多少分钟上报一次所有标签
+    private Integer rfidMin;
+    //每隔多少秒上报一次数据
+    private Integer beat;
+}

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Doctor.java

@@ -40,7 +40,7 @@ public class Doctor extends CommonEntity implements Serializable {
     /**地址（门牌号）*/
     private String detailAddress;
     /**组织类型*/
-    private Integer organType;
+    private String organType;
     /**组织id*/
     private String organId;
     /**组织名称*/

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java

@@ -29,7 +29,7 @@ public class Hospital extends CommonEntity implements Serializable {
 
     private String name;
 
-    private Integer type;
+    private String type;
 
     private String contactsName;
 

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Institution.java

@@ -28,7 +28,7 @@ public class Institution extends CommonEntity implements Serializable{
 
     private String name;
 
-    private Integer type;
+    private String type;
 
     private String contactsName;
 

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Office.java

@@ -29,7 +29,7 @@ public class Office extends CommonEntity implements Serializable {
 
     private String name;
 
-    private Integer organType;
+    private String organType;
 
     private String organId;
 

kicc-platform/kicc-platform-api/pom.xml

@@ -19,6 +19,7 @@
         <module>kicc-common-api</module>
         <module>kicc-monitor-api</module>
         <module>kicc-template-api</module>
+        <module>kicc-equip-api</module>
     </modules>
 
 </project>

kicc-platform/kicc-platform-biz/kicc-equip-biz/Dockerfile

@@ -0,0 +1,15 @@
+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

kicc-platform/kicc-platform-biz/kicc-equip-biz/pom.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.cloud</groupId>
+		<artifactId>kicc-platform-biz</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>kicc-equip-biz</artifactId>
+	<packaging>jar</packaging>
+
+	<description>kicc 通用业务模块</description>
+
+	<dependencies>
+		<!--common api模块-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-api</artifactId>
+		</dependency>
+		<!--安全模块-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-security</artifactId>
+		</dependency>
+		<!--日志处理-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-log</artifactId>
+		</dependency>
+		<!--接口文档-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-swagger</artifactId>
+		</dependency>
+		<!--注册中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+		</dependency>
+		<!--配置中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+		<!--undertow容器-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
+		</dependency>
+		<!--模拟测试-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-mock</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java

@@ -0,0 +1,29 @@
+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;
+
+/**
+ *<p>
+ * 通用业务模块
+ *</p>
+ *
+ * @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);
+	}
+
+}

kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java

@@ -0,0 +1,36 @@
+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;
+/**
+ *<p>
+ * 地图任务
+ *</p>
+ *
+ * @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;
+
+}

kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java

@@ -0,0 +1,44 @@
+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;
+
+/**
+ *<p>
+ * 地图任务信息
+ *</p>
+ *
+ * @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<MapTask> list = mapTaskService.list(Wrappers.<MapTask>lambdaQuery().eq(MapTask::getTakeSpecimenId, takeSpecimenId));
+        return R.ok(list);
+    }
+
+    @SysLog("用户修改")
+    @PutMapping("/update")
+    @PreAuthorize("@pms.hasPermission('user_edit')")
+    public R update(@RequestBody List<MapTask> mapTasks) {
+        mapTaskService.batchUpdate(mapTasks);
+        return R.ok();
+    }
+
+}

kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cloud.kicc.commonbiz.api.entity.MapTask;
+
+/**
+ *<p>
+ * 地图任务
+ *</p>
+ *
+ * @Author: entfrm开发团队-王翔
+ * @Date: 2022/6/6
+ */
+public interface MapTaskMapper extends BaseMapper<MapTask> {
+
+}

kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/MapTaskService.java

@@ -0,0 +1,20 @@
+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;
+
+/**
+ *<p>
+ * 地图任务
+ *</p>
+ *
+ * @Author: entfrm开发团队-王翔
+ * @Date: 2022/6/6
+ */
+public interface MapTaskService extends IService<MapTask> {
+
+   void batchUpdate(List<MapTask> mapTasks);
+
+}

kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java

@@ -0,0 +1,33 @@
+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;
+
+/**
+ *<p>
+ * 地图任务
+ *</p>
+ *
+ * @Author: entfrm开发团队-王翔
+ * @Date: 2022/6/6
+ */
+@Service
+@RequiredArgsConstructor
+public class MapTaskServiceImpl extends ServiceImpl<MapTaskMapper, MapTask> implements MapTaskService {
+
+    @Transactional(noRollbackFor = Exception.class)
+    @Override
+    public void batchUpdate(List<MapTask> mapTasks) {
+        mapTasks.forEach(mapTask -> {
+
+        });
+    }
+
+}

kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/bootstrap.yml

@@ -0,0 +1,17 @@
+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}

kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/logback-spring.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--基础日志配置,工程继承可以进行替换-->
+<configuration debug="false" scan="false">
+	<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+	<property name="log.path" value="logs/${spring.application.name}"/>
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN"
+			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+	<conversionRule conversionWord="wex"
+					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+	<conversionRule conversionWord="wEx"
+					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+	<!-- 控制台日志输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 日志文件调试输出 -->
+	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/debug.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 日志文件错误输出 -->
+	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/error.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>ERROR</level>
+		</filter>
+	</appender>
+
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="INFO">
+		<appender-ref ref="console"/>
+		<appender-ref ref="debug"/>
+		<appender-ref ref="error"/>
+	</root>
+</configuration>

kicc-platform/kicc-platform-biz/kicc-equip-biz/src/main/resources/mapper/MapTaskMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cloud.kicc.system.mapper.DeptMapper">
+
+    <resultMap type="Dept" id="DeptResult">
+        <id property="deptId" column="dept_id"/>
+        <result property="code" column="code"/>
+        <result property="name" column="name"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="sort" column="sort"/>
+        <result property="contacts" column="contacts"/>
+        <result property="phone" column="phone"/>
+        <result property="email" column="email"/>
+        <result property="status" column="status"/>
+        <result property="createById" column="create_by_id"/>
+        <result property="createByName" column="create_by_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateById" column="update_by_id"/>
+        <result property="updateByName" column="update_by_name"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+</mapper>

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java

@@ -84,7 +84,7 @@ public class AddressController {
      */
     @ApiOperation(value = "根据parentId列表查询list")
     @GetMapping("/queryByParentId")
-    public R queryByParentIds( Address address) {
+    public R queryByParentId( Address address) {
         List<Address> addressList = addressService.list(Wrappers.<Address>lambdaQuery().eq(Address::getParentId, address.getParentId()));
         return R.ok(addressList, addressList.size());
     }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/Address.xml

@@ -45,7 +45,7 @@
     </select>
 
     <select id="queryListByParentIds" resultType="com.cloud.kicc.system.api.entity.Address">
-        SELECT code, level, (select count(code)=0 from sys_address a2 where a2.parent_id = a.code)  parent_id,
+        SELECT code, level, (select code from sys_address a2 where a2.parent_id = a.code)  parent_id,
         name, sort, create_by_id,
         create_by_name, create_time,
         update_by_id, update_by_name, update_time,

kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java

@@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class KiccTemplateApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(KiccTemplateApplication.class, args);
+		SpringApplication.run(KiccEquipApplication.class, args);
 	}
 
 }

kicc-platform/kicc-platform-biz/pom.xml

@@ -19,6 +19,7 @@
         <module>kicc-common-biz</module>
         <module>kicc-monitor-biz</module>
         <module>kicc-template-biz</module>
+        <module>kicc-equip-biz</module>
     </modules>
 
 </project>

kicc-platform/pom.xml

@@ -18,6 +18,7 @@
     <modules>
         <module>kicc-platform-api</module>
         <module>kicc-platform-biz</module>
+
     </modules>
 
 </project>

pom.xml

@@ -87,7 +87,8 @@
 		<module>kicc-common</module>
 		<module>kicc-visual</module>
 		<module>kicc-common-demo</module>
-	</modules>
+
+    </modules>
 
 	<dependencyManagement>
 		<dependencies>