diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index ea96afa..2be20fd 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -189,4 +189,23 @@ } } + /** + * 取消授权（删除） + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll(@RequestParam(value = "doorCode") String doorCode, + @RequestParam(value = "personType")String personType){ + List ids = acsPermissionService.selectPermissionsByDoorCode(doorCode,personType); + boolean delete = acsPermissionService.deleteBatchIds(ids); + List errorList = acsPermissionService.deleteSocketPermission(ids,doorCode); + if(!delete){ + return ResponseData.error("取消授权失败"); + }else if(ToolUtil.isNotEmpty(errorList)){ + return ResponseData.error("取消授权成功，".concat(StringUtils.join(errorList,",")).concat("下发失败")); + }else { + return ResponseData.success(); + } + } + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index ea96afa..2be20fd 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -189,4 +189,23 @@ } } + /** + * 取消授权（删除） + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll(@RequestParam(value = "doorCode") String doorCode, + @RequestParam(value = "personType")String personType){ + List ids = acsPermissionService.selectPermissionsByDoorCode(doorCode,personType); + boolean delete = acsPermissionService.deleteBatchIds(ids); + List errorList = acsPermissionService.deleteSocketPermission(ids,doorCode); + if(!delete){ + return ResponseData.error("取消授权失败"); + }else if(ToolUtil.isNotEmpty(errorList)){ + return ResponseData.error("取消授权成功，".concat(StringUtils.join(errorList,",")).concat("下发失败")); + }else { + return ResponseData.success(); + } + } + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java index 79315db..6e19e4f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java @@ -24,4 +24,6 @@ List> selectUserList(@Param("doorCode")String doorCode,@Param("personType")String personType,@Param("keyword")String keyword,@Param("deptId")Long deptId); //List> selectByDoorAndUser(@Param("doorCode")String doorCode,@Param("personId")Long personId); + List selectPermissionsByDoorCode(@Param("doorCode")String doorCode,@Param("personType")String personType); + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index ea96afa..2be20fd 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -189,4 +189,23 @@ } } + /** + * 取消授权（删除） + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll(@RequestParam(value = "doorCode") String doorCode, + @RequestParam(value = "personType")String personType){ + List ids = acsPermissionService.selectPermissionsByDoorCode(doorCode,personType); + boolean delete = acsPermissionService.deleteBatchIds(ids); + List errorList = acsPermissionService.deleteSocketPermission(ids,doorCode); + if(!delete){ + return ResponseData.error("取消授权失败"); + }else if(ToolUtil.isNotEmpty(errorList)){ + return ResponseData.error("取消授权成功，".concat(StringUtils.join(errorList,",")).concat("下发失败")); + }else { + return ResponseData.success(); + } + } + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java index 79315db..6e19e4f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java @@ -24,4 +24,6 @@ List> selectUserList(@Param("doorCode")String doorCode,@Param("personType")String personType,@Param("keyword")String keyword,@Param("deptId")Long deptId); //List> selectByDoorAndUser(@Param("doorCode")String doorCode,@Param("personId")Long personId); + List selectPermissionsByDoorCode(@Param("doorCode")String doorCode,@Param("personType")String personType); + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml index 4f5b121..6aa23ca 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml @@ -29,8 +29,7 @@ FROM acs_door door LEFT JOIN acs_permission per ON per.DOOR_CODE = door.DOOR_CODE - LEFT JOIN sys_person p ON per.PERSON_ID = p.ID - WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID AND (p.DELFLAG = '0' OR p.DELFLAG IS NULL) GROUP BY door.DOOR_CODE @@ -112,4 +111,15 @@ + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index ea96afa..2be20fd 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -189,4 +189,23 @@ } } + /** + * 取消授权（删除） + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll(@RequestParam(value = "doorCode") String doorCode, + @RequestParam(value = "personType")String personType){ + List ids = acsPermissionService.selectPermissionsByDoorCode(doorCode,personType); + boolean delete = acsPermissionService.deleteBatchIds(ids); + List errorList = acsPermissionService.deleteSocketPermission(ids,doorCode); + if(!delete){ + return ResponseData.error("取消授权失败"); + }else if(ToolUtil.isNotEmpty(errorList)){ + return ResponseData.error("取消授权成功，".concat(StringUtils.join(errorList,",")).concat("下发失败")); + }else { + return ResponseData.success(); + } + } + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java index 79315db..6e19e4f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java @@ -24,4 +24,6 @@ List> selectUserList(@Param("doorCode")String doorCode,@Param("personType")String personType,@Param("keyword")String keyword,@Param("deptId")Long deptId); //List> selectByDoorAndUser(@Param("doorCode")String doorCode,@Param("personId")Long personId); + List selectPermissionsByDoorCode(@Param("doorCode")String doorCode,@Param("personType")String personType); + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml index 4f5b121..6aa23ca 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml @@ -29,8 +29,7 @@ FROM acs_door door LEFT JOIN acs_permission per ON per.DOOR_CODE = door.DOOR_CODE - LEFT JOIN sys_person p ON per.PERSON_ID = p.ID - WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID AND (p.DELFLAG = '0' OR p.DELFLAG IS NULL) GROUP BY door.DOOR_CODE @@ -112,4 +111,15 @@ + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java index d672e51..959e400 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java @@ -2,6 +2,7 @@ import java.io.Serializable; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.enums.FieldStrategy; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.core.base.json.DateDeserializer; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -63,12 +65,14 @@ */ @TableField(value = "BEGIN_DATETIME", strategy= FieldStrategy.IGNORED) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = DateDeserializer.class) private Date beginDatetime; /** * 失效时间 */ @TableField(value = "END_DATETIME", strategy= FieldStrategy.IGNORED) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = DateDeserializer.class) private Date endDatetime; @Override diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index ea96afa..2be20fd 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -189,4 +189,23 @@ } } + /** + * 取消授权（删除） + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll(@RequestParam(value = "doorCode") String doorCode, + @RequestParam(value = "personType")String personType){ + List ids = acsPermissionService.selectPermissionsByDoorCode(doorCode,personType); + boolean delete = acsPermissionService.deleteBatchIds(ids); + List errorList = acsPermissionService.deleteSocketPermission(ids,doorCode); + if(!delete){ + return ResponseData.error("取消授权失败"); + }else if(ToolUtil.isNotEmpty(errorList)){ + return ResponseData.error("取消授权成功，".concat(StringUtils.join(errorList,",")).concat("下发失败")); + }else { + return ResponseData.success(); + } + } + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java index 79315db..6e19e4f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java @@ -24,4 +24,6 @@ List> selectUserList(@Param("doorCode")String doorCode,@Param("personType")String personType,@Param("keyword")String keyword,@Param("deptId")Long deptId); //List> selectByDoorAndUser(@Param("doorCode")String doorCode,@Param("personId")Long personId); + List selectPermissionsByDoorCode(@Param("doorCode")String doorCode,@Param("personType")String personType); + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml index 4f5b121..6aa23ca 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml @@ -29,8 +29,7 @@ FROM acs_door door LEFT JOIN acs_permission per ON per.DOOR_CODE = door.DOOR_CODE - LEFT JOIN sys_person p ON per.PERSON_ID = p.ID - WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID AND (p.DELFLAG = '0' OR p.DELFLAG IS NULL) GROUP BY door.DOOR_CODE @@ -112,4 +111,15 @@ + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java index d672e51..959e400 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java @@ -2,6 +2,7 @@ import java.io.Serializable; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.enums.FieldStrategy; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.core.base.json.DateDeserializer; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -63,12 +65,14 @@ */ @TableField(value = "BEGIN_DATETIME", strategy= FieldStrategy.IGNORED) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = DateDeserializer.class) private Date beginDatetime; /** * 失效时间 */ @TableField(value = "END_DATETIME", strategy= FieldStrategy.IGNORED) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = DateDeserializer.class) private Date endDatetime; @Override diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java index 5fa57a3..5218252 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java @@ -25,4 +25,5 @@ List updateSocketPermission(String doorCode,Integer strategyId,List acsPermissionList); List deleteSocketPermission(List permissionIds,String doorCode); Boolean deleteByStrategy(Integer strategyId); + List selectPermissionsByDoorCode(String doorCode,String personType); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index ea96afa..2be20fd 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -189,4 +189,23 @@ } } + /** + * 取消授权（删除） + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll(@RequestParam(value = "doorCode") String doorCode, + @RequestParam(value = "personType")String personType){ + List ids = acsPermissionService.selectPermissionsByDoorCode(doorCode,personType); + boolean delete = acsPermissionService.deleteBatchIds(ids); + List errorList = acsPermissionService.deleteSocketPermission(ids,doorCode); + if(!delete){ + return ResponseData.error("取消授权失败"); + }else if(ToolUtil.isNotEmpty(errorList)){ + return ResponseData.error("取消授权成功，".concat(StringUtils.join(errorList,",")).concat("下发失败")); + }else { + return ResponseData.success(); + } + } + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java index 79315db..6e19e4f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java @@ -24,4 +24,6 @@ List> selectUserList(@Param("doorCode")String doorCode,@Param("personType")String personType,@Param("keyword")String keyword,@Param("deptId")Long deptId); //List> selectByDoorAndUser(@Param("doorCode")String doorCode,@Param("personId")Long personId); + List selectPermissionsByDoorCode(@Param("doorCode")String doorCode,@Param("personType")String personType); + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml index 4f5b121..6aa23ca 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml @@ -29,8 +29,7 @@ FROM acs_door door LEFT JOIN acs_permission per ON per.DOOR_CODE = door.DOOR_CODE - LEFT JOIN sys_person p ON per.PERSON_ID = p.ID - WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID AND (p.DELFLAG = '0' OR p.DELFLAG IS NULL) GROUP BY door.DOOR_CODE @@ -112,4 +111,15 @@ + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java index d672e51..959e400 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java @@ -2,6 +2,7 @@ import java.io.Serializable; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.enums.FieldStrategy; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.core.base.json.DateDeserializer; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -63,12 +65,14 @@ */ @TableField(value = "BEGIN_DATETIME", strategy= FieldStrategy.IGNORED) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = DateDeserializer.class) private Date beginDatetime; /** * 失效时间 */ @TableField(value = "END_DATETIME", strategy= FieldStrategy.IGNORED) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = DateDeserializer.class) private Date endDatetime; @Override diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java index 5fa57a3..5218252 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java @@ -25,4 +25,5 @@ List updateSocketPermission(String doorCode,Integer strategyId,List acsPermissionList); List deleteSocketPermission(List permissionIds,String doorCode); Boolean deleteByStrategy(Integer strategyId); + List selectPermissionsByDoorCode(String doorCode,String personType); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java index 8f66228..55d006d 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.modular.system.service.IDoorService; import com.casic.missiles.modular.system.service.IStrategyService; import com.casic.missiles.modular.system.util.SocketClientUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -28,6 +30,7 @@ import java.util.List; import java.util.Map; + import static com.casic.missiles.modular.system.constant.SocketConst.SOCKET_SUCCESS_MSG; /** @@ -40,6 +43,8 @@ */ @Service public class AcsPermissionServiceImpl extends ServiceImpl implements IAcsPermissionService { + private static final Logger logger = LoggerFactory.getLogger(AcsPermissionServiceImpl.class); + @Autowired private ICommonPermissionService commonPermissionService; @Autowired @@ -96,6 +101,7 @@ jsonObject.put("acs_strategy",strategyList); jsonObject.put("bus_device",deviceList); String socketMsg = SocketConst.SOCKET_PREFIX_ADD_PERMISSION.concat(jsonObject.toJSONString()); + logger.info(socketMsg); List errorList = new ArrayList<>(); for (Device device : deviceList) { Map socketRes = SocketClientUtil.sendMessage(device.getDevIp(),port,socketMsg); @@ -113,6 +119,7 @@ JSONObject jsonObject = new JSONObject(); jsonObject.put("ids",permissionIds); String socketMsg = SocketConst.SOCKET_PREFIX_DELETE_PERMISSION.concat(jsonObject.toJSONString()); + logger.info(socketMsg); List errorList = new ArrayList<>(); for (Device device : deviceList) { Map socketRes = SocketClientUtil.sendMessage(device.getDevIp(),port,socketMsg); @@ -147,4 +154,9 @@ } return true; } + + @Override + public List selectPermissionsByDoorCode(String doorCode,String personType) { + return this.baseMapper.selectPermissionsByDoorCode(doorCode,personType); + } } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index ea96afa..2be20fd 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -189,4 +189,23 @@ } } + /** + * 取消授权（删除） + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll(@RequestParam(value = "doorCode") String doorCode, + @RequestParam(value = "personType")String personType){ + List ids = acsPermissionService.selectPermissionsByDoorCode(doorCode,personType); + boolean delete = acsPermissionService.deleteBatchIds(ids); + List errorList = acsPermissionService.deleteSocketPermission(ids,doorCode); + if(!delete){ + return ResponseData.error("取消授权失败"); + }else if(ToolUtil.isNotEmpty(errorList)){ + return ResponseData.error("取消授权成功，".concat(StringUtils.join(errorList,",")).concat("下发失败")); + }else { + return ResponseData.success(); + } + } + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java index 79315db..6e19e4f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/AcsPermissionMapper.java @@ -24,4 +24,6 @@ List> selectUserList(@Param("doorCode")String doorCode,@Param("personType")String personType,@Param("keyword")String keyword,@Param("deptId")Long deptId); //List> selectByDoorAndUser(@Param("doorCode")String doorCode,@Param("personId")Long personId); + List selectPermissionsByDoorCode(@Param("doorCode")String doorCode,@Param("personType")String personType); + } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml index 4f5b121..6aa23ca 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/AcsPermissionMapper.xml @@ -29,8 +29,7 @@ FROM acs_door door LEFT JOIN acs_permission per ON per.DOOR_CODE = door.DOOR_CODE - LEFT JOIN sys_person p ON per.PERSON_ID = p.ID - WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL + LEFT JOIN sys_person p ON per.PERSON_ID = p.ID AND (p.DELFLAG = '0' OR p.DELFLAG IS NULL) GROUP BY door.DOOR_CODE @@ -112,4 +111,15 @@ + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java index d672e51..959e400 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Door.java @@ -2,6 +2,7 @@ import java.io.Serializable; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.enums.FieldStrategy; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.core.base.json.DateDeserializer; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -63,12 +65,14 @@ */ @TableField(value = "BEGIN_DATETIME", strategy= FieldStrategy.IGNORED) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = DateDeserializer.class) private Date beginDatetime; /** * 失效时间 */ @TableField(value = "END_DATETIME", strategy= FieldStrategy.IGNORED) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = DateDeserializer.class) private Date endDatetime; @Override diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java index 5fa57a3..5218252 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IAcsPermissionService.java @@ -25,4 +25,5 @@ List updateSocketPermission(String doorCode,Integer strategyId,List acsPermissionList); List deleteSocketPermission(List permissionIds,String doorCode); Boolean deleteByStrategy(Integer strategyId); + List selectPermissionsByDoorCode(String doorCode,String personType); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java index 8f66228..55d006d 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.modular.system.service.IDoorService; import com.casic.missiles.modular.system.service.IStrategyService; import com.casic.missiles.modular.system.util.SocketClientUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -28,6 +30,7 @@ import java.util.List; import java.util.Map; + import static com.casic.missiles.modular.system.constant.SocketConst.SOCKET_SUCCESS_MSG; /** @@ -40,6 +43,8 @@ */ @Service public class AcsPermissionServiceImpl extends ServiceImpl implements IAcsPermissionService { + private static final Logger logger = LoggerFactory.getLogger(AcsPermissionServiceImpl.class); + @Autowired private ICommonPermissionService commonPermissionService; @Autowired @@ -96,6 +101,7 @@ jsonObject.put("acs_strategy",strategyList); jsonObject.put("bus_device",deviceList); String socketMsg = SocketConst.SOCKET_PREFIX_ADD_PERMISSION.concat(jsonObject.toJSONString()); + logger.info(socketMsg); List errorList = new ArrayList<>(); for (Device device : deviceList) { Map socketRes = SocketClientUtil.sendMessage(device.getDevIp(),port,socketMsg); @@ -113,6 +119,7 @@ JSONObject jsonObject = new JSONObject(); jsonObject.put("ids",permissionIds); String socketMsg = SocketConst.SOCKET_PREFIX_DELETE_PERMISSION.concat(jsonObject.toJSONString()); + logger.info(socketMsg); List errorList = new ArrayList<>(); for (Device device : deviceList) { Map socketRes = SocketClientUtil.sendMessage(device.getDevIp(),port,socketMsg); @@ -147,4 +154,9 @@ } return true; } + + @Override + public List selectPermissionsByDoorCode(String doorCode,String personType) { + return this.baseMapper.selectPermissionsByDoorCode(doorCode,personType); + } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index 46ae909..d249a07 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -328,7 +328,7 @@ jsonObject.put("sys_person",personList); jsonObject.put("sys_dept",deptList); String socketMsg = SocketConst.SOCKET_PREFIX_ADD_PERSON.concat(jsonObject.toJSONString()); - //System.out.println(socketMsg); + logger.info(socketMsg); List errorList = new ArrayList<>(); for (Long deviceId : deviceIds) { Device device = deviceSupportService.selectById(deviceId);