Merge branch 'vpp-zyj' into feature/service-vpp-20260701

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/domain/VppDevice.java

@@ -28,7 +28,6 @@ public class VppDevice implements Serializable {
     private String deviceUuid;
     @TableField("device_name")
     private String deviceName;
-    /** 所属站点ID，关�vpp_site.id */
     @TableField("site_id")
     private Long siteId;
     @TableField("device_type")
@@ -62,4 +61,6 @@ public class VppDevice implements Serializable {
     private Integer deleteFlag;
     @TableField("deleted_at")
     private LocalDateTime deletedAt;
+    private String accountNo;
+    private String streetTown;
 }

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/impl/VppDeviceServiceImpl.java

@@ -145,6 +145,9 @@ public class VppDeviceServiceImpl implements VppDeviceService {
         if (params.get("runStatus") != null) {
             wrapper.eq(VppDevice::getRunStatus, Integer.parseInt(params.get("runStatus").toString()));
         }
+        if (params.get("streetTown") != null) {
+            wrapper.eq(VppDevice::getStreetTown, params.get("streetTown").toString());
+        }
         return wrapper;
     }
 
@@ -187,6 +190,10 @@ public class VppDeviceServiceImpl implements VppDeviceService {
         device.setFirmwareVersion(request.getFirmwareVersion());
         device.setGatewayId(request.getGatewayId());
         device.setRemark(request.getRemark());
+        device.setAccountNo(request.getAccountNo());
+        if(request.getStreetTown() != null){
+            device.setStreetTown(request.getStreetTown());
+        }
     }
 
     private CommonPage<VppDevice> toCommonPage(Page<VppDevice> page) {

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/vo/DeviceRequest.java

@@ -21,6 +21,8 @@ public class DeviceRequest {
     private String firmwareVersion;
     private String gatewayId;
     private String remark;
+    private String accountNo;
+    private String streetTown;
 
     private String productCode;
 }