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

web/src/main/java/com/jpsoft/smart/modules/mobile/controller/PersonDeviceFilterLogController.java

@@ -57,8 +57,12 @@ public class PersonDeviceFilterLogController {
                 DeviceInfo deviceInfo = deviceInfoService.getByDeviceNo(personDeviceFilterLog.getDeviceNo());
                 PersonInfo personInfo = personInfoService.get(Long.valueOf(personDeviceFilterLog.getPersonId()));
 
-                personDeviceFilterLogDTO.setDeviceName(deviceInfo.getAliasName());
-                personDeviceFilterLogDTO.setPersonName(personInfo.getName());
+                if(deviceInfo != null) {
+                    personDeviceFilterLogDTO.setDeviceName(deviceInfo.getAliasName());
+                }
+                if(personInfo != null) {
+                    personDeviceFilterLogDTO.setPersonName(personInfo.getName());
+                }
                 if(personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 1 || personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 0){
                     personDeviceFilterLogDTO.setFever(true);
                 }else {
@@ -86,11 +90,11 @@ public class PersonDeviceFilterLogController {
     @RequestMapping(value = "list",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name="token",value = "令牌",required = true,paramType = "form"),
-            @ApiImplicitParam(name = "personId",value = "人员编号", required = true, paramType = "form",dataType = "Long"),
+            @ApiImplicitParam(name="subject",value = "目标(不传)",paramType = "form"),
             @ApiImplicitParam(name = "recordDate",value = "查询日期(yyyy-MM-dd)", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<List<PersonDeviceFilterLogDTO>> list(@RequestParam(value="personId",defaultValue="") Long personId,
-                                                              @RequestParam(value="recordDate",defaultValue="") String recordDate,
+    public MessageResult<List<PersonDeviceFilterLogDTO>> list(@RequestParam(value="recordDate",defaultValue="") String recordDate,
+                                                              @RequestAttribute String subject,
                                                               String token){
         MessageResult<List<PersonDeviceFilterLogDTO>> msgResult = new MessageResult<>();
 
@@ -106,7 +110,7 @@ public class PersonDeviceFilterLogController {
             List<PersonDeviceFilterLogDTO> listPersonDeviceFilterLogDTO = new ArrayList<>();
 
             Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("personId",personId);
+            searchParams.put("personId",subject);
             searchParams.put("beginTime",beginTime);
             searchParams.put("endTime",endTime);
             List<Sort> sortList = new ArrayList<>();
@@ -120,8 +124,12 @@ public class PersonDeviceFilterLogController {
                 DeviceInfo deviceInfo = deviceInfoService.getByDeviceNo(personDeviceFilterLog.getDeviceNo());
                 PersonInfo personInfo = personInfoService.get(Long.valueOf(personDeviceFilterLog.getPersonId()));
 
-                personDeviceFilterLogDTO.setDeviceName(deviceInfo.getAliasName());
-                personDeviceFilterLogDTO.setPersonName(personInfo.getName());
+                if(deviceInfo != null) {
+                    personDeviceFilterLogDTO.setDeviceName(deviceInfo.getAliasName());
+                }
+                if(personInfo != null) {
+                    personDeviceFilterLogDTO.setPersonName(personInfo.getName());
+                }
                 if(personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 1){//|| personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 0
                     personDeviceFilterLogDTO.setFever(true);
                 }else {