1

src/main/java/com/fdkankan/agent/httpClient/request/LaserSceneParam.java

@@ -14,4 +14,7 @@ public class LaserSceneParam {
     private Integer status;
     private String snCode;
     private List<String> snCodes;
+
+    private String startTime;
+    private String endTime;
 }

src/main/java/com/fdkankan/agent/request/CameraParam.java

@@ -19,7 +19,7 @@ public class CameraParam extends RequestBase {
     private Integer agentId;
 
     private Integer incrementTypeId;              //权益类型
-    private Integer incrementStatus;            //权益状态  0未绑定权益，1生效中，2已过期
+    private Integer incrementStatus;            //权益状态  -1未绑定权益，0生效中，1已过期
     private Integer bindStatus;                 //绑定状态  0未绑定，1已绑定
 
 

src/main/java/com/fdkankan/agent/response/CameraDetailVo.java

@@ -20,7 +20,7 @@ public class CameraDetailVo {
     private Integer incrementTypeId;
     private String incrementTypeName;
 
-    private Integer incrementStatus;
+    private Integer incrementStatus =-1;
     private Integer validTimeType;
 
 }

src/main/resources/mapper/agent/CameraMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="pageList" resultType="com.fdkankan.agent.response.CameraDetailVo">
         select c.id ,c.sn_code,c.activated_time ,d.create_time as outTime ,d.type,d.own as outType  ,u.user_name, c.wifi_name,
-        d.order_sn,ui.increment_type_id,ui.is_expired +1 as incrementStatus ,uit.valid_time_type
+        d.order_sn,ui.increment_type_id,ui.is_expired  as incrementStatus ,uit.valid_time_type
         from t_camera c
         left join t_camera_detail d on c.id = d.camera_id
         left join t_user u on d.user_id = u.id
@@ -26,9 +26,12 @@
         <if test="param.incrementTypeId !=null ">
             and ui.increment_type_id = #{param.incrementTypeId}
         </if>
-        <if test="param.incrementStatus !=null ">
+        <if test="param.incrementStatus !=null and param.incrementStatus != -1">
             and ui.is_expired = #{param.incrementStatus}
         </if>
+        <if test="param.incrementStatus !=null and param.incrementStatus == -1">
+            and ui.id is null
+        </if>
         <if test="param.bindStatus !=null and param.bindStatus == 0">
             and d.user_id is null
         </if>