场景管理添加参数

README.md

@@ -38,4 +38,10 @@
     /service/manage/takeLook/roomList
     /service/manage/takeLook/updateRoomShow
     /service/manage/takeLook/deleteRoom
+2.设备管理列表  /service/manage/camera/list
+    添加参数    private Integer bindStatus;         //绑定状态查询 0 未绑定，1已绑定
+               private String bindUserName;        //绑定账号查询
+3.场景管理 /service/manage/scene/list
+    添加参数 num      场景码查询
+            timeList 拍摄时间查询
 ~~~~

src/main/java/com/fdkankan/manage/vo/request/CameraParam.java

@@ -23,6 +23,9 @@ public class CameraParam extends RequestBase {
 
     private String  agentName;
 
+    private Integer bindStatus;         //绑定状态查询 0 未绑定，1已绑定
+    private String bindUserName;        //绑定账号查询
+
 
 
     public String getActivatedStartTime() {

src/main/java/com/fdkankan/manage/vo/request/SceneParam.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.vo.request;
 
+import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.request.RequestBase;
 import lombok.Data;
 
@@ -15,4 +16,23 @@ public class SceneParam extends RequestBase {
     private Integer companyId;
 
     private List<String> snCodes;
+
+    private List<String> timeList;
+
+    private String startTime;
+    private String endTime;
+
+    public String getStartTime() {
+        if(timeList != null && timeList.size() >1){
+            return Dateutils.getStartTime(timeList.get(0));
+        }
+        return Dateutils.getStartTime(startTime);
+    }
+
+    public String getEndTime() {
+        if(timeList != null && timeList.size() >1){
+            return Dateutils.getEndTime(timeList.get(1));
+        }
+        return Dateutils.getEndTime(endTime);
+    }
 }

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

@@ -41,6 +41,15 @@
         <if test="param.agentName !=null and param.agentName !=''  ">
             and an.name like  concat('%',#{param.agentName},'%')
         </if>
+        <if test="param.bindUserName !=null and param.bindUserName !=''  ">
+            and u.user_name like  concat('%',#{param.bindUserName},'%')
+        </if>
+        <if test="param.bindStatus !=null and param.bindStatus ==0 ">
+            and u.user_name is null
+        </if>
+        <if test="param.bindStatus !=null and param.bindStatus ==1 ">
+            and u.user_name is not null
+        </if>
         order by c.activated_time desc
     </select>
     <select id="getByOutSnCodes" resultType="com.fdkankan.manage.entity.Camera">

src/main/resources/mapper/manage/InvoiceMapper.xml

@@ -31,16 +31,16 @@
         and o.`order_sn` like  concat('%', #{param.orderSn}, '%')
       </if>
       <if test="param.invoiceTimeStart != null">
-        and i.`create_time` >=  #{param.invoiceTimeStart}
+        and i.`create_time` &gt;=  #{param.invoiceTimeStart}
       </if>
       <if test="param.invoiceTimeEnd != null">
-        and i.`create_time` <![CDATA[ <= ]]>  #{param.invoiceTimeEnd}
+        and i.`create_time` &lt;= #{param.invoiceTimeEnd}
       </if>
       <if test="param.payTimeStart != null">
-        and o.`finish_time` >=  #{param.payTimeStart}
+        and o.`finish_time` &gt;=  #{param.payTimeStart}
       </if>
       <if test="param.payTimeEnd != null">
-        and o.`finish_time` <![CDATA[ <= ]]>  #{param.payTimeEnd}
+        and o.`finish_time` &lt;=  #{param.payTimeEnd}
       </if>
 
       UNION
@@ -72,16 +72,16 @@
         and o.`order_sn` like  concat('%', #{param.orderSn}, '%')
       </if>
       <if test="param.invoiceTimeStart != null">
-        and i.`create_time` >=  #{param.invoiceTimeStart}
+        and i.`create_time` &gt;=  #{param.invoiceTimeStart}
       </if>
       <if test="param.invoiceTimeEnd != null">
-        and i.`create_time` <![CDATA[ <= ]]>  #{param.invoiceTimeEnd}
+        and i.`create_time` &lt;=  #{param.invoiceTimeEnd}
       </if>
       <if test="param.payTimeStart != null">
-        and o.`trade_time` >=  #{param.payTimeStart}
+        and o.`trade_time` &gt;=  #{param.payTimeStart}
       </if>
       <if test="param.payTimeEnd != null">
-        and o.`trade_time` <![CDATA[ <= ]]>  #{param.payTimeEnd}
+        and o.`trade_time` &lt;=  #{param.payTimeEnd}
       </if>
 
       UNION
@@ -113,16 +113,16 @@
         and o.`order_sn` like  concat('%', #{param.orderSn}, '%')
       </if>
       <if test="param.invoiceTimeStart != null">
-        and i.`create_time` >=  #{param.invoiceTimeStart}
+        and i.`create_time` &gt;=  #{param.invoiceTimeStart}
       </if>
       <if test="param.invoiceTimeEnd != null">
-        and i.`create_time` <![CDATA[ <= ]]>  #{param.invoiceTimeEnd}
+        and i.`create_time` &lt;=  #{param.invoiceTimeEnd}
       </if>
       <if test="param.payTimeStart != null">
-        and o.`trade_time` >=  #{param.payTimeStart}
+        and o.`trade_time` &gt;=  #{param.payTimeStart}
       </if>
       <if test="param.payTimeEnd != null">
-        and o.`trade_time` <![CDATA[ <= ]]>  #{param.payTimeEnd}
+        and o.`trade_time` &lt;=  #{param.payTimeEnd}
       </if>
     ) t
     <if test="param.orderBy != null and param.orderBy!='' and param.sortBy !=null and param.sortBy !='' ">

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -73,5 +73,14 @@
         <if test="param.companyId !=null ">
             and co.id = #{param.companyId}
         </if>
+        <if test="param.num !=null and param.num !='' ">
+            and s.num like concat ('%',#{param.num},'%')
+        </if>
+        <if test="param.startTime !=null and param.startTime !='' ">
+            and s.create_time &gt;= #{startTime}
+        </if>
+        <if test="param.endTime !=null and param.endTime !='' ">
+            and s.create_time &lt;= #{endTime}
+        </if>
     </sql>
 </mapper>