Merge remote-tracking branch 'origin/master'

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoModel.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.client.model.devices;
 
 import com.github.microservice.models.device.DeviceAboutInfo;
+import com.github.microservice.models.type.DeviceModel;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
@@ -37,6 +38,18 @@ public class DeviceInfoModel extends SuperModel {
         return "";
     }
 
+    @Schema(description = "设备型号")
+    private DeviceModel deviceModel;
+
+    private String deviceModelStr;
+
+    public String getDeviceModelStr() {
+        if (deviceModel != null) {
+            return deviceModel.getRemark();
+        }
+        return "";
+    }
+
     @Schema(description = "网关号")
     private String gateWayId;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoParam.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.devices;
 
+import com.github.microservice.models.type.DeviceModel;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperParam;
 import com.zhongshu.card.client.type.OnLineState;
@@ -21,6 +22,9 @@ public class DeviceInfoParam extends SuperParam {
     @Schema(description = "设备类型，如 消费机 门禁机")
     private DeviceType deviceType;
 
+    @Schema(description = "设备型号")
+    private DeviceModel deviceModel;
+
     @Schema(description = "网关号")
     private String gateWayId;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoSearch.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.devices;
 
+import com.github.microservice.models.type.DeviceModel;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.type.OnLineState;
@@ -37,6 +38,9 @@ public class DeviceInfoSearch extends SuperSearch {
     @Schema(description = "设备类型，如 消费机 门禁机")
     private DeviceType deviceType;
 
+    @Schema(description = "设备型号")
+    private DeviceModel deviceModel;
+
     @Schema(description = "网关号")
     private String gateWayId;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/impl/DeviceInfoDaoImpl.java

@@ -57,14 +57,21 @@ public class DeviceInfoDaoImpl extends BaseImpl implements DeviceInfoDaoExtend {
         param.setOid("");
         Criteria criteria = buildCriteria(param);
 
+        // 项目oid
         if (StringUtils.isNotEmpty(param.getProjectOid())) {
             criteria.and("projectOid").is(param.getProjectOid());
         }
 
+        // 设备类型
         if (param.getDeviceType() != null) {
             criteria.and("deviceType").is(param.getDeviceType());
         }
 
+        // 设备型号
+        if (param.getDeviceModel() != null) {
+            criteria.and("deviceModel").is(param.getDeviceModel());
+        }
+
         if (param.getOnLineState() != null) {
             criteria.and("onLineState").is(param.getOnLineState());
         }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceInfo.java

@@ -1,7 +1,8 @@
 package com.zhongshu.card.server.core.domain.devices;
 
-import com.github.microservice.models.type.DeviceType;
 import com.github.microservice.models.device.DeviceAboutInfo;
+import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
@@ -53,6 +54,9 @@ public class DeviceInfo extends SuperMain {
     @Schema(description = "设备类型，如 消费机 门禁机")
     private DeviceType deviceType;
 
+    @Schema(description = "设备型号")
+    private DeviceModel deviceModel;
+
     @Schema(description = "网关号")
     private String gateWayId;