fix&patch: 补丁info-edit,对代码规整修改
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good

This commit is contained in:
筱锋xiao_lfeng 2024-01-31 13:14:33 +08:00
parent de99fe1dc5
commit df143738db
No known key found for this signature in database
GPG Key ID: F693AA12AABBFA87
12 changed files with 26 additions and 43 deletions

View File

@ -3,7 +3,6 @@ package com.jsl.oa.config.redis;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.RedisStandaloneConfiguration; import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;

View File

@ -1,13 +1,10 @@
package com.jsl.oa.controllers; package com.jsl.oa.controllers;
import com.jsl.oa.common.constant.BusinessConstants;
import com.jsl.oa.services.MessageService; import com.jsl.oa.services.MessageService;
import com.jsl.oa.services.impl.MessageServiceImpl;
import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.BaseResponse;
import com.jsl.oa.utils.ErrorCode; import com.jsl.oa.utils.ErrorCode;
import com.jsl.oa.utils.JwtUtil; import com.jsl.oa.utils.JwtUtil;
import com.jsl.oa.utils.ResultUtil; import com.jsl.oa.utils.ResultUtil;
import com.jsl.oa.utils.redis.TokenRedisUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;

View File

@ -2,9 +2,7 @@ package com.jsl.oa.controllers;
import com.jsl.oa.model.voData.NewsAddVO; import com.jsl.oa.model.voData.NewsAddVO;
import com.jsl.oa.model.voData.PermissionEditVO;
import com.jsl.oa.services.NewsService; import com.jsl.oa.services.NewsService;
import com.jsl.oa.services.RoleService;
import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.BaseResponse;
import com.jsl.oa.utils.ErrorCode; import com.jsl.oa.utils.ErrorCode;
import com.jsl.oa.utils.Processing; import com.jsl.oa.utils.Processing;

View File

@ -2,7 +2,6 @@ package com.jsl.oa.dao;
import com.jsl.oa.mapper.NewsMapper; import com.jsl.oa.mapper.NewsMapper;
import com.jsl.oa.model.doData.NewsDO; import com.jsl.oa.model.doData.NewsDO;
import com.jsl.oa.model.voData.NewsAddVO;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

View File

@ -1,7 +1,6 @@
package com.jsl.oa.mapper; package com.jsl.oa.mapper;
import com.jsl.oa.model.doData.MessageDO; import com.jsl.oa.model.doData.MessageDO;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;
@ -24,6 +23,7 @@ public interface MessageMapper {
@Select("select count(*) from organize_oa.oa_message where uid = #{uid}") @Select("select count(*) from organize_oa.oa_message where uid = #{uid}")
Long count(Long uid); Long count(Long uid);
@Select("select * from organize_oa.oa_message where uid = #{uid}") //and created_at between #{begin} and #{end} limit #{start},#{pageSize}") @Select("select * from organize_oa.oa_message where uid = #{uid}")
//and created_at between #{begin} and #{end} limit #{start},#{pageSize}")
List<MessageDO> page(LocalDate begin, LocalDate end, Long uid, Long start, Long pageSize); List<MessageDO> page(LocalDate begin, LocalDate end, Long uid, Long start, Long pageSize);
} }

View File

@ -4,7 +4,6 @@ import com.jsl.oa.model.doData.ProjectCuttingDO;
import com.jsl.oa.model.doData.ProjectDO; import com.jsl.oa.model.doData.ProjectDO;
import com.jsl.oa.model.doData.ProjectUserDO; import com.jsl.oa.model.doData.ProjectUserDO;
import com.jsl.oa.model.voData.ProjectInfoVO; import com.jsl.oa.model.voData.ProjectInfoVO;
import com.jsl.oa.utils.BaseResponse;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import java.util.List; import java.util.List;

View File

@ -1,7 +1,7 @@
package com.jsl.oa.model.voData; package com.jsl.oa.model.voData;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data

View File

@ -1,11 +1,9 @@
package com.jsl.oa.model.voData; package com.jsl.oa.model.voData;
import lombok.Data; import lombok.Data;
import lombok.Value;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.sql.Timestamp;
@Data @Data

View File

@ -5,7 +5,6 @@ import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.sql.Timestamp;
@Data @Data
public class ProjectCuttingEditVO { public class ProjectCuttingEditVO {

View File

@ -1,9 +1,6 @@
package com.jsl.oa.model.voData; package com.jsl.oa.model.voData;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;

View File

@ -3,9 +3,7 @@ package com.jsl.oa.model.voData;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.sql.Timestamp;
@Setter @Setter
@Getter @Getter

View File

@ -1,6 +1,5 @@
package com.jsl.oa.services; package com.jsl.oa.services;
import com.jsl.oa.model.doData.info.ProjectShowDO;
import com.jsl.oa.model.voData.ProjectCuttingAddVO; import com.jsl.oa.model.voData.ProjectCuttingAddVO;
import com.jsl.oa.model.voData.ProjectCuttingEditVO; import com.jsl.oa.model.voData.ProjectCuttingEditVO;
import com.jsl.oa.model.voData.ProjectInfoVO; import com.jsl.oa.model.voData.ProjectInfoVO;