设备管理

kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java

@@ -16,4 +16,5 @@ public interface AppConstants {
 
     String APP_COMMON = "/common";
 
+    String APP_EQUIP = "/equip";
 }

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

@@ -1,33 +0,0 @@
-package com.cloud.kicc.equip.api.vo;
-
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class DownCmdVo implements Serializable {
-
-  // 时间戳 - 用于下行指令的唯一标识
-  private String ts;
-
-  // 下行指令代码
-  private Integer cmd;
-
-  // 指纹id
-  //private String fid;
-
-  // 指纹id/语音播报内容
-  private String data;
-
-  //温度最低警报值
-  private Double tempMin;
-  //温度最高警报值
-  private Double tempMax;
-  //rfid每隔多少分钟上报一次所有标签
-  private Integer rfidMin;
-  //每隔多少秒上报一次数据
-  private Integer beat;
-  //设备状态 (1.已连接 2.已断开 3.已休眠)
-
-}

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

@@ -1,23 +0,0 @@
-package com.cloud.kicc.equip.api.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 物联网卡管理(EquipBoxCard)表实体类
- *
- * @author Mak
- * @since 2022-02-13 12:06:29
- */
-@Data
-public class EquipBoxCardVo  implements Serializable {
-
-    private String id;
-
-    private String iccid;
-
-    private String card;
-
-
-}

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

@@ -1,25 +0,0 @@
-package com.cloud.kicc.equip.api.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 标本箱设备信息(EquipBox)表实体类
- *
- * @author Mak
- * @since 2021-09-14 19:07:07
- */
-@Data
-public class EquipBoxConfigVo implements Serializable {
-
-    //温度最低警报值
-    private Double tempMin;
-    //温度最高警报值
-    private Double tempMax;
-    //rfid每隔多少分钟上报一次所有标签
-    private Integer rfidMin;
-    //每隔多少秒上报一次数据
-    private Integer beat;
-
-}

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenListVo.java

@@ -0,0 +1,47 @@
+package com.cloud.kicc.equip.api.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+
+@Data
+public class EquipSpecimenListVo implements Serializable {
+
+    /**ID*/
+    private String id;
+    /**设备编号*/
+    private String boxCode;
+    /**设备名称*/
+    private String boxName;
+    /**设备类型*/
+    private String boxType;
+    /**温控设备id*/
+    private String etId;
+    /**温控设备编号*/
+    private String equipCode;
+    /**设备温度*/
+    private Integer equipTemperature;
+    /**剩余电量*/
+    private String equipPower;
+    /**温度最高警报值*/
+    private Integer temperatureMaxWarn;
+    /**温度最低警报值*/
+    private Integer temperatureMinWarn;
+    /**收样员用户id*/
+    private String syUserId;
+    /**收样员用户名称*/
+    private String syUserName;
+    /**标记（0.禁用 1.启用）*/
+    private String status;
+    /**设备最新上报时间*/
+    private String latestTime;
+    /**创建时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    protected LocalDateTime createTime;
+
+}

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipSpecimenUsageVo.java

@@ -0,0 +1,44 @@
+package com.cloud.kicc.equip.api.vo;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EquipSpecimenUsageVo implements Serializable {
+
+  /**ID*/
+  private String id;
+  /**设备编号*/
+  private String boxCode;
+  /**设备名称*/
+  private String boxName;
+  /**温控设备ID*/
+  private String etId;
+  /**标本箱用户ID*/
+  private String syUserId;
+  /**设备编号*/
+  private String equipCode;
+  /**设备名称*/
+  private String equipName;
+  /**设备温度*/
+  private String equipTemperature;
+  /**设备湿度*/
+  private String equipHumidity;
+  /**经度*/
+  private String longitude;
+  /**纬度*/
+  private String latitude;
+  /**设备位置*/
+  private String equipAddr;
+  /**剩余电量*/
+  private String equipPower;
+  /**设备状态*/
+  private String equipStatus;
+  /**设备类型*/
+  private String equipType;
+  /**设备最新上报时间*/
+  private String latestTime;
+
+}

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/vo/EquipTempSelectVo.java

@@ -0,0 +1,18 @@
+package com.cloud.kicc.equip.api.vo;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EquipTempSelectVo implements Serializable {
+
+  /**ID*/
+  private String etId;
+  /**设备名称*/
+  private String equipName;
+  /**设备编号*/
+  private String equipCode;
+
+}

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

@@ -66,12 +66,7 @@
 			<artifactId>qpid-jms-client</artifactId>
 			<version>0.50.0</version>
 		</dependency>
-		<dependency>
-			<groupId>com.cloud</groupId>
-			<artifactId>kicc-equip-api</artifactId>
-			<version>1.0.0</version>
-			<scope>compile</scope>
-		</dependency>
+
 	</dependencies>
 
 	<build>

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

@@ -1,7 +1,8 @@
-package com.cloud.kicc.commonbiz.controller.equip;
+package com.cloud.kicc.equip.controller;
 
 
 import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.service.box.BoxDownCmdService;
 import com.cloud.kicc.commonbiz.service.box.EquipBoxUserService;
 import com.cloud.kicc.equip.api.entity.box.EquipBoxUser;
@@ -20,7 +21,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/equip/box/user")
+@RequestMapping(AppConstants.APP_EQUIP + "/box/user")
 public class EquipBoxUserController {
 
 
@@ -60,7 +61,7 @@ public class EquipBoxUserController {
      */
     @GetMapping("/list")
     public R listEquipBoxUser(@RequestParam("boxId") String boxId,
-                                       @RequestParam(value = "userName", required = false) String userName) {
+                              @RequestParam(value = "userName", required = false) String userName) {
         return R.ok(equipBoxUserService.listBoxUser(boxId, userName));
     }
 
@@ -90,4 +91,4 @@ public class EquipBoxUserController {
 
 
 
-}
+}

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

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.controller.equip;
+package com.cloud.kicc.equip.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,7 +15,7 @@ import java.util.Arrays;
 
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/equip/specimen")
+@RequestMapping(AppConstants.APP_EQUIP + "/specimen")
 public class EquipSpecimenController {
 
 
@@ -96,4 +96,4 @@ public class EquipSpecimenController {
         return R.ok();
     }
 
-}
+}

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

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.controller.equip;
+package com.cloud.kicc.equip.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,7 +19,7 @@ import java.util.Arrays;
 
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/equip/temperature")
+@RequestMapping(AppConstants.APP_EQUIP + "/temperature")
 public class EquipTemperatureController {
 
 
@@ -123,4 +123,4 @@ public class EquipTemperatureController {
     }
 
 
-}
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/test/testDemo.java

@@ -0,0 +1,22 @@
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.IdcardUtil;
+
+
+/**
+ * @Author: lizhi
+ * @Description:
+ * @Since 1.0
+ * @Date Created in 11:04 2022/6/29
+ */
+public class testDemo {
+    public static void main(String[] args) {
+      String IdCard18 = "523485241251412521";
+      String IdCard15 = "135248524214562";
+      boolean valid18 = IdcardUtil.isValidCard(IdCard18);
+      boolean valid15 = IdcardUtil.isValidCard(IdCard15);
+        System.out.println(valid18);
+        System.out.println(valid15);
+    }
+}

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

@@ -54,12 +54,7 @@
 			<groupId>com.cloud</groupId>
 			<artifactId>kicc-common-mock</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>com.cloud</groupId>
-            <artifactId>kicc-equip-api</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
+
     </dependencies>
 
 	<build>