diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 16f3add..774526f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -42,7 +43,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } - + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(DeviceGroupInfoVO deviceGroupInfoVO) { @@ -52,7 +53,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "设备分组新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -61,7 +62,7 @@ deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -69,21 +70,21 @@ deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 16f3add..774526f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -42,7 +43,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } - + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(DeviceGroupInfoVO deviceGroupInfoVO) { @@ -52,7 +53,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "设备分组新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -61,7 +62,7 @@ deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -69,21 +70,21 @@ deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java index e33bfaa..5450d1d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.data.dto.AreaDataDTO; import com.casic.missiles.modular.data.dto.DayDevDTO; @@ -39,7 +40,7 @@ this.busDeviceInfoService = busDeviceInfoService; this.onlineLogService = onlineLogService; } - + @BussinessLog(value = "数据统计概况统计") @ApiOperation(value = "概况统计") @GetMapping(value = "/total") public ResponseDataDTO total() { @@ -47,7 +48,7 @@ TotalDataDTO totalDataDTO = busDeviceInfoService.total(query); return ResponseDataDTO.success(totalDataDTO); } - + @BussinessLog(value = "地区设备数量统计") @ApiOperation(value = "地区设备数量") @GetMapping(value = "/areaDev") public ResponseDataDTO> areaDev() { @@ -55,7 +56,7 @@ List dtos = busDeviceInfoService.areaDev(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "地区设备在线情况") @ApiOperation(value = "地区设备在线情况") @GetMapping(value = "/areaDevOnline") public ResponseDataDTO> areaDevOnline() { @@ -63,7 +64,7 @@ List dtos = busDeviceInfoService.areaDevOnline(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "设备在线趋势") @ApiOperation(value = "设备在线趋势") @GetMapping(value = "/dayDev") public ResponseDataDTO> dayDev(String startTime, String endTime) { diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 16f3add..774526f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -42,7 +43,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } - + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(DeviceGroupInfoVO deviceGroupInfoVO) { @@ -52,7 +53,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "设备分组新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -61,7 +62,7 @@ deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -69,21 +70,21 @@ deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java index e33bfaa..5450d1d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.data.dto.AreaDataDTO; import com.casic.missiles.modular.data.dto.DayDevDTO; @@ -39,7 +40,7 @@ this.busDeviceInfoService = busDeviceInfoService; this.onlineLogService = onlineLogService; } - + @BussinessLog(value = "数据统计概况统计") @ApiOperation(value = "概况统计") @GetMapping(value = "/total") public ResponseDataDTO total() { @@ -47,7 +48,7 @@ TotalDataDTO totalDataDTO = busDeviceInfoService.total(query); return ResponseDataDTO.success(totalDataDTO); } - + @BussinessLog(value = "地区设备数量统计") @ApiOperation(value = "地区设备数量") @GetMapping(value = "/areaDev") public ResponseDataDTO> areaDev() { @@ -55,7 +56,7 @@ List dtos = busDeviceInfoService.areaDev(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "地区设备在线情况") @ApiOperation(value = "地区设备在线情况") @GetMapping(value = "/areaDevOnline") public ResponseDataDTO> areaDevOnline() { @@ -63,7 +64,7 @@ List dtos = busDeviceInfoService.areaDevOnline(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "设备在线趋势") @ApiOperation(value = "设备在线趋势") @GetMapping(value = "/dayDev") public ResponseDataDTO> dayDev(String startTime, String endTime) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index c53861a..6cf26a0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -35,7 +36,7 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } - + @BussinessLog(value = "相机树查询") @ApiOperation(value = "相机树") @PostMapping(value = "/tree") public ResponseDataDTO> tree() { diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 16f3add..774526f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -42,7 +43,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } - + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(DeviceGroupInfoVO deviceGroupInfoVO) { @@ -52,7 +53,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "设备分组新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -61,7 +62,7 @@ deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -69,21 +70,21 @@ deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java index e33bfaa..5450d1d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.data.dto.AreaDataDTO; import com.casic.missiles.modular.data.dto.DayDevDTO; @@ -39,7 +40,7 @@ this.busDeviceInfoService = busDeviceInfoService; this.onlineLogService = onlineLogService; } - + @BussinessLog(value = "数据统计概况统计") @ApiOperation(value = "概况统计") @GetMapping(value = "/total") public ResponseDataDTO total() { @@ -47,7 +48,7 @@ TotalDataDTO totalDataDTO = busDeviceInfoService.total(query); return ResponseDataDTO.success(totalDataDTO); } - + @BussinessLog(value = "地区设备数量统计") @ApiOperation(value = "地区设备数量") @GetMapping(value = "/areaDev") public ResponseDataDTO> areaDev() { @@ -55,7 +56,7 @@ List dtos = busDeviceInfoService.areaDev(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "地区设备在线情况") @ApiOperation(value = "地区设备在线情况") @GetMapping(value = "/areaDevOnline") public ResponseDataDTO> areaDevOnline() { @@ -63,7 +64,7 @@ List dtos = busDeviceInfoService.areaDevOnline(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "设备在线趋势") @ApiOperation(value = "设备在线趋势") @GetMapping(value = "/dayDev") public ResponseDataDTO> dayDev(String startTime, String endTime) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index c53861a..6cf26a0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -35,7 +36,7 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } - + @BussinessLog(value = "相机树查询") @ApiOperation(value = "相机树") @PostMapping(value = "/tree") public ResponseDataDTO> tree() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java index a0263c5..df68dd2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -43,7 +44,7 @@ QueryWrapper query = voiceLogVO.genQuery(); return ResponseDataDTO.success(voiceLogService.list(query)); } - + @BussinessLog(value = "历史广播记录分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(VoiceLogVO voiceLogVO) { @@ -53,7 +54,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "历史广播记录新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody VoiceLog voiceLog) { @@ -62,6 +63,7 @@ voiceLogService.save(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录修改") @ApiIgnore @ApiOperation(value = "修改接口") @PostMapping(value = "/update") @@ -69,6 +71,7 @@ voiceLogService.updateById(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录删除") @ApiIgnore @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") @@ -76,6 +79,7 @@ voiceLogService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录批量删除") @ApiIgnore @ApiOperation("批量删除") @PostMapping("/batchDelete") @@ -83,6 +87,7 @@ voiceLogService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录详情查询") @ApiIgnore @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 16f3add..774526f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -42,7 +43,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } - + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(DeviceGroupInfoVO deviceGroupInfoVO) { @@ -52,7 +53,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "设备分组新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -61,7 +62,7 @@ deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -69,21 +70,21 @@ deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java index e33bfaa..5450d1d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.data.dto.AreaDataDTO; import com.casic.missiles.modular.data.dto.DayDevDTO; @@ -39,7 +40,7 @@ this.busDeviceInfoService = busDeviceInfoService; this.onlineLogService = onlineLogService; } - + @BussinessLog(value = "数据统计概况统计") @ApiOperation(value = "概况统计") @GetMapping(value = "/total") public ResponseDataDTO total() { @@ -47,7 +48,7 @@ TotalDataDTO totalDataDTO = busDeviceInfoService.total(query); return ResponseDataDTO.success(totalDataDTO); } - + @BussinessLog(value = "地区设备数量统计") @ApiOperation(value = "地区设备数量") @GetMapping(value = "/areaDev") public ResponseDataDTO> areaDev() { @@ -55,7 +56,7 @@ List dtos = busDeviceInfoService.areaDev(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "地区设备在线情况") @ApiOperation(value = "地区设备在线情况") @GetMapping(value = "/areaDevOnline") public ResponseDataDTO> areaDevOnline() { @@ -63,7 +64,7 @@ List dtos = busDeviceInfoService.areaDevOnline(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "设备在线趋势") @ApiOperation(value = "设备在线趋势") @GetMapping(value = "/dayDev") public ResponseDataDTO> dayDev(String startTime, String endTime) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index c53861a..6cf26a0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -35,7 +36,7 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } - + @BussinessLog(value = "相机树查询") @ApiOperation(value = "相机树") @PostMapping(value = "/tree") public ResponseDataDTO> tree() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java index a0263c5..df68dd2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -43,7 +44,7 @@ QueryWrapper query = voiceLogVO.genQuery(); return ResponseDataDTO.success(voiceLogService.list(query)); } - + @BussinessLog(value = "历史广播记录分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(VoiceLogVO voiceLogVO) { @@ -53,7 +54,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "历史广播记录新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody VoiceLog voiceLog) { @@ -62,6 +63,7 @@ voiceLogService.save(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录修改") @ApiIgnore @ApiOperation(value = "修改接口") @PostMapping(value = "/update") @@ -69,6 +71,7 @@ voiceLogService.updateById(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录删除") @ApiIgnore @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") @@ -76,6 +79,7 @@ voiceLogService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录批量删除") @ApiIgnore @ApiOperation("批量删除") @PostMapping("/batchDelete") @@ -83,6 +87,7 @@ voiceLogService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录详情查询") @ApiIgnore @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java new file mode 100644 index 0000000..c2425a8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.device.dictmap; + +import com.casic.missiles.core.common.constant.dictmap.base.AbstractDictMap; + +public class DeviceDict extends AbstractDictMap { + + @Override + public void init() { + put("id", "主键"); + put("devType", "类型查询"); + put("keyword", "设备名称"); + + + put("name", "名字"); + put("birthday", "生日"); + put("sex", "性别"); + put("email", "电子邮件"); + put("phone", "电话"); + put("roleid", "角色名称"); + put("deptid", "部门名称"); + put("roleIds", "角色名称集合"); + } + + @Override + protected void initBeWrapped() { + + } +} \ No newline at end of file diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 16f3add..774526f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -42,7 +43,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } - + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(DeviceGroupInfoVO deviceGroupInfoVO) { @@ -52,7 +53,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "设备分组新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -61,7 +62,7 @@ deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -69,21 +70,21 @@ deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java index e33bfaa..5450d1d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.data.dto.AreaDataDTO; import com.casic.missiles.modular.data.dto.DayDevDTO; @@ -39,7 +40,7 @@ this.busDeviceInfoService = busDeviceInfoService; this.onlineLogService = onlineLogService; } - + @BussinessLog(value = "数据统计概况统计") @ApiOperation(value = "概况统计") @GetMapping(value = "/total") public ResponseDataDTO total() { @@ -47,7 +48,7 @@ TotalDataDTO totalDataDTO = busDeviceInfoService.total(query); return ResponseDataDTO.success(totalDataDTO); } - + @BussinessLog(value = "地区设备数量统计") @ApiOperation(value = "地区设备数量") @GetMapping(value = "/areaDev") public ResponseDataDTO> areaDev() { @@ -55,7 +56,7 @@ List dtos = busDeviceInfoService.areaDev(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "地区设备在线情况") @ApiOperation(value = "地区设备在线情况") @GetMapping(value = "/areaDevOnline") public ResponseDataDTO> areaDevOnline() { @@ -63,7 +64,7 @@ List dtos = busDeviceInfoService.areaDevOnline(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "设备在线趋势") @ApiOperation(value = "设备在线趋势") @GetMapping(value = "/dayDev") public ResponseDataDTO> dayDev(String startTime, String endTime) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index c53861a..6cf26a0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -35,7 +36,7 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } - + @BussinessLog(value = "相机树查询") @ApiOperation(value = "相机树") @PostMapping(value = "/tree") public ResponseDataDTO> tree() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java index a0263c5..df68dd2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -43,7 +44,7 @@ QueryWrapper query = voiceLogVO.genQuery(); return ResponseDataDTO.success(voiceLogService.list(query)); } - + @BussinessLog(value = "历史广播记录分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(VoiceLogVO voiceLogVO) { @@ -53,7 +54,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "历史广播记录新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody VoiceLog voiceLog) { @@ -62,6 +63,7 @@ voiceLogService.save(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录修改") @ApiIgnore @ApiOperation(value = "修改接口") @PostMapping(value = "/update") @@ -69,6 +71,7 @@ voiceLogService.updateById(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录删除") @ApiIgnore @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") @@ -76,6 +79,7 @@ voiceLogService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录批量删除") @ApiIgnore @ApiOperation("批量删除") @PostMapping("/batchDelete") @@ -83,6 +87,7 @@ voiceLogService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录详情查询") @ApiIgnore @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java new file mode 100644 index 0000000..c2425a8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.device.dictmap; + +import com.casic.missiles.core.common.constant.dictmap.base.AbstractDictMap; + +public class DeviceDict extends AbstractDictMap { + + @Override + public void init() { + put("id", "主键"); + put("devType", "类型查询"); + put("keyword", "设备名称"); + + + put("name", "名字"); + put("birthday", "生日"); + put("sex", "性别"); + put("email", "电子邮件"); + put("phone", "电话"); + put("roleid", "角色名称"); + put("deptid", "部门名称"); + put("roleIds", "角色名称集合"); + } + + @Override + protected void initBeWrapped() { + + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java index 09cefd3..bc9a07e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java @@ -1,5 +1,12 @@ package com.casic.missiles.modular.device.model; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,6 +23,11 @@ * @author lwh * @date 2024-04-11 */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @TableName("bus_device_info") public class BusDeviceInfo extends Model { @@ -25,22 +37,24 @@ @TableId("id") private Long id; + @ApiModelProperty(value = "区域名称", dataType = "String") @TableField("station_name") private String stationName; + @ExcelProperty("设备名称") @ApiModelProperty(value = "设备名称", dataType = "String") @TableField("monitor_name") private String monitorName; - + @ExcelProperty("设备IP") @ApiModelProperty(value = "设备IP", dataType = "String") @TableField("device_ip") private String deviceIp; - + @ExcelProperty("设备端口") @ApiModelProperty(value = "设备端口", dataType = "Integer") @TableField("device_port") private Integer devicePort; - + @ExcelProperty("设备用户名") @ApiModelProperty(value = "设备用户名", dataType = "String") @TableField("device_user") private String deviceUser; @@ -48,11 +62,11 @@ @ApiModelProperty(value = "设备密码", dataType = "String") @TableField("device_password") private String devicePassword; - + @ExcelProperty("NVRip") @ApiModelProperty(value = "NVRip", dataType = "String") @TableField("nvr_ip") private String nvrIp; - + @ExcelProperty("NVR端口") @ApiModelProperty(value = "NVRport", dataType = "Integer") @TableField("nvr_port") private Integer nvrPort; @@ -64,7 +78,7 @@ @ApiModelProperty(value = "nvr密码", dataType = "String") @TableField("nvr_password") private String nvrPassword; - + @ExcelProperty("nvr通道") @ApiModelProperty(value = "nvr通道", dataType = "String") @TableField("nvr_channel") private String nvrChannel; @@ -73,10 +87,11 @@ @TableField("device_type") private String deviceType; + @ExcelProperty("设备类型名称") @ApiModelProperty(value = "设备类型名称", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField(exist = false) private String deviceTypeName; - + @ExcelProperty("备注") @ApiModelProperty(value = "备注", dataType = "String") @TableField("description") private String description; @@ -84,7 +99,7 @@ @ApiModelProperty(value = "设备状态(0在线 1 离线 字典status)", dataType = "Integer") @TableField("device_status") private Integer deviceStatus; - + @ExcelProperty("设备状态名称") @ApiModelProperty(value = "设备状态名称", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField(exist = false) private String deviceStatusName; @@ -96,6 +111,7 @@ @ApiModelProperty(value = "所属组织", dataType = "Long") @TableField("dept_id") private Long deptId; + @ExcelProperty("所属组织") @TableField(exist = false) private String deptName; @@ -110,7 +126,7 @@ @ApiModelProperty(value = "布防状态(1,布防 0 撤防)", dataType = "Integer") @TableField("bf_flag") private Integer bfFlag; - + @ExcelProperty("创建时间") @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -121,6 +137,7 @@ @ApiModelProperty(value = "所属区域", dataType = "String") @TableField("area") private String area; + @ExcelProperty("区域名称") @ApiModelProperty(value = "区域名称", dataType = "String") @TableField(exist = false) private String areaName; diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 16f3add..774526f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -42,7 +43,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } - + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(DeviceGroupInfoVO deviceGroupInfoVO) { @@ -52,7 +53,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "设备分组新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -61,7 +62,7 @@ deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -69,21 +70,21 @@ deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java index e33bfaa..5450d1d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.data.dto.AreaDataDTO; import com.casic.missiles.modular.data.dto.DayDevDTO; @@ -39,7 +40,7 @@ this.busDeviceInfoService = busDeviceInfoService; this.onlineLogService = onlineLogService; } - + @BussinessLog(value = "数据统计概况统计") @ApiOperation(value = "概况统计") @GetMapping(value = "/total") public ResponseDataDTO total() { @@ -47,7 +48,7 @@ TotalDataDTO totalDataDTO = busDeviceInfoService.total(query); return ResponseDataDTO.success(totalDataDTO); } - + @BussinessLog(value = "地区设备数量统计") @ApiOperation(value = "地区设备数量") @GetMapping(value = "/areaDev") public ResponseDataDTO> areaDev() { @@ -55,7 +56,7 @@ List dtos = busDeviceInfoService.areaDev(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "地区设备在线情况") @ApiOperation(value = "地区设备在线情况") @GetMapping(value = "/areaDevOnline") public ResponseDataDTO> areaDevOnline() { @@ -63,7 +64,7 @@ List dtos = busDeviceInfoService.areaDevOnline(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "设备在线趋势") @ApiOperation(value = "设备在线趋势") @GetMapping(value = "/dayDev") public ResponseDataDTO> dayDev(String startTime, String endTime) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index c53861a..6cf26a0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -35,7 +36,7 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } - + @BussinessLog(value = "相机树查询") @ApiOperation(value = "相机树") @PostMapping(value = "/tree") public ResponseDataDTO> tree() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java index a0263c5..df68dd2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -43,7 +44,7 @@ QueryWrapper query = voiceLogVO.genQuery(); return ResponseDataDTO.success(voiceLogService.list(query)); } - + @BussinessLog(value = "历史广播记录分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(VoiceLogVO voiceLogVO) { @@ -53,7 +54,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "历史广播记录新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody VoiceLog voiceLog) { @@ -62,6 +63,7 @@ voiceLogService.save(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录修改") @ApiIgnore @ApiOperation(value = "修改接口") @PostMapping(value = "/update") @@ -69,6 +71,7 @@ voiceLogService.updateById(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录删除") @ApiIgnore @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") @@ -76,6 +79,7 @@ voiceLogService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录批量删除") @ApiIgnore @ApiOperation("批量删除") @PostMapping("/batchDelete") @@ -83,6 +87,7 @@ voiceLogService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录详情查询") @ApiIgnore @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java new file mode 100644 index 0000000..c2425a8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.device.dictmap; + +import com.casic.missiles.core.common.constant.dictmap.base.AbstractDictMap; + +public class DeviceDict extends AbstractDictMap { + + @Override + public void init() { + put("id", "主键"); + put("devType", "类型查询"); + put("keyword", "设备名称"); + + + put("name", "名字"); + put("birthday", "生日"); + put("sex", "性别"); + put("email", "电子邮件"); + put("phone", "电话"); + put("roleid", "角色名称"); + put("deptid", "部门名称"); + put("roleIds", "角色名称集合"); + } + + @Override + protected void initBeWrapped() { + + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java index 09cefd3..bc9a07e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java @@ -1,5 +1,12 @@ package com.casic.missiles.modular.device.model; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,6 +23,11 @@ * @author lwh * @date 2024-04-11 */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @TableName("bus_device_info") public class BusDeviceInfo extends Model { @@ -25,22 +37,24 @@ @TableId("id") private Long id; + @ApiModelProperty(value = "区域名称", dataType = "String") @TableField("station_name") private String stationName; + @ExcelProperty("设备名称") @ApiModelProperty(value = "设备名称", dataType = "String") @TableField("monitor_name") private String monitorName; - + @ExcelProperty("设备IP") @ApiModelProperty(value = "设备IP", dataType = "String") @TableField("device_ip") private String deviceIp; - + @ExcelProperty("设备端口") @ApiModelProperty(value = "设备端口", dataType = "Integer") @TableField("device_port") private Integer devicePort; - + @ExcelProperty("设备用户名") @ApiModelProperty(value = "设备用户名", dataType = "String") @TableField("device_user") private String deviceUser; @@ -48,11 +62,11 @@ @ApiModelProperty(value = "设备密码", dataType = "String") @TableField("device_password") private String devicePassword; - + @ExcelProperty("NVRip") @ApiModelProperty(value = "NVRip", dataType = "String") @TableField("nvr_ip") private String nvrIp; - + @ExcelProperty("NVR端口") @ApiModelProperty(value = "NVRport", dataType = "Integer") @TableField("nvr_port") private Integer nvrPort; @@ -64,7 +78,7 @@ @ApiModelProperty(value = "nvr密码", dataType = "String") @TableField("nvr_password") private String nvrPassword; - + @ExcelProperty("nvr通道") @ApiModelProperty(value = "nvr通道", dataType = "String") @TableField("nvr_channel") private String nvrChannel; @@ -73,10 +87,11 @@ @TableField("device_type") private String deviceType; + @ExcelProperty("设备类型名称") @ApiModelProperty(value = "设备类型名称", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField(exist = false) private String deviceTypeName; - + @ExcelProperty("备注") @ApiModelProperty(value = "备注", dataType = "String") @TableField("description") private String description; @@ -84,7 +99,7 @@ @ApiModelProperty(value = "设备状态(0在线 1 离线 字典status)", dataType = "Integer") @TableField("device_status") private Integer deviceStatus; - + @ExcelProperty("设备状态名称") @ApiModelProperty(value = "设备状态名称", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField(exist = false) private String deviceStatusName; @@ -96,6 +111,7 @@ @ApiModelProperty(value = "所属组织", dataType = "Long") @TableField("dept_id") private Long deptId; + @ExcelProperty("所属组织") @TableField(exist = false) private String deptName; @@ -110,7 +126,7 @@ @ApiModelProperty(value = "布防状态(1,布防 0 撤防)", dataType = "Integer") @TableField("bf_flag") private Integer bfFlag; - + @ExcelProperty("创建时间") @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -121,6 +137,7 @@ @ApiModelProperty(value = "所属区域", dataType = "String") @TableField("area") private String area; + @ExcelProperty("区域名称") @ApiModelProperty(value = "区域名称", dataType = "String") @TableField(exist = false) private String areaName; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index 1870d2b..bc958b5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -61,6 +61,13 @@ } @Override + public List list(Wrapper queryWrapper) { + List busDeviceInfos = super.list(queryWrapper); + busDeviceInfos.forEach(this::wrapInfo); + return busDeviceInfos; + } + + @Override public BusDeviceInfo getById(Serializable id) { BusDeviceInfo busDeviceInfo = super.getById(id); if (busDeviceInfo != null) { @@ -77,7 +84,7 @@ } private void wrapInfo(BusDeviceInfo busDeviceInfo) { - Area area = areaService.getById(busDeviceInfo.getId()); + Area area = areaService.getById(busDeviceInfo.getArea()); if (area != null) { busDeviceInfo.setAreaName(area.getAreaName()); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 16f3add..774526f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -42,7 +43,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } - + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(DeviceGroupInfoVO deviceGroupInfoVO) { @@ -52,7 +53,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "设备分组新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -61,7 +62,7 @@ deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -69,21 +70,21 @@ deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java index e33bfaa..5450d1d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.data.dto.AreaDataDTO; import com.casic.missiles.modular.data.dto.DayDevDTO; @@ -39,7 +40,7 @@ this.busDeviceInfoService = busDeviceInfoService; this.onlineLogService = onlineLogService; } - + @BussinessLog(value = "数据统计概况统计") @ApiOperation(value = "概况统计") @GetMapping(value = "/total") public ResponseDataDTO total() { @@ -47,7 +48,7 @@ TotalDataDTO totalDataDTO = busDeviceInfoService.total(query); return ResponseDataDTO.success(totalDataDTO); } - + @BussinessLog(value = "地区设备数量统计") @ApiOperation(value = "地区设备数量") @GetMapping(value = "/areaDev") public ResponseDataDTO> areaDev() { @@ -55,7 +56,7 @@ List dtos = busDeviceInfoService.areaDev(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "地区设备在线情况") @ApiOperation(value = "地区设备在线情况") @GetMapping(value = "/areaDevOnline") public ResponseDataDTO> areaDevOnline() { @@ -63,7 +64,7 @@ List dtos = busDeviceInfoService.areaDevOnline(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "设备在线趋势") @ApiOperation(value = "设备在线趋势") @GetMapping(value = "/dayDev") public ResponseDataDTO> dayDev(String startTime, String endTime) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index c53861a..6cf26a0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -35,7 +36,7 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } - + @BussinessLog(value = "相机树查询") @ApiOperation(value = "相机树") @PostMapping(value = "/tree") public ResponseDataDTO> tree() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java index a0263c5..df68dd2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -43,7 +44,7 @@ QueryWrapper query = voiceLogVO.genQuery(); return ResponseDataDTO.success(voiceLogService.list(query)); } - + @BussinessLog(value = "历史广播记录分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(VoiceLogVO voiceLogVO) { @@ -53,7 +54,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "历史广播记录新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody VoiceLog voiceLog) { @@ -62,6 +63,7 @@ voiceLogService.save(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录修改") @ApiIgnore @ApiOperation(value = "修改接口") @PostMapping(value = "/update") @@ -69,6 +71,7 @@ voiceLogService.updateById(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录删除") @ApiIgnore @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") @@ -76,6 +79,7 @@ voiceLogService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录批量删除") @ApiIgnore @ApiOperation("批量删除") @PostMapping("/batchDelete") @@ -83,6 +87,7 @@ voiceLogService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录详情查询") @ApiIgnore @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java new file mode 100644 index 0000000..c2425a8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.device.dictmap; + +import com.casic.missiles.core.common.constant.dictmap.base.AbstractDictMap; + +public class DeviceDict extends AbstractDictMap { + + @Override + public void init() { + put("id", "主键"); + put("devType", "类型查询"); + put("keyword", "设备名称"); + + + put("name", "名字"); + put("birthday", "生日"); + put("sex", "性别"); + put("email", "电子邮件"); + put("phone", "电话"); + put("roleid", "角色名称"); + put("deptid", "部门名称"); + put("roleIds", "角色名称集合"); + } + + @Override + protected void initBeWrapped() { + + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java index 09cefd3..bc9a07e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java @@ -1,5 +1,12 @@ package com.casic.missiles.modular.device.model; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,6 +23,11 @@ * @author lwh * @date 2024-04-11 */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @TableName("bus_device_info") public class BusDeviceInfo extends Model { @@ -25,22 +37,24 @@ @TableId("id") private Long id; + @ApiModelProperty(value = "区域名称", dataType = "String") @TableField("station_name") private String stationName; + @ExcelProperty("设备名称") @ApiModelProperty(value = "设备名称", dataType = "String") @TableField("monitor_name") private String monitorName; - + @ExcelProperty("设备IP") @ApiModelProperty(value = "设备IP", dataType = "String") @TableField("device_ip") private String deviceIp; - + @ExcelProperty("设备端口") @ApiModelProperty(value = "设备端口", dataType = "Integer") @TableField("device_port") private Integer devicePort; - + @ExcelProperty("设备用户名") @ApiModelProperty(value = "设备用户名", dataType = "String") @TableField("device_user") private String deviceUser; @@ -48,11 +62,11 @@ @ApiModelProperty(value = "设备密码", dataType = "String") @TableField("device_password") private String devicePassword; - + @ExcelProperty("NVRip") @ApiModelProperty(value = "NVRip", dataType = "String") @TableField("nvr_ip") private String nvrIp; - + @ExcelProperty("NVR端口") @ApiModelProperty(value = "NVRport", dataType = "Integer") @TableField("nvr_port") private Integer nvrPort; @@ -64,7 +78,7 @@ @ApiModelProperty(value = "nvr密码", dataType = "String") @TableField("nvr_password") private String nvrPassword; - + @ExcelProperty("nvr通道") @ApiModelProperty(value = "nvr通道", dataType = "String") @TableField("nvr_channel") private String nvrChannel; @@ -73,10 +87,11 @@ @TableField("device_type") private String deviceType; + @ExcelProperty("设备类型名称") @ApiModelProperty(value = "设备类型名称", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField(exist = false) private String deviceTypeName; - + @ExcelProperty("备注") @ApiModelProperty(value = "备注", dataType = "String") @TableField("description") private String description; @@ -84,7 +99,7 @@ @ApiModelProperty(value = "设备状态(0在线 1 离线 字典status)", dataType = "Integer") @TableField("device_status") private Integer deviceStatus; - + @ExcelProperty("设备状态名称") @ApiModelProperty(value = "设备状态名称", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField(exist = false) private String deviceStatusName; @@ -96,6 +111,7 @@ @ApiModelProperty(value = "所属组织", dataType = "Long") @TableField("dept_id") private Long deptId; + @ExcelProperty("所属组织") @TableField(exist = false) private String deptName; @@ -110,7 +126,7 @@ @ApiModelProperty(value = "布防状态(1,布防 0 撤防)", dataType = "Integer") @TableField("bf_flag") private Integer bfFlag; - + @ExcelProperty("创建时间") @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -121,6 +137,7 @@ @ApiModelProperty(value = "所属区域", dataType = "String") @TableField("area") private String area; + @ExcelProperty("区域名称") @ApiModelProperty(value = "区域名称", dataType = "String") @TableField(exist = false) private String areaName; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index 1870d2b..bc958b5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -61,6 +61,13 @@ } @Override + public List list(Wrapper queryWrapper) { + List busDeviceInfos = super.list(queryWrapper); + busDeviceInfos.forEach(this::wrapInfo); + return busDeviceInfos; + } + + @Override public BusDeviceInfo getById(Serializable id) { BusDeviceInfo busDeviceInfo = super.getById(id); if (busDeviceInfo != null) { @@ -77,7 +84,7 @@ } private void wrapInfo(BusDeviceInfo busDeviceInfo) { - Area area = areaService.getById(busDeviceInfo.getId()); + Area area = areaService.getById(busDeviceInfo.getArea()); if (area != null) { busDeviceInfo.setAreaName(area.getAreaName()); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/vo/BusDeviceInfoVO.java b/casic-server/src/main/java/com/casic/missiles/modular/device/vo/BusDeviceInfoVO.java index aff0e04..826269c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/vo/BusDeviceInfoVO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/vo/BusDeviceInfoVO.java @@ -1,6 +1,12 @@ package com.casic.missiles.modular.device.vo; import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.modular.device.model.BusDeviceInfo; import io.swagger.annotations.ApiModelProperty; @@ -12,6 +18,7 @@ * @author lwh * @date 2024-04-11 */ + @Data public class BusDeviceInfoVO { private static final long serialVersionUID = 1L; diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 507b6f0..a372f4a 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,6 +40,11 @@ ${extension.version} + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java index 5f0b6cc..7dfcd98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceInfoController.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; -import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.dto.DeptDTO; +import com.casic.missiles.modular.device.dto.IdDTO; import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.vo.BusDeviceInfoVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -29,13 +31,15 @@ @Api(tags = "设备") @RestController @RequestMapping("/device") -public class BusDeviceInfoController extends BaseController { +public class BusDeviceInfoController extends ExportController { private final IBusDeviceInfoService busDeviceInfoService; + public BusDeviceInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } + @BussinessLog(value = "设备列表查询") @ApiOperation(value = "列表查询") @GetMapping(value = "/list") public ResponseDataDTO> list(BusDeviceInfoVO busDeviceInfoVO) { @@ -43,6 +47,15 @@ return ResponseDataDTO.success(busDeviceInfoService.list(query)); } + @BussinessLog(value = "设备导出") + @ApiOperation(value = "列表查询") + @GetMapping(value = "/export") + public void export(BusDeviceInfoVO busDeviceInfoVO) throws IOException { + QueryWrapper query = busDeviceInfoVO.genQuery(); + super.exportExcel(BusDeviceInfo.class, busDeviceInfoService.list(query), "设备列表导出"); + } + + @BussinessLog(value = "设备分页查询", key = "busDeviceInfoVO") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(BusDeviceInfoVO busDeviceInfoVO) { @@ -52,6 +65,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } + @BussinessLog(value = "设备新增操作") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -61,6 +75,7 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备修改操作") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody BusDeviceInfo busDeviceInfo) { @@ -69,20 +84,24 @@ return ResponseDataDTO.success(); } + @BussinessLog(value = "设备删除操作") @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") public ResponseDataDTO delete(@RequestBody IdDTO delDTO) { busDeviceInfoService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @ApiIgnore @ApiOperation("批量删除") + @BussinessLog(value = "设备批量删除操作") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { busDeviceInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "设备详情查询操作", key = "dto.id") @ApiOperation(value = "详情查询") @PostMapping(value = "/info") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java index 16f3add..774526f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/DeviceGroupInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -42,7 +43,7 @@ QueryWrapper query = deviceGroupInfoVO.genQuery(); return ResponseDataDTO.success(deviceGroupInfoService.list(query)); } - + @BussinessLog(value = "设备分组管理分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(DeviceGroupInfoVO deviceGroupInfoVO) { @@ -52,7 +53,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "设备分组新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -61,7 +62,7 @@ deviceGroupInfoService.save(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组修改") @ApiOperation(value = "修改接口") @PostMapping(value = "/update") public ResponseDataDTO update(@RequestBody DeviceGroupInfo deviceGroupInfo) { @@ -69,21 +70,21 @@ deviceGroupInfoService.updateById(deviceGroupInfo); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组删除") @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { deviceGroupInfoService.removeById(id); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组批量删除") @ApiOperation("批量删除") @PostMapping("/batchDelete") public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { deviceGroupInfoService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } - + @BussinessLog(value = "设备分组详情查询") @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") public ResponseDataDTO detail(@RequestBody IdDTO dto) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java index e33bfaa..5450d1d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/StatisticsController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.data.dto.AreaDataDTO; import com.casic.missiles.modular.data.dto.DayDevDTO; @@ -39,7 +40,7 @@ this.busDeviceInfoService = busDeviceInfoService; this.onlineLogService = onlineLogService; } - + @BussinessLog(value = "数据统计概况统计") @ApiOperation(value = "概况统计") @GetMapping(value = "/total") public ResponseDataDTO total() { @@ -47,7 +48,7 @@ TotalDataDTO totalDataDTO = busDeviceInfoService.total(query); return ResponseDataDTO.success(totalDataDTO); } - + @BussinessLog(value = "地区设备数量统计") @ApiOperation(value = "地区设备数量") @GetMapping(value = "/areaDev") public ResponseDataDTO> areaDev() { @@ -55,7 +56,7 @@ List dtos = busDeviceInfoService.areaDev(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "地区设备在线情况") @ApiOperation(value = "地区设备在线情况") @GetMapping(value = "/areaDevOnline") public ResponseDataDTO> areaDevOnline() { @@ -63,7 +64,7 @@ List dtos = busDeviceInfoService.areaDevOnline(query); return ResponseDataDTO.success(dtos); } - + @BussinessLog(value = "设备在线趋势") @ApiOperation(value = "设备在线趋势") @GetMapping(value = "/dayDev") public ResponseDataDTO> dayDev(String startTime, String endTime) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index c53861a..6cf26a0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -35,7 +36,7 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; } - + @BussinessLog(value = "相机树查询") @ApiOperation(value = "相机树") @PostMapping(value = "/tree") public ResponseDataDTO> tree() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java index a0263c5..df68dd2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.form.IdForms; @@ -43,7 +44,7 @@ QueryWrapper query = voiceLogVO.genQuery(); return ResponseDataDTO.success(voiceLogService.list(query)); } - + @BussinessLog(value = "历史广播记录分页查询") @ApiOperation(value = "分页查询") @GetMapping(value = "/listPage") public ResponseDataDTO> listPage(VoiceLogVO voiceLogVO) { @@ -53,7 +54,7 @@ return ResponseDataDTO.success(super.packForBT(page)); } - + @BussinessLog(value = "历史广播记录新增") @ApiOperation(value = "新增接口") @PostMapping(value = "/add") public ResponseDataDTO add(@RequestBody VoiceLog voiceLog) { @@ -62,6 +63,7 @@ voiceLogService.save(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录修改") @ApiIgnore @ApiOperation(value = "修改接口") @PostMapping(value = "/update") @@ -69,6 +71,7 @@ voiceLogService.updateById(voiceLog); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录删除") @ApiIgnore @ApiOperation(value = "删除接口") @PostMapping(value = "/delete") @@ -76,6 +79,7 @@ voiceLogService.removeById(delDTO.getId()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录批量删除") @ApiIgnore @ApiOperation("批量删除") @PostMapping("/batchDelete") @@ -83,6 +87,7 @@ voiceLogService.removeByIds(ids.getIds()); return ResponseDataDTO.success(); } + @BussinessLog(value = "历史广播记录详情查询") @ApiIgnore @ApiOperation(value = "详情查询") @PostMapping(value = "/detail") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java new file mode 100644 index 0000000..c2425a8 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/dictmap/DeviceDict.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.device.dictmap; + +import com.casic.missiles.core.common.constant.dictmap.base.AbstractDictMap; + +public class DeviceDict extends AbstractDictMap { + + @Override + public void init() { + put("id", "主键"); + put("devType", "类型查询"); + put("keyword", "设备名称"); + + + put("name", "名字"); + put("birthday", "生日"); + put("sex", "性别"); + put("email", "电子邮件"); + put("phone", "电话"); + put("roleid", "角色名称"); + put("deptid", "部门名称"); + put("roleIds", "角色名称集合"); + } + + @Override + protected void initBeWrapped() { + + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java index 09cefd3..bc9a07e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/model/BusDeviceInfo.java @@ -1,5 +1,12 @@ package com.casic.missiles.modular.device.model; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,6 +23,11 @@ * @author lwh * @date 2024-04-11 */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @TableName("bus_device_info") public class BusDeviceInfo extends Model { @@ -25,22 +37,24 @@ @TableId("id") private Long id; + @ApiModelProperty(value = "区域名称", dataType = "String") @TableField("station_name") private String stationName; + @ExcelProperty("设备名称") @ApiModelProperty(value = "设备名称", dataType = "String") @TableField("monitor_name") private String monitorName; - + @ExcelProperty("设备IP") @ApiModelProperty(value = "设备IP", dataType = "String") @TableField("device_ip") private String deviceIp; - + @ExcelProperty("设备端口") @ApiModelProperty(value = "设备端口", dataType = "Integer") @TableField("device_port") private Integer devicePort; - + @ExcelProperty("设备用户名") @ApiModelProperty(value = "设备用户名", dataType = "String") @TableField("device_user") private String deviceUser; @@ -48,11 +62,11 @@ @ApiModelProperty(value = "设备密码", dataType = "String") @TableField("device_password") private String devicePassword; - + @ExcelProperty("NVRip") @ApiModelProperty(value = "NVRip", dataType = "String") @TableField("nvr_ip") private String nvrIp; - + @ExcelProperty("NVR端口") @ApiModelProperty(value = "NVRport", dataType = "Integer") @TableField("nvr_port") private Integer nvrPort; @@ -64,7 +78,7 @@ @ApiModelProperty(value = "nvr密码", dataType = "String") @TableField("nvr_password") private String nvrPassword; - + @ExcelProperty("nvr通道") @ApiModelProperty(value = "nvr通道", dataType = "String") @TableField("nvr_channel") private String nvrChannel; @@ -73,10 +87,11 @@ @TableField("device_type") private String deviceType; + @ExcelProperty("设备类型名称") @ApiModelProperty(value = "设备类型名称", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField(exist = false) private String deviceTypeName; - + @ExcelProperty("备注") @ApiModelProperty(value = "备注", dataType = "String") @TableField("description") private String description; @@ -84,7 +99,7 @@ @ApiModelProperty(value = "设备状态(0在线 1 离线 字典status)", dataType = "Integer") @TableField("device_status") private Integer deviceStatus; - + @ExcelProperty("设备状态名称") @ApiModelProperty(value = "设备状态名称", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField(exist = false) private String deviceStatusName; @@ -96,6 +111,7 @@ @ApiModelProperty(value = "所属组织", dataType = "Long") @TableField("dept_id") private Long deptId; + @ExcelProperty("所属组织") @TableField(exist = false) private String deptName; @@ -110,7 +126,7 @@ @ApiModelProperty(value = "布防状态(1,布防 0 撤防)", dataType = "Integer") @TableField("bf_flag") private Integer bfFlag; - + @ExcelProperty("创建时间") @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; @@ -121,6 +137,7 @@ @ApiModelProperty(value = "所属区域", dataType = "String") @TableField("area") private String area; + @ExcelProperty("区域名称") @ApiModelProperty(value = "区域名称", dataType = "String") @TableField(exist = false) private String areaName; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java index 1870d2b..bc958b5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceInfoServiceImpl.java @@ -61,6 +61,13 @@ } @Override + public List list(Wrapper queryWrapper) { + List busDeviceInfos = super.list(queryWrapper); + busDeviceInfos.forEach(this::wrapInfo); + return busDeviceInfos; + } + + @Override public BusDeviceInfo getById(Serializable id) { BusDeviceInfo busDeviceInfo = super.getById(id); if (busDeviceInfo != null) { @@ -77,7 +84,7 @@ } private void wrapInfo(BusDeviceInfo busDeviceInfo) { - Area area = areaService.getById(busDeviceInfo.getId()); + Area area = areaService.getById(busDeviceInfo.getArea()); if (area != null) { busDeviceInfo.setAreaName(area.getAreaName()); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/vo/BusDeviceInfoVO.java b/casic-server/src/main/java/com/casic/missiles/modular/device/vo/BusDeviceInfoVO.java index aff0e04..826269c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/vo/BusDeviceInfoVO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/vo/BusDeviceInfoVO.java @@ -1,6 +1,12 @@ package com.casic.missiles.modular.device.vo; import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.modular.device.model.BusDeviceInfo; import io.swagger.annotations.ApiModelProperty; @@ -12,6 +18,7 @@ * @author lwh * @date 2024-04-11 */ + @Data public class BusDeviceInfoVO { private static final long serialVersionUID = 1L; diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 8bfe2c8..e548a0f 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -128,6 +128,11 @@ 3.0.9 + com.casic + casic-export-support + ${extension.version} + + com.sun.jna.examples jna 3.0.0