From 8c5b380cf06e4cd87651e2a536296f85e4485cbc Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 28 Jun 2024 15:05:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SystemUserController.java | 13 ++ .../controller/SystemUserExternalApi.java | 6 + .../car/controller/CarCameraController.java | 171 +++++++++--------- .../CarInfoApprovalFlowController.java | 7 + .../car/controller/CarInfoController.java | 7 + .../controller/CarPassRecordController.java | 14 ++ .../car/controller/CarTypeController.java | 18 +- .../ProjectCarCameraConfigController.java | 8 + 8 files changed, 154 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java index a19540d2a..ef104ac8d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java @@ -110,6 +110,7 @@ public class SystemUserController { * @param * @return */ + @OperLog(operModul = "账号管理", operType = "通过id查询账号信息", operDesc = "通过id查询账号信息") @ApiOperation(value = "通过id查询账号信息", notes = "通过id查询账号信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "账号ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/queryById") @@ -128,6 +129,7 @@ public class SystemUserController { return Result.ok(); } + @OperLog(operModul = "账号管理", operType = "根据企业或项目SN查找账号列表", operDesc = "根据企业或项目SN查找账号列表") @ApiOperation(value = "根据企业或项目SN查找账号列表", notes = "根据企业或项目SN查找账号列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "sn", required = true, value = "企业或项目SN", paramType = "body"), @@ -138,6 +140,7 @@ public class SystemUserController { return Result.success(systemUserService.getSystemUsersBySn(map)); } + @OperLog(operModul = "账号管理", operType = "根据企业或项目SN查找账号分页列表", operDesc = "根据企业或项目SN查找账号分页列表") @ApiOperation(value = "根据企业或项目SN查找账号分页列表", notes = "根据企业或项目SN查找账号分页列表1", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "sn", required = true, value = "企业或项目SN", paramType = "body"), @@ -150,6 +153,7 @@ public class SystemUserController { return Result.success(systemUserService.getSystemUserBySnPage(map)); } + @OperLog(operModul = "账号管理", operType = "查找项目子账号列表", operDesc = "查找项目子账号列表") @ApiOperation(value = "查找项目子账号列表", notes = "查找项目子账号列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", required = true, value = "项目SN", paramType = "body"), @@ -168,6 +172,7 @@ public class SystemUserController { return Result.success(systemUserService.getProjectChildernSystemUserList(map)); } + @OperLog(operModul = "账号管理", operType = "发送安全帽平台账号信息", operDesc = "发送安全帽平台账号信息") @ApiOperation(value = "发送安全帽平台账号信息", notes = "发送安全帽平台账号信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "userId", required = true, value = "用户ID", paramType = "body"), @@ -178,6 +183,7 @@ public class SystemUserController { return Result.ok(); } + @OperLog(operModul = "账号管理", operType = "发送安全帽平台项目信息", operDesc = "发送安全帽平台项目信息") @ApiOperation(value = "发送安全帽平台项目信息", notes = "发送安全帽平台项目信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", required = true, value = "项目sn", paramType = "body"), @@ -188,6 +194,7 @@ public class SystemUserController { return Result.ok(); } + @OperLog(operModul = "账号管理", operType = "修改密码", operDesc = "修改密码") @ApiOperation(value = "星纵修改密码", notes = "星纵修改密码", httpMethod = "POST") @PostMapping(value = "/xz/updatePw") public Result xzUpdatePw(@RequestBody SystemUser systemUser) { @@ -195,6 +202,7 @@ public class SystemUserController { return Result.ok(); } + @OperLog(operModul = "账号管理", operType = "根据项目SN查找新用户（租户）列表", operDesc = "根据项目SN查找新用户（租户）列表") @ApiOperation(value = "根据项目SN查找新用户（租户）列表", notes = "根据项目SN查找新用户（租户）列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", required = true, value = "项目SN", paramType = "body"), @@ -204,6 +212,7 @@ public class SystemUserController { return Result.success(systemUserService.getTenantListBySn(map)); } + @OperLog(operModul = "账号管理", operType = "根据项目SN查找新用户（租户）分页列表", operDesc = "根据项目SN查找新用户（租户）分页列表") @ApiOperation(value = "根据项目SN查找新用户（租户）分页列表", notes = "根据项目SN查找新用户（租户）分页列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", required = true, value = "项目SN", paramType = "body"), @@ -215,6 +224,7 @@ public class SystemUserController { } + @OperLog(operModul = "账号管理", operType = "验证账号", operDesc = "验证账号") @ApiOperation(value = "验证账号", notes = "验证账号", httpMethod = "POST") @PostMapping(value = "/xz/checkAccount") public Result checkAccount(@RequestBody SystemUser systemUser) { @@ -222,6 +232,7 @@ public class SystemUserController { return Result.ok(); } + @OperLog(operModul = "账号管理", operType = "根据账号获取邮箱验证码", operDesc = "根据账号获取邮箱验证码") @ApiOperation(value = "根据账号获取邮箱验证码", notes = "根据账号获取邮箱验证码", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "type", required = true, value = "1修改密码", paramType = "body"), @@ -233,6 +244,7 @@ public class SystemUserController { return Result.ok(); } + @OperLog(operModul = "账号管理", operType = "重置密码验证邮箱", operDesc = "重置密码验证邮箱") @ApiOperation(value = "重置密码验证邮箱", notes = "重置密码验证邮箱", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "account", required = true, value = "账号", paramType = "body"), @@ -243,6 +255,7 @@ public class SystemUserController { return Result.success(systemUserService.resetPwValidCode(paramMap)); } + @OperLog(operModul = "账号管理", operType = "重置密码通过邮箱方式", operDesc = "重置密码通过邮箱方式") @ApiOperation(value = "重置密码通过邮箱方式", notes = "重置密码通过邮箱方式", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "account", required = true, value = "账号", paramType = "body"), diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserExternalApi.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserExternalApi.java index 5cd48bed7..8d9cca18f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserExternalApi.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserExternalApi.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.basicdata.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; @@ -18,30 +19,35 @@ public class SystemUserExternalApi { @Autowired private ISystemUserService systemUserService; + @OperLog(operModul = "人员管理", operType = "查询", operDesc = "中建五局查询人员分页列表") @ApiOperation(value = "中建五局查询人员分页列表", notes = "中建五局查询人员分页列表", httpMethod = "GET") @GetMapping(value = "/zjwj/page") public Result> getZjwjUserPage(SystemUser systemUser) { return systemUserService.getZjwjUserPage(systemUser); } + @OperLog(operModul = "人员管理", operType = "查询", operDesc = "中建五局查询人员列表") @ApiOperation(value = "中建五局查询人员列表", notes = "中建五局查询人员列表", httpMethod = "GET") @GetMapping(value = "/zjwj/list") public Result> getZjwjUserList(SystemUser systemUser) { return systemUserService.getZjwjUserList(systemUser); } + @OperLog(operModul = "人员管理", operType = "新增", operDesc = "中建五局新增人员") @ApiOperation(value = "中建五局新增人员", notes = "中建五局新增人员", httpMethod = "POST") @PostMapping(value = "/zjwj/add") public Result addZjwjUser(@RequestBody SystemUser systemUser) { return systemUserService.addZjwjUser(systemUser); } + @OperLog(operModul = "人员管理", operType = "修改", operDesc = "中建五局修改人员") @ApiOperation(value = "中建五局修改人员", notes = "中建五局修改人员", httpMethod = "POST") @PostMapping(value = "/zjwj/update") public Result updateZjwjUser(@RequestBody SystemUser systemUser) { return systemUserService.updateZjwjUser(systemUser); } + @OperLog(operModul = "人员管理", operType = "删除", operDesc = "中建五局删除人员") @ApiOperation(value = "中建五局删除人员", notes = "中建五局删除人员", httpMethod = "POST") @PostMapping(value = "/zjwj/delete") public Result deleteZjwjUser(@RequestBody SystemUser systemUser) { diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarCameraController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarCameraController.java index 813d694d6..8abab315a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarCameraController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarCameraController.java @@ -13,17 +13,20 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; - /** +/** * @Title: Controller * @Description: 车辆相机 * @author： pds - * @date： 2020-09-29 + * @date： 2020-09-29 * @version： V1.0 */ @RestController @@ -31,104 +34,108 @@ import java.util.Map; @Slf4j @Api(tags = "车辆相机") public class CarCameraController { - @Autowired - private ICarCameraService carCameraService; + @Autowired + private ICarCameraService carCameraService; - /** - * 分页列表查询 - * @return - */ - - @ApiOperation(value = "列表查询车辆相机信息", notes = "列表查询车辆相机信息", httpMethod = "POST") + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "车辆相机管理", operType = "列表查询车辆相机信息", operDesc = "列表查询车辆相机信息") + @ApiOperation(value = "列表查询车辆相机信息", notes = "列表查询车辆相机信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/list") - public Result> selectCarCameraList(@RequestBody Map map) { - QueryWrapper queryWrapper =new QueryWrapper<>(); - queryWrapper.lambda().eq(CarCamera::getProjectSn, MapUtils.getString(map,"projectSn")); - List list=carCameraService.list(queryWrapper); + public Result> selectCarCameraList(@RequestBody Map map) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(CarCamera::getProjectSn, MapUtils.getString(map, "projectSn")); + List list = carCameraService.list(queryWrapper); return Result.success(list); - } + } - /** - * 添加 - * @param carCamera - * @return - */ - @OperLog(operModul = "车辆管理", operType = "添加车辆相机", operDesc = "添加车辆相机信息") - @ApiOperation(value = "添加车辆相机信息", notes = "添加车辆相机信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody CarCamera carCamera) { + /** + * 添加 + * + * @param carCamera + * @return + */ + @OperLog(operModul = "车辆相机管理", operType = "添加车辆相机", operDesc = "添加车辆相机信息") + @ApiOperation(value = "添加车辆相机信息", notes = "添加车辆相机信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody CarCamera carCamera) { carCameraService.addCarCamera(carCamera); return Result.ok(); - } + } - /** - * 编辑 - * @param carCamera - * @return - */ - @OperLog(operModul = "车辆管理",operType = "编辑车辆相机",operDesc = "编辑车辆相机信息") - @ApiOperation(value = "编辑车辆相机信息", notes = "编辑车辆相机信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody CarCamera carCamera) { + /** + * 编辑 + * + * @param carCamera + * @return + */ + @OperLog(operModul = "车辆相机管理", operType = "编辑车辆相机", operDesc = "编辑车辆相机信息") + @ApiOperation(value = "编辑车辆相机信息", notes = "编辑车辆相机信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody CarCamera carCamera) { carCameraService.editCarCamera(carCamera); return Result.ok(); - } + } - /** - * 通过id删除 - * @param - * @return - */ - @OperLog(operModul = "车辆管理",operType = "删除车辆相机",operDesc = "删除车辆相机信息") + /** + * 通过id删除 + * + * @param + * @return + */ + @OperLog(operModul = "车辆相机管理", operType = "删除车辆相机", operDesc = "删除车辆相机信息") @ApiOperation(value = "删除车辆相机信息", notes = "删除车辆相机信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "车辆相机ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - Result result = new Result(); - CarCamera carCamera = carCameraService.getById(MapUtils.getString(map,"id")); - if(carCamera==null) { - result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = carCameraService.removeById(MapUtils.getString(map,"id")); - if(ok) { - result.successMsg(MessageUtil.get("deleteSucess")); - } - } - return result; - } + public Result delete(@RequestBody Map map) { + Result result = new Result(); + CarCamera carCamera = carCameraService.getById(MapUtils.getString(map, "id")); + if (carCamera == null) { + result.error500(MessageUtil.get("notFindErr")); + } else { + boolean ok = carCameraService.removeById(MapUtils.getString(map, "id")); + if (ok) { + result.successMsg(MessageUtil.get("deleteSucess")); + } + } + return result; + } - @OperLog(operModul = "车辆管理",operType = "车辆进出闸门开闸操作",operDesc = "车辆进出闸门开闸操作") - @ApiOperation(value = "车辆进出闸门开闸操作", notes = "车辆进出闸门开闸操作", httpMethod="POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "cameraId", value = "相机ID", paramType = "body", required = true, dataType = "String"), - }) - @PostMapping(value = "/openGate") - public Result openGate(@RequestBody Map map) { - CarPassRecordController.openCarMap.put(MapUtils.getString(map,"cameraId"),1); - return Result.ok(); - } + @OperLog(operModul = "车辆相机管理", operType = "车辆进出闸门开闸操作", operDesc = "车辆进出闸门开闸操作") + @ApiOperation(value = "车辆进出闸门开闸操作", notes = "车辆进出闸门开闸操作", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "cameraId", value = "相机ID", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/openGate") + public Result openGate(@RequestBody Map map) { + CarPassRecordController.openCarMap.put(MapUtils.getString(map, "cameraId"), 1); + return Result.ok(); + } - @OperLog(operModul = "车辆管理",operType = "修改车辆相机地图坐标",operDesc = "修改车辆相机地图坐标") - @ApiOperation(value = "修改车辆相机地图坐标", notes = "修改车辆相机地图坐标" , httpMethod="POST") - @PostMapping(value = "/updateCarCameraCoordinate") - public Result updateCarCameraCoordinate(@RequestBody List list) { - carCameraService.updateCarCameraCoordinate(list); - return Result.ok(); - } + @OperLog(operModul = "车辆相机管理", operType = "修改车辆相机地图坐标", operDesc = "修改车辆相机地图坐标") + @ApiOperation(value = "修改车辆相机地图坐标", notes = "修改车辆相机地图坐标", httpMethod = "POST") + @PostMapping(value = "/updateCarCameraCoordinate") + public Result updateCarCameraCoordinate(@RequestBody List list) { + carCameraService.updateCarCameraCoordinate(list); + return Result.ok(); + } - @ApiOperation(value = "根据车辆相机统计数据", notes = "根据车辆相机统计数据" , httpMethod="POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "cameraId", value = "相机ID", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") - }) - - @PostMapping(value = "selectCarStatisticsByCameraId") - public Result> selectCarStatisticsByCameraId(@RequestBody Map map) { - return Result.success(carCameraService.selectCarStatisticsByCameraId(map)); - } + @OperLog(operModul = "车辆相机管理", operType = "根据车辆相机统计数据", operDesc = "根据车辆相机统计数据") + @ApiOperation(value = "根据车辆相机统计数据", notes = "根据车辆相机统计数据", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "cameraId", value = "相机ID", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + }) + @PostMapping(value = "selectCarStatisticsByCameraId") + public Result> selectCarStatisticsByCameraId(@RequestBody Map map) { + return Result.success(carCameraService.selectCarStatisticsByCameraId(map)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoApprovalFlowController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoApprovalFlowController.java index 5e198c109..d4578e847 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoApprovalFlowController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoApprovalFlowController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.car.controller; +import com.zhgd.annotation.OperLog; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -44,6 +45,7 @@ public class CarInfoApprovalFlowController { * * @return */ + @OperLog(operModul = "车辆黑白名单管理-审批流进来的车辆管理", operType = "查询", operDesc = "车辆黑白名单管理-审批流进来的车辆") @ApiOperation(value = "分页列表查询车辆黑白名单管理-审批流进来的车辆信息", notes = "分页列表查询车辆黑白名单管理-审批流进来的车辆信息", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @@ -59,6 +61,7 @@ public class CarInfoApprovalFlowController { * * @return */ + @OperLog(operModul = "车辆黑白名单管理-审批流进来的车辆管理", operType = "查询", operDesc = "车辆黑白名单管理-审批流进来的车辆") @ApiOperation(value = "列表查询车辆黑白名单管理-审批流进来的车辆信息", notes = "列表查询车辆黑白名单管理-审批流进来的车辆信息", httpMethod = "GET") @GetMapping(value = "/list") public Result> queryList(@ApiIgnore @RequestParam HashMap param) { @@ -71,6 +74,7 @@ public class CarInfoApprovalFlowController { * @param carInfoApprovalFlow * @return */ + @OperLog(operModul = "车辆黑白名单管理-审批流进来的车辆管理", operType = "查询", operDesc = "车辆黑白名单管理-审批流进来的车辆") @ApiOperation(value = "添加车辆黑白名单管理-审批流进来的车辆信息", notes = "添加车辆黑白名单管理-审批流进来的车辆信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody @Validate CarInfoApprovalFlow carInfoApprovalFlow) { @@ -84,6 +88,7 @@ public class CarInfoApprovalFlowController { * @param carInfoApprovalFlow * @return */ + @OperLog(operModul = "车辆黑白名单管理-审批流进来的车辆管理", operType = "查询", operDesc = "车辆黑白名单管理-审批流进来的车辆") @ApiOperation(value = "编辑车辆黑白名单管理-审批流进来的车辆信息", notes = "编辑车辆黑白名单管理-审批流进来的车辆信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody CarInfoApprovalFlow carInfoApprovalFlow) { @@ -96,6 +101,7 @@ public class CarInfoApprovalFlowController { * * @return */ + @OperLog(operModul = "车辆黑白名单管理-审批流进来的车辆管理", operType = "查询", operDesc = "车辆黑白名单管理-审批流进来的车辆") @ApiOperation(value = "删除车辆黑白名单管理-审批流进来的车辆信息", notes = "删除车辆黑白名单管理-审批流进来的车辆信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "车辆黑白名单管理-审批流进来的车辆ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") @@ -110,6 +116,7 @@ public class CarInfoApprovalFlowController { * @param id * @return */ + @OperLog(operModul = "车辆黑白名单管理-审批流进来的车辆管理", operType = "查询", operDesc = "车辆黑白名单管理-审批流进来的车辆") @ApiOperation(value = "通过id查询车辆黑白名单管理-审批流进来的车辆信息", notes = "通过id查询车辆黑白名单管理-审批流进来的车辆信息", httpMethod = "GET") @ApiImplicitParam(name = "id", value = "车辆黑白名单管理-审批流进来的车辆ID", paramType = "query", required = true, dataType = "Integer") @GetMapping(value = "/queryById") diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index 75c6816a7..e2430e419 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -64,6 +64,7 @@ public class CarInfoController { @Autowired private IXzSystemUserToCompanyProjectService xzSystemUserToCompanyProjectService; + @OperLog(operModul = "车辆黑白名单管理", operType = "查询", operDesc = "分页列表查询项目下车辆黑白名单") @ApiOperation(value = "分页列表查询项目下车辆黑白名单", notes = "分页列表查询项目下车辆黑白名单", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "isBlack", value = "是否黑名单，0白名单，1黑名单", paramType = "body", required = false, dataType = "String"), @@ -78,6 +79,7 @@ public class CarInfoController { return Result.success(carInfoService.selectCarListPage(map)); } + @OperLog(operModul = "车辆黑白名单管理", operType = "查询", operDesc = "列表查询项目下车辆黑白名单") @ApiOperation(value = "列表查询项目下车辆黑白名单", notes = "列表查询项目下车辆黑白名单", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "isBlack", value = "是否黑名单，0白名单，1黑名单", paramType = "body", required = false, dataType = "String"), @@ -268,6 +270,7 @@ public class CarInfoController { * @return */ + @OperLog(operModul = "车辆黑白名单管理", operType = "查询", operDesc = "通过id查询车辆黑白名单管理信息") @ApiOperation(value = "通过id查询车辆黑白名单管理信息", notes = "通过id查询车辆黑白名单管理信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "车辆黑白名单管理ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/queryById") @@ -276,6 +279,7 @@ public class CarInfoController { return Result.success(carInfoService.queryById(id)); } + @OperLog(operModul = "车辆黑白名单管理", operType = "查询", operDesc = "统计项目下各车辆黑白名单情况") @ApiOperation(value = "统计项目下各车辆黑白名单情况", notes = "统计项目下各车辆黑白名单情况", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @@ -285,6 +289,7 @@ public class CarInfoController { return Result.success(carInfoService.selectCarTypeCount(map)); } + @OperLog(operModul = "车辆黑白名单管理", operType = "查询", operDesc = "统计项目下各车辆类型情况") @ApiOperation(value = "统计项目下各车辆类型情况", notes = "统计项目下各车辆类型情况", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @@ -294,6 +299,7 @@ public class CarInfoController { return Result.success(carInfoService.countCarModuleType(map)); } + @OperLog(operModul = "车辆黑白名单管理", operType = "查询", operDesc = "更新车辆二维码，如果为空") @ApiOperation(value = "更新车辆二维码，如果为空", notes = "更新车辆二维码，如果为空", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), @@ -304,6 +310,7 @@ public class CarInfoController { return Result.ok(); } + @OperLog(operModul = "车辆黑白名单管理", operType = "查询", operDesc = "批量更新车辆信息") @ApiOperation(value = "批量更新车辆信息", notes = "批量更新车辆信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java index 593544678..0dc7e3957 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java @@ -4,6 +4,7 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.gexin.fastjson.JSON; +import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.car.entity.CarCamera; @@ -49,6 +50,7 @@ public class CarPassRecordController { * * @return */ + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "分页列表查询车辆通行记录信息") @ApiOperation(value = "分页列表查询车辆通行记录信息", notes = "分页列表查询车辆通行记录信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "carType", value = "查询类型，1白名单，2黑名单，3临时车辆", paramType = "body", required = false, dataType = "String"), @@ -66,6 +68,7 @@ public class CarPassRecordController { return Result.success(carPassRecordService.selectProjectCarPassPageList(map)); } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "查询当日车辆通行记录列表") @ApiOperation(value = "查询当日车辆通行记录列表", notes = "查询当日车辆通行记录列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @@ -82,6 +85,7 @@ public class CarPassRecordController { * @param taskProgressMaterialRel * @return */ + @OperLog(operModul = "车辆通行记录管理", operType = "编辑", operDesc = "编辑车辆通行记录") @ApiOperation(value = "编辑车辆通行记录", notes = "编辑车辆通行记录", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody CarPassRecord taskProgressMaterialRel) { @@ -94,6 +98,7 @@ public class CarPassRecordController { * * @return */ + @OperLog(operModul = "车辆通行记录管理", operType = "删除", operDesc = "删除车辆通行记录") @ApiOperation(value = "删除车辆通行记录", notes = "删除车辆通行记录", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "车辆通行记录id", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") @@ -114,6 +119,7 @@ public class CarPassRecordController { } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "车辆通行记录统计") @ApiOperation(value = "车辆通行记录统计", notes = "车辆通行记录统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @@ -123,6 +129,7 @@ public class CarPassRecordController { return Result.success(carPassRecordService.getCarPassRecordStatistics(map)); } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "24小时进出时间段统计") @ApiOperation(value = "24小时进出时间段统计", notes = "24小时进出时间段统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") @@ -132,6 +139,7 @@ public class CarPassRecordController { return Result.success(carPassRecordService.selectCarPassRecordInOutCount(map)); } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "今日出入车辆数") @ApiOperation(value = "今日出入车辆数", notes = "今日出入车辆数") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), @@ -142,6 +150,7 @@ public class CarPassRecordController { return Result.success(carPassRecordService.getTodayOutInNumber(projectSn, isOpen)); } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "根据车辆相机统计数据") @ApiOperation(value = "根据车辆相机统计数据", notes = "根据车辆相机统计数据", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "queryTime", value = "查询时间，格式2021-06-01", paramType = "body", required = true, dataType = "String"), @@ -153,6 +162,7 @@ public class CarPassRecordController { return Result.success(carPassRecordService.selectCarStatistics(map)); } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "分页列表查询车辆通行记录") @ApiOperation(value = "分页列表查询车辆通行记录", notes = "分页列表查询车辆通行记录", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "查询类型，1白名单，2黑名单，3临时车辆", paramType = "body", required = true, dataType = "String"), @@ -166,6 +176,7 @@ public class CarPassRecordController { return Result.success(carPassRecordService.selectCarPassPage(map)); } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "接收车辆摄像头传过来的车辆通行记录") @ApiOperation(value = "接收车辆摄像头传过来的车辆通行记录", notes = "接收车辆摄像头传过来的车辆通行记录", httpMethod = "POST") @PostMapping(value = "/saveCarPassRecord") public String saveCarPassRecord(String plate_num, String car_logo, String car_color, String park_id, @@ -230,6 +241,7 @@ public class CarPassRecordController { return rs; } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "接收车辆摄像头传过来的车辆通行记录") @ApiOperation(value = "接收车辆摄像头传过来的车辆通行记录", notes = "接收车辆摄像头传过来的车辆通行记录", httpMethod = "POST") @PostMapping(value = "/addCarPassRecord") public Result addCarPassRecord(@RequestBody CarPassRecord carPassRecord) { @@ -278,12 +290,14 @@ public class CarPassRecordController { return list; } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "通过项目sn获取最后三次车辆通过记录") @ApiOperation(value = "通过项目sn获取最后三次车辆通过记录", notes = "通过项目sn获取最后三次车辆通过记录") @GetMapping(value = "/getLastThreeListByProjectSn") public Result> getLastThreeListByProjectSn(String projectSn) { return Result.success(carPassRecordService.list(Wrappers.lambdaQuery().eq(CarPassRecord::getProjectSn, projectSn).last("limit 3"))); } + @OperLog(operModul = "车辆通行记录管理", operType = "查询", operDesc = "查询最新一条车辆通行记录信息") @ApiOperation(value = "查询最新一条车辆通行记录信息", notes = "查询最新一条车辆通行记录信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "carType", value = "查询类型，1白名单，2黑名单，3临时车辆", paramType = "body", required = false, dataType = "String"), diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarTypeController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarTypeController.java index fb005c1fc..c85e627d0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarTypeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarTypeController.java @@ -41,11 +41,12 @@ public class CarTypeController { * 分页列表查询 * @return */ - @ApiOperation(value = "列表查询车辆类型表信息", notes = "列表查询车辆类型表信息", httpMethod="POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), - }) - @PostMapping(value = "/list") + @OperLog(operModul = "车辆类型表管理", operType = "查询", operDesc = "列表查询车辆类型表信息") + @ApiOperation(value = "列表查询车辆类型表信息", notes = "列表查询车辆类型表信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/list") public Result> queryPageList(@RequestBody Map map) { QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.lambda().eq(CarType::getProjectSn,MapUtils.getString(map,"projectSn")); @@ -108,9 +109,10 @@ public class CarTypeController { * @param * @return */ - @ApiOperation(value = "通过id查询车辆类型表信息", notes = "通过id查询车辆类型表信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "车辆类型表ID", paramType = "body", required = true, dataType = "Integer") - @PostMapping(value = "/queryById") + @OperLog(operModul = "车辆类型表管理", operType = "查询", operDesc = "通过id查询车辆类型表信息") + @ApiOperation(value = "通过id查询车辆类型表信息", notes = "通过id查询车辆类型表信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "车辆类型表ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/queryById") public Result queryById(@RequestBody Map map) { Result result = new Result(); CarType carType = carTypeService.getById(MapUtils.getString(map,"id")); diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/ProjectCarCameraConfigController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/ProjectCarCameraConfigController.java index 63a7f579d..f361ef429 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/ProjectCarCameraConfigController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/ProjectCarCameraConfigController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.car.controller; +import com.zhgd.annotation.OperLog; import com.zhgd.xmgl.modules.car.entity.ProjectCarCameraConfig; import com.zhgd.xmgl.modules.car.service.IProjectCarCameraConfigService; import io.swagger.annotations.Api; @@ -44,6 +45,7 @@ public class ProjectCarCameraConfigController { * * @return */ + @OperLog(operModul = "项目对应的车辆相机设备配置管理", operType = "查询", operDesc = "分页列表查询项目对应的车辆相机设备配置信息") @ApiOperation(value = "分页列表查询项目对应的车辆相机设备配置信息", notes = "分页列表查询项目对应的车辆相机设备配置信息", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @@ -59,6 +61,7 @@ public class ProjectCarCameraConfigController { * * @return */ + @OperLog(operModul = "项目对应的车辆相机设备配置管理", operType = "查询", operDesc = "列表查询项目对应的车辆相机设备配置信息") @ApiOperation(value = "列表查询项目对应的车辆相机设备配置信息", notes = "列表查询项目对应的车辆相机设备配置信息", httpMethod = "GET") @GetMapping(value = "/list") public Result> queryList(@ApiIgnore @RequestParam HashMap param) { @@ -71,6 +74,7 @@ public class ProjectCarCameraConfigController { * @param projectCarCameraConfig * @return */ + @OperLog(operModul = "项目对应的车辆相机设备配置管理", operType = "添加", operDesc = "添加项目对应的车辆相机设备配置信息") @ApiOperation(value = "添加项目对应的车辆相机设备配置信息", notes = "添加项目对应的车辆相机设备配置信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody @Validate ProjectCarCameraConfig projectCarCameraConfig) { @@ -84,6 +88,7 @@ public class ProjectCarCameraConfigController { * @param projectCarCameraConfig * @return */ + @OperLog(operModul = "项目对应的车辆相机设备配置管理", operType = "编辑", operDesc = "编辑项目对应的车辆相机设备配置信息") @ApiOperation(value = "编辑项目对应的车辆相机设备配置信息", notes = "编辑项目对应的车辆相机设备配置信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody ProjectCarCameraConfig projectCarCameraConfig) { @@ -92,6 +97,7 @@ public class ProjectCarCameraConfigController { } + @OperLog(operModul = "项目对应的车辆相机设备配置管理", operType = "添加", operDesc = "添加项目对应的车辆相机设备配置信息") @ApiOperation(value = "添加项目对应的车辆相机设备配置信息", notes = "添加项目对应的车辆相机设备配置信息", httpMethod = "POST") @PostMapping(value = "/saveProjectCarCameraConfig") public Result saveProjectCarCameraConfig(@RequestBody @Validate ProjectCarCameraConfig projectCarCameraConfig) { @@ -104,6 +110,7 @@ public class ProjectCarCameraConfigController { * * @return */ + @OperLog(operModul = "项目对应的车辆相机设备配置管理", operType = "删除", operDesc = "删除项目对应的车辆相机设备配置信息") @ApiOperation(value = "删除项目对应的车辆相机设备配置信息", notes = "删除项目对应的车辆相机设备配置信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "项目对应的车辆相机设备配置ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") @@ -118,6 +125,7 @@ public class ProjectCarCameraConfigController { * @param id * @return */ + @OperLog(operModul = "项目对应的车辆相机设备配置管理", operType = "查询", operDesc = "通过id查询项目对应的车辆相机设备配置信息") @ApiOperation(value = "通过id查询项目对应的车辆相机设备配置信息", notes = "通过id查询项目对应的车辆相机设备配置信息", httpMethod = "GET") @ApiImplicitParam(name = "id", value = "项目对应的车辆相机设备配置ID", paramType = "query", required = true, dataType = "Integer") @GetMapping(value = "/queryById")