diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index 1d417e6a..90d892d5 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -3,11 +3,9 @@ package io.renren.common.controller; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import io.renren.common.annotation.LogOperation; -import io.renren.common.constant.Constant; import io.renren.common.dto.AuditingBaseDTO; import io.renren.common.page.PageData; import io.renren.common.utils.CodeGenerationUtils; -import io.renren.common.utils.DateUtils; import io.renren.common.utils.Result; import io.renren.common.validator.ValidatorUtils; import io.renren.common.validator.group.AddGroup; diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java index 3c160a06..832dd355 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java @@ -122,7 +122,7 @@ public class ActTaskController { public Result> myToDoTaskPage(@ApiIgnore @RequestParam Map params) { String userId = SecurityUser.getUserId().toString(); params.put("userId", userId); - logger.info("--------------------------------------------------------{}",userId); + logger.info("--------------------------------------------------------{}", userId); PageData page = actTaskService.page(params); for (TaskDTO taskDTO : page.getList()) { if (!StringUtils.isEmpty(taskDTO.getAssignee())) { diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index 51f33c83..6f9eaf71 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -145,7 +145,7 @@ public class TAbilityApplicationController { @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), @ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "ended", value = "是否完成(true, false)", paramType = "query", dataType = "String") - } + } ) public Result> myPage(@ApiIgnore @RequestParam Map params) { final UserDetail user = SecurityUser.getUser(); diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java index f763b77f..8323156e 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java @@ -1,7 +1,6 @@ package io.renren.modules.processForm.service; import io.renren.common.service.CrudService; -import io.renren.common.utils.Result; import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.entity.TAbilityApplicationEntity; @@ -55,6 +54,7 @@ public interface TAbilityApplicationService extends CrudService { - + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/dto/SysNoticeManagementDTO.java b/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/dto/SysNoticeManagementDTO.java index 83900a2b..d1e6c583 100644 --- a/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/dto/SysNoticeManagementDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/dto/SysNoticeManagementDTO.java @@ -1,18 +1,17 @@ package io.renren.modules.sysnoticemanagement.dto; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.Date; /** -* 公告管理 -* -* @author dg 2498628697@qq.com -* @since 1.0 2022-12-01 -*/ + * 公告管理 + * + * @author dg 2498628697@qq.com + * @since 1.0 2022-12-01 + */ @Data @ApiModel(value = "公告管理") public class SysNoticeManagementDTO implements Serializable { diff --git a/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/entity/SysNoticeManagementEntity.java b/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/entity/SysNoticeManagementEntity.java index e6d4ec67..9f266977 100644 --- a/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/entity/SysNoticeManagementEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/entity/SysNoticeManagementEntity.java @@ -1,8 +1,11 @@ package io.renren.modules.sysnoticemanagement.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import com.baomidou.mybatisplus.annotation.*; import java.util.Date; @@ -13,18 +16,18 @@ import java.util.Date; * @since 1.0 2022-12-01 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("sys_notice_management") public class SysNoticeManagementEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - @TableId - private Long id; - private String content; - private Date publishTime; - private Integer delFlag; - @TableField(fill = FieldFill.INSERT) - private Date createDate; - @TableField(fill = FieldFill.INSERT) - private Long creator; + @TableId + private Long id; + private String content; + private Date publishTime; + private Integer delFlag; + @TableField(fill = FieldFill.INSERT) + private Date createDate; + @TableField(fill = FieldFill.INSERT) + private Long creator; } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/service/impl/SysNoticeManagementServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/service/impl/SysNoticeManagementServiceImpl.java index 8fd9a4a5..54a240a3 100644 --- a/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/service/impl/SysNoticeManagementServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/service/impl/SysNoticeManagementServiceImpl.java @@ -23,7 +23,7 @@ import java.util.Map; public class SysNoticeManagementServiceImpl extends CrudServiceImpl implements SysNoticeManagementService { @Override - public QueryWrapper getWrapper(Map params){ + public QueryWrapper getWrapper(Map params) { QueryWrapper wrapper = new QueryWrapper<>(); if (params.get("days") != null) {