Merge remote-tracking branch 'origin/V1' into V1

common/src/main/resources/mapper/base/PersonDeviceLog.xml

@@ -132,6 +132,10 @@
                   and a.temperature_ <= #{searchParams.maxTemperature}
                 ]]>
             </if>
+            <if test="searchParams.matchMsg != null">
+                and a.match_msg like #{searchParams.matchMsg}
+            </if>
+
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonDeviceLogController.java

@@ -62,12 +62,12 @@ public class PersonDeviceLogController {
             @ApiImplicitParam(name = "aliasName",value = "设备别名", paramType = "query"),
             @ApiImplicitParam(name = "personName",value = "人员姓名", paramType = "query"),
             @ApiImplicitParam(name = "timeRanges",value = "时间范围", paramType = "query"),
-            @ApiImplicitParam(name = "temperatureRanges",value = "温度范围", paramType = "query")
-
+            @ApiImplicitParam(name = "temperatureRanges",value = "温度范围", paramType = "query"),
+            @ApiImplicitParam(name = "matchMsg",value = "匹配状态", paramType = "query")
     })
     public MessageResult<Map> pageList(
             String deviceNo,String aliasName,String personName,
-            String timeRanges,String temperatureRanges,
+            String timeRanges,String temperatureRanges,String matchMsg,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -112,6 +112,10 @@ public class PersonDeviceLogController {
             searchParams.put("personName","%"+personName+"%");
         }
 
+        if(StringUtil.isNotEmpty(matchMsg)){
+            searchParams.put("matchMsg","%"+matchMsg+"%");
+        }
+
 
         if(StringUtil.isNotEmpty(timeRanges)){
             String[] timeRangeArray = timeRanges.split(",");