diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index b1d9b45..899c451 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; @@ -14,6 +15,7 @@ import com.casic.missiles.modular.system.warpper.DoorWarpper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -86,9 +88,11 @@ try { doorService.insert(door); }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } logger.error("门禁添加失败", e); - e.printStackTrace(); - return ResponseData.error("添加失败"); + return ResponseData.error("门禁添加失败"); } return ResponseData.success(); } @@ -105,8 +109,15 @@ } Door oldDoor = this.doorService.selectById(door.getId()); LogObjectHolder.me().set(oldDoor); - - doorService.updateById(door); + try{ + doorService.updateById(door); + }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } + logger.error("门禁更新失败", e); + return ResponseData.error("门禁更新失败"); + } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index b1d9b45..899c451 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; @@ -14,6 +15,7 @@ import com.casic.missiles.modular.system.warpper.DoorWarpper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -86,9 +88,11 @@ try { doorService.insert(door); }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } logger.error("门禁添加失败", e); - e.printStackTrace(); - return ResponseData.error("添加失败"); + return ResponseData.error("门禁添加失败"); } return ResponseData.success(); } @@ -105,8 +109,15 @@ } Door oldDoor = this.doorService.selectById(door.getId()); LogObjectHolder.me().set(oldDoor); - - doorService.updateById(door); + try{ + doorService.updateById(door); + }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } + logger.error("门禁更新失败", e); + return ResponseData.error("门禁更新失败"); + } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java index f55aafd..cab84e3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java @@ -2,6 +2,9 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.exception.GunsException; +import com.casic.missiles.core.exception.GunsExceptionEnum; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.warpper.StrategyWarpper; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -91,6 +94,9 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Strategy strategy) { + if (ToolUtil.isEmpty(strategy.getId())) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } strategyService.updateById(strategy); return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index b1d9b45..899c451 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; @@ -14,6 +15,7 @@ import com.casic.missiles.modular.system.warpper.DoorWarpper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -86,9 +88,11 @@ try { doorService.insert(door); }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } logger.error("门禁添加失败", e); - e.printStackTrace(); - return ResponseData.error("添加失败"); + return ResponseData.error("门禁添加失败"); } return ResponseData.success(); } @@ -105,8 +109,15 @@ } Door oldDoor = this.doorService.selectById(door.getId()); LogObjectHolder.me().set(oldDoor); - - doorService.updateById(door); + try{ + doorService.updateById(door); + }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } + logger.error("门禁更新失败", e); + return ResponseData.error("门禁更新失败"); + } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java index f55aafd..cab84e3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java @@ -2,6 +2,9 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.exception.GunsException; +import com.casic.missiles.core.exception.GunsExceptionEnum; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.warpper.StrategyWarpper; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -91,6 +94,9 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Strategy strategy) { + if (ToolUtil.isEmpty(strategy.getId())) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } strategyService.updateById(strategy); return ResponseData.success(); } 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 03b9df5..57db741 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 @@ -30,7 +30,7 @@ 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' + WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL GROUP BY door.DOOR_CODE diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index b1d9b45..899c451 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; @@ -14,6 +15,7 @@ import com.casic.missiles.modular.system.warpper.DoorWarpper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -86,9 +88,11 @@ try { doorService.insert(door); }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } logger.error("门禁添加失败", e); - e.printStackTrace(); - return ResponseData.error("添加失败"); + return ResponseData.error("门禁添加失败"); } return ResponseData.success(); } @@ -105,8 +109,15 @@ } Door oldDoor = this.doorService.selectById(door.getId()); LogObjectHolder.me().set(oldDoor); - - doorService.updateById(door); + try{ + doorService.updateById(door); + }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } + logger.error("门禁更新失败", e); + return ResponseData.error("门禁更新失败"); + } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java index f55aafd..cab84e3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java @@ -2,6 +2,9 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.exception.GunsException; +import com.casic.missiles.core.exception.GunsExceptionEnum; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.warpper.StrategyWarpper; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -91,6 +94,9 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Strategy strategy) { + if (ToolUtil.isEmpty(strategy.getId())) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } strategyService.updateById(strategy); return ResponseData.success(); } 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 03b9df5..57db741 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 @@ -30,7 +30,7 @@ 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' + WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL GROUP BY door.DOOR_CODE diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java index 0407066..8039759 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java @@ -62,13 +62,15 @@ private void setInOutDevice(Map map){ String doorCode = map.get("doorCode").toString(); - map.put("inDevice",getDevice(doorCode,"1")); - map.put("outDevice",getDevice(doorCode,"0")); + map.put("inDeviceCodes",getDeviceCodes(doorCode,"1")); + map.put("outDeviceCodes",getDeviceCodes(doorCode,"0")); + map.put("inDeviceIds",getDeviceIds(doorCode,"1")); + map.put("outDeviceIds",getDeviceIds(doorCode,"0")); map.put("hasOut",existOut(doorCode)); map.put("hasOutRecords",recordsService.hasOutRecords(doorCode)); } - private String getDevice(String doorCode,String inoutType){ + private String getDeviceCodes(String doorCode,String inoutType){ List> list = deviceService.selectDeviceByDoor(doorCode,inoutType); //设备列表 if(list.size()>0){ List devCodes = new ArrayList<>(); @@ -79,6 +81,17 @@ } } + private String getDeviceIds(String doorCode,String inoutType){ + List> list = deviceService.selectDeviceByDoor(doorCode,inoutType); //设备列表 + if(list.size()>0){ + List devCodes = new ArrayList<>(); + list.forEach(map -> devCodes.add(map.get("id").toString())); + return String.join(",",devCodes); + }else{ + return ""; + } + } + @Override @Transactional public Boolean deleteBatch(List ids) { diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index b1d9b45..899c451 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; @@ -14,6 +15,7 @@ import com.casic.missiles.modular.system.warpper.DoorWarpper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -86,9 +88,11 @@ try { doorService.insert(door); }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } logger.error("门禁添加失败", e); - e.printStackTrace(); - return ResponseData.error("添加失败"); + return ResponseData.error("门禁添加失败"); } return ResponseData.success(); } @@ -105,8 +109,15 @@ } Door oldDoor = this.doorService.selectById(door.getId()); LogObjectHolder.me().set(oldDoor); - - doorService.updateById(door); + try{ + doorService.updateById(door); + }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("门禁编号重复"); + } + logger.error("门禁更新失败", e); + return ResponseData.error("门禁更新失败"); + } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java index f55aafd..cab84e3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StrategyController.java @@ -2,6 +2,9 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.exception.GunsException; +import com.casic.missiles.core.exception.GunsExceptionEnum; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.warpper.StrategyWarpper; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -91,6 +94,9 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Strategy strategy) { + if (ToolUtil.isEmpty(strategy.getId())) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } strategyService.updateById(strategy); return ResponseData.success(); } 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 03b9df5..57db741 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 @@ -30,7 +30,7 @@ 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' + WHERE p.DELFLAG = '0' OR p.DELFLAG IS NULL GROUP BY door.DOOR_CODE diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java index 0407066..8039759 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java @@ -62,13 +62,15 @@ private void setInOutDevice(Map map){ String doorCode = map.get("doorCode").toString(); - map.put("inDevice",getDevice(doorCode,"1")); - map.put("outDevice",getDevice(doorCode,"0")); + map.put("inDeviceCodes",getDeviceCodes(doorCode,"1")); + map.put("outDeviceCodes",getDeviceCodes(doorCode,"0")); + map.put("inDeviceIds",getDeviceIds(doorCode,"1")); + map.put("outDeviceIds",getDeviceIds(doorCode,"0")); map.put("hasOut",existOut(doorCode)); map.put("hasOutRecords",recordsService.hasOutRecords(doorCode)); } - private String getDevice(String doorCode,String inoutType){ + private String getDeviceCodes(String doorCode,String inoutType){ List> list = deviceService.selectDeviceByDoor(doorCode,inoutType); //设备列表 if(list.size()>0){ List devCodes = new ArrayList<>(); @@ -79,6 +81,17 @@ } } + private String getDeviceIds(String doorCode,String inoutType){ + List> list = deviceService.selectDeviceByDoor(doorCode,inoutType); //设备列表 + if(list.size()>0){ + List devCodes = new ArrayList<>(); + list.forEach(map -> devCodes.add(map.get("id").toString())); + return String.join(",",devCodes); + }else{ + return ""; + } + } + @Override @Transactional public Boolean deleteBatch(List ids) { diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 17ae78a..3271a10 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -13,6 +14,7 @@ import com.casic.missiles.modular.system.warpper.DeviceWarpper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -90,8 +92,10 @@ try { deviceService.insert(device); }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("设备编号重复"); + } logger.error("设备添加失败", e); - e.printStackTrace(); return ResponseData.error("设备添加失败"); } return ResponseData.success(); @@ -112,8 +116,15 @@ } Device oldDevice = this.deviceService.selectById(device.getId()); LogObjectHolder.me().set(oldDevice); - - deviceService.updateById(device); + try { + deviceService.updateById(device); + }catch (Exception e){ + if (e instanceof DuplicateKeyException) { + return ResponseData.error("设备编号重复"); + } + logger.error("设备修改失败", e); + return ResponseData.error("设备修改失败"); + } return ResponseData.success(); }