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

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

@@ -259,6 +259,44 @@ public class PersonDeviceRelationController {
     }
 
 
+    @ApiOperation(value="人员解绑所有设备")
+    @RequestMapping(value = "unbindDevice",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "personId",value = "人员ID",paramType = "query")
+    })
+    public MessageResult<Integer> unbindDevice(String personId,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try{
+            List<PersonDeviceRelation> personDeviceRelationList = personDeviceRelationService.findByPersonId(personId);
+
+            int affectCount = 0;
+
+            for (PersonDeviceRelation personDeviceRelation: personDeviceRelationList){
+                personDeviceRelation.setDelFlag(true);
+                personDeviceRelation.setUpdateBy(subject);
+                personDeviceRelation.setUpdateTime(new Date());
+                affectCount += personDeviceRelationService.update(personDeviceRelation);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
 
 
 }