diff --git a/common/src/main/java/com/jeesite/common/ueditor/define/State.java b/common/src/main/java/com/jeesite/common/ueditor/define/State.java index 1c5260f2..18b91b68 100644 --- a/common/src/main/java/com/jeesite/common/ueditor/define/State.java +++ b/common/src/main/java/com/jeesite/common/ueditor/define/State.java @@ -6,12 +6,12 @@ package com.jeesite.common.ueditor.define; */ public interface State { - public boolean isSuccess (); + boolean isSuccess(); - public void putInfo( String name, String val ); + void putInfo(String name, String val); - public void putInfo ( String name, long val ); + void putInfo(String name, long val); - public String toJSONString (); + String toJSONString(); } diff --git a/common/src/main/java/com/jeesite/common/utils/excel/fieldtype/FieldType.java b/common/src/main/java/com/jeesite/common/utils/excel/fieldtype/FieldType.java index d009773b..21cceab7 100644 --- a/common/src/main/java/com/jeesite/common/utils/excel/fieldtype/FieldType.java +++ b/common/src/main/java/com/jeesite/common/utils/excel/fieldtype/FieldType.java @@ -14,21 +14,21 @@ public interface FieldType { /** * 获取对象值（导入） */ - default public Object getValue(String val) { + default Object getValue(String val) { return null; } /** * 获取对象值（导出） */ - default public String setValue(Object val) { + default String setValue(Object val) { return null; } /** * 获取对象值格式（导出） */ - default public String getDataFormat() { + default String getDataFormat() { return null; } diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/dao/ArticleDao.java b/modules/cms/src/main/java/com/jeesite/modules/cms/dao/ArticleDao.java index ad45b4f3..a9b8b5f4 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/dao/ArticleDao.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/dao/ArticleDao.java @@ -16,8 +16,8 @@ import com.jeesite.modules.cms.entity.Article; @MyBatisDao public interface ArticleDao extends CrudDao
{ - public long updateExpiredWeight(Article article); + long updateExpiredWeight(Article article); - public long updateHitsAddOne(String id); + long updateHitsAddOne(String id); } \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/dao/MsgInnerRecordDao.java b/modules/core/src/main/java/com/jeesite/modules/msg/dao/MsgInnerRecordDao.java index a2fa3bda..12726092 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/dao/MsgInnerRecordDao.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/dao/MsgInnerRecordDao.java @@ -21,6 +21,6 @@ public interface MsgInnerRecordDao extends CrudDao { /** * 根据消息编号和接受者用户名更新读取状态 */ - public long updateReadStatus(MsgInnerRecord msgInnerRecord); + long updateReadStatus(MsgInnerRecord msgInnerRecord); } \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java index 4abb51e0..a8a4df55 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java @@ -23,21 +23,21 @@ public interface EmpUserDao extends CrudDao { /** * 查询全部用户，仅返回基本信息 */ - public List findUserList(EmpUser empUser); + List findUserList(EmpUser empUser); /** * 根据部门编码查询用户，仅返回基本信息 */ - public List findUserListByOfficeCodes(EmpUser empUser); + List findUserListByOfficeCodes(EmpUser empUser); /** * 根据角色编码查询用户，仅返回基本信息 */ - public List findUserListByRoleCodes(EmpUser empUser); + List findUserListByRoleCodes(EmpUser empUser); /** * 根据岗位编码查询用户，仅返回基本信息 */ - public List findUserListByPostCodes(EmpUser empUser); + List findUserListByPostCodes(EmpUser empUser); } \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/AreaService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/AreaService.java index 3bd82a2f..e6ed9edf 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/AreaService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/AreaService.java @@ -4,11 +4,11 @@ */ package com.jeesite.modules.sys.service; -import java.util.List; - import com.jeesite.common.service.api.TreeServiceApi; import com.jeesite.modules.sys.entity.Area; +import java.util.List; + /** * 行政区划Service * @author ThinkGem @@ -20,24 +20,24 @@ public interface AreaService extends TreeServiceApi { * 获取区划 */ @Override - public Area get(Area area); + Area get(Area area); /** * 查询区划 */ @Override - public List findList(Area area); + List findList(Area area); /** * 保存区划 */ @Override - public void save(Area area); + void save(Area area); /** * 删除区划 */ @Override - public void delete(Area area); + void delete(Area area); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/CompanyService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/CompanyService.java index f01ceafa..848d1707 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/CompanyService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/CompanyService.java @@ -4,11 +4,11 @@ */ package com.jeesite.modules.sys.service; -import java.util.List; - import com.jeesite.common.service.api.TreeServiceApi; import com.jeesite.modules.sys.entity.Company; +import java.util.List; + /** * 公司管理Service * @author ThinkGem @@ -20,36 +20,36 @@ public interface CompanyService extends TreeServiceApi { * 获取单条数据 */ @Override - public Company get(Company company); + Company get(Company company); /** * 添加数据权限过滤条件 */ @Override - public void addDataScopeFilter(Company company, String ctrlPermi); + void addDataScopeFilter(Company company, String ctrlPermi); /** * 查询公司列表 */ @Override - public List findList(Company company); + List findList(Company company); /** * 保存公司 */ @Override - public void save(Company company); + void save(Company company); /** * 删除公司 */ @Override - public void delete(Company company); + void delete(Company company); /** * 停用当前节点 */ @Override - public void updateStatus(Company company); + void updateStatus(Company company); } \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java index 2ca2343c..4930e8c4 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java @@ -4,13 +4,12 @@ */ package com.jeesite.modules.sys.service; -import java.util.List; - -import org.springframework.web.multipart.MultipartFile; - import com.jeesite.common.entity.Page; import com.jeesite.common.service.api.CrudServiceApi; import com.jeesite.modules.sys.entity.EmpUser; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; /** * 员工管理Service @@ -23,7 +22,7 @@ public interface EmpUserService extends CrudServiceApi { * 获取单条数据 */ @Override - public EmpUser get(EmpUser empUser); + EmpUser get(EmpUser empUser); /** * 添加数据权限过滤条件 @@ -31,57 +30,57 @@ public interface EmpUserService extends CrudServiceApi { * @param ctrlPermi 控制权限类型（拥有的数据权限：DataScope.CTRL_PERMI_HAVE、可管理的数据权限：DataScope.CTRL_PERMI_HAVE） */ @Override - public void addDataScopeFilter(EmpUser empUser, String ctrlPermi); + void addDataScopeFilter(EmpUser empUser, String ctrlPermi); /** * 分页查询数据 */ @Override - public Page findPage(EmpUser empUser); + Page findPage(EmpUser empUser); /** * 查询全部用户，仅返回基本信息 */ - public List findUserList(EmpUser empUser); + List findUserList(EmpUser empUser); /** * 根据部门编码查询用户，仅返回基本信息 */ - public List findUserListByOfficeCodes(EmpUser empUser); + List findUserListByOfficeCodes(EmpUser empUser); /** * 根据角色编码查询用户，仅返回基本信息 */ - public List findUserListByRoleCodes(EmpUser empUser); + List findUserListByRoleCodes(EmpUser empUser); /** * 根据岗位编码查询用户，仅返回基本信息 */ - public List findUserListByPostCodes(EmpUser empUser); + List findUserListByPostCodes(EmpUser empUser); /** * 保存用户员工 */ @Override - public void save(EmpUser user); + void save(EmpUser user); /** * 导入用户数据 * @param file 导入的用户数据文件 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 */ - public String importData(MultipartFile file, Boolean isUpdateSupport); + String importData(MultipartFile file, Boolean isUpdateSupport); /** * 更新状态 */ @Override - public void updateStatus(EmpUser empUser); + void updateStatus(EmpUser empUser); /** * 删除用户 */ @Override - public void delete(EmpUser empUser); + void delete(EmpUser empUser); } \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java index 31771001..70ccce4f 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java @@ -4,14 +4,14 @@ */ package com.jeesite.modules.sys.service; -import java.util.List; - import com.jeesite.common.entity.Page; import com.jeesite.common.service.api.CrudServiceApi; import com.jeesite.modules.sys.entity.Employee; import com.jeesite.modules.sys.entity.EmployeeOffice; import com.jeesite.modules.sys.entity.EmployeePost; +import java.util.List; + /** * 员工管理Service * @author ThinkGem @@ -23,39 +23,39 @@ public interface EmployeeService extends CrudServiceApi { * 获取单条数据 */ @Override - public Employee get(Employee employee); + Employee get(Employee employee); /** * 根据工号获取数据 */ - public Employee getByEmpNo(Employee employee); + Employee getByEmpNo(Employee employee); /** * 查询分页数据 */ @Override - public Page findPage(Employee employee); + Page findPage(Employee employee); /** * 保存数据（插入或更新） */ @Override - public void save(Employee employee); + void save(Employee employee); /** * 删除数据 */ @Override - public void delete(Employee employee); + void delete(Employee employee); /** * 查询当前员工关联的岗位信息 */ - public List findEmployeePostList(Employee employee); + List findEmployeePostList(Employee employee); /** * 查询当前员工关联的附属机构信息 */ - public List findEmployeeOfficeList(Employee employee); + List findEmployeeOfficeList(Employee employee); } \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java index 55bde5af..986e2c49 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java @@ -19,11 +19,11 @@ public interface LogService extends CrudServiceApi { * 查询日志记录 */ @Override - public Page findPage(Log log); + Page findPage(Log log); /** * 不使用数据库事务，执行插入日志 */ - public void insertLog(Log entity); + void insertLog(Log entity); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/OfficeService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/OfficeService.java index cd042953..667f1b08 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/OfficeService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/OfficeService.java @@ -22,43 +22,43 @@ public interface OfficeService extends TreeServiceApi { * 获取单条数据 */ @Override - public Office get(Office office); + Office get(Office office); /** * 添加数据权限过滤条件 */ @Override - public void addDataScopeFilter(Office office, String ctrlPermi); + void addDataScopeFilter(Office office, String ctrlPermi); /** * 查询组织机构列表 */ @Override - public List findList(Office office); + List findList(Office office); /** * 保存数据（插入或更新） */ @Override - public void save(Office office); + void save(Office office); /** * 导入机构数据 * @param file 导入的用户数据文件 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 */ - public String importData(MultipartFile file, Boolean isUpdateSupport); + String importData(MultipartFile file, Boolean isUpdateSupport); /** * 更新部门状态 */ @Override - public void updateStatus(Office office); + void updateStatus(Office office); /** * 删除数据 */ @Override - public void delete(Office office); + void delete(Office office); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java index 920f3fff..5c63d657 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java @@ -19,35 +19,35 @@ public interface PostService extends CrudServiceApi { * 查询岗位 */ @Override - public Post get(Post post); + Post get(Post post); /** * 根据名称查询岗位 */ - public Post getByPostName(Post post); + Post getByPostName(Post post); /** * 查询岗位 */ @Override - public Page findPage(Post post); + Page findPage(Post post); /** * 保存岗位 */ @Override - public void save(Post post); + void save(Post post); /** * 更新岗位状态 */ @Override - public void updateStatus(Post post); + void updateStatus(Post post); /** * 删除岗位 */ @Override - public void delete(Post post); + void delete(Post post); } \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java b/web-api/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java index 93ba7f35..5f73cfd0 100644 --- a/web-api/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java +++ b/web-api/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java @@ -4,13 +4,13 @@ */ package com.jeesite.modules.test.dao; -import java.util.List; -import java.util.Map; - import com.jeesite.common.dao.CrudDao; import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.modules.test.entity.TestData; +import java.util.List; +import java.util.Map; + /** * 测试数据DAO接口 * @author ThinkGem @@ -22,6 +22,6 @@ public interface TestDataDao extends CrudDao { /** * 演示Map参数和返回值，支持分页 */ - public List> findListForMap(Map params); + List> findListForMap(Map params); } \ No newline at end of file diff --git a/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java b/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java index 93ba7f35..5f73cfd0 100644 --- a/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java +++ b/web-fast/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java @@ -4,13 +4,13 @@ */ package com.jeesite.modules.test.dao; -import java.util.List; -import java.util.Map; - import com.jeesite.common.dao.CrudDao; import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.modules.test.entity.TestData; +import java.util.List; +import java.util.Map; + /** * 测试数据DAO接口 * @author ThinkGem @@ -22,6 +22,6 @@ public interface TestDataDao extends CrudDao { /** * 演示Map参数和返回值，支持分页 */ - public List> findListForMap(Map params); + List> findListForMap(Map params); } \ No newline at end of file diff --git a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java b/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java index 93ba7f35..52aea481 100644 --- a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java +++ b/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java @@ -22,6 +22,6 @@ public interface TestDataDao extends CrudDao { /** * 演示Map参数和返回值，支持分页 */ - public List> findListForMap(Map params); + List> findListForMap(Map params); } \ No newline at end of file