Merge remote-tracking branch 'origin/master'

fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java

@@ -63,6 +63,9 @@ private static final long serialVersionUID = 1L;
 
     private String spaceValue;
 
+            /** 搜索值 */
+            private String searchValue;
+
     //------------------------------------------------拓展业务字段--------------------------------------------
 
     /** 父菜单名称 */

fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java

@@ -46,5 +46,7 @@ public class GLegend extends BaseEntity
 
     /**图例描述 */
     private String description;
+    /** 搜索值 */
+    private String searchValue;
 
 }

fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java

@@ -84,4 +84,7 @@ public class GSites extends BaseEntity {
 
     /** 删除状态[0存在,2删除] */
     private Long delFlag;
+
+    /** 搜索值 */
+    private String searchValue;
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/UtilDeviceNumberAdd.java

@@ -0,0 +1,54 @@
+package com.fastbee.iot.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fastbee.common.annotation.Excel;
+import com.fastbee.common.core.domain.BaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 设备编号累加，记录设备编号的排序对象 util_device_number_add
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@ApiModel(value = "UtilDeviceNumberAdd",description = "设备编号累加，记录设备编号的排序 util_device_number_add")
+@Data
+public class UtilDeviceNumberAdd implements Serializable {
+private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 设备编号前缀 */
+            @Excel(name = "设备编号前缀")
+            @ApiModelProperty("设备编号前缀")
+            private String prefix;
+
+    /** 后缀 */
+            @Excel(name = "后缀")
+            @ApiModelProperty("后缀")
+    private Long suffix;
+
+
+
+            /** 创建时间 */
+            @ApiModelProperty("创建时间")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+            private Date createTime;
+
+
+
+            /** 更新时间 */
+            @ApiModelProperty("更新时间")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+            private Date updateTime;
+
+}

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/UtilDeviceNumberAddMapper.java

@@ -0,0 +1,11 @@
+package com.fastbee.iot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fastbee.iot.domain.UtilDeviceNumberAdd;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface UtilDeviceNumberAddMapper extends BaseMapper<UtilDeviceNumberAdd> {
+    // 这里可以添加自定义的方法，如果需要的话
+}

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DevicePowerDTO.java

@@ -0,0 +1,20 @@
+package com.fastbee.iot.model.dto;
+
+import lombok.Data;
+
+@Data
+public class DevicePowerDTO {
+    private String imei;
+    private String iccid;
+    private String mcuId;
+    private String bspType;
+    private String lteType;
+    private String mcuType;
+    private String mcuFw;
+    private String lteFw;
+    private String lcdType;
+    private String voiceType;
+    private String framType;
+    private String facType;
+    private String testRecord;
+}

fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/domain/Project.java

@@ -158,6 +158,10 @@ public class Project extends BaseEntity
     @ApiModelProperty("项目lei")
     private Long type;
 
+    //    @ApiModelProperty("搜索值")
+//    @JsonIgnore
+    private String searchValue;
+
     //业务字段---------------------------------------------------------------------------
     /**
      * 系统账号名称

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserConsumptionDetails.java

@@ -140,6 +140,6 @@ public class UserConsumptionDetails extends BaseEntity
     /** 关于账单的额外信息或备注 */
     @Excel(name = "关于账单的额外信息或备注")
     @ApiModelProperty("关于账单的额外信息或备注")
-    private String remarks;
+    private String remark;
 
 }

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/UserConsumptionDetailsMapper.java

@@ -1,6 +1,8 @@
 package com.fastbee.rechargecard.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fastbee.rechargecard.domain.UserConsumptionDetails;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -11,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2024-12-18
  */
 @Mapper
-public interface UserConsumptionDetailsMapper
+public interface UserConsumptionDetailsMapper extends BaseMapper<UserConsumptionDetails>
 {
     /**
      * 根据卡号查询用户充值卡账单明细记录列表

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserConsumptionDetailsServiceImpl.java

@@ -1,6 +1,8 @@
 package com.fastbee.rechargecard.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.fastbee.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,7 +31,10 @@ public class UserConsumptionDetailsServiceImpl implements IUserConsumptionDetail
     @Override
     public List<UserConsumptionDetails> selectUserConsumptionDetailsListById(String cardNumber)
     {
-        return userConsumptionDetailsMapper.selectUserConsumptionDetailsListById(cardNumber);
+        List<UserConsumptionDetails> list = new LambdaQueryChainWrapper<>(userConsumptionDetailsMapper)
+                .eq(UserConsumptionDetails::getCardNumber, cardNumber)
+                .list();
+        return list;
     }
 
     /**