diff --git a/device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java b/device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java index 0b8f2ffb..f58296a1 100644 --- a/device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java +++ b/device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java @@ -103,14 +103,14 @@ public class PqDevController extends BaseController { } } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD) @PostMapping("/downloadTemplate") @ApiOperation("下载被检设备导入文件模板") public void downloadTemplate() { pqDevService.downloadTemplate(); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD) @PostMapping(value = "/import") @ApiOperation("批量导入被检设备数据") @ApiImplicitParam(name = "ids", value = "被检设备id", required = true) @@ -139,7 +139,7 @@ public class PqDevController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD) @PostMapping("/export") @ApiOperation("导出被检设备数据") @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) @@ -175,7 +175,7 @@ public class PqDevController extends BaseController { @ApiImplicitParam(name = "planId", value = "计划id", required = true), @ApiImplicitParam(name = "pqDevId", value = "被检设备id", required = true) }) - public HttpResult bindPlan(@RequestBody PqDevParam.PqDevBindPlanParam bindPlanParam) { + public HttpResult bindPlan(@RequestBody @Validated PqDevParam.PqDevBindPlanParam bindPlanParam) { String methodDescribe = getMethodDescribe("bindPlan"); LogUtil.njcnDebug(log, "{},绑定计划数据为:planId={}, pqDevId={}", methodDescribe, bindPlanParam.getPlanId(), String.join(StrUtil.COMMA, bindPlanParam.getPqDevIds())); boolean result = pqDevService.bindPlan(bindPlanParam.getPlanId(), bindPlanParam.getPqDevIds()); diff --git a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java index 01cea035..0f75cc3b 100644 --- a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java +++ b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java @@ -3,27 +3,24 @@ package com.njcn.gather.device.device.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.db.mybatisplus.constant.DbConstant; +import com.njcn.gather.device.device.mapper.PqDevMapper; import com.njcn.gather.device.device.pojo.param.PqDevParam; +import com.njcn.gather.device.device.pojo.po.PqDev; import com.njcn.gather.device.device.pojo.vo.PqDevExcel; import com.njcn.gather.device.device.service.IPqDevService; -import com.njcn.gather.device.device.mapper.PqDevMapper; -import com.njcn.gather.device.device.pojo.po.PqDev; import com.njcn.gather.device.device.util.DeviceUtil; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.ExcelUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java index 94cb8ca3..0e7d7f88 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java @@ -148,10 +148,10 @@ public class DictDataController extends BaseController { } } - @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DOWNLOAD) @PostMapping("/export") @ApiOperation("导出字典数据") - @ApiImplicitParam(name = "queryParam", value = "查询参数",required = true) + @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) public void export(@RequestBody @Validated DictDataParam.DicTypeIdQueryParam queryParam) { dictDataService.exportDictData(queryParam); } diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java index f9241a0f..d21d9127 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java @@ -129,6 +129,7 @@ public class DictTreeController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/queryByid") @ApiOperation("根据id查询字典树最底层") diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java index 53fcec05..1166a666 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java @@ -106,10 +106,10 @@ public class DictTypeController extends BaseController { } } - @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DOWNLOAD) @PostMapping("/export") @ApiOperation("导出字典类型数据") - @ApiImplicitParam(name = "queryParam", value = "查询参数",required = true) + @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) public void export(@RequestBody @Validated DictTypeParam.DictTypeQueryParam queryParam) { dictTypeService.exportDictType(queryParam); } diff --git a/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java b/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java index 3c3d0e54..74644219 100644 --- a/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java +++ b/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java @@ -1,12 +1,51 @@ package com.njcn.gather.user.user.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.gather.user.user.pojo.param.SysUserParam; import com.njcn.gather.user.user.pojo.po.SysUser; +import java.util.List; + /** * @author caozehui * @since 2024-11-08 */ public interface ISysUserService extends IService { + /** + * 分页查询用户列表 + * @param queryParam 分页查询参数 + * @return 分页查询结果 + */ + Page listUser(SysUserParam.UserQueryParam queryParam); + + /** + * 根据部门ID查询用户列表 + * @param deptId 部门ID + * @return 用户列表 + */ + List listUserByDeptId(String deptId); + + /** + * 新增用户 + * @param addUserParam 新增用户参数 + * @return 结果,true表示新增成功,false表示新增失败 + */ + boolean addUser(SysUserParam.UserAddParam addUserParam); + + /** + * 更新用户 + * @param updateUserParam 更新用户参数 + * @return 结果,true表示更新成功,false表示更新失败 + */ + boolean updateUser(SysUserParam.UserUpdateParam updateUserParam); + + /** + * 批量删除用户 + * @param ids 用户ID列表 + * @return 结果,true表示删除成功,false表示删除失败 + */ + boolean deleteUser(List ids); + }