Ver Fonte

1、根据debug的优化

machaoyi há 1 ano atrás
pai
commit
0ad4f8c200
30 ficheiros alterados com 83 adições e 82 exclusões
  1. 2 1
      application/src/main/java/com/ctsi/Application.java
  2. 2 2
      application/src/main/java/com/ctsi/System/SysMenu/service/impl/SysMenuServiceImpl.java
  3. 2 2
      application/src/main/java/com/ctsi/System/SysOrg/service/impl/SysOrgServiceImpl.java
  4. 5 3
      application/src/main/java/com/ctsi/System/SysRole/service/impl/SysRoleServiceImpl.java
  5. 2 2
      application/src/main/java/com/ctsi/System/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java
  6. 1 2
      application/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java
  7. 5 3
      application/src/main/java/com/ctsi/System/SysUserDetail/service/impl/SysUserDetailServiceImpl.java
  8. 5 3
      application/src/main/java/com/ctsi/System/SysUserOrg/service/impl/SysUserOrgServiceImpl.java
  9. 2 2
      application/src/main/java/com/ctsi/System/SysUserRole/service/impl/SysUserRoleServiceImpl.java
  10. 0 2
      application/src/main/java/com/ctsi/config/MybatisPlusConfig.java
  11. 1 0
      application/src/main/resources/application.yml
  12. 1 0
      application/src/main/resources/logback-spring.xml
  13. 2 2
      core/src/main/java/com/ctsi/System/SysDic/controller/SysDicController.java
  14. 3 2
      core/src/main/java/com/ctsi/System/SysDic/entity/SysDic.java
  15. 1 1
      core/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.java
  16. 8 6
      core/src/main/java/com/ctsi/System/SysDic/service/impl/SysDicServiceImpl.java
  17. 2 2
      core/src/main/java/com/ctsi/System/SysDicItem/controller/SysDicItemController.java
  18. 3 2
      core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItem.java
  19. 0 2
      core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchVO.java
  20. 1 1
      core/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.java
  21. 9 9
      core/src/main/java/com/ctsi/System/SysDicItem/service/impl/SysDicItemServiceImpl.java
  22. 2 2
      work/src/main/java/com/ctsi/work/WorkAddr/controller/WorkAddrController.java
  23. 2 3
      work/src/main/java/com/ctsi/work/WorkAddr/entity/WorkAddr.java
  24. 1 1
      work/src/main/java/com/ctsi/work/WorkAddr/mapper/WorkAddrMapper.java
  25. 8 6
      work/src/main/java/com/ctsi/work/WorkAddr/service/impl/WorkAddrServiceImpl.java
  26. 2 2
      work/src/main/java/com/ctsi/work/WorkClock/controller/WorkClockController.java
  27. 3 3
      work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClock.java
  28. 0 3
      work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClockVO.java
  29. 1 2
      work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.java
  30. 7 11
      work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java

+ 2 - 1
application/src/main/java/com/ctsi/Application.java

@@ -2,6 +2,7 @@ package com.ctsi;
 
 import cn.dev33.satoken.SaManager;
 import cn.hutool.system.HostInfo;
+import org.apache.ibatis.annotations.Mapper;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,7 +12,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication(scanBasePackages = {"com.ctsi.*"})
-@MapperScan("com.ctsi.*.*.mapper")
+@MapperScan(basePackages = {"com.ctsi"}, annotationClass = Mapper.class)
 @EnableTransactionManagement
 public class Application {
     private static final Logger log = LoggerFactory.getLogger(Application.class);

+ 2 - 2
application/src/main/java/com/ctsi/System/SysMenu/service/impl/SysMenuServiceImpl.java

@@ -11,9 +11,9 @@ import com.ctsi.System.SysMenu.service.SysMenuService;
 import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
 import com.ctsi.System.SysUserRole.entity.SysUserRole;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -23,7 +23,7 @@ import java.util.*;
  */
 @Service
 public class SysMenuServiceImpl implements SysMenuService{
-    @Autowired
+    @Resource
     private SysMenuMapper sysMenuMapper;
 
     /**

+ 2 - 2
application/src/main/java/com/ctsi/System/SysOrg/service/impl/SysOrgServiceImpl.java

@@ -9,9 +9,9 @@ import com.ctsi.System.SysOrg.entity.SysOrg;
 import com.ctsi.System.SysOrg.mapper.SysOrgMapper;
 import com.ctsi.System.SysOrg.service.SysOrgService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -21,7 +21,7 @@ import java.util.*;
  */
 @Service
 public class SysOrgServiceImpl implements SysOrgService {
-    @Autowired
+    @Resource
     private SysOrgMapper sysOrgMapper;
     
     /** 

+ 5 - 3
application/src/main/java/com/ctsi/System/SysRole/service/impl/SysRoleServiceImpl.java

@@ -8,16 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.System.SysRole.entity.SysRole;
 import com.ctsi.System.SysRole.mapper.SysRoleMapper;
 import com.ctsi.System.SysRole.service.SysRoleService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
- /**
+
+import javax.annotation.Resource;
+
+/**
  * 角色表;(sys_role)表服务实现类
  * @author : machaoyi
  * @date : 2024-1-11
  */
 @Service
 public class SysRoleServiceImpl implements SysRoleService{
-    @Autowired
+    @Resource
     private SysRoleMapper sysRoleMapper;
     
     /** 

+ 2 - 2
application/src/main/java/com/ctsi/System/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java

@@ -9,9 +9,9 @@ import com.ctsi.System.SysRole.entity.VO.SysRoleMenuAddVO;
 import com.ctsi.System.SysRoleMenu.entity.SysRoleMenu;
 import com.ctsi.System.SysRoleMenu.mapper.SysRoleMenuMapper;
 import com.ctsi.System.SysRoleMenu.service.SysRoleMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,7 +22,7 @@ import java.util.List;
  */
 @Service
 public class SysRoleMenuServiceImpl implements SysRoleMenuService {
-    @Autowired
+    @Resource
     private SysRoleMenuMapper sysRoleMenuMapper;
     
     /** 

+ 1 - 2
application/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java

@@ -22,7 +22,6 @@ import com.ctsi.utils.PasswordEncoderUtil;
 import com.ctsi.utils.PasswordUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -35,7 +34,7 @@ import javax.annotation.Resource;
  */
 @Service
 public class SysUserServiceImpl implements SysUserService {
-    @Autowired
+    @Resource
     private SysUserMapper sysUserMapper;
     @Resource
     private SysUserRoleService sysUserRoleService;

+ 5 - 3
application/src/main/java/com/ctsi/System/SysUserDetail/service/impl/SysUserDetailServiceImpl.java

@@ -8,16 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.System.SysUserDetail.entity.SysUserDetail;
 import com.ctsi.System.SysUserDetail.mapper.SysUserDetailMapper;
 import com.ctsi.System.SysUserDetail.service.SysUserDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
- /**
+
+import javax.annotation.Resource;
+
+/**
  * 用户信息表;(sys_user_detail)表服务实现类
  * @author : machaoyi
  * @date : 2024-1-10
  */
 @Service
 public class SysUserDetailServiceImpl implements SysUserDetailService {
-    @Autowired
+    @Resource
     private SysUserDetailMapper sysUserDetailMapper;
     
     /** 

+ 5 - 3
application/src/main/java/com/ctsi/System/SysUserOrg/service/impl/SysUserOrgServiceImpl.java

@@ -7,16 +7,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.System.SysUserOrg.entity.SysUserOrg;
 import com.ctsi.System.SysUserOrg.mapper.SysUserOrgMapper;
 import com.ctsi.System.SysUserOrg.service.SysUserOrgService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
- /**
+
+import javax.annotation.Resource;
+
+/**
  * 用户部门表;(sys_user_org)表服务实现类
  * @author : machaoyi
  * @date : 2024-1-11
  */
 @Service
 public class SysUserOrgServiceImpl implements SysUserOrgService{
-    @Autowired
+    @Resource
     private SysUserOrgMapper sysUserOrgMapper;
     
     /** 

+ 2 - 2
application/src/main/java/com/ctsi/System/SysUserRole/service/impl/SysUserRoleServiceImpl.java

@@ -12,9 +12,9 @@ import com.ctsi.System.SysUserRole.entity.VO.SysUserRoleAddVO;
 import com.ctsi.System.SysUserRole.mapper.SysUserRoleMapper;
 import com.ctsi.System.SysUserRole.service.SysUserRoleService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Service
 public class SysUserRoleServiceImpl implements SysUserRoleService {
-    @Autowired
+    @Resource
     private SysUserRoleMapper sysUserRoleMapper;
     
     /** 

+ 0 - 2
application/src/main/java/com/ctsi/config/MybatisPlusConfig.java

@@ -3,12 +3,10 @@ package com.ctsi.config;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@MapperScan("com.ctsi.*.mapper")
 public class MybatisPlusConfig {
 
     /**

+ 1 - 0
application/src/main/resources/application.yml

@@ -12,3 +12,4 @@ mybatis-plus:
       logic-not-delete-value: 0
   configuration:
     log-impl: com.ctsi.log.MySlf4jImpl
+  mapper-locations: classpath:com/ctsi/**/mapper/*.xml

+ 1 - 0
application/src/main/resources/logback-spring.xml

@@ -58,6 +58,7 @@
     <logger name="com.netflix.turbine.monitor.cluster" level="INFO"/>
     <logger name="com.netflix.turbine.discovery" level="WARN"/>
     <logger name="org.reflections.Reflections" level="ERROR"/>
+    <logger name="Validator" level="INFO"/>
 
     <logger name="springfox.documentation" level="ERROR"/>
     <logger name="com.alibaba.nacos" level="ERROR"/>

+ 2 - 2
core/src/main/java/com/ctsi/System/SysDic/controller/SysDicController.java

@@ -1,6 +1,8 @@
 package com.ctsi.System.SysDic.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.System.SysDic.entity.SysDic;
+import com.ctsi.System.SysDic.service.SysDicService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
@@ -8,8 +10,6 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.System.SysDic.entity.SysDic;
-import com.ctsi.System.SysDic.service.SysDicService;
 
 import javax.annotation.Resource;
 

+ 3 - 2
core/src/main/java/com/ctsi/System/SysDic/entity/SysDic.java

@@ -1,11 +1,12 @@
 package com.ctsi.System.SysDic.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.utils.LongtoStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 import java.util.Date;
 

+ 1 - 1
core/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.System.SysDic.entity.SysDic;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.System.SysDic.entity.SysDic;
 
  /**
  * 字典表;(sys_dic)表数据库访问层

+ 8 - 6
core/src/main/java/com/ctsi/System/SysDic/service/impl/SysDicServiceImpl.java

@@ -1,23 +1,25 @@
 package com.ctsi.System.SysDic.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.System.SysDic.entity.SysDic;
 import com.ctsi.System.SysDic.mapper.SysDicMapper;
 import com.ctsi.System.SysDic.service.SysDicService;
- /**
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
  * 字典表;(sys_dic)表服务实现类
  * @author : machaoyi
  * @date : 2024-1-16
  */
 @Service
 public class SysDicServiceImpl implements SysDicService{
-    @Autowired
+    @Resource
     private SysDicMapper sysDicMapper;
     
     /** 

+ 2 - 2
core/src/main/java/com/ctsi/System/SysDicItem/controller/SysDicItemController.java

@@ -1,8 +1,10 @@
 package com.ctsi.System.SysDicItem.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.System.SysDicItem.entity.SysDicItem;
 import com.ctsi.System.SysDicItem.entity.SysDicItemSearchPO;
 import com.ctsi.System.SysDicItem.entity.SysDicItemSearchVO;
+import com.ctsi.System.SysDicItem.service.SysDicItemService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
@@ -10,8 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.System.SysDicItem.entity.SysDicItem;
-import com.ctsi.System.SysDicItem.service.SysDicItemService;
 
 import javax.annotation.Resource;
 import java.util.List;

+ 3 - 2
core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItem.java

@@ -1,11 +1,12 @@
 package com.ctsi.System.SysDicItem.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.utils.LongtoStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 import java.util.Date;
 

+ 0 - 2
core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchVO.java

@@ -1,6 +1,5 @@
 package com.ctsi.System.SysDicItem.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.utils.LongtoStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -9,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
 * 字典表;

+ 1 - 1
core/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.java

@@ -3,10 +3,10 @@ package com.ctsi.System.SysDicItem.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.System.SysDicItem.entity.SysDicItem;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.System.SysDicItem.entity.SysDicItem;
 
  /**
  * 字典项表;(sys_dic_item)表数据库访问层

+ 9 - 9
core/src/main/java/com/ctsi/System/SysDicItem/service/impl/SysDicItemServiceImpl.java

@@ -1,20 +1,20 @@
 package com.ctsi.System.SysDicItem.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.ctsi.System.SysDic.entity.SysDic;
-import com.ctsi.System.SysDicItem.entity.SysDicItemSearchPO;
-import com.ctsi.System.SysDicItem.entity.SysDicItemSearchVO;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.System.SysDic.entity.SysDic;
 import com.ctsi.System.SysDicItem.entity.SysDicItem;
+import com.ctsi.System.SysDicItem.entity.SysDicItemSearchPO;
+import com.ctsi.System.SysDicItem.entity.SysDicItemSearchVO;
 import com.ctsi.System.SysDicItem.mapper.SysDicItemMapper;
 import com.ctsi.System.SysDicItem.service.SysDicItemService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -24,7 +24,7 @@ import java.util.*;
  */
 @Service
 public class SysDicItemServiceImpl implements SysDicItemService{
-    @Autowired
+    @Resource
     private SysDicItemMapper sysDicItemMapper;
     
     /** 

+ 2 - 2
work/src/main/java/com/ctsi/work/WorkAddr/controller/WorkAddrController.java

@@ -4,14 +4,14 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
+import com.ctsi.work.WorkAddr.entity.WorkAddr;
+import com.ctsi.work.WorkAddr.service.WorkAddrService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.work.WorkAddr.entity.WorkAddr;
-import com.ctsi.work.WorkAddr.service.WorkAddrService;
 
 import javax.annotation.Resource;
 

+ 2 - 3
work/src/main/java/com/ctsi/work/WorkAddr/entity/WorkAddr.java

@@ -1,12 +1,11 @@
 package com.ctsi.work.WorkAddr.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.utils.LongtoStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.Max;
 import java.io.Serializable;

+ 1 - 1
work/src/main/java/com/ctsi/work/WorkAddr/mapper/WorkAddrMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.work.WorkAddr.entity.WorkAddr;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.work.WorkAddr.entity.WorkAddr;
 
  /**
  * 打卡地址表;(work_addr)表数据库访问层

+ 8 - 6
work/src/main/java/com/ctsi/work/WorkAddr/service/impl/WorkAddrServiceImpl.java

@@ -1,23 +1,25 @@
 package com.ctsi.work.WorkAddr.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.work.WorkAddr.entity.WorkAddr;
 import com.ctsi.work.WorkAddr.mapper.WorkAddrMapper;
 import com.ctsi.work.WorkAddr.service.WorkAddrService;
- /**
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
  * 打卡地址表;(work_addr)表服务实现类
  * @author : machaoyi
  * @date : 2024-1-17
  */
 @Service
 public class WorkAddrServiceImpl implements WorkAddrService{
-    @Autowired
+    @Resource
     private WorkAddrMapper workAddrMapper;
     
     /** 

+ 2 - 2
work/src/main/java/com/ctsi/work/WorkClock/controller/WorkClockController.java

@@ -7,16 +7,16 @@ import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import com.ctsi.work.WorkAddr.entity.WorkAddr;
 import com.ctsi.work.WorkAddr.service.WorkAddrService;
+import com.ctsi.work.WorkClock.entity.WorkClock;
 import com.ctsi.work.WorkClock.entity.WorkClockPO;
 import com.ctsi.work.WorkClock.entity.WorkClockVO;
+import com.ctsi.work.WorkClock.service.WorkClockService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.work.WorkClock.entity.WorkClock;
-import com.ctsi.work.WorkClock.service.WorkClockService;
 
 import javax.annotation.Resource;
 import java.util.Objects;

+ 3 - 3
work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClock.java

@@ -1,13 +1,13 @@
 package com.ctsi.work.WorkClock.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.utils.LongtoStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
-import java.util.Date;
 
  /**
  * 员工打卡表;

+ 0 - 3
work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClockVO.java

@@ -1,9 +1,6 @@
 package com.ctsi.work.WorkClock.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

+ 1 - 2
work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.java

@@ -1,13 +1,12 @@
 package com.ctsi.work.WorkClock.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.work.WorkClock.entity.WorkClock;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.work.WorkClock.entity.WorkClock;
 
  /**
  * 员工打卡表;(work_clock)表数据库访问层

+ 7 - 11
work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java

@@ -2,21 +2,17 @@ package com.ctsi.work.WorkClock.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.ctsi.System.SysDic.entity.SysDic;
-import com.ctsi.System.SysDicItem.entity.SysDicItem;
-import com.ctsi.utils.ApiResult;
-import com.ctsi.work.WorkAddr.service.WorkAddrService;
-import com.ctsi.work.WorkClock.entity.WorkClockPO;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.utils.ApiResult;
 import com.ctsi.work.WorkClock.entity.WorkClock;
+import com.ctsi.work.WorkClock.entity.WorkClockPO;
 import com.ctsi.work.WorkClock.mapper.WorkClockMapper;
 import com.ctsi.work.WorkClock.service.WorkClockService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -28,7 +24,7 @@ import java.util.List;
  */
 @Service
 public class WorkClockServiceImpl implements WorkClockService{
-    @Autowired
+    @Resource
     private WorkClockMapper workClockMapper;
     
     /**