xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-17 19:06:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改单词错误;修改Date为LocalDateTime;修改PageUtil工具类;添加.gitignore;

Browse Source
This commit is contained in:
Turbolisten 2020-09-07 18:30:26 +08:00
parent 486cc02088
commit 3e95e29b15
17 changed files with 79 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
smart-admin-service/.gitignore vendored Normal file
View File

@ -0,0 +1,31 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**
!**/src/test/**
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
### VS Code ###
.vscode/

5
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
/**
@ -28,11 +29,11 @@ public class BaseEntity {
/**
* 更新时间
*/
private Date updateTime;
private LocalDateTime updateTime;
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
}

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartDruidDataSourceConfig.java
View File

@ -65,7 +65,7 @@ public class SmartDruidDataSourceConfig {
@Value("${spring.datasource.time-between-eviction-runs-millis}")
long timeBetweenEvictionRunsMillis;
@Value("${spring.datasource.min-evictable-edle-time-millis}")
@Value("${spring.datasource.min-evictable-idle-time-millis}")
long minEvictableIdleTimeMillis;
@Value("${spring.datasource.filters}")

3
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java
View File

@ -9,6 +9,7 @@ import net.lab1024.smartadmin.util.SmartStringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -41,7 +42,7 @@ public class OrderOperateLogService {
}
orderOperateLogEntity.setOperateRemark(e.getOperateRemark());
orderOperateLogEntity.setExtData(e.getExtData());
orderOperateLogEntity.setCreateTime(new Date());
orderOperateLogEntity.setCreateTime(LocalDateTime.now());
orderOperateLogEntity.setOrderType(e.getOrderType().getType());
entityList.add(orderOperateLogEntity);
});

9
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java
View File

@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Date;
/**
@ -45,8 +46,8 @@ public class NoticeManage {
NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity();
recordEntity.setEmployeeId(requestToken.getRequestUserId());
recordEntity.setNoticeId(entity.getId());
recordEntity.setCreateTime(new Date());
recordEntity.setUpdateTime(new Date());
recordEntity.setCreateTime(LocalDateTime.now());
recordEntity.setUpdateTime(LocalDateTime.now());
noticeReceiveRecordDao.insert(recordEntity);
}
@ -60,8 +61,8 @@ public class NoticeManage {
NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity();
recordEntity.setEmployeeId(requestToken.getRequestUserId());
recordEntity.setNoticeId(noticeId);
recordEntity.setCreateTime(new Date());
recordEntity.setUpdateTime(new Date());
recordEntity.setCreateTime(LocalDateTime.now());
recordEntity.setUpdateTime(LocalDateTime.now());
noticeReceiveRecordDao.insert(recordEntity);
}

5
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java
View File

@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -108,8 +109,8 @@ public class NoticeService {
*/
public ResponseDTO<String> add(NoticeAddDTO addDTO, RequestTokenBO requestToken) {
NoticeEntity entity = SmartBeanUtil.copy(addDTO, NoticeEntity.class);
entity.setCreateTime(new Date());
entity.setUpdateTime(new Date());
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
entity.setCreateUser(requestToken.getRequestUserId());
entity.setSendStatus(JudgeEnum.NO.getValue());
entity.setDeleted(JudgeEnum.NO.getValue());

3
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java
View File

@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@ -190,7 +191,7 @@ public class FileService {
public ResponseDTO<String> saveFile(FileAddDTO addDTO, RequestTokenBO requestToken) {
FileEntity entity = SmartBeanUtil.copy(addDTO,FileEntity.class);
entity.setCreaterUser(requestToken.getRequestUserId());
entity.setCreateTime(new Date());
entity.setCreateTime(LocalDateTime.now());
fileDao.insert(entity);
return ResponseDTO.succ();
}

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorEntity.java
View File

@ -42,6 +42,4 @@ public class IdGeneratorEntity extends BaseEntity implements Serializable {
* 备注
*/
private String remark;
private Date updateTime;
private Date createTime;
}

5
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java
View File

@ -17,6 +17,7 @@ import org.springframework.scheduling.quartz.QuartzJobBean;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.time.LocalDateTime;
import java.util.Date;
/**
@ -53,8 +54,8 @@ public class QuartzTask extends QuartzJobBean {
paramsStr = params.toString();
taskLogEntity.setTaskParams(paramsStr);
}
taskLogEntity.setUpdateTime(new Date());
taskLogEntity.setCreateTime(new Date());
taskLogEntity.setUpdateTime(LocalDateTime.now());
taskLogEntity.setCreateTime(LocalDateTime.now());
//任务开始时间
long startTime = System.currentTimeMillis();
try {

7
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java
View File

@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@ -112,8 +113,8 @@ public class QuartzTaskService {
private ResponseDTO<String> saveTask(QuartzTaskDTO quartzTaskDTO) throws Exception {
QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class);
taskEntity.setTaskStatus(TaskStatusEnum.NORMAL.getStatus());
taskEntity.setUpdateTime(new Date());
taskEntity.setCreateTime(new Date());
taskEntity.setUpdateTime(LocalDateTime.now());
taskEntity.setCreateTime(LocalDateTime.now());
quartzTaskDao.insert(taskEntity);
this.createQuartzTask(scheduler, taskEntity);
return ResponseDTO.succ();
@ -127,7 +128,7 @@ public class QuartzTaskService {
QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class);
//任务状态不能更新
taskEntity.setTaskStatus(updateEntity.getTaskStatus());
taskEntity.setUpdateTime(new Date());
taskEntity.setUpdateTime(LocalDateTime.now());
quartzTaskDao.updateById(taskEntity);
this.updateQuartzTask(scheduler, taskEntity);
return ResponseDTO.succ();

5
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java
View File

@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -266,7 +267,7 @@ public class EmployeeService {
updateDTO.setLoginPwd(employeeEntity.getLoginPwd());
}
EmployeeEntity entity = SmartBeanUtil.copy(updateDTO, EmployeeEntity.class);
entity.setUpdateTime(new Date());
entity.setUpdateTime(LocalDateTime.now());
if (StringUtils.isEmpty(entity.getBirthday())) {
entity.setBirthday(null);
}
@ -280,7 +281,7 @@ public class EmployeeService {
entity.setIsLeave(employeeEntity.getIsLeave());
entity.setCreateUser(employeeEntity.getCreateUser());
entity.setCreateTime(employeeEntity.getCreateTime());
entity.setUpdateTime(new Date());
entity.setUpdateTime(LocalDateTime.now());
employeeDao.updateById(entity);
employeeCache.remove(employeeId);
return ResponseDTO.succ();

6
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartPageUtil.java
View File

@ -22,7 +22,7 @@ public class SmartPageUtil {
PageResultDTO<T> result = new PageResultDTO<>();
result.setPageNum(page.getCurrent());
result.setPageSize(page.getSize());
result.setTotal(Long.valueOf(page.getTotal()));
result.setTotal(page.getTotal());
result.setPages(page.getPages());
result.setList(page.getRecords());
return result;
@ -33,7 +33,7 @@ public class SmartPageUtil {
List<OrderItemDTO> orders = baseDTO.getOrders();
if (orders != null && !orders.isEmpty()) {
List<com.baomidou.mybatisplus.core.metadata.OrderItem> orderItemList = orders.stream().map(e -> convertOrderItem(e)).collect(Collectors.toList());
List<com.baomidou.mybatisplus.core.metadata.OrderItem> orderItemList = orders.stream().map(SmartPageUtil::convertOrderItem).collect(Collectors.toList());
page.setOrders(orderItemList);
}
page.setCurrent(baseDTO.getPageNum());
@ -90,7 +90,7 @@ public class SmartPageUtil {
PageResultDTO pageResultDTO = new PageResultDTO();
pageResultDTO.setPageNum(page.getCurrent());
pageResultDTO.setPageSize(page.getSize());
pageResultDTO.setTotal(Long.valueOf(page.getTotal()));
pageResultDTO.setTotal(page.getTotal());
pageResultDTO.setPages(page.getPages());
return pageResultDTO;
}

2
smart-admin-service/smart-admin-api/src/main/resources/banner.txt
View File

@ -4,5 +4,5 @@
____) | | | | | | (_| | | | |_ / ____ \ (_| | | | | | | | | | |
|_____/|_| |_| |_|\__,_|_| \__/_/ \_\__,_|_| |_| |_|_|_| |_|
SmartAdmin v1.1.0
SmartAdmin v1.2.0

8
smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
View File

@ -31,7 +31,7 @@ spring.datasource.min-idle=1
spring.datasource.max-active=10
spring.datasource.max-wait=60000
spring.datasource.time-between-eviction-runs-millis=60000
spring.datasource.min-evictable-edle-time-millis=300000
spring.datasource.min-evictable-idle-time-millis=300000
spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver
spring.datasource.filters=stat
spring.datasource.druid.username=druid
@ -44,16 +44,16 @@ spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.timeout=10000ms
spring.redis.password=
spring.redis.lettuce..pool.max-active=100
spring.redis.lettuce..pool.max-active=10
spring.redis.lettuce.pool.min-idle=5
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.max-wait=30000ms
########################## rest http pool #########################
#\u6700\u5927\u8FDE\u63A5\u6570
http.pool.max-total=100
http.pool.max-total=10
#\u5355\u8DEF\u7531\u6700\u5927\u8FDE\u63A5\u6570
http.pool.default-max-per-route=25
http.pool.default-max-per-route=5
#\u670D\u52A1\u5668\u8FD4\u56DE\u6570\u636E(response)\u7684\u65F6\u95F4
http.pool.socket-timeout=8000
#\u8FDE\u63A5\u4E0A\u670D\u52A1\u5668(\u63E1\u624B\u6210\u529F)\u7684\u65F6\u95F4

8
smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties
View File

@ -31,7 +31,7 @@ spring.datasource.min-idle=1
spring.datasource.max-active=10
spring.datasource.max-wait=60000
spring.datasource.time-between-eviction-runs-millis=60000
spring.datasource.min-evictable-edle-time-millis=300000
spring.datasource.min-evictable-idle-time-millis=300000
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.filters=stat
spring.datasource.druid.username=druid
@ -44,16 +44,16 @@ spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.timeout=10000ms
spring.redis.password=
spring.redis.lettuce..pool.max-active=100
spring.redis.lettuce..pool.max-active=10
spring.redis.lettuce.pool.min-idle=5
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.max-wait=30000ms
########################## rest http pool #########################
#\u6700\u5927\u8FDE\u63A5\u6570
http.pool.max-total=100
http.pool.max-total=10
#\u5355\u8DEF\u7531\u6700\u5927\u8FDE\u63A5\u6570
http.pool.default-max-per-route=25
http.pool.default-max-per-route=5
#\u670D\u52A1\u5668\u8FD4\u56DE\u6570\u636E(response)\u7684\u65F6\u95F4
http.pool.socket-timeout=8000
#\u8FDE\u63A5\u4E0A\u670D\u52A1\u5668(\u63E1\u624B\u6210\u529F)\u7684\u65F6\u95F4

8
smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
View File

@ -31,7 +31,7 @@ spring.datasource.min-idle=1
spring.datasource.max-active=10
spring.datasource.max-wait=60000
spring.datasource.time-between-eviction-runs-millis=60000
spring.datasource.min-evictable-edle-time-millis=300000
spring.datasource.min-evictable-idle-time-millis=300000
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.filters=stat
spring.datasource.druid.username=druid
@ -44,16 +44,16 @@ spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.timeout=10000ms
spring.redis.password=Gq123456@
spring.redis.lettuce..pool.max-active=100
spring.redis.lettuce..pool.max-active=10
spring.redis.lettuce.pool.min-idle=5
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.max-wait=30000ms
########################## rest http pool #########################
#\u6700\u5927\u8FDE\u63A5\u6570
http.pool.max-total=100
http.pool.max-total=10
#\u5355\u8DEF\u7531\u6700\u5927\u8FDE\u63A5\u6570
http.pool.default-max-per-route=25
http.pool.default-max-per-route=5
#\u670D\u52A1\u5668\u8FD4\u56DE\u6570\u636E(response)\u7684\u65F6\u95F4
http.pool.socket-timeout=8000
#\u8FDE\u63A5\u4E0A\u670D\u52A1\u5668(\u63E1\u624B\u6210\u529F)\u7684\u65F6\u95F4

8
smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties
View File

@ -31,7 +31,7 @@ spring.datasource.min-idle=1
spring.datasource.max-active=10
spring.datasource.max-wait=60000
spring.datasource.time-between-eviction-runs-millis=60000
spring.datasource.min-evictable-edle-time-millis=300000
spring.datasource.min-evictable-idle-time-millis=300000
spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver
spring.datasource.filters=stat
spring.datasource.druid.username=druid
@ -44,16 +44,16 @@ spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.timeout=10000ms
spring.redis.password=
spring.redis.lettuce..pool.max-active=100
spring.redis.lettuce..pool.max-active=10
spring.redis.lettuce.pool.min-idle=5
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.max-wait=30000ms
########################## rest http pool #########################
#\u6700\u5927\u8FDE\u63A5\u6570
http.pool.max-total=100
http.pool.max-total=10
#\u5355\u8DEF\u7531\u6700\u5927\u8FDE\u63A5\u6570
http.pool.default-max-per-route=25
http.pool.default-max-per-route=5
#\u670D\u52A1\u5668\u8FD4\u56DE\u6570\u636E(response)\u7684\u65F6\u95F4
http.pool.socket-timeout=8000
#\u8FDE\u63A5\u4E0A\u670D\u52A1\u5668(\u63E1\u624B\u6210\u529F)\u7684\u65F6\u95F4