youxiw2000 / trash · Commits

Commit ae103c5f29cee61dd36b924320edc19b2f968aac

Authored by 273548560@qq.com
1 parent c0517e7e
build: skipped

11

Inline Side-by-side
Showing 100 changed files with 992 additions and 511 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 182 files are displayed.

trash-activiti/src/main/java/com/trash/activiti/mapper/ActWorkflowFormDataMapper.java
  View file @ae103c5
... ... @@ -23,14 +23,14 @@ public interface ActWorkflowFormDataMapper
23 23 * @param id 动态单ID
24 24 * @return 动态单
25 25 */
26   - public ActWorkflowFormData selectActWorkflowFormDataById(Long id);
  26 + ActWorkflowFormData selectActWorkflowFormDataById(Long id);
27 27 /**
28 28 * 查询动态单
29 29 *
30 30 * @param businessKey 动态单ID
31 31 * @return 动态单
32 32 */
33   - public List<ActWorkflowFormData> selectActWorkflowFormDataByBusinessKey(String businessKey);
  33 + List<ActWorkflowFormData> selectActWorkflowFormDataByBusinessKey(String businessKey);
34 34  
35 35 /**
36 36 * 查询动态单列表
... ... @@ -38,7 +38,7 @@ public interface ActWorkflowFormDataMapper
38 38 * @param ActWorkflowFormData 动态单
39 39 * @return 动态单集合
40 40 */
41   - public List<ActWorkflowFormData> selectActWorkflowFormDataList(ActWorkflowFormData ActWorkflowFormData);
  41 + List<ActWorkflowFormData> selectActWorkflowFormDataList(ActWorkflowFormData ActWorkflowFormData);
42 42  
43 43 /**
44 44 * 新增动态单
... ... @@ -46,7 +46,7 @@ public interface ActWorkflowFormDataMapper
46 46 * @param ActWorkflowFormData 动态单
47 47 * @return 结果
48 48 */
49   - public int insertActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData);
  49 + int insertActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData);
50 50  
51 51  
52 52 /**
... ... @@ -55,7 +55,7 @@ public interface ActWorkflowFormDataMapper
55 55 * @param
56 56 * @return 结果
57 57 */
58   - public int insertActWorkflowFormDatas(@Param("createBy") String createBy, @Param("ActWorkflowFormData")List<ActWorkflowFormData> ActWorkflowFormData, Date date ,String createName);
  58 + int insertActWorkflowFormDatas(@Param("createBy") String createBy, @Param("ActWorkflowFormData") List<ActWorkflowFormData> ActWorkflowFormData, Date date, String createName);
59 59  
60 60  
61 61  
... ... @@ -66,7 +66,7 @@ public interface ActWorkflowFormDataMapper
66 66 * @param ActWorkflowFormData 动态单
67 67 * @return 结果
68 68 */
69   - public int updateActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData);
  69 + int updateActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData);
70 70  
71 71 /**
72 72 * 删除动态单
... ... @@ -74,7 +74,7 @@ public interface ActWorkflowFormDataMapper
74 74 * @param id 动态单ID
75 75 * @return 结果
76 76 */
77   - public int deleteActWorkflowFormDataById(Long id);
  77 + int deleteActWorkflowFormDataById(Long id);
78 78  
79 79 /**
80 80 * 批量删除动态单
... ... @@ -82,5 +82,5 @@ public interface ActWorkflowFormDataMapper
82 82 * @param ids 需要删除的数据ID
83 83 * @return 结果
84 84 */
85   - public int deleteActWorkflowFormDataByIds(Long[] ids);
  85 + int deleteActWorkflowFormDataByIds(Long[] ids);
86 86 }
... ...
trash-activiti/src/main/java/com/trash/activiti/service/IActTaskService.java
  View file @ae103c5
... ... @@ -9,9 +9,9 @@ import java.text.ParseException;
9 9 import java.util.List;
10 10  
11 11 public interface IActTaskService {
12   - public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain);
13   - public List<String>formDataShow(String taskID);
14   - public int formDataSave(String taskID, List<ActWorkflowFormDataDTO> awfs) throws ParseException;
  12 + Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain);
  13 + List<String>formDataShow(String taskID);
  14 + int formDataSave(String taskID, List<ActWorkflowFormDataDTO> awfs) throws ParseException;
15 15  
16 16 Page<ActTaskDTO> selectRuntimeTaskHistoryDefinitionList(PageDomain pageDomain);
17 17  
... ...
trash-activiti/src/main/java/com/trash/activiti/service/IActWorkflowFormDataService.java
  View file @ae103c5
... ... @@ -18,9 +18,9 @@ public interface IActWorkflowFormDataService
18 18 * @param id 动态单ID
19 19 * @return 动态单
20 20 */
21   - public ActWorkflowFormData selectActWorkflowFormDataById(Long id);
  21 + ActWorkflowFormData selectActWorkflowFormDataById(Long id);
22 22  
23   - public List<ActWorkflowFormData> selectActWorkflowFormDataByBusinessKey(String businessKey);
  23 + List<ActWorkflowFormData> selectActWorkflowFormDataByBusinessKey(String businessKey);
24 24  
25 25 /**
26 26 * 查询动态单列表
... ... @@ -28,7 +28,7 @@ public interface IActWorkflowFormDataService
28 28 * @param ActWorkflowFormData 动态单
29 29 * @return 动态单集合
30 30 */
31   - public List<ActWorkflowFormData> selectActWorkflowFormDataList(ActWorkflowFormData ActWorkflowFormData);
  31 + List<ActWorkflowFormData> selectActWorkflowFormDataList(ActWorkflowFormData ActWorkflowFormData);
32 32  
33 33 /**
34 34 * 新增动态单
... ... @@ -36,14 +36,14 @@ public interface IActWorkflowFormDataService
36 36 * @param ActWorkflowFormData 动态单
37 37 * @return 结果
38 38 */
39   - public int insertActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData);
  39 + int insertActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData);
40 40  
41 41 /**
42 42 * 新增动态单集合
43 43 * @param ActWorkflowFormDatas 动态表单集合
44 44 * @return
45 45 */
46   - public int insertActWorkflowFormDatas(List<ActWorkflowFormData> ActWorkflowFormDatas);
  46 + int insertActWorkflowFormDatas(List<ActWorkflowFormData> ActWorkflowFormDatas);
47 47  
48 48 /**
49 49 * 修改动态单
... ... @@ -51,7 +51,7 @@ public interface IActWorkflowFormDataService
51 51 * @param ActWorkflowFormData 动态单
52 52 * @return 结果
53 53 */
54   - public int updateActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData);
  54 + int updateActWorkflowFormData(ActWorkflowFormData ActWorkflowFormData);
55 55  
56 56 /**
57 57 * 批量删除动态单
... ... @@ -59,7 +59,7 @@ public interface IActWorkflowFormDataService
59 59 * @param ids 需要删除的动态单ID
60 60 * @return 结果
61 61 */
62   - public int deleteActWorkflowFormDataByIds(Long[] ids);
  62 + int deleteActWorkflowFormDataByIds(Long[] ids);
63 63  
64 64 /**
65 65 * 删除动态单信息
... ... @@ -67,5 +67,5 @@ public interface IActWorkflowFormDataService
67 67 * @param id 动态单ID
68 68 * @return 结果
69 69 */
70   - public int deleteActWorkflowFormDataById(Long id);
  70 + int deleteActWorkflowFormDataById(Long id);
71 71 }
... ...
trash-activiti/src/main/java/com/trash/activiti/service/IActivitiHistoryService.java
  View file @ae103c5
... ... @@ -3,5 +3,5 @@ package com.trash.activiti.service;
3 3 import com.trash.activiti.domain.dto.ActivitiHighLineDTO;
4 4  
5 5 public interface IActivitiHistoryService {
6   - public ActivitiHighLineDTO gethighLine(String instanceId);
  6 + ActivitiHighLineDTO gethighLine(String instanceId);
7 7 }
... ...
trash-activiti/src/main/java/com/trash/activiti/service/IFormHistoryDataService.java
  View file @ae103c5
... ... @@ -12,5 +12,5 @@ import com.trash.activiti.domain.dto.HistoryDataDTO;
12 12 */
13 13 public interface IFormHistoryDataService {
14 14  
15   - public List<HistoryDataDTO> historyDataShow(String instanceId);
  15 + List<HistoryDataDTO> historyDataShow(String instanceId);
16 16 }
... ...
trash-activiti/src/main/java/com/trash/activiti/service/IProcessDefinitionService.java
  View file @ae103c5
... ... @@ -24,41 +24,41 @@ public interface IProcessDefinitionService {
24 24 * @param processDefinition
25 25 * @return Page 分页信息
26 26 */
27   - public Page<ProcessDefinitionDTO> selectProcessDefinitionList(ProcessDefinitionDTO processDefinition, PageDomain pageDomain);
28   - public DefinitionIdDTO getDefinitionsByInstanceId(String instanceId);
  27 + Page<ProcessDefinitionDTO> selectProcessDefinitionList(ProcessDefinitionDTO processDefinition, PageDomain pageDomain);
  28 + DefinitionIdDTO getDefinitionsByInstanceId(String instanceId);
29 29 /**
30 30 * 删除流程定义
31 31 * @param id
32 32 * @return
33 33 */
34   - public int deleteProcessDefinitionById(String id);
  34 + int deleteProcessDefinitionById(String id);
35 35 /**
36 36 * 上传并部署流程定义
37 37 * @param file
38 38 * @return
39 39 * @throws IOException
40 40 */
41   - public void uploadStreamAndDeployment(MultipartFile file) throws IOException;
  41 + void uploadStreamAndDeployment(MultipartFile file) throws IOException;
42 42 /**
43 43 * 启动挂起流程流程定义
44 44 * @param id 流程定义id
45 45 * @param suspendState 流程状态
46 46 * @return
47 47 */
48   - public void suspendOrActiveApply(String id, Integer suspendState);
  48 + void suspendOrActiveApply(String id, Integer suspendState);
49 49  
50 50 /**
51 51 * 上传流程流程定义
52 52 * @param multipartFile
53 53 * @return
54 54 */
55   - public String upload(MultipartFile multipartFile) throws IOException;
  55 + String upload(MultipartFile multipartFile) throws IOException;
56 56 /**
57 57 * 通过stringBPMN添加流程定义
58 58 * @param stringBPMN
59 59 * @return
60 60 */
61   - public void addDeploymentByString(String stringBPMN );
  61 + void addDeploymentByString(String stringBPMN);
62 62  
63 63 /**
64 64 * 获取流程定义XML
... ... @@ -66,5 +66,5 @@ public interface IProcessDefinitionService {
66 66 * @param deploymentId
67 67 * @param resourceName
68 68 */
69   - public void getProcessDefineXML(HttpServletResponse response, String deploymentId,String resourceName) throws IOException;
  69 + void getProcessDefineXML(HttpServletResponse response, String deploymentId, String resourceName) throws IOException;
70 70 }
... ...
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @ae103c5
... ... @@ -67,22 +67,22 @@ public class ActTaskServiceImpl implements IActTaskService {
67 67 UserGroupManager userGroupManager;
68 68  
69 69 HistoricProcessInstanceQuery processInstanceQuery;
70   -
71   -
  70 +
  71 +
72 72  
73 73 @Override
74 74 public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) {
75 75 Page<ActTaskDTO> list = new Page<ActTaskDTO>();
76   -
77   - List<String> posts = new ArrayList<>();
78   - posts.add("4");
79   - SecurityUtils.getLoginUser().getUser().setPostIds(posts);
80   - List<String> roles = new ArrayList<>();
81   - roles.add("7");
82   - SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
  76 +
  77 +// List<String> posts = new ArrayList<>();
  78 +// posts.add("4");
  79 +// SecurityUtils.getLoginUser().getUser().setPostIds(posts);
  80 +// List<String> roles = new ArrayList<>();
  81 +// posts.add("7");
  82 +// SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
83 83  
84 84 org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
85   -
  85 +
86 86 List<Task> tasks = pageTasks.getContent();
87 87 int totalItems = pageTasks.getTotalItems();
88 88 list.setTotal(totalItems);
... ... @@ -247,8 +247,8 @@ public class ActTaskServiceImpl implements IActTaskService {
247 247  
248 248  
249 249 List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); //测试 当前用户为审批用户
250   -
251   -
  250 +
  251 +
252 252  
253 253 // 写入数据库
254 254 return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds);
... ...
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
  View file @ae103c5
... ... @@ -28,7 +28,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
28 28  
29 29  
30 30  
31   - private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  31 + private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
32 32  
33 33 @Override
34 34 public List<HistoryDataDTO> historyDataShow(String businessKey) {
... ...
trash-admin/src/main/java/com/trash/web/controller/system/SysDeptController.java
  View file @ae103c5
... ... @@ -59,7 +59,7 @@ public class SysDeptController extends BaseController
59 59 Iterator<SysDept> it = depts.iterator();
60 60 while (it.hasNext())
61 61 {
62   - SysDept d = (SysDept) it.next();
  62 + SysDept d = it.next();
63 63 if (d.getDeptId().intValue() == deptId
64 64 || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
65 65 {
... ...
trash-admin/src/main/resources/application-dev.yml
  View file @ae103c5
... ... @@ -9,8 +9,9 @@ trash:
9 9 # 实例演示开关
10 10 demoEnabled: true
11 11 # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
12   - profile: E:/trash/uploadPath
13   - # 获取ip地址开关
  12 +# profile: E:/trash/uploadPath
  13 + profile: D:/work/project/Documents/uploadPath/trash
  14 +# 获取ip地址开关
14 15 addressEnabled: false
15 16 # 验证码类型 math 数组计算 char 字符验证
16 17 captchaType: math
... ... @@ -26,7 +27,8 @@ spring:
26 27 master:
27 28 url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
28 29 username: root
29   - password: root
  30 +# password: root
  31 + password: asd0731.
30 32 # 从库数据源
31 33 slave:
32 34 # 从数据源开关/默认关闭
... ... @@ -80,7 +82,7 @@ spring:
80 82 # 端口，默认为6379
81 83 port: 6379
82 84 # 密码
83   - password:
  85 + password: bsth123
84 86 # 连接超时时间
85 87 timeout: 10s
86 88 database: 10
... ...
trash-admin/src/main/resources/logback.xml
  View file @ae103c5
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <configuration>
3 3 <!-- 日志存放路径 -->
4   - <property name="log.path" value="/home/trash/logs" />
  4 +<!-- <property name="log.path" value="/home/trash/logs" />-->
  5 + <property name="log.path" value="D:/work/project/logs/trash" />
5 6 <!-- 日志输出格式 -->
6 7 <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
7 8  
... ...
trash-common/src/main/java/com/trash/common/annotation/DataScope.java
  View file @ae103c5
... ... @@ -19,10 +19,10 @@ public @interface DataScope
19 19 /**
20 20 * 部门表的别名
21 21 */
22   - public String deptAlias() default "";
  22 + String deptAlias() default "";
23 23  
24 24 /**
25 25 * 用户表的别名
26 26 */
27   - public String userAlias() default "";
  27 + String userAlias() default "";
28 28 }
... ...
trash-common/src/main/java/com/trash/common/annotation/DataSource.java
  View file @ae103c5
... ... @@ -25,5 +25,5 @@ public @interface DataSource
25 25 /**
26 26 * 切换数据源名称
27 27 */
28   - public DataSourceType value() default DataSourceType.MASTER;
  28 + DataSourceType value() default DataSourceType.MASTER;
29 29 }
... ...
trash-common/src/main/java/com/trash/common/annotation/Excel.java
  View file @ae103c5
... ... @@ -18,99 +18,99 @@ public @interface Excel
18 18 /**
19 19 * 导出时在excel中排序
20 20 */
21   - public int sort() default Integer.MAX_VALUE;
  21 + int sort() default Integer.MAX_VALUE;
22 22  
23 23 /**
24 24 * 导出到Excel中的名字.
25 25 */
26   - public String name() default "";
  26 + String name() default "";
27 27  
28 28 /**
29 29 * 日期格式, 如: yyyy-MM-dd
30 30 */
31   - public String dateFormat() default "";
  31 + String dateFormat() default "";
32 32  
33 33 /**
34 34 * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
35 35 */
36   - public String dictType() default "";
  36 + String dictType() default "";
37 37  
38 38 /**
39 39 * 读取内容转表达式 (如: 0=男,1=女,2=未知)
40 40 */
41   - public String readConverterExp() default "";
  41 + String readConverterExp() default "";
42 42  
43 43 /**
44 44 * 分隔符，读取字符串组内容
45 45 */
46   - public String separator() default ",";
  46 + String separator() default ",";
47 47  
48 48 /**
49 49 * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
50 50 */
51   - public int scale() default -1;
  51 + int scale() default -1;
52 52  
53 53 /**
54 54 * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
55 55 */
56   - public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
  56 + int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
57 57  
58 58 /**
59 59 * 导出类型（0数字 1字符串）
60 60 */
61   - public ColumnType cellType() default ColumnType.STRING;
  61 + ColumnType cellType() default ColumnType.STRING;
62 62  
63 63 /**
64 64 * 导出时在excel中每个列的高度 单位为字符
65 65 */
66   - public double height() default 14;
  66 + double height() default 14;
67 67  
68 68 /**
69 69 * 导出时在excel中每个列的宽 单位为字符
70 70 */
71   - public double width() default 16;
  71 + double width() default 16;
72 72  
73 73 /**
74 74 * 文字后缀,如% 90 变成90%
75 75 */
76   - public String suffix() default "";
  76 + String suffix() default "";
77 77  
78 78 /**
79 79 * 当值为空时,字段的默认值
80 80 */
81   - public String defaultValue() default "";
  81 + String defaultValue() default "";
82 82  
83 83 /**
84 84 * 提示信息
85 85 */
86   - public String prompt() default "";
  86 + String prompt() default "";
87 87  
88 88 /**
89 89 * 设置只能选择不能输入的列内容.
90 90 */
91   - public String[] combo() default {};
  91 + String[] combo() default {};
92 92  
93 93 /**
94 94 * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
95 95 */
96   - public boolean isExport() default true;
  96 + boolean isExport() default true;
97 97  
98 98 /**
99 99 * 另一个类中的属性名称,支持多级获取,以小数点隔开
100 100 */
101   - public String targetAttr() default "";
  101 + String targetAttr() default "";
102 102  
103 103 /**
104 104 * 是否自动统计数据,在最后追加一行统计数据总和
105 105 */
106   - public boolean isStatistics() default false;
  106 + boolean isStatistics() default false;
107 107  
108 108 /**
109 109 * 字段类型（0：导出导入；1：仅导出；2：仅导入）
110 110 */
111 111 Type type() default Type.ALL;
112 112  
113   - public enum Type
  113 + enum Type
114 114 {
115 115 ALL(0), EXPORT(1), IMPORT(2);
116 116 private final int value;
... ... @@ -126,7 +126,7 @@ public @interface Excel
126 126 }
127 127 }
128 128  
129   - public enum ColumnType
  129 + enum ColumnType
130 130 {
131 131 NUMERIC(0), STRING(1);
132 132 private final int value;
... ...
trash-common/src/main/java/com/trash/common/annotation/Log.java
  View file @ae103c5
... ... @@ -23,20 +23,20 @@ public @interface Log
23 23 /**
24 24 * 模块
25 25 */
26   - public String title() default "";
  26 + String title() default "";
27 27  
28 28 /**
29 29 * 功能
30 30 */
31   - public BusinessType businessType() default BusinessType.OTHER;
  31 + BusinessType businessType() default BusinessType.OTHER;
32 32  
33 33 /**
34 34 * 操作人类别
35 35 */
36   - public OperatorType operatorType() default OperatorType.MANAGE;
  36 + OperatorType operatorType() default OperatorType.MANAGE;
37 37  
38 38 /**
39 39 * 是否保存请求的参数
40 40 */
41   - public boolean isSaveRequestData() default true;
  41 + boolean isSaveRequestData() default true;
42 42 }
... ...
trash-common/src/main/java/com/trash/common/config/trashConfig.java
  View file @ae103c5
... ... @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
6 6 /**
7 7 * 读取项目相关配置
8 8 *
9   - * @author trash
  9 + * @author 2c
10 10 */
11 11 @Component
12 12 @ConfigurationProperties(prefix = "trash")
... ...
trash-common/src/main/java/com/trash/common/constant/ScheduleConstants.java
  View file @ae103c5
... ... @@ -35,9 +35,9 @@ public class ScheduleConstants
35 35 */
36 36 PAUSE("1");
37 37  
38   - private String value;
  38 + private final String value;
39 39  
40   - private Status(String value)
  40 + Status(String value)
41 41 {
42 42 this.value = value;
43 43 }
... ...
trash-common/src/main/java/com/trash/common/core/domain/entity/SysDictData.java
  View file @ae103c5
... ... @@ -132,7 +132,7 @@ public class SysDictData extends BaseEntity
132 132  
133 133 public boolean getDefault()
134 134 {
135   - return UserConstants.YES.equals(this.isDefault) ? true : false;
  135 + return UserConstants.YES.equals(this.isDefault);
136 136 }
137 137  
138 138 public String getIsDefault()
... ...
trash-common/src/main/java/com/trash/common/core/text/CharsetKit.java
  View file @ae103c5
... ... @@ -20,9 +20,9 @@ public class CharsetKit
20 20 public static final String GBK = "GBK";
21 21  
22 22 /** ISO-8859-1 */
23   - public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
  23 + public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1;
24 24 /** UTF-8 */
25   - public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
  25 + public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8;
26 26 /** GBK */
27 27 public static final Charset CHARSET_GBK = Charset.forName(GBK);
28 28  
... ...
trash-common/src/main/java/com/trash/common/core/text/Convert.java
  View file @ae103c5
... ... @@ -798,7 +798,7 @@ public class Convert
798 798 }
799 799 else if (obj instanceof byte[] || obj instanceof Byte[])
800 800 {
801   - return str((Byte[]) obj, charset);
  801 + return str(obj, charset);
802 802 }
803 803 else if (obj instanceof ByteBuffer)
804 804 {
... ... @@ -894,7 +894,7 @@ public class Convert
894 894 */
895 895 public static String toSBC(String input, Set<Character> notConvertSet)
896 896 {
897   - char c[] = input.toCharArray();
  897 + char[] c = input.toCharArray();
898 898 for (int i = 0; i < c.length; i++)
899 899 {
900 900 if (null != notConvertSet && notConvertSet.contains(c[i]))
... ... @@ -936,7 +936,7 @@ public class Convert
936 936 */
937 937 public static String toDBC(String text, Set<Character> notConvertSet)
938 938 {
939   - char c[] = text.toCharArray();
  939 + char[] c = text.toCharArray();
940 940 for (int i = 0; i < c.length; i++)
941 941 {
942 942 if (null != notConvertSet && notConvertSet.contains(c[i]))
... ...
trash-common/src/main/java/com/trash/common/exception/BaseException.java
  View file @ae103c5
... ... @@ -15,22 +15,22 @@ public class BaseException extends RuntimeException
15 15 /**
16 16 * 所属模块
17 17 */
18   - private String module;
  18 + private final String module;
19 19  
20 20 /**
21 21 * 错误码
22 22 */
23   - private String code;
  23 + private final String code;
24 24  
25 25 /**
26 26 * 错误码对应的参数
27 27 */
28   - private Object[] args;
  28 + private final Object[] args;
29 29  
30 30 /**
31 31 * 错误消息
32 32 */
33   - private String defaultMessage;
  33 + private final String defaultMessage;
34 34  
35 35 public BaseException(String module, String code, Object[] args, String defaultMessage)
36 36 {
... ...
trash-common/src/main/java/com/trash/common/exception/CustomException.java
  View file @ae103c5
... ... @@ -11,7 +11,7 @@ public class CustomException extends RuntimeException
11 11  
12 12 private Integer code;
13 13  
14   - private String message;
  14 + private final String message;
15 15  
16 16 public CustomException(String message)
17 17 {
... ...
trash-common/src/main/java/com/trash/common/exception/file/InvalidExtensionException.java
  View file @ae103c5
... ... @@ -12,9 +12,9 @@ public class InvalidExtensionException extends FileUploadException
12 12 {
13 13 private static final long serialVersionUID = 1L;
14 14  
15   - private String[] allowedExtension;
16   - private String extension;
17   - private String filename;
  15 + private final String[] allowedExtension;
  16 + private final String extension;
  17 + private final String filename;
18 18  
19 19 public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
20 20 {
... ...
trash-common/src/main/java/com/trash/common/exception/job/TaskException.java
  View file @ae103c5
... ... @@ -9,7 +9,7 @@ public class TaskException extends Exception
9 9 {
10 10 private static final long serialVersionUID = 1L;
11 11  
12   - private Code code;
  12 + private final Code code;
13 13  
14 14 public TaskException(String msg, Code code)
15 15 {
... ...
trash-common/src/main/java/com/trash/common/filter/RepeatedlyRequestWrapper.java
  View file @ae103c5
... ... @@ -4,6 +4,7 @@ import java.io.BufferedReader;
4 4 import java.io.ByteArrayInputStream;
5 5 import java.io.IOException;
6 6 import java.io.InputStreamReader;
  7 +import java.nio.charset.StandardCharsets;
7 8 import javax.servlet.ReadListener;
8 9 import javax.servlet.ServletInputStream;
9 10 import javax.servlet.ServletResponse;
... ... @@ -27,7 +28,7 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
27 28 request.setCharacterEncoding("UTF-8");
28 29 response.setCharacterEncoding("UTF-8");
29 30  
30   - body = HttpHelper.getBodyString(request).getBytes("UTF-8");
  31 + body = HttpHelper.getBodyString(request).getBytes(StandardCharsets.UTF_8);
31 32 }
32 33  
33 34 @Override
... ...
trash-common/src/main/java/com/trash/common/filter/XssHttpServletRequestWrapper.java
  View file @ae103c5
... ... @@ -2,6 +2,7 @@ package com.trash.common.filter;
2 2  
3 3 import java.io.ByteArrayInputStream;
4 4 import java.io.IOException;
  5 +import java.nio.charset.StandardCharsets;
5 6 import javax.servlet.ReadListener;
6 7 import javax.servlet.ServletInputStream;
7 8 import javax.servlet.http.HttpServletRequest;
... ... @@ -56,7 +57,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
56 57 }
57 58  
58 59 // 为空，直接返回
59   - String json = IOUtils.toString(super.getInputStream(), "utf-8");
  60 + String json = IOUtils.toString(super.getInputStream(), StandardCharsets.UTF_8);
60 61 if (StringUtils.isEmpty(json))
61 62 {
62 63 return super.getInputStream();
... ... @@ -64,7 +65,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
64 65  
65 66 // xss过滤
66 67 json = EscapeUtil.clean(json).trim();
67   - final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8"));
  68 + final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8));
68 69 return new ServletInputStream()
69 70 {
70 71 @Override
... ...
trash-common/src/main/java/com/trash/common/utils/DateUtils.java
  View file @ae103c5
... ... @@ -23,7 +23,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
23 23  
24 24 public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
25 25  
26   - private static String[] parsePatterns = {
  26 + private static final String[] parsePatterns = {
27 27 "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
28 28 "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
29 29 "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
... ...
trash-common/src/main/java/com/trash/common/utils/LogUtils.java
  View file @ae103c5
... ... @@ -13,6 +13,6 @@ public class LogUtils
13 13 {
14 14 msg = "";
15 15 }
16   - return "[" + msg.toString() + "]";
  16 + return "[" + msg + "]";
17 17 }
18 18 }
... ...
trash-common/src/main/java/com/trash/common/utils/ServletUtils.java
  View file @ae103c5
... ... @@ -128,10 +128,6 @@ public class ServletUtils
128 128 }
129 129  
130 130 String ajax = request.getParameter("__ajax");
131   - if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
132   - {
133   - return true;
134   - }
135   - return false;
  131 + return StringUtils.inStringIgnoreCase(ajax, "json", "xml");
136 132 }
137 133 }
... ...
trash-common/src/main/java/com/trash/common/utils/VerifyCodeUtils.java
  View file @ae103c5
... ... @@ -24,7 +24,7 @@ public class VerifyCodeUtils
24 24 // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符
25 25 public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ";
26 26  
27   - private static Random random = new SecureRandom();
  27 + private static final Random random = new SecureRandom();
28 28  
29 29 /**
30 30 * 使用系统默认字符源生成验证码
... ...
trash-common/src/main/java/com/trash/common/utils/file/FileUploadUtils.java
  View file @ae103c5
... ... @@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
22 22 /**
23 23 * 文件上传工具类
24 24 *
25   - * @author trash
  25 + * @author 2c
26 26 */
27 27 public class FileUploadUtils {
28 28 /**
... ... @@ -229,11 +229,27 @@ public class FileUploadUtils {
229 229 /**
230 230 * 文件删除
231 231 * @param filePath
  232 + * @author 2c
232 233 */
233 234 public static void deleteFile(String filePath) {
  235 + filePath = filePath.substring(filePath.indexOf("/profile")+8);
234 236 File file = new File(defaultBaseDir+filePath);
235 237 if (file.exists()) {
236 238 file.delete();
237 239 }
238 240 }
  241 +
  242 + /**
  243 + * 文件上传
  244 + * @param file
  245 + * @author 2c
  246 + */
  247 + public static String uploadFile(MultipartFile file) throws IOException {
  248 + // 上传文件路径
  249 + String filePath = trashConfig.getUploadPath();
  250 + // 上传并返回新文件名称
  251 + String newFileName = upload(filePath, file);
  252 + return newFileName;
  253 + }
  254 +
239 255 }
... ...
trash-common/src/main/java/com/trash/common/utils/html/EscapeUtil.java
  View file @ae103c5
... ... @@ -134,7 +134,7 @@ public class EscapeUtil
134 134 }
135 135 else
136 136 {
137   - tmp.append(content.substring(lastPos, pos));
  137 + tmp.append(content, lastPos, pos);
138 138 lastPos = pos;
139 139 }
140 140 }
... ...
trash-common/src/main/java/com/trash/common/utils/http/HttpHelper.java
  View file @ae103c5
... ... @@ -5,6 +5,7 @@ import java.io.IOException;
5 5 import java.io.InputStream;
6 6 import java.io.InputStreamReader;
7 7 import java.nio.charset.Charset;
  8 +import java.nio.charset.StandardCharsets;
8 9 import javax.servlet.ServletRequest;
9 10 import org.apache.commons.lang3.exception.ExceptionUtils;
10 11 import org.slf4j.Logger;
... ... @@ -25,7 +26,7 @@ public class HttpHelper
25 26 BufferedReader reader = null;
26 27 try (InputStream inputStream = request.getInputStream())
27 28 {
28   - reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
  29 + reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
29 30 String line = "";
30 31 while ((line = reader.readLine()) != null)
31 32 {
... ...
trash-common/src/main/java/com/trash/common/utils/http/HttpUtils.java
  View file @ae103c5
... ... @@ -9,6 +9,7 @@ import java.net.ConnectException;
9 9 import java.net.SocketTimeoutException;
10 10 import java.net.URL;
11 11 import java.net.URLConnection;
  12 +import java.nio.charset.StandardCharsets;
12 13 import java.security.cert.X509Certificate;
13 14 import javax.net.ssl.HostnameVerifier;
14 15 import javax.net.ssl.HttpsURLConnection;
... ... @@ -133,7 +134,7 @@ public class HttpUtils
133 134 out = new PrintWriter(conn.getOutputStream());
134 135 out.print(param);
135 136 out.flush();
136   - in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
  137 + in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
137 138 String line;
138 139 while ((line = in.readLine()) != null)
139 140 {
... ... @@ -207,7 +208,7 @@ public class HttpUtils
207 208 {
208 209 if (ret != null && !"".equals(ret.trim()))
209 210 {
210   - result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
  211 + result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
211 212 }
212 213 }
213 214 log.info("recv - {}", result);
... ...
trash-common/src/main/java/com/trash/common/utils/poi/ExcelUtil.java
  View file @ae103c5
... ... @@ -107,7 +107,7 @@ public class ExcelUtil&lt;T&gt;
107 107 /**
108 108 * 统计列表
109 109 */
110   - private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
  110 + private final Map<Integer, Double> statistics = new HashMap<Integer, Double>();
111 111  
112 112 /**
113 113 * 数字格式
... ... @@ -407,7 +407,7 @@ public class ExcelUtil&lt;T&gt;
407 407 {
408 408 row = sheet.createRow(i + 1 - startNo);
409 409 // 得到导出对象.
410   - T vo = (T) list.get(i);
  410 + T vo = list.get(i);
411 411 int column = 0;
412 412 for (Object[] os : fields)
413 413 {
... ... @@ -800,7 +800,7 @@ public class ExcelUtil&lt;T&gt;
800 800 */
801 801 public String encodingFilename(String filename)
802 802 {
803   - filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
  803 + filename = UUID.randomUUID() + "_" + filename + ".xlsx";
804 804 return filename;
805 805 }
806 806  
... ...
trash-common/src/main/java/com/trash/common/utils/reflect/ReflectUtils.java
  View file @ae103c5
... ... @@ -30,7 +30,7 @@ public class ReflectUtils
30 30  
31 31 private static final String CGLIB_CLASS_SEPARATOR = "$$";
32 32  
33   - private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
  33 + private static final Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
34 34  
35 35 /**
36 36 * 调用Getter方法.
... ...
trash-common/src/main/java/com/trash/common/utils/sign/Base64.java
  View file @ae103c5
... ... @@ -55,8 +55,8 @@ public final class Base64
55 55 {
56 56 lookUpBase64Alphabet[i] = (char) ('0' + j);
57 57 }
58   - lookUpBase64Alphabet[62] = (char) '+';
59   - lookUpBase64Alphabet[63] = (char) '/';
  58 + lookUpBase64Alphabet[62] = '+';
  59 + lookUpBase64Alphabet[63] = '/';
60 60 }
61 61  
62 62 private static boolean isWhiteSpace(char octect)
... ... @@ -96,7 +96,7 @@ public final class Base64
96 96 int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
97 97 int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
98 98 int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
99   - char encodedData[] = null;
  99 + char[] encodedData = null;
100 100  
101 101 encodedData = new char[numberQuartet * 4];
102 102  
... ... @@ -182,7 +182,7 @@ public final class Base64
182 182 return new byte[0];
183 183 }
184 184  
185   - byte decodedData[] = null;
  185 + byte[] decodedData = null;
186 186 byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
187 187 char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
188 188  
... ...
trash-common/src/main/java/com/trash/common/utils/sign/Md5Utils.java
  View file @ae103c5
1 1 package com.trash.common.utils.sign;
2 2  
  3 +import java.nio.charset.StandardCharsets;
3 4 import java.security.MessageDigest;
4 5 import org.slf4j.Logger;
5 6 import org.slf4j.LoggerFactory;
... ... @@ -20,7 +21,7 @@ public class Md5Utils
20 21 {
21 22 algorithm = MessageDigest.getInstance("MD5");
22 23 algorithm.reset();
23   - algorithm.update(s.getBytes("UTF-8"));
  24 + algorithm.update(s.getBytes(StandardCharsets.UTF_8));
24 25 byte[] messageDigest = algorithm.digest();
25 26 return messageDigest;
26 27 }
... ... @@ -31,7 +32,7 @@ public class Md5Utils
31 32 return null;
32 33 }
33 34  
34   - private static final String toHex(byte hash[])
  35 + private static final String toHex(byte[] hash)
35 36 {
36 37 if (hash == null)
37 38 {
... ... @@ -55,7 +56,7 @@ public class Md5Utils
55 56 {
56 57 try
57 58 {
58   - return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
  59 + return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
59 60 }
60 61 catch (Exception e)
61 62 {
... ...
trash-common/src/main/java/com/trash/common/utils/spring/SpringUtils.java
  View file @ae103c5
... ... @@ -60,7 +60,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
60 60 */
61 61 public static <T> T getBean(Class<T> clz) throws BeansException
62 62 {
63   - T result = (T) beanFactory.getBean(clz);
  63 + T result = beanFactory.getBean(clz);
64 64 return result;
65 65 }
66 66  
... ...
trash-daily/src/main/java/com/trash/information_sharing/mapper/InformationSharingMapper.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface InformationSharingMapper
18 18 * @param id 信息共享ID
19 19 * @return 信息共享
20 20 */
21   - public InformationSharing selectInformationSharingById(Long id);
  21 + InformationSharing selectInformationSharingById(Long id);
22 22  
23 23 /**
24 24 * 查询信息共享列表
... ... @@ -26,7 +26,7 @@ public interface InformationSharingMapper
26 26 * @param informationSharing 信息共享
27 27 * @return 信息共享集合
28 28 */
29   - public List<InformationSharing> selectInformationSharingList(InformationSharing informationSharing);
  29 + List<InformationSharing> selectInformationSharingList(InformationSharing informationSharing);
30 30  
31 31 /**
32 32 * 新增信息共享
... ... @@ -34,7 +34,7 @@ public interface InformationSharingMapper
34 34 * @param informationSharing 信息共享
35 35 * @return 结果
36 36 */
37   - public int insertInformationSharing(InformationSharing informationSharing);
  37 + int insertInformationSharing(InformationSharing informationSharing);
38 38  
39 39 /**
40 40 * 修改信息共享
... ... @@ -42,7 +42,7 @@ public interface InformationSharingMapper
42 42 * @param informationSharing 信息共享
43 43 * @return 结果
44 44 */
45   - public int updateInformationSharing(InformationSharing informationSharing);
  45 + int updateInformationSharing(InformationSharing informationSharing);
46 46  
47 47 /**
48 48 * 删除信息共享
... ... @@ -50,7 +50,7 @@ public interface InformationSharingMapper
50 50 * @param id 信息共享ID
51 51 * @return 结果
52 52 */
53   - public int deleteInformationSharingById(Long id);
  53 + int deleteInformationSharingById(Long id);
54 54  
55 55 /**
56 56 * 批量删除信息共享
... ... @@ -58,5 +58,5 @@ public interface InformationSharingMapper
58 58 * @param ids 需要删除的数据ID
59 59 * @return 结果
60 60 */
61   - public int deleteInformationSharingByIds(Long[] ids);
  61 + int deleteInformationSharingByIds(Long[] ids);
62 62 }
... ...
trash-daily/src/main/java/com/trash/information_sharing/service/IInformationSharingService.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface IInformationSharingService
18 18 * @param id 信息共享ID
19 19 * @return 信息共享
20 20 */
21   - public InformationSharing selectInformationSharingById(Long id);
  21 + InformationSharing selectInformationSharingById(Long id);
22 22  
23 23 /**
24 24 * 查询信息共享列表
... ... @@ -26,7 +26,7 @@ public interface IInformationSharingService
26 26 * @param informationSharing 信息共享
27 27 * @return 信息共享集合
28 28 */
29   - public List<InformationSharing> selectInformationSharingList(InformationSharing informationSharing);
  29 + List<InformationSharing> selectInformationSharingList(InformationSharing informationSharing);
30 30  
31 31 /**
32 32 * 新增信息共享
... ... @@ -34,7 +34,7 @@ public interface IInformationSharingService
34 34 * @param informationSharing 信息共享
35 35 * @return 结果
36 36 */
37   - public int insertInformationSharing(InformationSharing informationSharing);
  37 + int insertInformationSharing(InformationSharing informationSharing);
38 38  
39 39 /**
40 40 * 修改信息共享
... ... @@ -42,7 +42,7 @@ public interface IInformationSharingService
42 42 * @param informationSharing 信息共享
43 43 * @return 结果
44 44 */
45   - public int updateInformationSharing(InformationSharing informationSharing);
  45 + int updateInformationSharing(InformationSharing informationSharing);
46 46  
47 47 /**
48 48 * 批量删除信息共享
... ... @@ -50,7 +50,7 @@ public interface IInformationSharingService
50 50 * @param ids 需要删除的信息共享ID
51 51 * @return 结果
52 52 */
53   - public int deleteInformationSharingByIds(Long[] ids);
  53 + int deleteInformationSharingByIds(Long[] ids);
54 54  
55 55 /**
56 56 * 删除信息共享信息
... ... @@ -58,5 +58,5 @@ public interface IInformationSharingService
58 58 * @param id 信息共享ID
59 59 * @return 结果
60 60 */
61   - public int deleteInformationSharingById(Long id);
  61 + int deleteInformationSharingById(Long id);
62 62 }
... ...
trash-daily/src/main/java/com/trash/report/mapper/WorkReportMapper.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface WorkReportMapper
18 18 * @param id 工作日报ID
19 19 * @return 工作日报
20 20 */
21   - public WorkReport selectWorkReportById(Long id);
  21 + WorkReport selectWorkReportById(Long id);
22 22  
23 23 /**
24 24 * 查询工作日报列表
... ... @@ -26,7 +26,7 @@ public interface WorkReportMapper
26 26 * @param workReport 工作日报
27 27 * @return 工作日报集合
28 28 */
29   - public List<WorkReport> selectWorkReportList(WorkReport workReport);
  29 + List<WorkReport> selectWorkReportList(WorkReport workReport);
30 30  
31 31 /**
32 32 * 新增工作日报
... ... @@ -34,7 +34,7 @@ public interface WorkReportMapper
34 34 * @param workReport 工作日报
35 35 * @return 结果
36 36 */
37   - public int insertWorkReport(WorkReport workReport);
  37 + int insertWorkReport(WorkReport workReport);
38 38  
39 39 /**
40 40 * 修改工作日报
... ... @@ -42,7 +42,7 @@ public interface WorkReportMapper
42 42 * @param workReport 工作日报
43 43 * @return 结果
44 44 */
45   - public int updateWorkReport(WorkReport workReport);
  45 + int updateWorkReport(WorkReport workReport);
46 46  
47 47 /**
48 48 * 删除工作日报
... ... @@ -50,7 +50,7 @@ public interface WorkReportMapper
50 50 * @param id 工作日报ID
51 51 * @return 结果
52 52 */
53   - public int deleteWorkReportById(Long id);
  53 + int deleteWorkReportById(Long id);
54 54  
55 55 /**
56 56 * 批量删除工作日报
... ... @@ -58,5 +58,5 @@ public interface WorkReportMapper
58 58 * @param ids 需要删除的数据ID
59 59 * @return 结果
60 60 */
61   - public int deleteWorkReportByIds(Long[] ids);
  61 + int deleteWorkReportByIds(Long[] ids);
62 62 }
... ...
trash-daily/src/main/java/com/trash/report/service/IWorkReportService.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface IWorkReportService
18 18 * @param id 工作日报ID
19 19 * @return 工作日报
20 20 */
21   - public WorkReport selectWorkReportById(Long id);
  21 + WorkReport selectWorkReportById(Long id);
22 22  
23 23 /**
24 24 * 查询工作日报列表
... ... @@ -26,7 +26,7 @@ public interface IWorkReportService
26 26 * @param workReport 工作日报
27 27 * @return 工作日报集合
28 28 */
29   - public List<WorkReport> selectWorkReportList(WorkReport workReport);
  29 + List<WorkReport> selectWorkReportList(WorkReport workReport);
30 30  
31 31 /**
32 32 * 新增工作日报
... ... @@ -34,7 +34,7 @@ public interface IWorkReportService
34 34 * @param workReport 工作日报
35 35 * @return 结果
36 36 */
37   - public int insertWorkReport(WorkReport workReport);
  37 + int insertWorkReport(WorkReport workReport);
38 38  
39 39 /**
40 40 * 修改工作日报
... ... @@ -42,7 +42,7 @@ public interface IWorkReportService
42 42 * @param workReport 工作日报
43 43 * @return 结果
44 44 */
45   - public int updateWorkReport(WorkReport workReport);
  45 + int updateWorkReport(WorkReport workReport);
46 46  
47 47 /**
48 48 * 批量删除工作日报
... ... @@ -50,7 +50,7 @@ public interface IWorkReportService
50 50 * @param ids 需要删除的工作日报ID
51 51 * @return 结果
52 52 */
53   - public int deleteWorkReportByIds(Long[] ids);
  53 + int deleteWorkReportByIds(Long[] ids);
54 54  
55 55 /**
56 56 * 删除工作日报信息
... ... @@ -58,5 +58,5 @@ public interface IWorkReportService
58 58 * @param id 工作日报ID
59 59 * @return 结果
60 60 */
61   - public int deleteWorkReportById(Long id);
  61 + int deleteWorkReportById(Long id);
62 62 }
... ...
trash-daily/src/main/java/com/trash/situation/mapper/DailySituationMapper.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface DailySituationMapper
18 18 * @param id 每日普查情况ID
19 19 * @return 每日普查情况
20 20 */
21   - public DailySituation selectDailySituationById(String id);
  21 + DailySituation selectDailySituationById(String id);
22 22  
23 23 /**
24 24 * 查询每日普查情况列表
... ... @@ -26,7 +26,7 @@ public interface DailySituationMapper
26 26 * @param dailySituation 每日普查情况
27 27 * @return 每日普查情况集合
28 28 */
29   - public List<DailySituation> selectDailySituationList(DailySituation dailySituation);
  29 + List<DailySituation> selectDailySituationList(DailySituation dailySituation);
30 30  
31 31 /**
32 32 * 新增每日普查情况
... ... @@ -34,7 +34,7 @@ public interface DailySituationMapper
34 34 * @param dailySituation 每日普查情况
35 35 * @return 结果
36 36 */
37   - public int insertDailySituation(DailySituation dailySituation);
  37 + int insertDailySituation(DailySituation dailySituation);
38 38  
39 39 /**
40 40 * 修改每日普查情况
... ... @@ -42,7 +42,7 @@ public interface DailySituationMapper
42 42 * @param dailySituation 每日普查情况
43 43 * @return 结果
44 44 */
45   - public int updateDailySituation(DailySituation dailySituation);
  45 + int updateDailySituation(DailySituation dailySituation);
46 46  
47 47 /**
48 48 * 删除每日普查情况
... ... @@ -50,7 +50,7 @@ public interface DailySituationMapper
50 50 * @param id 每日普查情况ID
51 51 * @return 结果
52 52 */
53   - public int deleteDailySituationById(String id);
  53 + int deleteDailySituationById(String id);
54 54  
55 55 /**
56 56 * 批量删除每日普查情况
... ... @@ -58,5 +58,5 @@ public interface DailySituationMapper
58 58 * @param ids 需要删除的数据ID
59 59 * @return 结果
60 60 */
61   - public int deleteDailySituationByIds(String[] ids);
  61 + int deleteDailySituationByIds(String[] ids);
62 62 }
... ...
trash-daily/src/main/java/com/trash/situation/service/IDailySituationService.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface IDailySituationService
18 18 * @param id 每日普查情况ID
19 19 * @return 每日普查情况
20 20 */
21   - public DailySituation selectDailySituationById(String id);
  21 + DailySituation selectDailySituationById(String id);
22 22  
23 23 /**
24 24 * 查询每日普查情况列表
... ... @@ -26,7 +26,7 @@ public interface IDailySituationService
26 26 * @param dailySituation 每日普查情况
27 27 * @return 每日普查情况集合
28 28 */
29   - public List<DailySituation> selectDailySituationList(DailySituation dailySituation);
  29 + List<DailySituation> selectDailySituationList(DailySituation dailySituation);
30 30  
31 31 /**
32 32 * 新增每日普查情况
... ... @@ -34,7 +34,7 @@ public interface IDailySituationService
34 34 * @param dailySituation 每日普查情况
35 35 * @return 结果
36 36 */
37   - public int insertDailySituation(DailySituation dailySituation);
  37 + int insertDailySituation(DailySituation dailySituation);
38 38  
39 39 /**
40 40 * 修改每日普查情况
... ... @@ -42,7 +42,7 @@ public interface IDailySituationService
42 42 * @param dailySituation 每日普查情况
43 43 * @return 结果
44 44 */
45   - public int updateDailySituation(DailySituation dailySituation);
  45 + int updateDailySituation(DailySituation dailySituation);
46 46  
47 47 /**
48 48 * 批量删除每日普查情况
... ... @@ -50,7 +50,7 @@ public interface IDailySituationService
50 50 * @param ids 需要删除的每日普查情况ID
51 51 * @return 结果
52 52 */
53   - public int deleteDailySituationByIds(String[] ids);
  53 + int deleteDailySituationByIds(String[] ids);
54 54  
55 55 /**
56 56 * 删除每日普查情况信息
... ... @@ -58,5 +58,5 @@ public interface IDailySituationService
58 58 * @param id 每日普查情况ID
59 59 * @return 结果
60 60 */
61   - public int deleteDailySituationById(String id);
  61 + int deleteDailySituationById(String id);
62 62 }
... ...
trash-daily/src/main/java/com/trash/toollist/mapper/DailyToolListMapper.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface DailyToolListMapper
18 18 * @param id 每日工作清单ID
19 19 * @return 每日工作清单
20 20 */
21   - public DailyToolList selectDailyToolListById(Long id);
  21 + DailyToolList selectDailyToolListById(Long id);
22 22  
23 23 /**
24 24 * 查询每日工作清单列表
... ... @@ -26,7 +26,7 @@ public interface DailyToolListMapper
26 26 * @param dailyToolList 每日工作清单
27 27 * @return 每日工作清单集合
28 28 */
29   - public List<DailyToolList> selectDailyToolListList(DailyToolList dailyToolList);
  29 + List<DailyToolList> selectDailyToolListList(DailyToolList dailyToolList);
30 30  
31 31 /**
32 32 * 新增每日工作清单
... ... @@ -34,7 +34,7 @@ public interface DailyToolListMapper
34 34 * @param dailyToolList 每日工作清单
35 35 * @return 结果
36 36 */
37   - public int insertDailyToolList(DailyToolList dailyToolList);
  37 + int insertDailyToolList(DailyToolList dailyToolList);
38 38  
39 39 /**
40 40 * 修改每日工作清单
... ... @@ -42,7 +42,7 @@ public interface DailyToolListMapper
42 42 * @param dailyToolList 每日工作清单
43 43 * @return 结果
44 44 */
45   - public int updateDailyToolList(DailyToolList dailyToolList);
  45 + int updateDailyToolList(DailyToolList dailyToolList);
46 46  
47 47 /**
48 48 * 删除每日工作清单
... ... @@ -50,7 +50,7 @@ public interface DailyToolListMapper
50 50 * @param id 每日工作清单ID
51 51 * @return 结果
52 52 */
53   - public int deleteDailyToolListById(Long id);
  53 + int deleteDailyToolListById(Long id);
54 54  
55 55 /**
56 56 * 批量删除每日工作清单
... ... @@ -58,5 +58,5 @@ public interface DailyToolListMapper
58 58 * @param ids 需要删除的数据ID
59 59 * @return 结果
60 60 */
61   - public int deleteDailyToolListByIds(Long[] ids);
  61 + int deleteDailyToolListByIds(Long[] ids);
62 62 }
... ...
trash-daily/src/main/java/com/trash/toollist/service/IDailyToolListService.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface IDailyToolListService
18 18 * @param id 每日工作清单ID
19 19 * @return 每日工作清单
20 20 */
21   - public DailyToolList selectDailyToolListById(Long id);
  21 + DailyToolList selectDailyToolListById(Long id);
22 22  
23 23 /**
24 24 * 查询每日工作清单列表
... ... @@ -26,7 +26,7 @@ public interface IDailyToolListService
26 26 * @param dailyToolList 每日工作清单
27 27 * @return 每日工作清单集合
28 28 */
29   - public List<DailyToolList> selectDailyToolListList(DailyToolList dailyToolList);
  29 + List<DailyToolList> selectDailyToolListList(DailyToolList dailyToolList);
30 30  
31 31 /**
32 32 * 新增每日工作清单
... ... @@ -34,7 +34,7 @@ public interface IDailyToolListService
34 34 * @param dailyToolList 每日工作清单
35 35 * @return 结果
36 36 */
37   - public int insertDailyToolList(DailyToolList dailyToolList);
  37 + int insertDailyToolList(DailyToolList dailyToolList);
38 38  
39 39 /**
40 40 * 修改每日工作清单
... ... @@ -42,7 +42,7 @@ public interface IDailyToolListService
42 42 * @param dailyToolList 每日工作清单
43 43 * @return 结果
44 44 */
45   - public int updateDailyToolList(DailyToolList dailyToolList);
  45 + int updateDailyToolList(DailyToolList dailyToolList);
46 46  
47 47 /**
48 48 * 批量删除每日工作清单
... ... @@ -50,7 +50,7 @@ public interface IDailyToolListService
50 50 * @param ids 需要删除的每日工作清单ID
51 51 * @return 结果
52 52 */
53   - public int deleteDailyToolListByIds(Long[] ids);
  53 + int deleteDailyToolListByIds(Long[] ids);
54 54  
55 55 /**
56 56 * 删除每日工作清单信息
... ... @@ -58,5 +58,5 @@ public interface IDailyToolListService
58 58 * @param id 每日工作清单ID
59 59 * @return 结果
60 60 */
61   - public int deleteDailyToolListById(Long id);
  61 + int deleteDailyToolListById(Long id);
62 62 }
... ...
trash-framework/src/main/java/com/trash/framework/config/FastJson2JsonRedisSerializer.java
  View file @ae103c5
... ... @@ -10,6 +10,7 @@ import org.springframework.data.redis.serializer.SerializationException;
10 10 import com.alibaba.fastjson.parser.ParserConfig;
11 11 import org.springframework.util.Assert;
12 12 import java.nio.charset.Charset;
  13 +import java.nio.charset.StandardCharsets;
13 14  
14 15 /**
15 16 * Redis使用FastJson序列化
... ... @@ -21,9 +22,9 @@ public class FastJson2JsonRedisSerializer&lt;T&gt; implements RedisSerializer&lt;T&gt;
21 22 @SuppressWarnings("unused")
22 23 private ObjectMapper objectMapper = new ObjectMapper();
23 24  
24   - public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
  25 + public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
25 26  
26   - private Class<T> clazz;
  27 + private final Class<T> clazz;
27 28  
28 29 static
29 30 {
... ...
trash-framework/src/main/java/com/trash/framework/config/MyBatisConfig.java
  View file @ae103c5
... ... @@ -37,7 +37,7 @@ public class MyBatisConfig
37 37  
38 38 public static String setTypeAliasesPackage(String typeAliasesPackage)
39 39 {
40   - ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
  40 + ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
41 41 MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
42 42 List<String> allResult = new ArrayList<String>();
43 43 try
... ... @@ -75,7 +75,7 @@ public class MyBatisConfig
75 75 }
76 76 if (allResult.size() > 0)
77 77 {
78   - typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
  78 + typeAliasesPackage = String.join(",", allResult.toArray(new String[0]));
79 79 }
80 80 else
81 81 {
... ...
trash-framework/src/main/java/com/trash/framework/config/ThreadPoolConfig.java
  View file @ae103c5
... ... @@ -19,16 +19,16 @@ import com.trash.common.utils.Threads;
19 19 public class ThreadPoolConfig
20 20 {
21 21 // 核心线程池大小
22   - private int corePoolSize = 50;
  22 + private final int corePoolSize = 50;
23 23  
24 24 // 最大可创建的线程数
25   - private int maxPoolSize = 200;
  25 + private final int maxPoolSize = 200;
26 26  
27 27 // 队列最大长度
28   - private int queueCapacity = 1000;
  28 + private final int queueCapacity = 1000;
29 29  
30 30 // 线程池维护线程所允许的空闲时间
31   - private int keepAliveSeconds = 300;
  31 + private final int keepAliveSeconds = 300;
32 32  
33 33 @Bean(name = "threadPoolTaskExecutor")
34 34 public ThreadPoolTaskExecutor threadPoolTaskExecutor()
... ...
trash-framework/src/main/java/com/trash/framework/interceptor/impl/SameUrlDataInterceptor.java
  View file @ae103c5
... ... @@ -116,10 +116,6 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
116 116 {
117 117 long time1 = (Long) nowMap.get(REPEAT_TIME);
118 118 long time2 = (Long) preMap.get(REPEAT_TIME);
119   - if ((time1 - time2) < (this.intervalTime * 1000))
120   - {
121   - return true;
122   - }
123   - return false;
  119 + return (time1 - time2) < (this.intervalTime * 1000);
124 120 }
125 121 }
... ...
trash-framework/src/main/java/com/trash/framework/manager/AsyncManager.java
  View file @ae103c5
... ... @@ -22,14 +22,14 @@ public class AsyncManager
22 22 /**
23 23 * 异步操作任务调度线程池
24 24 */
25   - private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService");
  25 + private final ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService");
26 26  
27 27 /**
28 28 * 单例模式
29 29 */
30 30 private AsyncManager(){}
31 31  
32   - private static AsyncManager me = new AsyncManager();
  32 + private static final AsyncManager me = new AsyncManager();
33 33  
34 34 public static AsyncManager me()
35 35 {
... ...
trash-generator/src/main/java/com/trash/generator/domain/GenTableColumn.java
  View file @ae103c5
... ... @@ -356,7 +356,7 @@ public class GenTableColumn extends BaseEntity
356 356 {
357 357 Object startStr = value.subSequence(0, 1);
358 358 String endStr = value.substring(1);
359   - sb.append("").append(startStr).append("=").append(endStr).append(",");
  359 + sb.append(startStr).append("=").append(endStr).append(",");
360 360 }
361 361 }
362 362 return sb.deleteCharAt(sb.length() - 1).toString();
... ...
trash-generator/src/main/java/com/trash/generator/mapper/GenTableColumnMapper.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface GenTableColumnMapper
17 17 * @param tableName 表名称
18 18 * @return 列信息
19 19 */
20   - public List<GenTableColumn> selectDbTableColumnsByName(String tableName);
  20 + List<GenTableColumn> selectDbTableColumnsByName(String tableName);
21 21  
22 22 /**
23 23 * 查询业务字段列表
... ... @@ -25,7 +25,7 @@ public interface GenTableColumnMapper
25 25 * @param tableId 业务字段编号
26 26 * @return 业务字段集合
27 27 */
28   - public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
  28 + List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
29 29  
30 30 /**
31 31 * 新增业务字段
... ... @@ -33,7 +33,7 @@ public interface GenTableColumnMapper
33 33 * @param genTableColumn 业务字段信息
34 34 * @return 结果
35 35 */
36   - public int insertGenTableColumn(GenTableColumn genTableColumn);
  36 + int insertGenTableColumn(GenTableColumn genTableColumn);
37 37  
38 38 /**
39 39 * 修改业务字段
... ... @@ -41,7 +41,7 @@ public interface GenTableColumnMapper
41 41 * @param genTableColumn 业务字段信息
42 42 * @return 结果
43 43 */
44   - public int updateGenTableColumn(GenTableColumn genTableColumn);
  44 + int updateGenTableColumn(GenTableColumn genTableColumn);
45 45  
46 46 /**
47 47 * 删除业务字段
... ... @@ -49,7 +49,7 @@ public interface GenTableColumnMapper
49 49 * @param genTableColumns 列数据
50 50 * @return 结果
51 51 */
52   - public int deleteGenTableColumns(List<GenTableColumn> genTableColumns);
  52 + int deleteGenTableColumns(List<GenTableColumn> genTableColumns);
53 53  
54 54 /**
55 55 * 批量删除业务字段
... ... @@ -57,5 +57,5 @@ public interface GenTableColumnMapper
57 57 * @param ids 需要删除的数据ID
58 58 * @return 结果
59 59 */
60   - public int deleteGenTableColumnByIds(Long[] ids);
  60 + int deleteGenTableColumnByIds(Long[] ids);
61 61 }
... ...
trash-generator/src/main/java/com/trash/generator/mapper/GenTableMapper.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface GenTableMapper
17 17 * @param genTable 业务信息
18 18 * @return 业务集合
19 19 */
20   - public List<GenTable> selectGenTableList(GenTable genTable);
  20 + List<GenTable> selectGenTableList(GenTable genTable);
21 21  
22 22 /**
23 23 * 查询据库列表
... ... @@ -25,7 +25,7 @@ public interface GenTableMapper
25 25 * @param genTable 业务信息
26 26 * @return 数据库表集合
27 27 */
28   - public List<GenTable> selectDbTableList(GenTable genTable);
  28 + List<GenTable> selectDbTableList(GenTable genTable);
29 29  
30 30 /**
31 31 * 查询据库列表
... ... @@ -33,7 +33,7 @@ public interface GenTableMapper
33 33 * @param tableNames 表名称组
34 34 * @return 数据库表集合
35 35 */
36   - public List<GenTable> selectDbTableListByNames(String[] tableNames);
  36 + List<GenTable> selectDbTableListByNames(String[] tableNames);
37 37  
38 38 /**
39 39 * 查询表ID业务信息
... ... @@ -41,7 +41,7 @@ public interface GenTableMapper
41 41 * @param id 业务ID
42 42 * @return 业务信息
43 43 */
44   - public GenTable selectGenTableById(Long id);
  44 + GenTable selectGenTableById(Long id);
45 45  
46 46 /**
47 47 * 查询表名称业务信息
... ... @@ -49,7 +49,7 @@ public interface GenTableMapper
49 49 * @param tableName 表名称
50 50 * @return 业务信息
51 51 */
52   - public GenTable selectGenTableByName(String tableName);
  52 + GenTable selectGenTableByName(String tableName);
53 53  
54 54 /**
55 55 * 新增业务
... ... @@ -57,7 +57,7 @@ public interface GenTableMapper
57 57 * @param genTable 业务信息
58 58 * @return 结果
59 59 */
60   - public int insertGenTable(GenTable genTable);
  60 + int insertGenTable(GenTable genTable);
61 61  
62 62 /**
63 63 * 修改业务
... ... @@ -65,7 +65,7 @@ public interface GenTableMapper
65 65 * @param genTable 业务信息
66 66 * @return 结果
67 67 */
68   - public int updateGenTable(GenTable genTable);
  68 + int updateGenTable(GenTable genTable);
69 69  
70 70 /**
71 71 * 批量删除业务
... ... @@ -73,5 +73,5 @@ public interface GenTableMapper
73 73 * @param ids 需要删除的数据ID
74 74 * @return 结果
75 75 */
76   - public int deleteGenTableByIds(Long[] ids);
  76 + int deleteGenTableByIds(Long[] ids);
77 77 }
... ...
trash-generator/src/main/java/com/trash/generator/service/IGenTableColumnService.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface IGenTableColumnService
17 17 * @param tableId 业务字段编号
18 18 * @return 业务字段集合
19 19 */
20   - public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
  20 + List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
21 21  
22 22 /**
23 23 * 新增业务字段
... ... @@ -25,7 +25,7 @@ public interface IGenTableColumnService
25 25 * @param genTableColumn 业务字段信息
26 26 * @return 结果
27 27 */
28   - public int insertGenTableColumn(GenTableColumn genTableColumn);
  28 + int insertGenTableColumn(GenTableColumn genTableColumn);
29 29  
30 30 /**
31 31 * 修改业务字段
... ... @@ -33,7 +33,7 @@ public interface IGenTableColumnService
33 33 * @param genTableColumn 业务字段信息
34 34 * @return 结果
35 35 */
36   - public int updateGenTableColumn(GenTableColumn genTableColumn);
  36 + int updateGenTableColumn(GenTableColumn genTableColumn);
37 37  
38 38 /**
39 39 * 删除业务字段信息
... ... @@ -41,5 +41,5 @@ public interface IGenTableColumnService
41 41 * @param ids 需要删除的数据ID
42 42 * @return 结果
43 43 */
44   - public int deleteGenTableColumnByIds(String ids);
  44 + int deleteGenTableColumnByIds(String ids);
45 45 }
... ...
trash-generator/src/main/java/com/trash/generator/service/IGenTableService.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface IGenTableService
18 18 * @param genTable 业务信息
19 19 * @return 业务集合
20 20 */
21   - public List<GenTable> selectGenTableList(GenTable genTable);
  21 + List<GenTable> selectGenTableList(GenTable genTable);
22 22  
23 23 /**
24 24 * 查询据库列表
... ... @@ -26,7 +26,7 @@ public interface IGenTableService
26 26 * @param genTable 业务信息
27 27 * @return 数据库表集合
28 28 */
29   - public List<GenTable> selectDbTableList(GenTable genTable);
  29 + List<GenTable> selectDbTableList(GenTable genTable);
30 30  
31 31 /**
32 32 * 查询据库列表
... ... @@ -34,7 +34,7 @@ public interface IGenTableService
34 34 * @param tableNames 表名称组
35 35 * @return 数据库表集合
36 36 */
37   - public List<GenTable> selectDbTableListByNames(String[] tableNames);
  37 + List<GenTable> selectDbTableListByNames(String[] tableNames);
38 38  
39 39 /**
40 40 * 查询业务信息
... ... @@ -42,7 +42,7 @@ public interface IGenTableService
42 42 * @param id 业务ID
43 43 * @return 业务信息
44 44 */
45   - public GenTable selectGenTableById(Long id);
  45 + GenTable selectGenTableById(Long id);
46 46  
47 47 /**
48 48 * 修改业务
... ... @@ -50,7 +50,7 @@ public interface IGenTableService
50 50 * @param genTable 业务信息
51 51 * @return 结果
52 52 */
53   - public void updateGenTable(GenTable genTable);
  53 + void updateGenTable(GenTable genTable);
54 54  
55 55 /**
56 56 * 删除业务信息
... ... @@ -58,14 +58,14 @@ public interface IGenTableService
58 58 * @param tableIds 需要删除的表数据ID
59 59 * @return 结果
60 60 */
61   - public void deleteGenTableByIds(Long[] tableIds);
  61 + void deleteGenTableByIds(Long[] tableIds);
62 62  
63 63 /**
64 64 * 导入表结构
65 65 *
66 66 * @param tableList 导入表列表
67 67 */
68   - public void importGenTable(List<GenTable> tableList);
  68 + void importGenTable(List<GenTable> tableList);
69 69  
70 70 /**
71 71 * 预览代码
... ... @@ -73,7 +73,7 @@ public interface IGenTableService
73 73 * @param tableId 表编号
74 74 * @return 预览数据列表
75 75 */
76   - public Map<String, String> previewCode(Long tableId);
  76 + Map<String, String> previewCode(Long tableId);
77 77  
78 78 /**
79 79 * 生成代码（下载方式）
... ... @@ -81,7 +81,7 @@ public interface IGenTableService
81 81 * @param tableName 表名称
82 82 * @return 数据
83 83 */
84   - public byte[] downloadCode(String tableName);
  84 + byte[] downloadCode(String tableName);
85 85  
86 86 /**
87 87 * 生成代码（自定义路径）
... ... @@ -89,14 +89,14 @@ public interface IGenTableService
89 89 * @param tableName 表名称
90 90 * @return 数据
91 91 */
92   - public void generatorCode(String tableName);
  92 + void generatorCode(String tableName);
93 93  
94 94 /**
95 95 * 同步数据库
96 96 *
97 97 * @param tableName 表名称
98 98 */
99   - public void synchDb(String tableName);
  99 + void synchDb(String tableName);
100 100  
101 101 /**
102 102 * 批量生成代码（下载方式）
... ... @@ -104,12 +104,12 @@ public interface IGenTableService
104 104 * @param tableNames 表数组
105 105 * @return 数据
106 106 */
107   - public byte[] downloadCode(String[] tableNames);
  107 + byte[] downloadCode(String[] tableNames);
108 108  
109 109 /**
110 110 * 修改保存参数校验
111 111 *
112 112 * @param genTable 业务信息
113 113 */
114   - public void validateEdit(GenTable genTable);
  114 + void validateEdit(GenTable genTable);
115 115 }
... ...
trash-generator/src/main/resources/vm/java/mapper.java.vm
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface ${ClassName}Mapper
17 17 * @param ${pkColumn.javaField} ${functionName}ID
18 18 * @return ${functionName}
19 19 */
20   - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
  20 + ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
21 21  
22 22 /**
23 23 * 查询${functionName}列表
... ... @@ -25,7 +25,7 @@ public interface ${ClassName}Mapper
25 25 * @param ${className} ${functionName}
26 26 * @return ${functionName}集合
27 27 */
28   - public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
  28 + List<${ClassName}> select${ClassName}List(${ClassName} ${className});
29 29  
30 30 /**
31 31 * 新增${functionName}
... ... @@ -33,7 +33,7 @@ public interface ${ClassName}Mapper
33 33 * @param ${className} ${functionName}
34 34 * @return 结果
35 35 */
36   - public int insert${ClassName}(${ClassName} ${className});
  36 + int insert${ClassName}(${ClassName} ${className});
37 37  
38 38 /**
39 39 * 修改${functionName}
... ... @@ -41,7 +41,7 @@ public interface ${ClassName}Mapper
41 41 * @param ${className} ${functionName}
42 42 * @return 结果
43 43 */
44   - public int update${ClassName}(${ClassName} ${className});
  44 + int update${ClassName}(${ClassName} ${className});
45 45  
46 46 /**
47 47 * 删除${functionName}
... ... @@ -49,7 +49,7 @@ public interface ${ClassName}Mapper
49 49 * @param ${pkColumn.javaField} ${functionName}ID
50 50 * @return 结果
51 51 */
52   - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
  52 + int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
53 53  
54 54 /**
55 55 * 批量删除${functionName}
... ... @@ -57,5 +57,5 @@ public interface ${ClassName}Mapper
57 57 * @param ${pkColumn.javaField}s 需要删除的数据ID
58 58 * @return 结果
59 59 */
60   - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
  60 + int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
61 61 }
... ...
trash-generator/src/main/resources/vm/java/service.java.vm
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface I${ClassName}Service
17 17 * @param ${pkColumn.javaField} ${functionName}ID
18 18 * @return ${functionName}
19 19 */
20   - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
  20 + ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
21 21  
22 22 /**
23 23 * 查询${functionName}列表
... ... @@ -25,7 +25,7 @@ public interface I${ClassName}Service
25 25 * @param ${className} ${functionName}
26 26 * @return ${functionName}集合
27 27 */
28   - public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
  28 + List<${ClassName}> select${ClassName}List(${ClassName} ${className});
29 29  
30 30 /**
31 31 * 新增${functionName}
... ... @@ -33,7 +33,7 @@ public interface I${ClassName}Service
33 33 * @param ${className} ${functionName}
34 34 * @return 结果
35 35 */
36   - public int insert${ClassName}(${ClassName} ${className});
  36 + int insert${ClassName}(${ClassName} ${className});
37 37  
38 38 /**
39 39 * 修改${functionName}
... ... @@ -41,7 +41,7 @@ public interface I${ClassName}Service
41 41 * @param ${className} ${functionName}
42 42 * @return 结果
43 43 */
44   - public int update${ClassName}(${ClassName} ${className});
  44 + int update${ClassName}(${ClassName} ${className});
45 45  
46 46 /**
47 47 * 批量删除${functionName}
... ... @@ -49,7 +49,7 @@ public interface I${ClassName}Service
49 49 * @param ${pkColumn.javaField}s 需要删除的${functionName}ID
50 50 * @return 结果
51 51 */
52   - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
  52 + int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
53 53  
54 54 /**
55 55 * 删除${functionName}信息
... ... @@ -57,5 +57,5 @@ public interface I${ClassName}Service
57 57 * @param ${pkColumn.javaField} ${functionName}ID
58 58 * @return 结果
59 59 */
60   - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
  60 + int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
61 61 }
... ...
trash-quartz/src/main/java/com/trash/quartz/mapper/SysJobLogMapper.java
  View file @ae103c5
... ... @@ -17,14 +17,14 @@ public interface SysJobLogMapper
17 17 * @param jobLog 调度日志信息
18 18 * @return 调度任务日志集合
19 19 */
20   - public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
  20 + List<SysJobLog> selectJobLogList(SysJobLog jobLog);
21 21  
22 22 /**
23 23 * 查询所有调度任务日志
24 24 *
25 25 * @return 调度任务日志列表
26 26 */
27   - public List<SysJobLog> selectJobLogAll();
  27 + List<SysJobLog> selectJobLogAll();
28 28  
29 29 /**
30 30 * 通过调度任务日志ID查询调度信息
... ... @@ -32,7 +32,7 @@ public interface SysJobLogMapper
32 32 * @param jobLogId 调度任务日志ID
33 33 * @return 调度任务日志对象信息
34 34 */
35   - public SysJobLog selectJobLogById(Long jobLogId);
  35 + SysJobLog selectJobLogById(Long jobLogId);
36 36  
37 37 /**
38 38 * 新增任务日志
... ... @@ -40,7 +40,7 @@ public interface SysJobLogMapper
40 40 * @param jobLog 调度日志信息
41 41 * @return 结果
42 42 */
43   - public int insertJobLog(SysJobLog jobLog);
  43 + int insertJobLog(SysJobLog jobLog);
44 44  
45 45 /**
46 46 * 批量删除调度日志信息
... ... @@ -48,7 +48,7 @@ public interface SysJobLogMapper
48 48 * @param logIds 需要删除的数据ID
49 49 * @return 结果
50 50 */
51   - public int deleteJobLogByIds(Long[] logIds);
  51 + int deleteJobLogByIds(Long[] logIds);
52 52  
53 53 /**
54 54 * 删除任务日志
... ... @@ -56,10 +56,10 @@ public interface SysJobLogMapper
56 56 * @param jobId 调度日志ID
57 57 * @return 结果
58 58 */
59   - public int deleteJobLogById(Long jobId);
  59 + int deleteJobLogById(Long jobId);
60 60  
61 61 /**
62 62 * 清空任务日志
63 63 */
64   - public void cleanJobLog();
  64 + void cleanJobLog();
65 65 }
... ...
trash-quartz/src/main/java/com/trash/quartz/mapper/SysJobMapper.java
  View file @ae103c5
... ... @@ -17,14 +17,14 @@ public interface SysJobMapper
17 17 * @param job 调度信息
18 18 * @return 操作日志集合
19 19 */
20   - public List<SysJob> selectJobList(SysJob job);
  20 + List<SysJob> selectJobList(SysJob job);
21 21  
22 22 /**
23 23 * 查询所有调度任务
24 24 *
25 25 * @return 调度任务列表
26 26 */
27   - public List<SysJob> selectJobAll();
  27 + List<SysJob> selectJobAll();
28 28  
29 29 /**
30 30 * 通过调度ID查询调度任务信息
... ... @@ -32,7 +32,7 @@ public interface SysJobMapper
32 32 * @param jobId 调度ID
33 33 * @return 角色对象信息
34 34 */
35   - public SysJob selectJobById(Long jobId);
  35 + SysJob selectJobById(Long jobId);
36 36  
37 37 /**
38 38 * 通过调度ID删除调度任务信息
... ... @@ -40,7 +40,7 @@ public interface SysJobMapper
40 40 * @param jobId 调度ID
41 41 * @return 结果
42 42 */
43   - public int deleteJobById(Long jobId);
  43 + int deleteJobById(Long jobId);
44 44  
45 45 /**
46 46 * 批量删除调度任务信息
... ... @@ -48,7 +48,7 @@ public interface SysJobMapper
48 48 * @param ids 需要删除的数据ID
49 49 * @return 结果
50 50 */
51   - public int deleteJobByIds(Long[] ids);
  51 + int deleteJobByIds(Long[] ids);
52 52  
53 53 /**
54 54 * 修改调度任务信息
... ... @@ -56,7 +56,7 @@ public interface SysJobMapper
56 56 * @param job 调度任务信息
57 57 * @return 结果
58 58 */
59   - public int updateJob(SysJob job);
  59 + int updateJob(SysJob job);
60 60  
61 61 /**
62 62 * 新增调度任务信息
... ... @@ -64,5 +64,5 @@ public interface SysJobMapper
64 64 * @param job 调度任务信息
65 65 * @return 结果
66 66 */
67   - public int insertJob(SysJob job);
  67 + int insertJob(SysJob job);
68 68 }
... ...
trash-quartz/src/main/java/com/trash/quartz/service/ISysJobLogService.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface ISysJobLogService
17 17 * @param jobLog 调度日志信息
18 18 * @return 调度任务日志集合
19 19 */
20   - public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
  20 + List<SysJobLog> selectJobLogList(SysJobLog jobLog);
21 21  
22 22 /**
23 23 * 通过调度任务日志ID查询调度信息
... ... @@ -25,14 +25,14 @@ public interface ISysJobLogService
25 25 * @param jobLogId 调度任务日志ID
26 26 * @return 调度任务日志对象信息
27 27 */
28   - public SysJobLog selectJobLogById(Long jobLogId);
  28 + SysJobLog selectJobLogById(Long jobLogId);
29 29  
30 30 /**
31 31 * 新增任务日志
32 32 *
33 33 * @param jobLog 调度日志信息
34 34 */
35   - public void addJobLog(SysJobLog jobLog);
  35 + void addJobLog(SysJobLog jobLog);
36 36  
37 37 /**
38 38 * 批量删除调度日志信息
... ... @@ -40,7 +40,7 @@ public interface ISysJobLogService
40 40 * @param logIds 需要删除的日志ID
41 41 * @return 结果
42 42 */
43   - public int deleteJobLogByIds(Long[] logIds);
  43 + int deleteJobLogByIds(Long[] logIds);
44 44  
45 45 /**
46 46 * 删除任务日志
... ... @@ -48,10 +48,10 @@ public interface ISysJobLogService
48 48 * @param jobId 调度日志ID
49 49 * @return 结果
50 50 */
51   - public int deleteJobLogById(Long jobId);
  51 + int deleteJobLogById(Long jobId);
52 52  
53 53 /**
54 54 * 清空任务日志
55 55 */
56   - public void cleanJobLog();
  56 + void cleanJobLog();
57 57 }
... ...
trash-quartz/src/main/java/com/trash/quartz/service/ISysJobService.java
  View file @ae103c5
... ... @@ -19,7 +19,7 @@ public interface ISysJobService
19 19 * @param job 调度信息
20 20 * @return 调度任务集合
21 21 */
22   - public List<SysJob> selectJobList(SysJob job);
  22 + List<SysJob> selectJobList(SysJob job);
23 23  
24 24 /**
25 25 * 通过调度任务ID查询调度信息
... ... @@ -27,7 +27,7 @@ public interface ISysJobService
27 27 * @param jobId 调度任务ID
28 28 * @return 调度任务对象信息
29 29 */
30   - public SysJob selectJobById(Long jobId);
  30 + SysJob selectJobById(Long jobId);
31 31  
32 32 /**
33 33 * 暂停任务
... ... @@ -35,7 +35,7 @@ public interface ISysJobService
35 35 * @param job 调度信息
36 36 * @return 结果
37 37 */
38   - public int pauseJob(SysJob job) throws SchedulerException;
  38 + int pauseJob(SysJob job) throws SchedulerException;
39 39  
40 40 /**
41 41 * 恢复任务
... ... @@ -43,7 +43,7 @@ public interface ISysJobService
43 43 * @param job 调度信息
44 44 * @return 结果
45 45 */
46   - public int resumeJob(SysJob job) throws SchedulerException;
  46 + int resumeJob(SysJob job) throws SchedulerException;
47 47  
48 48 /**
49 49 * 删除任务后，所对应的trigger也将被删除
... ... @@ -51,7 +51,7 @@ public interface ISysJobService
51 51 * @param job 调度信息
52 52 * @return 结果
53 53 */
54   - public int deleteJob(SysJob job) throws SchedulerException;
  54 + int deleteJob(SysJob job) throws SchedulerException;
55 55  
56 56 /**
57 57 * 批量删除调度信息
... ... @@ -59,7 +59,7 @@ public interface ISysJobService
59 59 * @param jobIds 需要删除的任务ID
60 60 * @return 结果
61 61 */
62   - public void deleteJobByIds(Long[] jobIds) throws SchedulerException;
  62 + void deleteJobByIds(Long[] jobIds) throws SchedulerException;
63 63  
64 64 /**
65 65 * 任务调度状态修改
... ... @@ -67,7 +67,7 @@ public interface ISysJobService
67 67 * @param job 调度信息
68 68 * @return 结果
69 69 */
70   - public int changeStatus(SysJob job) throws SchedulerException;
  70 + int changeStatus(SysJob job) throws SchedulerException;
71 71  
72 72 /**
73 73 * 立即运行任务
... ... @@ -75,7 +75,7 @@ public interface ISysJobService
75 75 * @param job 调度信息
76 76 * @return 结果
77 77 */
78   - public void run(SysJob job) throws SchedulerException;
  78 + void run(SysJob job) throws SchedulerException;
79 79  
80 80 /**
81 81 * 新增任务
... ... @@ -83,7 +83,7 @@ public interface ISysJobService
83 83 * @param job 调度信息
84 84 * @return 结果
85 85 */
86   - public int insertJob(SysJob job) throws SchedulerException, TaskException;
  86 + int insertJob(SysJob job) throws SchedulerException, TaskException;
87 87  
88 88 /**
89 89 * 更新任务
... ... @@ -91,7 +91,7 @@ public interface ISysJobService
91 91 * @param job 调度信息
92 92 * @return 结果
93 93 */
94   - public int updateJob(SysJob job) throws SchedulerException, TaskException;
  94 + int updateJob(SysJob job) throws SchedulerException, TaskException;
95 95  
96 96 /**
97 97 * 校验cron表达式是否有效
... ... @@ -99,5 +99,5 @@ public interface ISysJobService
99 99 * @param cronExpression 表达式
100 100 * @return 结果
101 101 */
102   - public boolean checkCronExpressionIsValid(String cronExpression);
  102 + boolean checkCronExpressionIsValid(String cronExpression);
103 103 }
... ...
trash-quartz/src/main/java/com/trash/quartz/util/AbstractQuartzJob.java
  View file @ae103c5
... ... @@ -29,7 +29,7 @@ public abstract class AbstractQuartzJob implements Job
29 29 /**
30 30 * 线程本地变量
31 31 */
32   - private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
  32 + private static final ThreadLocal<Date> threadLocal = new ThreadLocal<>();
33 33  
34 34 @Override
35 35 public void execute(JobExecutionContext context) throws JobExecutionException
... ...
trash-quartz/src/main/java/com/trash/quartz/util/JobInvokeUtil.java
  View file @ae103c5
... ... @@ -175,7 +175,7 @@ public class JobInvokeUtil
175 175 int index = 0;
176 176 for (Object[] os : methodParams)
177 177 {
178   - classs[index] = (Object) os[0];
  178 + classs[index] = os[0];
179 179 index++;
180 180 }
181 181 return classs;
... ...
trash-system/src/main/java/com/trash/system/mapper/SysConfigMapper.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface SysConfigMapper
17 17 * @param config 参数配置信息
18 18 * @return 参数配置信息
19 19 */
20   - public SysConfig selectConfig(SysConfig config);
  20 + SysConfig selectConfig(SysConfig config);
21 21  
22 22 /**
23 23 * 查询参数配置列表
... ... @@ -25,7 +25,7 @@ public interface SysConfigMapper
25 25 * @param config 参数配置信息
26 26 * @return 参数配置集合
27 27 */
28   - public List<SysConfig> selectConfigList(SysConfig config);
  28 + List<SysConfig> selectConfigList(SysConfig config);
29 29  
30 30 /**
31 31 * 根据键名查询参数配置信息
... ... @@ -33,7 +33,7 @@ public interface SysConfigMapper
33 33 * @param configKey 参数键名
34 34 * @return 参数配置信息
35 35 */
36   - public SysConfig checkConfigKeyUnique(String configKey);
  36 + SysConfig checkConfigKeyUnique(String configKey);
37 37  
38 38 /**
39 39 * 新增参数配置
... ... @@ -41,7 +41,7 @@ public interface SysConfigMapper
41 41 * @param config 参数配置信息
42 42 * @return 结果
43 43 */
44   - public int insertConfig(SysConfig config);
  44 + int insertConfig(SysConfig config);
45 45  
46 46 /**
47 47 * 修改参数配置
... ... @@ -49,7 +49,7 @@ public interface SysConfigMapper
49 49 * @param config 参数配置信息
50 50 * @return 结果
51 51 */
52   - public int updateConfig(SysConfig config);
  52 + int updateConfig(SysConfig config);
53 53  
54 54 /**
55 55 * 删除参数配置
... ... @@ -57,7 +57,7 @@ public interface SysConfigMapper
57 57 * @param configId 参数ID
58 58 * @return 结果
59 59 */
60   - public int deleteConfigById(Long configId);
  60 + int deleteConfigById(Long configId);
61 61  
62 62 /**
63 63 * 批量删除参数信息
... ... @@ -65,5 +65,5 @@ public interface SysConfigMapper
65 65 * @param configIds 需要删除的参数ID
66 66 * @return 结果
67 67 */
68   - public int deleteConfigByIds(Long[] configIds);
  68 + int deleteConfigByIds(Long[] configIds);
69 69 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysDeptMapper.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface SysDeptMapper
18 18 * @param dept 部门信息
19 19 * @return 部门信息集合
20 20 */
21   - public List<SysDept> selectDeptList(SysDept dept);
  21 + List<SysDept> selectDeptList(SysDept dept);
22 22  
23 23 /**
24 24 * 根据角色ID查询部门树信息
... ... @@ -27,7 +27,7 @@ public interface SysDeptMapper
27 27 * @param deptCheckStrictly 部门树选择项是否关联显示
28 28 * @return 选中部门列表
29 29 */
30   - public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
  30 + List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
31 31  
32 32 /**
33 33 * 根据部门ID查询信息
... ... @@ -35,7 +35,7 @@ public interface SysDeptMapper
35 35 * @param deptId 部门ID
36 36 * @return 部门信息
37 37 */
38   - public SysDept selectDeptById(Long deptId);
  38 + SysDept selectDeptById(Long deptId);
39 39  
40 40 /**
41 41 * 根据ID查询所有子部门
... ... @@ -43,7 +43,7 @@ public interface SysDeptMapper
43 43 * @param deptId 部门ID
44 44 * @return 部门列表
45 45 */
46   - public List<SysDept> selectChildrenDeptById(Long deptId);
  46 + List<SysDept> selectChildrenDeptById(Long deptId);
47 47  
48 48 /**
49 49 * 根据ID查询所有子部门（正常状态）
... ... @@ -51,7 +51,7 @@ public interface SysDeptMapper
51 51 * @param deptId 部门ID
52 52 * @return 子部门数
53 53 */
54   - public int selectNormalChildrenDeptById(Long deptId);
  54 + int selectNormalChildrenDeptById(Long deptId);
55 55  
56 56 /**
57 57 * 是否存在子节点
... ... @@ -59,7 +59,7 @@ public interface SysDeptMapper
59 59 * @param deptId 部门ID
60 60 * @return 结果
61 61 */
62   - public int hasChildByDeptId(Long deptId);
  62 + int hasChildByDeptId(Long deptId);
63 63  
64 64 /**
65 65 * 查询部门是否存在用户
... ... @@ -67,7 +67,7 @@ public interface SysDeptMapper
67 67 * @param deptId 部门ID
68 68 * @return 结果
69 69 */
70   - public int checkDeptExistUser(Long deptId);
  70 + int checkDeptExistUser(Long deptId);
71 71  
72 72 /**
73 73 * 校验部门名称是否唯一
... ... @@ -76,7 +76,7 @@ public interface SysDeptMapper
76 76 * @param parentId 父部门ID
77 77 * @return 结果
78 78 */
79   - public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
  79 + SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
80 80  
81 81 /**
82 82 * 新增部门信息
... ... @@ -84,7 +84,7 @@ public interface SysDeptMapper
84 84 * @param dept 部门信息
85 85 * @return 结果
86 86 */
87   - public int insertDept(SysDept dept);
  87 + int insertDept(SysDept dept);
88 88  
89 89 /**
90 90 * 修改部门信息
... ... @@ -92,14 +92,14 @@ public interface SysDeptMapper
92 92 * @param dept 部门信息
93 93 * @return 结果
94 94 */
95   - public int updateDept(SysDept dept);
  95 + int updateDept(SysDept dept);
96 96  
97 97 /**
98 98 * 修改所在部门的父级部门状态
99 99 *
100 100 * @param dept 部门
101 101 */
102   - public void updateDeptStatus(SysDept dept);
  102 + void updateDeptStatus(SysDept dept);
103 103  
104 104 /**
105 105 * 修改子元素关系
... ... @@ -107,7 +107,7 @@ public interface SysDeptMapper
107 107 * @param depts 子元素
108 108 * @return 结果
109 109 */
110   - public int updateDeptChildren(@Param("depts") List<SysDept> depts);
  110 + int updateDeptChildren(@Param("depts") List<SysDept> depts);
111 111  
112 112 /**
113 113 * 删除部门管理信息
... ... @@ -115,5 +115,5 @@ public interface SysDeptMapper
115 115 * @param deptId 部门ID
116 116 * @return 结果
117 117 */
118   - public int deleteDeptById(Long deptId);
  118 + int deleteDeptById(Long deptId);
119 119 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysDictDataMapper.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface SysDictDataMapper
18 18 * @param dictData 字典数据信息
19 19 * @return 字典数据集合信息
20 20 */
21   - public List<SysDictData> selectDictDataList(SysDictData dictData);
  21 + List<SysDictData> selectDictDataList(SysDictData dictData);
22 22  
23 23 /**
24 24 * 根据字典类型查询字典数据
... ... @@ -26,7 +26,7 @@ public interface SysDictDataMapper
26 26 * @param dictType 字典类型
27 27 * @return 字典数据集合信息
28 28 */
29   - public List<SysDictData> selectDictDataByType(String dictType);
  29 + List<SysDictData> selectDictDataByType(String dictType);
30 30  
31 31 /**
32 32 * 根据字典类型和字典键值查询字典数据信息
... ... @@ -35,7 +35,7 @@ public interface SysDictDataMapper
35 35 * @param dictValue 字典键值
36 36 * @return 字典标签
37 37 */
38   - public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
  38 + String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
39 39  
40 40 /**
41 41 * 根据字典数据ID查询信息
... ... @@ -43,7 +43,7 @@ public interface SysDictDataMapper
43 43 * @param dictCode 字典数据ID
44 44 * @return 字典数据
45 45 */
46   - public SysDictData selectDictDataById(Long dictCode);
  46 + SysDictData selectDictDataById(Long dictCode);
47 47  
48 48 /**
49 49 * 查询字典数据
... ... @@ -51,7 +51,7 @@ public interface SysDictDataMapper
51 51 * @param dictType 字典类型
52 52 * @return 字典数据
53 53 */
54   - public int countDictDataByType(String dictType);
  54 + int countDictDataByType(String dictType);
55 55  
56 56 /**
57 57 * 通过字典ID删除字典数据信息
... ... @@ -59,7 +59,7 @@ public interface SysDictDataMapper
59 59 * @param dictCode 字典数据ID
60 60 * @return 结果
61 61 */
62   - public int deleteDictDataById(Long dictCode);
  62 + int deleteDictDataById(Long dictCode);
63 63  
64 64 /**
65 65 * 批量删除字典数据信息
... ... @@ -67,7 +67,7 @@ public interface SysDictDataMapper
67 67 * @param dictCodes 需要删除的字典数据ID
68 68 * @return 结果
69 69 */
70   - public int deleteDictDataByIds(Long[] dictCodes);
  70 + int deleteDictDataByIds(Long[] dictCodes);
71 71  
72 72 /**
73 73 * 新增字典数据信息
... ... @@ -75,7 +75,7 @@ public interface SysDictDataMapper
75 75 * @param dictData 字典数据信息
76 76 * @return 结果
77 77 */
78   - public int insertDictData(SysDictData dictData);
  78 + int insertDictData(SysDictData dictData);
79 79  
80 80 /**
81 81 * 修改字典数据信息
... ... @@ -83,7 +83,7 @@ public interface SysDictDataMapper
83 83 * @param dictData 字典数据信息
84 84 * @return 结果
85 85 */
86   - public int updateDictData(SysDictData dictData);
  86 + int updateDictData(SysDictData dictData);
87 87  
88 88 /**
89 89 * 同步修改字典类型
... ... @@ -92,5 +92,5 @@ public interface SysDictDataMapper
92 92 * @param newDictType 新旧字典类型
93 93 * @return 结果
94 94 */
95   - public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
  95 + int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
96 96 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysDictTypeMapper.java
  View file @ae103c5
... ... @@ -19,14 +19,14 @@ public interface SysDictTypeMapper
19 19 * @param dictType 字典类型信息
20 20 * @return 字典类型集合信息
21 21 */
22   - public List<SysDictType> selectDictTypeList(SysDictType dictType);
  22 + List<SysDictType> selectDictTypeList(SysDictType dictType);
23 23  
24 24 /**
25 25 * 根据所有字典类型
26 26 *
27 27 * @return 字典类型集合信息
28 28 */
29   - public List<SysDictType> selectDictTypeAll();
  29 + List<SysDictType> selectDictTypeAll();
30 30  
31 31 /**
32 32 * 根据字典类型ID查询信息
... ... @@ -34,7 +34,7 @@ public interface SysDictTypeMapper
34 34 * @param dictId 字典类型ID
35 35 * @return 字典类型
36 36 */
37   - public SysDictType selectDictTypeById(Long dictId);
  37 + SysDictType selectDictTypeById(Long dictId);
38 38  
39 39 /**
40 40 * 根据字典类型查询信息
... ... @@ -42,7 +42,7 @@ public interface SysDictTypeMapper
42 42 * @param dictType 字典类型
43 43 * @return 字典类型
44 44 */
45   - public SysDictType selectDictTypeByType(String dictType);
  45 + SysDictType selectDictTypeByType(String dictType);
46 46  
47 47 /**
48 48 * 通过字典ID删除字典信息
... ... @@ -50,7 +50,7 @@ public interface SysDictTypeMapper
50 50 * @param dictId 字典ID
51 51 * @return 结果
52 52 */
53   - public int deleteDictTypeById(Long dictId);
  53 + int deleteDictTypeById(Long dictId);
54 54  
55 55 /**
56 56 * 批量删除字典类型信息
... ... @@ -58,7 +58,7 @@ public interface SysDictTypeMapper
58 58 * @param dictIds 需要删除的字典ID
59 59 * @return 结果
60 60 */
61   - public int deleteDictTypeByIds(Long[] dictIds);
  61 + int deleteDictTypeByIds(Long[] dictIds);
62 62  
63 63 /**
64 64 * 新增字典类型信息
... ... @@ -66,7 +66,7 @@ public interface SysDictTypeMapper
66 66 * @param dictType 字典类型信息
67 67 * @return 结果
68 68 */
69   - public int insertDictType(SysDictType dictType);
  69 + int insertDictType(SysDictType dictType);
70 70  
71 71 /**
72 72 * 修改字典类型信息
... ... @@ -74,7 +74,7 @@ public interface SysDictTypeMapper
74 74 * @param dictType 字典类型信息
75 75 * @return 结果
76 76 */
77   - public int updateDictType(SysDictType dictType);
  77 + int updateDictType(SysDictType dictType);
78 78  
79 79 /**
80 80 * 校验字典类型称是否唯一
... ... @@ -82,5 +82,5 @@ public interface SysDictTypeMapper
82 82 * @param dictType 字典类型
83 83 * @return 结果
84 84 */
85   - public SysDictType checkDictTypeUnique(String dictType);
  85 + SysDictType checkDictTypeUnique(String dictType);
86 86 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysLogininforMapper.java
  View file @ae103c5
... ... @@ -16,7 +16,7 @@ public interface SysLogininforMapper
16 16 *
17 17 * @param logininfor 访问日志对象
18 18 */
19   - public void insertLogininfor(SysLogininfor logininfor);
  19 + void insertLogininfor(SysLogininfor logininfor);
20 20  
21 21 /**
22 22 * 查询系统登录日志集合
... ... @@ -24,7 +24,7 @@ public interface SysLogininforMapper
24 24 * @param logininfor 访问日志对象
25 25 * @return 登录记录集合
26 26 */
27   - public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
  27 + List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
28 28  
29 29 /**
30 30 * 批量删除系统登录日志
... ... @@ -32,12 +32,12 @@ public interface SysLogininforMapper
32 32 * @param infoIds 需要删除的登录日志ID
33 33 * @return 结果
34 34 */
35   - public int deleteLogininforByIds(Long[] infoIds);
  35 + int deleteLogininforByIds(Long[] infoIds);
36 36  
37 37 /**
38 38 * 清空系统登录日志
39 39 *
40 40 * @return 结果
41 41 */
42   - public int cleanLogininfor();
  42 + int cleanLogininfor();
43 43 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysMenuMapper.java
  View file @ae103c5
... ... @@ -18,14 +18,14 @@ public interface SysMenuMapper
18 18 * @param menu 菜单信息
19 19 * @return 菜单列表
20 20 */
21   - public List<SysMenu> selectMenuList(SysMenu menu);
  21 + List<SysMenu> selectMenuList(SysMenu menu);
22 22  
23 23 /**
24 24 * 根据用户所有权限
25 25 *
26 26 * @return 权限列表
27 27 */
28   - public List<String> selectMenuPerms();
  28 + List<String> selectMenuPerms();
29 29  
30 30 /**
31 31 * 根据用户查询系统菜单列表
... ... @@ -33,7 +33,7 @@ public interface SysMenuMapper
33 33 * @param menu 菜单信息
34 34 * @return 菜单列表
35 35 */
36   - public List<SysMenu> selectMenuListByUserId(SysMenu menu);
  36 + List<SysMenu> selectMenuListByUserId(SysMenu menu);
37 37  
38 38 /**
39 39 * 根据用户ID查询权限
... ... @@ -41,14 +41,14 @@ public interface SysMenuMapper
41 41 * @param userId 用户ID
42 42 * @return 权限列表
43 43 */
44   - public List<String> selectMenuPermsByUserId(String userId);
  44 + List<String> selectMenuPermsByUserId(String userId);
45 45  
46 46 /**
47 47 * 根据用户ID查询菜单
48 48 *
49 49 * @return 菜单列表
50 50 */
51   - public List<SysMenu> selectMenuTreeAll();
  51 + List<SysMenu> selectMenuTreeAll();
52 52  
53 53 /**
54 54 * 根据用户ID查询菜单
... ... @@ -56,7 +56,7 @@ public interface SysMenuMapper
56 56 * @param userId 用户ID
57 57 * @return 菜单列表
58 58 */
59   - public List<SysMenu> selectMenuTreeByUserId(String userId);
  59 + List<SysMenu> selectMenuTreeByUserId(String userId);
60 60  
61 61 /**
62 62 * 根据角色ID查询菜单树信息
... ... @@ -65,7 +65,7 @@ public interface SysMenuMapper
65 65 * @param menuCheckStrictly 菜单树选择项是否关联显示
66 66 * @return 选中菜单列表
67 67 */
68   - public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
  68 + List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
69 69  
70 70 /**
71 71 * 根据菜单ID查询信息
... ... @@ -73,7 +73,7 @@ public interface SysMenuMapper
73 73 * @param menuId 菜单ID
74 74 * @return 菜单信息
75 75 */
76   - public SysMenu selectMenuById(Long menuId);
  76 + SysMenu selectMenuById(Long menuId);
77 77  
78 78 /**
79 79 * 是否存在菜单子节点
... ... @@ -81,7 +81,7 @@ public interface SysMenuMapper
81 81 * @param menuId 菜单ID
82 82 * @return 结果
83 83 */
84   - public int hasChildByMenuId(Long menuId);
  84 + int hasChildByMenuId(Long menuId);
85 85  
86 86 /**
87 87 * 新增菜单信息
... ... @@ -89,7 +89,7 @@ public interface SysMenuMapper
89 89 * @param menu 菜单信息
90 90 * @return 结果
91 91 */
92   - public int insertMenu(SysMenu menu);
  92 + int insertMenu(SysMenu menu);
93 93  
94 94 /**
95 95 * 修改菜单信息
... ... @@ -97,7 +97,7 @@ public interface SysMenuMapper
97 97 * @param menu 菜单信息
98 98 * @return 结果
99 99 */
100   - public int updateMenu(SysMenu menu);
  100 + int updateMenu(SysMenu menu);
101 101  
102 102 /**
103 103 * 删除菜单管理信息
... ... @@ -105,7 +105,7 @@ public interface SysMenuMapper
105 105 * @param menuId 菜单ID
106 106 * @return 结果
107 107 */
108   - public int deleteMenuById(Long menuId);
  108 + int deleteMenuById(Long menuId);
109 109  
110 110 /**
111 111 * 校验菜单名称是否唯一
... ... @@ -114,5 +114,5 @@ public interface SysMenuMapper
114 114 * @param parentId 父菜单ID
115 115 * @return 结果
116 116 */
117   - public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
  117 + SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
118 118 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysNoticeMapper.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface SysNoticeMapper
17 17 * @param noticeId 公告ID
18 18 * @return 公告信息
19 19 */
20   - public SysNotice selectNoticeById(Long noticeId);
  20 + SysNotice selectNoticeById(Long noticeId);
21 21  
22 22 /**
23 23 * 查询公告列表
... ... @@ -25,7 +25,7 @@ public interface SysNoticeMapper
25 25 * @param notice 公告信息
26 26 * @return 公告集合
27 27 */
28   - public List<SysNotice> selectNoticeList(SysNotice notice);
  28 + List<SysNotice> selectNoticeList(SysNotice notice);
29 29  
30 30 /**
31 31 * 新增公告
... ... @@ -33,7 +33,7 @@ public interface SysNoticeMapper
33 33 * @param notice 公告信息
34 34 * @return 结果
35 35 */
36   - public int insertNotice(SysNotice notice);
  36 + int insertNotice(SysNotice notice);
37 37  
38 38 /**
39 39 * 修改公告
... ... @@ -41,7 +41,7 @@ public interface SysNoticeMapper
41 41 * @param notice 公告信息
42 42 * @return 结果
43 43 */
44   - public int updateNotice(SysNotice notice);
  44 + int updateNotice(SysNotice notice);
45 45  
46 46 /**
47 47 * 批量删除公告
... ... @@ -49,7 +49,7 @@ public interface SysNoticeMapper
49 49 * @param noticeId 公告ID
50 50 * @return 结果
51 51 */
52   - public int deleteNoticeById(Long noticeId);
  52 + int deleteNoticeById(Long noticeId);
53 53  
54 54 /**
55 55 * 批量删除公告信息
... ... @@ -57,5 +57,5 @@ public interface SysNoticeMapper
57 57 * @param noticeIds 需要删除的公告ID
58 58 * @return 结果
59 59 */
60   - public int deleteNoticeByIds(Long[] noticeIds);
  60 + int deleteNoticeByIds(Long[] noticeIds);
61 61 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysOperLogMapper.java
  View file @ae103c5
... ... @@ -16,7 +16,7 @@ public interface SysOperLogMapper
16 16 *
17 17 * @param operLog 操作日志对象
18 18 */
19   - public void insertOperlog(SysOperLog operLog);
  19 + void insertOperlog(SysOperLog operLog);
20 20  
21 21 /**
22 22 * 查询系统操作日志集合
... ... @@ -24,7 +24,7 @@ public interface SysOperLogMapper
24 24 * @param operLog 操作日志对象
25 25 * @return 操作日志集合
26 26 */
27   - public List<SysOperLog> selectOperLogList(SysOperLog operLog);
  27 + List<SysOperLog> selectOperLogList(SysOperLog operLog);
28 28  
29 29 /**
30 30 * 批量删除系统操作日志
... ... @@ -32,7 +32,7 @@ public interface SysOperLogMapper
32 32 * @param operIds 需要删除的操作日志ID
33 33 * @return 结果
34 34 */
35   - public int deleteOperLogByIds(Long[] operIds);
  35 + int deleteOperLogByIds(Long[] operIds);
36 36  
37 37 /**
38 38 * 查询操作日志详细
... ... @@ -40,10 +40,10 @@ public interface SysOperLogMapper
40 40 * @param operId 操作ID
41 41 * @return 操作日志对象
42 42 */
43   - public SysOperLog selectOperLogById(Long operId);
  43 + SysOperLog selectOperLogById(Long operId);
44 44  
45 45 /**
46 46 * 清空操作日志
47 47 */
48   - public void cleanOperLog();
  48 + void cleanOperLog();
49 49 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysPostMapper.java
  View file @ae103c5
... ... @@ -18,14 +18,14 @@ public interface SysPostMapper
18 18 * @param post 岗位信息
19 19 * @return 岗位数据集合
20 20 */
21   - public List<SysPost> selectPostList(SysPost post);
  21 + List<SysPost> selectPostList(SysPost post);
22 22  
23 23 /**
24 24 * 查询所有岗位
25 25 *
26 26 * @return 岗位列表
27 27 */
28   - public List<SysPost> selectPostAll();
  28 + List<SysPost> selectPostAll();
29 29  
30 30 /**
31 31 * 通过岗位ID查询岗位信息
... ... @@ -33,7 +33,7 @@ public interface SysPostMapper
33 33 * @param postId 岗位ID
34 34 * @return 角色对象信息
35 35 */
36   - public SysPost selectPostById(Long postId);
  36 + SysPost selectPostById(Long postId);
37 37  
38 38 /**
39 39 * 根据用户ID获取岗位选择框列表
... ... @@ -41,14 +41,14 @@ public interface SysPostMapper
41 41 * @param userId 用户ID
42 42 * @return 选中岗位ID列表
43 43 */
44   - public List<Integer> selectPostListByUserId(String userId);
  44 + List<Integer> selectPostListByUserId(String userId);
45 45 /**
46 46 * 根据用户ID获取PostCode
47 47 *
48 48 * @param userId 用户ID
49 49 * @return 选中岗位PostCode列表
50 50 */
51   - public Set<String> selectPostCodeByUserId(String userId);
  51 + Set<String> selectPostCodeByUserId(String userId);
52 52  
53 53 /**
54 54 * 查询用户所属岗位组
... ... @@ -56,7 +56,7 @@ public interface SysPostMapper
56 56 * @param userName 用户名
57 57 * @return 结果
58 58 */
59   - public List<SysPost> selectPostsByUserName(String userName);
  59 + List<SysPost> selectPostsByUserName(String userName);
60 60  
61 61 /**
62 62 * 删除岗位信息
... ... @@ -64,7 +64,7 @@ public interface SysPostMapper
64 64 * @param postId 岗位ID
65 65 * @return 结果
66 66 */
67   - public int deletePostById(Long postId);
  67 + int deletePostById(Long postId);
68 68  
69 69 /**
70 70 * 批量删除岗位信息
... ... @@ -72,7 +72,7 @@ public interface SysPostMapper
72 72 * @param postIds 需要删除的岗位ID
73 73 * @return 结果
74 74 */
75   - public int deletePostByIds(Long[] postIds);
  75 + int deletePostByIds(Long[] postIds);
76 76  
77 77 /**
78 78 * 修改岗位信息
... ... @@ -80,7 +80,7 @@ public interface SysPostMapper
80 80 * @param post 岗位信息
81 81 * @return 结果
82 82 */
83   - public int updatePost(SysPost post);
  83 + int updatePost(SysPost post);
84 84  
85 85 /**
86 86 * 新增岗位信息
... ... @@ -88,7 +88,7 @@ public interface SysPostMapper
88 88 * @param post 岗位信息
89 89 * @return 结果
90 90 */
91   - public int insertPost(SysPost post);
  91 + int insertPost(SysPost post);
92 92  
93 93 /**
94 94 * 校验岗位名称
... ... @@ -96,7 +96,7 @@ public interface SysPostMapper
96 96 * @param postName 岗位名称
97 97 * @return 结果
98 98 */
99   - public SysPost checkPostNameUnique(String postName);
  99 + SysPost checkPostNameUnique(String postName);
100 100  
101 101 /**
102 102 * 校验岗位编码
... ... @@ -104,5 +104,5 @@ public interface SysPostMapper
104 104 * @param postCode 岗位编码
105 105 * @return 结果
106 106 */
107   - public SysPost checkPostCodeUnique(String postCode);
  107 + SysPost checkPostCodeUnique(String postCode);
108 108 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysRoleDeptMapper.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface SysRoleDeptMapper
17 17 * @param roleId 角色ID
18 18 * @return 结果
19 19 */
20   - public int deleteRoleDeptByRoleId(Long roleId);
  20 + int deleteRoleDeptByRoleId(Long roleId);
21 21  
22 22 /**
23 23 * 批量删除角色部门关联信息
... ... @@ -25,7 +25,7 @@ public interface SysRoleDeptMapper
25 25 * @param ids 需要删除的数据ID
26 26 * @return 结果
27 27 */
28   - public int deleteRoleDept(Long[] ids);
  28 + int deleteRoleDept(Long[] ids);
29 29  
30 30 /**
31 31 * 查询部门使用数量
... ... @@ -33,7 +33,7 @@ public interface SysRoleDeptMapper
33 33 * @param deptId 部门ID
34 34 * @return 结果
35 35 */
36   - public int selectCountRoleDeptByDeptId(Long deptId);
  36 + int selectCountRoleDeptByDeptId(Long deptId);
37 37  
38 38 /**
39 39 * 批量新增角色部门信息
... ... @@ -41,5 +41,5 @@ public interface SysRoleDeptMapper
41 41 * @param roleDeptList 角色部门列表
42 42 * @return 结果
43 43 */
44   - public int batchRoleDept(List<SysRoleDept> roleDeptList);
  44 + int batchRoleDept(List<SysRoleDept> roleDeptList);
45 45 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysRoleMapper.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface SysRoleMapper
17 17 * @param role 角色信息
18 18 * @return 角色数据集合信息
19 19 */
20   - public List<SysRole> selectRoleList(SysRole role);
  20 + List<SysRole> selectRoleList(SysRole role);
21 21  
22 22 /**
23 23 * 根据用户ID查询角色
... ... @@ -25,14 +25,14 @@ public interface SysRoleMapper
25 25 * @param userId 用户ID
26 26 * @return 角色列表
27 27 */
28   - public List<SysRole> selectRolePermissionByUserId(String userId);
  28 + List<SysRole> selectRolePermissionByUserId(String userId);
29 29  
30 30 /**
31 31 * 查询所有角色
32 32 *
33 33 * @return 角色列表
34 34 */
35   - public List<SysRole> selectRoleAll();
  35 + List<SysRole> selectRoleAll();
36 36  
37 37 /**
38 38 * 根据用户ID获取角色选择框列表
... ... @@ -40,7 +40,7 @@ public interface SysRoleMapper
40 40 * @param userId 用户ID
41 41 * @return 选中角色ID列表
42 42 */
43   - public List<Integer> selectRoleListByUserId(String userId);
  43 + List<Integer> selectRoleListByUserId(String userId);
44 44  
45 45 /**
46 46 * 通过角色ID查询角色
... ... @@ -48,7 +48,7 @@ public interface SysRoleMapper
48 48 * @param roleId 角色ID
49 49 * @return 角色对象信息
50 50 */
51   - public SysRole selectRoleById(Long roleId);
  51 + SysRole selectRoleById(Long roleId);
52 52  
53 53 /**
54 54 * 根据用户ID查询角色
... ... @@ -56,7 +56,7 @@ public interface SysRoleMapper
56 56 * @param userName 用户名
57 57 * @return 角色列表
58 58 */
59   - public List<SysRole> selectRolesByUserName(String userName);
  59 + List<SysRole> selectRolesByUserName(String userName);
60 60  
61 61 /**
62 62 * 校验角色名称是否唯一
... ... @@ -64,7 +64,7 @@ public interface SysRoleMapper
64 64 * @param roleName 角色名称
65 65 * @return 角色信息
66 66 */
67   - public SysRole checkRoleNameUnique(String roleName);
  67 + SysRole checkRoleNameUnique(String roleName);
68 68  
69 69 /**
70 70 * 校验角色权限是否唯一
... ... @@ -72,7 +72,7 @@ public interface SysRoleMapper
72 72 * @param roleKey 角色权限
73 73 * @return 角色信息
74 74 */
75   - public SysRole checkRoleKeyUnique(String roleKey);
  75 + SysRole checkRoleKeyUnique(String roleKey);
76 76  
77 77 /**
78 78 * 修改角色信息
... ... @@ -80,7 +80,7 @@ public interface SysRoleMapper
80 80 * @param role 角色信息
81 81 * @return 结果
82 82 */
83   - public int updateRole(SysRole role);
  83 + int updateRole(SysRole role);
84 84  
85 85 /**
86 86 * 新增角色信息
... ... @@ -88,7 +88,7 @@ public interface SysRoleMapper
88 88 * @param role 角色信息
89 89 * @return 结果
90 90 */
91   - public int insertRole(SysRole role);
  91 + int insertRole(SysRole role);
92 92  
93 93 /**
94 94 * 通过角色ID删除角色
... ... @@ -96,7 +96,7 @@ public interface SysRoleMapper
96 96 * @param roleId 角色ID
97 97 * @return 结果
98 98 */
99   - public int deleteRoleById(Long roleId);
  99 + int deleteRoleById(Long roleId);
100 100  
101 101 /**
102 102 * 批量删除角色信息
... ... @@ -104,5 +104,5 @@ public interface SysRoleMapper
104 104 * @param roleIds 需要删除的角色ID
105 105 * @return 结果
106 106 */
107   - public int deleteRoleByIds(Long[] roleIds);
  107 + int deleteRoleByIds(Long[] roleIds);
108 108 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysRoleMenuMapper.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface SysRoleMenuMapper
17 17 * @param menuId 菜单ID
18 18 * @return 结果
19 19 */
20   - public int checkMenuExistRole(Long menuId);
  20 + int checkMenuExistRole(Long menuId);
21 21  
22 22 /**
23 23 * 通过角色ID删除角色和菜单关联
... ... @@ -25,7 +25,7 @@ public interface SysRoleMenuMapper
25 25 * @param roleId 角色ID
26 26 * @return 结果
27 27 */
28   - public int deleteRoleMenuByRoleId(Long roleId);
  28 + int deleteRoleMenuByRoleId(Long roleId);
29 29  
30 30 /**
31 31 * 批量新增角色菜单信息
... ... @@ -33,5 +33,5 @@ public interface SysRoleMenuMapper
33 33 * @param roleMenuList 角色菜单列表
34 34 * @return 结果
35 35 */
36   - public int batchRoleMenu(List<SysRoleMenu> roleMenuList);
  36 + int batchRoleMenu(List<SysRoleMenu> roleMenuList);
37 37 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysUserMapper.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface SysUserMapper
18 18 * @param sysUser 用户信息
19 19 * @return 用户信息集合信息
20 20 */
21   - public List<SysUser> selectUserList(SysUser sysUser);
  21 + List<SysUser> selectUserList(SysUser sysUser);
22 22  
23 23 /**
24 24 * 通过用户名查询用户
... ... @@ -26,7 +26,7 @@ public interface SysUserMapper
26 26 * @param userName 用户名
27 27 * @return 用户对象信息
28 28 */
29   - public SysUser selectUserByUserName(String userName);
  29 + SysUser selectUserByUserName(String userName);
30 30  
31 31 /**
32 32 * 通过用户ID查询用户
... ... @@ -34,9 +34,9 @@ public interface SysUserMapper
34 34 * @param userId 用户ID
35 35 * @return 用户对象信息
36 36 */
37   - public SysUser selectUserById(String userId);
  37 + SysUser selectUserById(String userId);
38 38  
39   - public List<String>selectUserNameByPostCodeAndDeptId(String postCode,Long deptId);
  39 + List<String>selectUserNameByPostCodeAndDeptId(String postCode, Long deptId);
40 40  
41 41 /**
42 42 * 新增用户信息
... ... @@ -44,7 +44,7 @@ public interface SysUserMapper
44 44 * @param user 用户信息
45 45 * @return 结果
46 46 */
47   - public int insertUser(SysUser user);
  47 + int insertUser(SysUser user);
48 48  
49 49 /**
50 50 * 修改用户信息
... ... @@ -52,7 +52,7 @@ public interface SysUserMapper
52 52 * @param user 用户信息
53 53 * @return 结果
54 54 */
55   - public int updateUser(SysUser user);
  55 + int updateUser(SysUser user);
56 56  
57 57 /**
58 58 * 修改用户头像
... ... @@ -61,7 +61,7 @@ public interface SysUserMapper
61 61 * @param avatar 头像地址
62 62 * @return 结果
63 63 */
64   - public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
  64 + int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
65 65  
66 66 /**
67 67 * 重置用户密码
... ... @@ -70,7 +70,7 @@ public interface SysUserMapper
70 70 * @param password 密码
71 71 * @return 结果
72 72 */
73   - public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
  73 + int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
74 74  
75 75 /**
76 76 * 通过用户ID删除用户
... ... @@ -78,7 +78,7 @@ public interface SysUserMapper
78 78 * @param userId 用户ID
79 79 * @return 结果
80 80 */
81   - public int deleteUserById(String userId);
  81 + int deleteUserById(String userId);
82 82  
83 83 /**
84 84 * 批量删除用户信息
... ... @@ -86,7 +86,7 @@ public interface SysUserMapper
86 86 * @param userIds 需要删除的用户ID
87 87 * @return 结果
88 88 */
89   - public int deleteUserByIds(String[] userIds);
  89 + int deleteUserByIds(String[] userIds);
90 90  
91 91 /**
92 92 * 校验用户名称是否唯一
... ... @@ -94,7 +94,7 @@ public interface SysUserMapper
94 94 * @param userName 用户名称
95 95 * @return 结果
96 96 */
97   - public int checkUserNameUnique(String userName);
  97 + int checkUserNameUnique(String userName);
98 98  
99 99 /**
100 100 * 校验手机号码是否唯一
... ... @@ -102,7 +102,7 @@ public interface SysUserMapper
102 102 * @param phonenumber 手机号码
103 103 * @return 结果
104 104 */
105   - public SysUser checkPhoneUnique(String phonenumber);
  105 + SysUser checkPhoneUnique(String phonenumber);
106 106  
107 107 /**
108 108 * 校验email是否唯一
... ... @@ -110,5 +110,5 @@ public interface SysUserMapper
110 110 * @param email 用户邮箱
111 111 * @return 结果
112 112 */
113   - public SysUser checkEmailUnique(String email);
  113 + SysUser checkEmailUnique(String email);
114 114 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysUserPostMapper.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface SysUserPostMapper
17 17 * @param userId 用户ID
18 18 * @return 结果
19 19 */
20   - public int deleteUserPostByUserId(String userId);
  20 + int deleteUserPostByUserId(String userId);
21 21  
22 22 /**
23 23 * 通过岗位ID查询岗位使用数量
... ... @@ -25,7 +25,7 @@ public interface SysUserPostMapper
25 25 * @param postId 岗位ID
26 26 * @return 结果
27 27 */
28   - public int countUserPostById(Long postId);
  28 + int countUserPostById(Long postId);
29 29  
30 30 /**
31 31 * 批量删除用户和岗位关联
... ... @@ -33,7 +33,7 @@ public interface SysUserPostMapper
33 33 * @param ids 需要删除的数据ID
34 34 * @return 结果
35 35 */
36   - public int deleteUserPost(Long[] ids);
  36 + int deleteUserPost(Long[] ids);
37 37  
38 38 /**
39 39 * 批量新增用户岗位信息
... ... @@ -41,5 +41,5 @@ public interface SysUserPostMapper
41 41 * @param userPostList 用户角色列表
42 42 * @return 结果
43 43 */
44   - public int batchUserPost(List<SysUserPost> userPostList);
  44 + int batchUserPost(List<SysUserPost> userPostList);
45 45 }
... ...
trash-system/src/main/java/com/trash/system/mapper/SysUserRoleMapper.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface SysUserRoleMapper
18 18 * @param userId 用户ID
19 19 * @return 结果
20 20 */
21   - public int deleteUserRoleByUserId(String userId);
  21 + int deleteUserRoleByUserId(String userId);
22 22  
23 23 /**
24 24 * 批量删除用户和角色关联
... ... @@ -26,7 +26,7 @@ public interface SysUserRoleMapper
26 26 * @param ids 需要删除的数据ID
27 27 * @return 结果
28 28 */
29   - public int deleteUserRole(Long[] ids);
  29 + int deleteUserRole(Long[] ids);
30 30  
31 31 /**
32 32 * 通过角色ID查询角色使用数量
... ... @@ -34,7 +34,7 @@ public interface SysUserRoleMapper
34 34 * @param roleId 角色ID
35 35 * @return 结果
36 36 */
37   - public int countUserRoleByRoleId(Long roleId);
  37 + int countUserRoleByRoleId(Long roleId);
38 38  
39 39 /**
40 40 * 批量新增用户角色信息
... ... @@ -42,7 +42,7 @@ public interface SysUserRoleMapper
42 42 * @param userRoleList 用户角色列表
43 43 * @return 结果
44 44 */
45   - public int batchUserRole(List<SysUserRole> userRoleList);
  45 + int batchUserRole(List<SysUserRole> userRoleList);
46 46  
47 47 /**
48 48 * 删除用户和角色关联信息
... ... @@ -50,7 +50,7 @@ public interface SysUserRoleMapper
50 50 * @param userRole 用户和角色关联信息
51 51 * @return 结果
52 52 */
53   - public int deleteUserRoleInfo(SysUserRole userRole);
  53 + int deleteUserRoleInfo(SysUserRole userRole);
54 54  
55 55 /**
56 56 * 批量取消授权用户角色
... ... @@ -59,5 +59,5 @@ public interface SysUserRoleMapper
59 59 * @param userIds 需要删除的用户数据ID
60 60 * @return 结果
61 61 */
62   - public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") String[] userIds);
  62 + int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") String[] userIds);
63 63 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysConfigService.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface ISysConfigService
17 17 * @param configId 参数配置ID
18 18 * @return 参数配置信息
19 19 */
20   - public SysConfig selectConfigById(Long configId);
  20 + SysConfig selectConfigById(Long configId);
21 21  
22 22 /**
23 23 * 根据键名查询参数配置信息
... ... @@ -25,7 +25,7 @@ public interface ISysConfigService
25 25 * @param configKey 参数键名
26 26 * @return 参数键值
27 27 */
28   - public String selectConfigByKey(String configKey);
  28 + String selectConfigByKey(String configKey);
29 29  
30 30 /**
31 31 * 查询参数配置列表
... ... @@ -33,7 +33,7 @@ public interface ISysConfigService
33 33 * @param config 参数配置信息
34 34 * @return 参数配置集合
35 35 */
36   - public List<SysConfig> selectConfigList(SysConfig config);
  36 + List<SysConfig> selectConfigList(SysConfig config);
37 37  
38 38 /**
39 39 * 新增参数配置
... ... @@ -41,7 +41,7 @@ public interface ISysConfigService
41 41 * @param config 参数配置信息
42 42 * @return 结果
43 43 */
44   - public int insertConfig(SysConfig config);
  44 + int insertConfig(SysConfig config);
45 45  
46 46 /**
47 47 * 修改参数配置
... ... @@ -49,7 +49,7 @@ public interface ISysConfigService
49 49 * @param config 参数配置信息
50 50 * @return 结果
51 51 */
52   - public int updateConfig(SysConfig config);
  52 + int updateConfig(SysConfig config);
53 53  
54 54 /**
55 55 * 批量删除参数信息
... ... @@ -57,12 +57,12 @@ public interface ISysConfigService
57 57 * @param configIds 需要删除的参数ID
58 58 * @return 结果
59 59 */
60   - public int deleteConfigByIds(Long[] configIds);
  60 + int deleteConfigByIds(Long[] configIds);
61 61  
62 62 /**
63 63 * 清空缓存数据
64 64 */
65   - public void clearCache();
  65 + void clearCache();
66 66  
67 67 /**
68 68 * 校验参数键名是否唯一
... ... @@ -70,5 +70,5 @@ public interface ISysConfigService
70 70 * @param config 参数信息
71 71 * @return 结果
72 72 */
73   - public String checkConfigKeyUnique(SysConfig config);
  73 + String checkConfigKeyUnique(SysConfig config);
74 74 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysDeptService.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface ISysDeptService
18 18 * @param dept 部门信息
19 19 * @return 部门信息集合
20 20 */
21   - public List<SysDept> selectDeptList(SysDept dept);
  21 + List<SysDept> selectDeptList(SysDept dept);
22 22  
23 23 /**
24 24 * 构建前端所需要树结构
... ... @@ -26,7 +26,7 @@ public interface ISysDeptService
26 26 * @param depts 部门列表
27 27 * @return 树结构列表
28 28 */
29   - public List<SysDept> buildDeptTree(List<SysDept> depts);
  29 + List<SysDept> buildDeptTree(List<SysDept> depts);
30 30  
31 31 /**
32 32 * 构建前端所需要下拉树结构
... ... @@ -34,7 +34,7 @@ public interface ISysDeptService
34 34 * @param depts 部门列表
35 35 * @return 下拉树结构列表
36 36 */
37   - public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
  37 + List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
38 38  
39 39 /**
40 40 * 根据角色ID查询部门树信息
... ... @@ -42,7 +42,7 @@ public interface ISysDeptService
42 42 * @param roleId 角色ID
43 43 * @return 选中部门列表
44 44 */
45   - public List<Integer> selectDeptListByRoleId(Long roleId);
  45 + List<Integer> selectDeptListByRoleId(Long roleId);
46 46  
47 47 /**
48 48 * 根据部门ID查询信息
... ... @@ -50,7 +50,7 @@ public interface ISysDeptService
50 50 * @param deptId 部门ID
51 51 * @return 部门信息
52 52 */
53   - public SysDept selectDeptById(Long deptId);
  53 + SysDept selectDeptById(Long deptId);
54 54  
55 55 /**
56 56 * 根据ID查询所有子部门（正常状态）
... ... @@ -58,7 +58,7 @@ public interface ISysDeptService
58 58 * @param deptId 部门ID
59 59 * @return 子部门数
60 60 */
61   - public int selectNormalChildrenDeptById(Long deptId);
  61 + int selectNormalChildrenDeptById(Long deptId);
62 62  
63 63 /**
64 64 * 是否存在部门子节点
... ... @@ -66,7 +66,7 @@ public interface ISysDeptService
66 66 * @param deptId 部门ID
67 67 * @return 结果
68 68 */
69   - public boolean hasChildByDeptId(Long deptId);
  69 + boolean hasChildByDeptId(Long deptId);
70 70  
71 71 /**
72 72 * 查询部门是否存在用户
... ... @@ -74,7 +74,7 @@ public interface ISysDeptService
74 74 * @param deptId 部门ID
75 75 * @return 结果 true 存在 false 不存在
76 76 */
77   - public boolean checkDeptExistUser(Long deptId);
  77 + boolean checkDeptExistUser(Long deptId);
78 78  
79 79 /**
80 80 * 校验部门名称是否唯一
... ... @@ -82,7 +82,7 @@ public interface ISysDeptService
82 82 * @param dept 部门信息
83 83 * @return 结果
84 84 */
85   - public String checkDeptNameUnique(SysDept dept);
  85 + String checkDeptNameUnique(SysDept dept);
86 86  
87 87 /**
88 88 * 新增保存部门信息
... ... @@ -90,7 +90,7 @@ public interface ISysDeptService
90 90 * @param dept 部门信息
91 91 * @return 结果
92 92 */
93   - public int insertDept(SysDept dept);
  93 + int insertDept(SysDept dept);
94 94  
95 95 /**
96 96 * 修改保存部门信息
... ... @@ -98,7 +98,7 @@ public interface ISysDeptService
98 98 * @param dept 部门信息
99 99 * @return 结果
100 100 */
101   - public int updateDept(SysDept dept);
  101 + int updateDept(SysDept dept);
102 102  
103 103 /**
104 104 * 删除部门管理信息
... ... @@ -106,5 +106,5 @@ public interface ISysDeptService
106 106 * @param deptId 部门ID
107 107 * @return 结果
108 108 */
109   - public int deleteDeptById(Long deptId);
  109 + int deleteDeptById(Long deptId);
110 110 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysDictDataService.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface ISysDictDataService
17 17 * @param dictData 字典数据信息
18 18 * @return 字典数据集合信息
19 19 */
20   - public List<SysDictData> selectDictDataList(SysDictData dictData);
  20 + List<SysDictData> selectDictDataList(SysDictData dictData);
21 21  
22 22 /**
23 23 * 根据字典类型和字典键值查询字典数据信息
... ... @@ -26,7 +26,7 @@ public interface ISysDictDataService
26 26 * @param dictValue 字典键值
27 27 * @return 字典标签
28 28 */
29   - public String selectDictLabel(String dictType, String dictValue);
  29 + String selectDictLabel(String dictType, String dictValue);
30 30  
31 31 /**
32 32 * 根据字典数据ID查询信息
... ... @@ -34,7 +34,7 @@ public interface ISysDictDataService
34 34 * @param dictCode 字典数据ID
35 35 * @return 字典数据
36 36 */
37   - public SysDictData selectDictDataById(Long dictCode);
  37 + SysDictData selectDictDataById(Long dictCode);
38 38  
39 39 /**
40 40 * 批量删除字典数据信息
... ... @@ -42,7 +42,7 @@ public interface ISysDictDataService
42 42 * @param dictCodes 需要删除的字典数据ID
43 43 * @return 结果
44 44 */
45   - public int deleteDictDataByIds(Long[] dictCodes);
  45 + int deleteDictDataByIds(Long[] dictCodes);
46 46  
47 47 /**
48 48 * 新增保存字典数据信息
... ... @@ -50,7 +50,7 @@ public interface ISysDictDataService
50 50 * @param dictData 字典数据信息
51 51 * @return 结果
52 52 */
53   - public int insertDictData(SysDictData dictData);
  53 + int insertDictData(SysDictData dictData);
54 54  
55 55 /**
56 56 * 修改保存字典数据信息
... ... @@ -58,5 +58,5 @@ public interface ISysDictDataService
58 58 * @param dictData 字典数据信息
59 59 * @return 结果
60 60 */
61   - public int updateDictData(SysDictData dictData);
  61 + int updateDictData(SysDictData dictData);
62 62 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysDictTypeService.java
  View file @ae103c5
... ... @@ -18,14 +18,14 @@ public interface ISysDictTypeService
18 18 * @param dictType 字典类型信息
19 19 * @return 字典类型集合信息
20 20 */
21   - public List<SysDictType> selectDictTypeList(SysDictType dictType);
  21 + List<SysDictType> selectDictTypeList(SysDictType dictType);
22 22  
23 23 /**
24 24 * 根据所有字典类型
25 25 *
26 26 * @return 字典类型集合信息
27 27 */
28   - public List<SysDictType> selectDictTypeAll();
  28 + List<SysDictType> selectDictTypeAll();
29 29  
30 30 /**
31 31 * 根据字典类型查询字典数据
... ... @@ -33,7 +33,7 @@ public interface ISysDictTypeService
33 33 * @param dictType 字典类型
34 34 * @return 字典数据集合信息
35 35 */
36   - public List<SysDictData> selectDictDataByType(String dictType);
  36 + List<SysDictData> selectDictDataByType(String dictType);
37 37  
38 38 /**
39 39 * 根据字典类型ID查询信息
... ... @@ -41,7 +41,7 @@ public interface ISysDictTypeService
41 41 * @param dictId 字典类型ID
42 42 * @return 字典类型
43 43 */
44   - public SysDictType selectDictTypeById(Long dictId);
  44 + SysDictType selectDictTypeById(Long dictId);
45 45  
46 46 /**
47 47 * 根据字典类型查询信息
... ... @@ -49,7 +49,7 @@ public interface ISysDictTypeService
49 49 * @param dictType 字典类型
50 50 * @return 字典类型
51 51 */
52   - public SysDictType selectDictTypeByType(String dictType);
  52 + SysDictType selectDictTypeByType(String dictType);
53 53  
54 54 /**
55 55 * 批量删除字典信息
... ... @@ -57,12 +57,12 @@ public interface ISysDictTypeService
57 57 * @param dictIds 需要删除的字典ID
58 58 * @return 结果
59 59 */
60   - public int deleteDictTypeByIds(Long[] dictIds);
  60 + int deleteDictTypeByIds(Long[] dictIds);
61 61  
62 62 /**
63 63 * 清空缓存数据
64 64 */
65   - public void clearCache();
  65 + void clearCache();
66 66  
67 67 /**
68 68 * 新增保存字典类型信息
... ... @@ -70,7 +70,7 @@ public interface ISysDictTypeService
70 70 * @param dictType 字典类型信息
71 71 * @return 结果
72 72 */
73   - public int insertDictType(SysDictType dictType);
  73 + int insertDictType(SysDictType dictType);
74 74  
75 75 /**
76 76 * 修改保存字典类型信息
... ... @@ -78,7 +78,7 @@ public interface ISysDictTypeService
78 78 * @param dictType 字典类型信息
79 79 * @return 结果
80 80 */
81   - public int updateDictType(SysDictType dictType);
  81 + int updateDictType(SysDictType dictType);
82 82  
83 83 /**
84 84 * 校验字典类型称是否唯一
... ... @@ -86,5 +86,5 @@ public interface ISysDictTypeService
86 86 * @param dictType 字典类型
87 87 * @return 结果
88 88 */
89   - public String checkDictTypeUnique(SysDictType dictType);
  89 + String checkDictTypeUnique(SysDictType dictType);
90 90 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysLogininforService.java
  View file @ae103c5
... ... @@ -16,7 +16,7 @@ public interface ISysLogininforService
16 16 *
17 17 * @param logininfor 访问日志对象
18 18 */
19   - public void insertLogininfor(SysLogininfor logininfor);
  19 + void insertLogininfor(SysLogininfor logininfor);
20 20  
21 21 /**
22 22 * 查询系统登录日志集合
... ... @@ -24,7 +24,7 @@ public interface ISysLogininforService
24 24 * @param logininfor 访问日志对象
25 25 * @return 登录记录集合
26 26 */
27   - public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
  27 + List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
28 28  
29 29 /**
30 30 * 批量删除系统登录日志
... ... @@ -32,10 +32,10 @@ public interface ISysLogininforService
32 32 * @param infoIds 需要删除的登录日志ID
33 33 * @return
34 34 */
35   - public int deleteLogininforByIds(Long[] infoIds);
  35 + int deleteLogininforByIds(Long[] infoIds);
36 36  
37 37 /**
38 38 * 清空系统登录日志
39 39 */
40   - public void cleanLogininfor();
  40 + void cleanLogininfor();
41 41 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysMenuService.java
  View file @ae103c5
... ... @@ -21,7 +21,7 @@ public interface ISysMenuService
21 21 * @param userId 用户ID
22 22 * @return 菜单列表
23 23 */
24   - public List<SysMenu> selectMenuList(String userId);
  24 + List<SysMenu> selectMenuList(String userId);
25 25  
26 26 /**
27 27 * 根据用户查询系统菜单列表
... ... @@ -30,7 +30,7 @@ public interface ISysMenuService
30 30 * @param userId 用户ID
31 31 * @return 菜单列表
32 32 */
33   - public List<SysMenu> selectMenuList(SysMenu menu, String userId);
  33 + List<SysMenu> selectMenuList(SysMenu menu, String userId);
34 34  
35 35 /**
36 36 * 根据用户ID查询权限
... ... @@ -38,7 +38,7 @@ public interface ISysMenuService
38 38 * @param userId 用户ID
39 39 * @return 权限列表
40 40 */
41   - public Set<String> selectMenuPermsByUserId(String userId);
  41 + Set<String> selectMenuPermsByUserId(String userId);
42 42  
43 43 /**
44 44 * 根据用户ID查询菜单树信息
... ... @@ -46,9 +46,9 @@ public interface ISysMenuService
46 46 * @param user 用户ID
47 47 * @return 菜单列表
48 48 */
49   - public List<SysMenu> selectMenuTreeByUserId(String userId);
  49 + List<SysMenu> selectMenuTreeByUserId(String userId);
50 50  
51   - public List<SysMenu> selectMenuTreeByUserId(SysUser user);
  51 + List<SysMenu> selectMenuTreeByUserId(SysUser user);
52 52  
53 53 /**
54 54 * 根据角色ID查询菜单树信息
... ... @@ -56,7 +56,7 @@ public interface ISysMenuService
56 56 * @param roleId 角色ID
57 57 * @return 选中菜单列表
58 58 */
59   - public List<Integer> selectMenuListByRoleId(Long roleId);
  59 + List<Integer> selectMenuListByRoleId(Long roleId);
60 60  
61 61 /**
62 62 * 构建前端路由所需要的菜单
... ... @@ -64,7 +64,7 @@ public interface ISysMenuService
64 64 * @param menus 菜单列表
65 65 * @return 路由列表
66 66 */
67   - public List<RouterVo> buildMenus(List<SysMenu> menus);
  67 + List<RouterVo> buildMenus(List<SysMenu> menus);
68 68  
69 69 /**
70 70 * 构建前端所需要树结构
... ... @@ -72,7 +72,7 @@ public interface ISysMenuService
72 72 * @param menus 菜单列表
73 73 * @return 树结构列表
74 74 */
75   - public List<SysMenu> buildMenuTree(List<SysMenu> menus);
  75 + List<SysMenu> buildMenuTree(List<SysMenu> menus);
76 76  
77 77 /**
78 78 * 构建前端所需要下拉树结构
... ... @@ -80,7 +80,7 @@ public interface ISysMenuService
80 80 * @param menus 菜单列表
81 81 * @return 下拉树结构列表
82 82 */
83   - public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
  83 + List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
84 84  
85 85 /**
86 86 * 根据菜单ID查询信息
... ... @@ -88,7 +88,7 @@ public interface ISysMenuService
88 88 * @param menuId 菜单ID
89 89 * @return 菜单信息
90 90 */
91   - public SysMenu selectMenuById(Long menuId);
  91 + SysMenu selectMenuById(Long menuId);
92 92  
93 93 /**
94 94 * 是否存在菜单子节点
... ... @@ -96,7 +96,7 @@ public interface ISysMenuService
96 96 * @param menuId 菜单ID
97 97 * @return 结果 true 存在 false 不存在
98 98 */
99   - public boolean hasChildByMenuId(Long menuId);
  99 + boolean hasChildByMenuId(Long menuId);
100 100  
101 101 /**
102 102 * 查询菜单是否存在角色
... ... @@ -104,7 +104,7 @@ public interface ISysMenuService
104 104 * @param menuId 菜单ID
105 105 * @return 结果 true 存在 false 不存在
106 106 */
107   - public boolean checkMenuExistRole(Long menuId);
  107 + boolean checkMenuExistRole(Long menuId);
108 108  
109 109 /**
110 110 * 新增保存菜单信息
... ... @@ -112,7 +112,7 @@ public interface ISysMenuService
112 112 * @param menu 菜单信息
113 113 * @return 结果
114 114 */
115   - public int insertMenu(SysMenu menu);
  115 + int insertMenu(SysMenu menu);
116 116  
117 117 /**
118 118 * 修改保存菜单信息
... ... @@ -120,7 +120,7 @@ public interface ISysMenuService
120 120 * @param menu 菜单信息
121 121 * @return 结果
122 122 */
123   - public int updateMenu(SysMenu menu);
  123 + int updateMenu(SysMenu menu);
124 124  
125 125 /**
126 126 * 删除菜单管理信息
... ... @@ -128,7 +128,7 @@ public interface ISysMenuService
128 128 * @param menuId 菜单ID
129 129 * @return 结果
130 130 */
131   - public int deleteMenuById(Long menuId);
  131 + int deleteMenuById(Long menuId);
132 132  
133 133 /**
134 134 * 校验菜单名称是否唯一
... ... @@ -136,5 +136,5 @@ public interface ISysMenuService
136 136 * @param menu 菜单信息
137 137 * @return 结果
138 138 */
139   - public String checkMenuNameUnique(SysMenu menu);
  139 + String checkMenuNameUnique(SysMenu menu);
140 140 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysNoticeService.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface ISysNoticeService
17 17 * @param noticeId 公告ID
18 18 * @return 公告信息
19 19 */
20   - public SysNotice selectNoticeById(Long noticeId);
  20 + SysNotice selectNoticeById(Long noticeId);
21 21  
22 22 /**
23 23 * 查询公告列表
... ... @@ -25,7 +25,7 @@ public interface ISysNoticeService
25 25 * @param notice 公告信息
26 26 * @return 公告集合
27 27 */
28   - public List<SysNotice> selectNoticeList(SysNotice notice);
  28 + List<SysNotice> selectNoticeList(SysNotice notice);
29 29  
30 30 /**
31 31 * 新增公告
... ... @@ -33,7 +33,7 @@ public interface ISysNoticeService
33 33 * @param notice 公告信息
34 34 * @return 结果
35 35 */
36   - public int insertNotice(SysNotice notice);
  36 + int insertNotice(SysNotice notice);
37 37  
38 38 /**
39 39 * 修改公告
... ... @@ -41,7 +41,7 @@ public interface ISysNoticeService
41 41 * @param notice 公告信息
42 42 * @return 结果
43 43 */
44   - public int updateNotice(SysNotice notice);
  44 + int updateNotice(SysNotice notice);
45 45  
46 46 /**
47 47 * 删除公告信息
... ... @@ -49,7 +49,7 @@ public interface ISysNoticeService
49 49 * @param noticeId 公告ID
50 50 * @return 结果
51 51 */
52   - public int deleteNoticeById(Long noticeId);
  52 + int deleteNoticeById(Long noticeId);
53 53  
54 54 /**
55 55 * 批量删除公告信息
... ... @@ -57,5 +57,5 @@ public interface ISysNoticeService
57 57 * @param noticeIds 需要删除的公告ID
58 58 * @return 结果
59 59 */
60   - public int deleteNoticeByIds(Long[] noticeIds);
  60 + int deleteNoticeByIds(Long[] noticeIds);
61 61 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysOperLogService.java
  View file @ae103c5
... ... @@ -16,7 +16,7 @@ public interface ISysOperLogService
16 16 *
17 17 * @param operLog 操作日志对象
18 18 */
19   - public void insertOperlog(SysOperLog operLog);
  19 + void insertOperlog(SysOperLog operLog);
20 20  
21 21 /**
22 22 * 查询系统操作日志集合
... ... @@ -24,7 +24,7 @@ public interface ISysOperLogService
24 24 * @param operLog 操作日志对象
25 25 * @return 操作日志集合
26 26 */
27   - public List<SysOperLog> selectOperLogList(SysOperLog operLog);
  27 + List<SysOperLog> selectOperLogList(SysOperLog operLog);
28 28  
29 29 /**
30 30 * 批量删除系统操作日志
... ... @@ -32,7 +32,7 @@ public interface ISysOperLogService
32 32 * @param operIds 需要删除的操作日志ID
33 33 * @return 结果
34 34 */
35   - public int deleteOperLogByIds(Long[] operIds);
  35 + int deleteOperLogByIds(Long[] operIds);
36 36  
37 37 /**
38 38 * 查询操作日志详细
... ... @@ -40,10 +40,10 @@ public interface ISysOperLogService
40 40 * @param operId 操作ID
41 41 * @return 操作日志对象
42 42 */
43   - public SysOperLog selectOperLogById(Long operId);
  43 + SysOperLog selectOperLogById(Long operId);
44 44  
45 45 /**
46 46 * 清空操作日志
47 47 */
48   - public void cleanOperLog();
  48 + void cleanOperLog();
49 49 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysPostService.java
  View file @ae103c5
... ... @@ -18,14 +18,14 @@ public interface ISysPostService
18 18 * @param post 岗位信息
19 19 * @return 岗位列表
20 20 */
21   - public List<SysPost> selectPostList(SysPost post);
  21 + List<SysPost> selectPostList(SysPost post);
22 22  
23 23 /**
24 24 * 查询所有岗位
25 25 *
26 26 * @return 岗位列表
27 27 */
28   - public List<SysPost> selectPostAll();
  28 + List<SysPost> selectPostAll();
29 29  
30 30 /**
31 31 * 通过岗位ID查询岗位信息
... ... @@ -33,7 +33,7 @@ public interface ISysPostService
33 33 * @param postId 岗位ID
34 34 * @return 角色对象信息
35 35 */
36   - public SysPost selectPostById(Long postId);
  36 + SysPost selectPostById(Long postId);
37 37  
38 38 /**
39 39 * 根据用户ID获取岗位选择框列表
... ... @@ -41,7 +41,7 @@ public interface ISysPostService
41 41 * @param userId 用户ID
42 42 * @return 选中岗位ID列表
43 43 */
44   - public List<Integer> selectPostListByUserId(String userId);
  44 + List<Integer> selectPostListByUserId(String userId);
45 45  
46 46 /**
47 47 * 根据用户ID获取PostCode
... ... @@ -49,7 +49,7 @@ public interface ISysPostService
49 49 * @param userId 用户ID
50 50 * @return 选中岗位PostCode列表
51 51 */
52   - public Set<String> selectPostCodeByUserId(String userId);
  52 + Set<String> selectPostCodeByUserId(String userId);
53 53  
54 54 /**
55 55 * 校验岗位名称
... ... @@ -57,7 +57,7 @@ public interface ISysPostService
57 57 * @param post 岗位信息
58 58 * @return 结果
59 59 */
60   - public String checkPostNameUnique(SysPost post);
  60 + String checkPostNameUnique(SysPost post);
61 61  
62 62 /**
63 63 * 校验岗位编码
... ... @@ -65,7 +65,7 @@ public interface ISysPostService
65 65 * @param post 岗位信息
66 66 * @return 结果
67 67 */
68   - public String checkPostCodeUnique(SysPost post);
  68 + String checkPostCodeUnique(SysPost post);
69 69  
70 70 /**
71 71 * 通过岗位ID查询岗位使用数量
... ... @@ -73,7 +73,7 @@ public interface ISysPostService
73 73 * @param postId 岗位ID
74 74 * @return 结果
75 75 */
76   - public int countUserPostById(Long postId);
  76 + int countUserPostById(Long postId);
77 77  
78 78 /**
79 79 * 删除岗位信息
... ... @@ -81,7 +81,7 @@ public interface ISysPostService
81 81 * @param postId 岗位ID
82 82 * @return 结果
83 83 */
84   - public int deletePostById(Long postId);
  84 + int deletePostById(Long postId);
85 85  
86 86 /**
87 87 * 批量删除岗位信息
... ... @@ -90,7 +90,7 @@ public interface ISysPostService
90 90 * @return 结果
91 91 * @throws Exception 异常
92 92 */
93   - public int deletePostByIds(Long[] postIds);
  93 + int deletePostByIds(Long[] postIds);
94 94  
95 95 /**
96 96 * 新增保存岗位信息
... ... @@ -98,7 +98,7 @@ public interface ISysPostService
98 98 * @param post 岗位信息
99 99 * @return 结果
100 100 */
101   - public int insertPost(SysPost post);
  101 + int insertPost(SysPost post);
102 102  
103 103 /**
104 104 * 修改保存岗位信息
... ... @@ -106,5 +106,5 @@ public interface ISysPostService
106 106 * @param post 岗位信息
107 107 * @return 结果
108 108 */
109   - public int updatePost(SysPost post);
  109 + int updatePost(SysPost post);
110 110 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysRoleService.java
  View file @ae103c5
... ... @@ -18,7 +18,7 @@ public interface ISysRoleService
18 18 * @param role 角色信息
19 19 * @return 角色数据集合信息
20 20 */
21   - public List<SysRole> selectRoleList(SysRole role);
  21 + List<SysRole> selectRoleList(SysRole role);
22 22  
23 23 /**
24 24 * 根据用户ID查询角色
... ... @@ -26,14 +26,14 @@ public interface ISysRoleService
26 26 * @param userId 用户ID
27 27 * @return 权限列表
28 28 */
29   - public Set<String> selectRolePermissionByUserId(String userId);
  29 + Set<String> selectRolePermissionByUserId(String userId);
30 30  
31 31 /**
32 32 * 查询所有角色
33 33 *
34 34 * @return 角色列表
35 35 */
36   - public List<SysRole> selectRoleAll();
  36 + List<SysRole> selectRoleAll();
37 37  
38 38 /**
39 39 * 根据用户ID获取角色选择框列表
... ... @@ -41,7 +41,7 @@ public interface ISysRoleService
41 41 * @param userId 用户ID
42 42 * @return 选中角色ID列表
43 43 */
44   - public List<Integer> selectRoleListByUserId(String userId);
  44 + List<Integer> selectRoleListByUserId(String userId);
45 45  
46 46 /**
47 47 * 通过角色ID查询角色
... ... @@ -49,7 +49,7 @@ public interface ISysRoleService
49 49 * @param roleId 角色ID
50 50 * @return 角色对象信息
51 51 */
52   - public SysRole selectRoleById(Long roleId);
  52 + SysRole selectRoleById(Long roleId);
53 53  
54 54 /**
55 55 * 校验角色名称是否唯一
... ... @@ -57,7 +57,7 @@ public interface ISysRoleService
57 57 * @param role 角色信息
58 58 * @return 结果
59 59 */
60   - public String checkRoleNameUnique(SysRole role);
  60 + String checkRoleNameUnique(SysRole role);
61 61  
62 62 /**
63 63 * 校验角色权限是否唯一
... ... @@ -65,14 +65,14 @@ public interface ISysRoleService
65 65 * @param role 角色信息
66 66 * @return 结果
67 67 */
68   - public String checkRoleKeyUnique(SysRole role);
  68 + String checkRoleKeyUnique(SysRole role);
69 69  
70 70 /**
71 71 * 校验角色是否允许操作
72 72 *
73 73 * @param role 角色信息
74 74 */
75   - public void checkRoleAllowed(SysRole role);
  75 + void checkRoleAllowed(SysRole role);
76 76  
77 77 /**
78 78 * 通过角色ID查询角色使用数量
... ... @@ -80,7 +80,7 @@ public interface ISysRoleService
80 80 * @param roleId 角色ID
81 81 * @return 结果
82 82 */
83   - public int countUserRoleByRoleId(Long roleId);
  83 + int countUserRoleByRoleId(Long roleId);
84 84  
85 85 /**
86 86 * 新增保存角色信息
... ... @@ -88,7 +88,7 @@ public interface ISysRoleService
88 88 * @param role 角色信息
89 89 * @return 结果
90 90 */
91   - public int insertRole(SysRole role);
  91 + int insertRole(SysRole role);
92 92  
93 93 /**
94 94 * 修改保存角色信息
... ... @@ -96,7 +96,7 @@ public interface ISysRoleService
96 96 * @param role 角色信息
97 97 * @return 结果
98 98 */
99   - public int updateRole(SysRole role);
  99 + int updateRole(SysRole role);
100 100  
101 101 /**
102 102 * 修改角色状态
... ... @@ -104,7 +104,7 @@ public interface ISysRoleService
104 104 * @param role 角色信息
105 105 * @return 结果
106 106 */
107   - public int updateRoleStatus(SysRole role);
  107 + int updateRoleStatus(SysRole role);
108 108  
109 109 /**
110 110 * 修改数据权限信息
... ... @@ -112,7 +112,7 @@ public interface ISysRoleService
112 112 * @param role 角色信息
113 113 * @return 结果
114 114 */
115   - public int authDataScope(SysRole role);
  115 + int authDataScope(SysRole role);
116 116  
117 117 /**
118 118 * 通过角色ID删除角色
... ... @@ -120,7 +120,7 @@ public interface ISysRoleService
120 120 * @param roleId 角色ID
121 121 * @return 结果
122 122 */
123   - public int deleteRoleById(Long roleId);
  123 + int deleteRoleById(Long roleId);
124 124  
125 125 /**
126 126 * 批量删除角色信息
... ... @@ -128,5 +128,5 @@ public interface ISysRoleService
128 128 * @param roleIds 需要删除的角色ID
129 129 * @return 结果
130 130 */
131   - public int deleteRoleByIds(Long[] roleIds);
  131 + int deleteRoleByIds(Long[] roleIds);
132 132 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysUserOnlineService.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface ISysUserOnlineService
17 17 * @param user 用户信息
18 18 * @return 在线用户信息
19 19 */
20   - public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
  20 + SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
21 21  
22 22 /**
23 23 * 通过用户名称查询信息
... ... @@ -26,7 +26,7 @@ public interface ISysUserOnlineService
26 26 * @param user 用户信息
27 27 * @return 在线用户信息
28 28 */
29   - public SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
  29 + SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
30 30  
31 31 /**
32 32 * 通过登录地址/用户名称查询信息
... ... @@ -36,7 +36,7 @@ public interface ISysUserOnlineService
36 36 * @param user 用户信息
37 37 * @return 在线用户信息
38 38 */
39   - public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);
  39 + SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);
40 40  
41 41 /**
42 42 * 设置在线用户信息
... ... @@ -44,5 +44,5 @@ public interface ISysUserOnlineService
44 44 * @param user 用户信息
45 45 * @return 在线用户
46 46 */
47   - public SysUserOnline loginUserToUserOnline(LoginUser user);
  47 + SysUserOnline loginUserToUserOnline(LoginUser user);
48 48 }
... ...
trash-system/src/main/java/com/trash/system/service/ISysUserService.java
  View file @ae103c5
... ... @@ -17,7 +17,7 @@ public interface ISysUserService
17 17 * @param user 用户信息
18 18 * @return 用户信息集合信息
19 19 */
20   - public List<SysUser> selectUserList(SysUser user);
  20 + List<SysUser> selectUserList(SysUser user);
21 21  
22 22 /**
23 23 * 通过用户名查询用户
... ... @@ -25,7 +25,7 @@ public interface ISysUserService
25 25 * @param userName 用户名
26 26 * @return 用户对象信息
27 27 */
28   - public SysUser selectUserByUserName(String userName);
  28 + SysUser selectUserByUserName(String userName);
29 29  
30 30 /**
31 31 * 通过用户ID查询用户
... ... @@ -33,7 +33,7 @@ public interface ISysUserService
33 33 * @param userId 用户ID
34 34 * @return 用户对象信息
35 35 */
36   - public SysUser selectUserById(String userId);
  36 + SysUser selectUserById(String userId);
37 37  
38 38 /**
39 39 * 根据用户ID查询用户所属角色组
... ... @@ -41,7 +41,7 @@ public interface ISysUserService
41 41 * @param userName 用户名
42 42 * @return 结果
43 43 */
44   - public String selectUserRoleGroup(String userName);
  44 + String selectUserRoleGroup(String userName);
45 45  
46 46 /**
47 47 * 根据用户ID查询用户所属岗位组
... ... @@ -49,7 +49,7 @@ public interface ISysUserService
49 49 * @param userName 用户名
50 50 * @return 结果
51 51 */
52   - public String selectUserPostGroup(String userName);
  52 + String selectUserPostGroup(String userName);
53 53  
54 54 /**
55 55 * 校验用户名称是否唯一
... ... @@ -57,7 +57,7 @@ public interface ISysUserService
57 57 * @param userName 用户名称
58 58 * @return 结果
59 59 */
60   - public String checkUserNameUnique(String userName);
  60 + String checkUserNameUnique(String userName);
61 61  
62 62 /**
63 63 * 校验手机号码是否唯一
... ... @@ -65,7 +65,7 @@ public interface ISysUserService
65 65 * @param user 用户信息
66 66 * @return 结果
67 67 */
68   - public String checkPhoneUnique(SysUser user);
  68 + String checkPhoneUnique(SysUser user);
69 69  
70 70 /**
71 71 * 校验email是否唯一
... ... @@ -73,15 +73,15 @@ public interface ISysUserService
73 73 * @param user 用户信息
74 74 * @return 结果
75 75 */
76   - public String checkEmailUnique(SysUser user);
  76 + String checkEmailUnique(SysUser user);
77 77  
78   - public List<String>selectUserNameByPostCodeAndDeptId(String postCode,Long deptId);
  78 + List<String>selectUserNameByPostCodeAndDeptId(String postCode, Long deptId);
79 79 /**
80 80 * 校验用户是否允许操作
81 81 *
82 82 * @param user 用户信息
83 83 */
84   - public void checkUserAllowed(SysUser user);
  84 + void checkUserAllowed(SysUser user);
85 85  
86 86 /**
87 87 * 新增用户信息
... ... @@ -89,7 +89,7 @@ public interface ISysUserService
89 89 * @param user 用户信息
90 90 * @return 结果
91 91 */
92   - public int insertUser(SysUser user);
  92 + int insertUser(SysUser user);
93 93  
94 94 /**
95 95 * 修改用户信息
... ... @@ -97,7 +97,7 @@ public interface ISysUserService
97 97 * @param user 用户信息
98 98 * @return 结果
99 99 */
100   - public int updateUser(SysUser user);
  100 + int updateUser(SysUser user);
101 101  
102 102 /**
103 103 * 修改用户状态
... ... @@ -105,7 +105,7 @@ public interface ISysUserService
105 105 * @param user 用户信息
106 106 * @return 结果
107 107 */
108   - public int updateUserStatus(SysUser user);
  108 + int updateUserStatus(SysUser user);
109 109  
110 110 /**
111 111 * 修改用户基本信息
... ... @@ -113,7 +113,7 @@ public interface ISysUserService
113 113 * @param user 用户信息
114 114 * @return 结果
115 115 */
116   - public int updateUserProfile(SysUser user);
  116 + int updateUserProfile(SysUser user);
117 117  
118 118 /**
119 119 * 修改用户头像
... ... @@ -122,7 +122,7 @@ public interface ISysUserService
122 122 * @param avatar 头像地址
123 123 * @return 结果
124 124 */
125   - public boolean updateUserAvatar(String userName, String avatar);
  125 + boolean updateUserAvatar(String userName, String avatar);
126 126  
127 127 /**
128 128 * 重置用户密码
... ... @@ -130,7 +130,7 @@ public interface ISysUserService
130 130 * @param user 用户信息
131 131 * @return 结果
132 132 */
133   - public int resetPwd(SysUser user);
  133 + int resetPwd(SysUser user);
134 134  
135 135 /**
136 136 * 重置用户密码
... ... @@ -139,7 +139,7 @@ public interface ISysUserService
139 139 * @param password 密码
140 140 * @return 结果
141 141 */
142   - public int resetUserPwd(String userName, String password);
  142 + int resetUserPwd(String userName, String password);
143 143  
144 144 /**
145 145 * 通过用户ID删除用户
... ... @@ -147,7 +147,7 @@ public interface ISysUserService
147 147 * @param userId 用户ID
148 148 * @return 结果
149 149 */
150   - public int deleteUserById(String userId);
  150 + int deleteUserById(String userId);
151 151  
152 152 /**
153 153 * 批量删除用户信息
... ... @@ -155,7 +155,7 @@ public interface ISysUserService
155 155 * @param userIds 需要删除的用户ID
156 156 * @return 结果
157 157 */
158   - public int deleteUserByIds(String[] userIds);
  158 + int deleteUserByIds(String[] userIds);
159 159  
160 160 /**
161 161 * 导入用户数据
... ... @@ -165,5 +165,5 @@ public interface ISysUserService
165 165 * @param operName 操作用户
166 166 * @return 结果
167 167 */
168   - public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
  168 + String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
169 169 }
... ...
trash-system/src/main/java/com/trash/system/service/impl/SysDeptServiceImpl.java
  View file @ae103c5
... ... @@ -62,7 +62,7 @@ public class SysDeptServiceImpl implements ISysDeptService
62 62 }
63 63 for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
64 64 {
65   - SysDept dept = (SysDept) iterator.next();
  65 + SysDept dept = iterator.next();
66 66 // 如果是顶级节点, 遍历该父节点的所有子节点
67 67 if (!tempList.contains(dept.getParentId()))
68 68 {
... ... @@ -137,7 +137,7 @@ public class SysDeptServiceImpl implements ISysDeptService
137 137 public boolean hasChildByDeptId(Long deptId)
138 138 {
139 139 int result = deptMapper.hasChildByDeptId(deptId);
140   - return result > 0 ? true : false;
  140 + return result > 0;
141 141 }
142 142  
143 143 /**
... ... @@ -150,7 +150,7 @@ public class SysDeptServiceImpl implements ISysDeptService
150 150 public boolean checkDeptExistUser(Long deptId)
151 151 {
152 152 int result = deptMapper.checkDeptExistUser(deptId);
153   - return result > 0 ? true : false;
  153 + return result > 0;
154 154 }
155 155  
156 156 /**
... ... @@ -288,7 +288,7 @@ public class SysDeptServiceImpl implements ISysDeptService
288 288 Iterator<SysDept> it = list.iterator();
289 289 while (it.hasNext())
290 290 {
291   - SysDept n = (SysDept) it.next();
  291 + SysDept n = it.next();
292 292 if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
293 293 {
294 294 tlist.add(n);
... ... @@ -302,6 +302,6 @@ public class SysDeptServiceImpl implements ISysDeptService
302 302 */
303 303 private boolean hasChild(List<SysDept> list, SysDept t)
304 304 {
305   - return getChildList(list, t).size() > 0 ? true : false;
  305 + return getChildList(list, t).size() > 0;
306 306 }
307 307 }
... ...
trash-system/src/main/java/com/trash/system/service/impl/SysMenuServiceImpl.java
  View file @ae103c5
... ... @@ -208,7 +208,7 @@ public class SysMenuServiceImpl implements ISysMenuService
208 208 }
209 209 for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
210 210 {
211   - SysMenu menu = (SysMenu) iterator.next();
  211 + SysMenu menu = iterator.next();
212 212 // 如果是顶级节点, 遍历该父节点的所有子节点
213 213 if (!tempList.contains(menu.getParentId()))
214 214 {
... ... @@ -258,7 +258,7 @@ public class SysMenuServiceImpl implements ISysMenuService
258 258 public boolean hasChildByMenuId(Long menuId)
259 259 {
260 260 int result = menuMapper.hasChildByMenuId(menuId);
261   - return result > 0 ? true : false;
  261 + return result > 0;
262 262 }
263 263  
264 264 /**
... ... @@ -271,7 +271,7 @@ public class SysMenuServiceImpl implements ISysMenuService
271 271 public boolean checkMenuExistRole(Long menuId)
272 272 {
273 273 int result = roleMenuMapper.checkMenuExistRole(menuId);
274   - return result > 0 ? true : false;
  274 + return result > 0;
275 275 }
276 276  
277 277 /**
... ... @@ -408,7 +408,7 @@ public class SysMenuServiceImpl implements ISysMenuService
408 408 List<SysMenu> returnList = new ArrayList<SysMenu>();
409 409 for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext();)
410 410 {
411   - SysMenu t = (SysMenu) iterator.next();
  411 + SysMenu t = iterator.next();
412 412 // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
413 413 if (t.getParentId() == parentId)
414 414 {
... ... @@ -448,7 +448,7 @@ public class SysMenuServiceImpl implements ISysMenuService
448 448 Iterator<SysMenu> it = list.iterator();
449 449 while (it.hasNext())
450 450 {
451   - SysMenu n = (SysMenu) it.next();
  451 + SysMenu n = it.next();
452 452 if (n.getParentId().longValue() == t.getMenuId().longValue())
453 453 {
454 454 tlist.add(n);
... ... @@ -462,6 +462,6 @@ public class SysMenuServiceImpl implements ISysMenuService
462 462 */
463 463 private boolean hasChild(List<SysMenu> list, SysMenu t)
464 464 {
465   - return getChildList(list, t).size() > 0 ? true : false;
  465 + return getChildList(list, t).size() > 0;
466 466 }
467 467 }
... ...
trash-ui/src/api/casefile/violationWarningInformation.js 0 → 100644
  View file @ae103c5
  1 +import request from '@/utils/request'
  2 +
  3 +// 查询违规预警信息列表
  4 +export function listViolationWarningInformation(query) {
  5 + return request({
  6 + url: '/casefile/violationWarningInformation/list',
  7 + method: 'get',
  8 + params: query
  9 + })
  10 +}
  11 +
  12 +// 查询违规预警信息详细
  13 +export function getViolationWarningInformation(id) {
  14 + return request({
  15 + url: '/casefile/violationWarningInformation/' + id,
  16 + method: 'get'
  17 + })
  18 +}
  19 +
  20 +// 新增违规预警信息
  21 +export function addViolationWarningInformation(data) {
  22 + return request({
  23 + url: '/casefile/violationWarningInformation',
  24 + method: 'post',
  25 + data: data
  26 + })
  27 +}
  28 +
  29 +// 修改违规预警信息
  30 +export function updateViolationWarningInformation(data) {
  31 + return request({
  32 + url: '/casefile/violationWarningInformation',
  33 + method: 'put',
  34 + data: data
  35 + })
  36 +}
  37 +
  38 +// 删除违规预警信息
  39 +export function delViolationWarningInformation(id) {
  40 + return request({
  41 + url: '/casefile/violationWarningInformation/' + id,
  42 + method: 'delete'
  43 + })
  44 +}
  45 +
  46 +// 导出违规预警信息
  47 +export function exportViolationWarningInformation(query) {
  48 + return request({
  49 + url: '/casefile/violationWarningInformation/export',
  50 + method: 'get',
  51 + params: query
  52 + })
  53 +}
... ...
trash-ui/src/api/office/conference.js 0 → 100644
  View file @ae103c5
  1 +import request from '@/utils/request'
  2 +
  3 +// 查询会议管理列表
  4 +export function listConference(query) {
  5 + return request({
  6 + url: '/office/conference/list',
  7 + method: 'get',
  8 + params: query
  9 + })
  10 +}
  11 +
  12 +// 查询会议管理详细
  13 +export function getConference(id) {
  14 + return request({
  15 + url: '/office/conference/' + id,
  16 + method: 'get'
  17 + })
  18 +}
  19 +
  20 +// 新增会议管理
  21 +export function addConference(data) {
  22 + return request({
  23 + url: '/office/conference',
  24 + method: 'post',
  25 + data: data
  26 + })
  27 +}
  28 +
  29 +// 修改会议管理
  30 +export function updateConference(data) {
  31 + return request({
  32 + url: '/office/conference',
  33 + method: 'put',
  34 + data: data
  35 + })
  36 +}
  37 +
  38 +// 删除会议管理
  39 +export function delConference(id) {
  40 + return request({
  41 + url: '/office/conference/' + id,
  42 + method: 'delete'
  43 + })
  44 +}
  45 +
  46 +// 导出会议管理
  47 +export function exportConference(query) {
  48 + return request({
  49 + url: '/office/conference/export',
  50 + method: 'get',
  51 + params: query
  52 + })
  53 +}
... ...
trash-ui/src/api/office/handle.js 0 → 100644
  View file @ae103c5
  1 +import request from '@/utils/request'
  2 +
  3 +// 查询办文办事列表
  4 +export function listHandle(query) {
  5 + return request({
  6 + url: '/office/handle/list',
  7 + method: 'get',
  8 + params: query
  9 + })
  10 +}
  11 +
  12 +// 查询办文办事详细
  13 +export function getHandle(id) {
  14 + return request({
  15 + url: '/office/handle/' + id,
  16 + method: 'get'
  17 + })
  18 +}
  19 +
  20 +// 新增办文办事
  21 +export function addHandle(data) {
  22 + return request({
  23 + url: '/office/handle',
  24 + method: 'post',
  25 + data: data
  26 + })
  27 +}
  28 +
  29 +// 修改办文办事
  30 +export function updateHandle(data) {
  31 + return request({
  32 + url: '/office/handle',
  33 + method: 'put',
  34 + data: data
  35 + })
  36 +}
  37 +
  38 +// 删除办文办事
  39 +export function delHandle(id) {
  40 + return request({
  41 + url: '/office/handle/' + id,
  42 + method: 'delete'
  43 + })
  44 +}
  45 +
  46 +// 导出办文办事
  47 +export function exportHandle(query) {
  48 + return request({
  49 + url: '/office/handle/export',
  50 + method: 'get',
  51 + params: query
  52 + })
  53 +}
... ...
trash-ui/src/api/office/leaveApplication.js 0 → 100644
  View file @ae103c5
  1 +import request from '@/utils/request'
  2 +
  3 +// 查询leaveApplication列表
  4 +export function listLeaveApplication(query) {
  5 + return request({
  6 + url: '/office/leaveApplication/list',
  7 + method: 'get',
  8 + params: query
  9 + })
  10 +}
  11 +
  12 +// 查询leaveApplication详细
  13 +export function getLeaveApplication(id) {
  14 + return request({
  15 + url: '/office/leaveApplication/' + id,
  16 + method: 'get'
  17 + })
  18 +}
  19 +
  20 +// 新增leaveApplication
  21 +export function addLeaveApplication(data) {
  22 + return request({
  23 + url: '/office/leaveApplication',
  24 + method: 'post',
  25 + data: data
  26 + })
  27 +}
  28 +
  29 +// 修改leaveApplication
  30 +export function updateLeaveApplication(data) {
  31 + return request({
  32 + url: '/office/leaveApplication',
  33 + method: 'put',
  34 + data: data
  35 + })
  36 +}
  37 +
  38 +// 删除leaveApplication
  39 +export function delLeaveApplication(id) {
  40 + return request({
  41 + url: '/office/leaveApplication/' + id,
  42 + method: 'delete'
  43 + })
  44 +}
  45 +
  46 +// 导出leaveApplication
  47 +export function exportLeaveApplication(query) {
  48 + return request({
  49 + url: '/office/leaveApplication/export',
  50 + method: 'get',
  51 + params: query
  52 + })
  53 +}
... ...
trash-ui/src/api/office/logistics.js 0 → 100644
  View file @ae103c5
  1 +import request from '@/utils/request'
  2 +
  3 +// 查询后勤管理列表
  4 +export function listLogistics(query) {
  5 + return request({
  6 + url: '/office/logistics/list',
  7 + method: 'get',
  8 + params: query
  9 + })
  10 +}
  11 +
  12 +// 查询后勤管理详细
  13 +export function getLogistics(id) {
  14 + return request({
  15 + url: '/office/logistics/' + id,
  16 + method: 'get'
  17 + })
  18 +}
  19 +
  20 +// 新增后勤管理
  21 +export function addLogistics(data) {
  22 + return request({
  23 + url: '/office/logistics',
  24 + method: 'post',
  25 + data: data
  26 + })
  27 +}
  28 +
  29 +// 修改后勤管理
  30 +export function updateLogistics(data) {
  31 + return request({
  32 + url: '/office/logistics',
  33 + method: 'put',
  34 + data: data
  35 + })
  36 +}
  37 +
  38 +// 删除后勤管理
  39 +export function delLogistics(id) {
  40 + return request({
  41 + url: '/office/logistics/' + id,
  42 + method: 'delete'
  43 + })
  44 +}
  45 +
  46 +// 导出后勤管理
  47 +export function exportLogistics(query) {
  48 + return request({
  49 + url: '/office/logistics/export',
  50 + method: 'get',
  51 + params: query
  52 + })
  53 +}
... ...
trash-ui/src/components/ZcEditor/index.vue 0 → 100644
  View file @ae103c5
  1 +<template>
  2 + <div class="editor" ref="editor" :style="styles"></div>
  3 +</template>
  4 +
  5 +<script>
  6 +import Quill from "quill";
  7 +import "quill/dist/quill.core.css";
  8 +import "quill/dist/quill.snow.css";
  9 +import "quill/dist/quill.bubble.css";
  10 +
  11 +export default {
  12 + name: "Editor",
  13 + props: {
  14 + /* 编辑器的内容 */
  15 + value: {
  16 + type: String,
  17 + default: "",
  18 + },
  19 + /* 高度 */
  20 + height: {
  21 + type: Number,
  22 + default: null,
  23 + },
  24 + /* 最小高度 */
  25 + minHeight: {
  26 + type: Number,
  27 + default: null,
  28 + },
  29 + isReadOnly: {
  30 + type: Boolean,
  31 + default: false,
  32 + },
  33 + },
  34 + data() {
  35 + return {
  36 + Quill: null,
  37 + currentValue: "",
  38 + options: {
  39 + theme: "snow",
  40 + bounds: document.body,
  41 + debug: "warn",
  42 + modules: {
  43 + // 工具栏配置
  44 + toolbar: [
  45 + ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
  46 + [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
  47 + [{ indent: '-1' }, { indent: '+1' }], // 缩进
  48 + [{ direction: 'rtl' }], // 文本方向
  49 + [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
  50 + [{ align: [] }], // 对齐方式
  51 + ['clean'], // 清除文本格式
  52 + ],
  53 + },
  54 + placeholder: "请输入内容",
  55 + readOnly: false,
  56 + },
  57 + };
  58 + },
  59 + computed: {
  60 + styles() {
  61 + let style = {};
  62 + if (this.minHeight) {
  63 + style.minHeight = `${this.minHeight}px`;
  64 + }
  65 + if (this.height) {
  66 + style.height = `${this.height}px`;
  67 + }
  68 + return style;
  69 + },
  70 + },
  71 + watch: {
  72 + value: {
  73 + handler(val) {
  74 + if (val !== this.currentValue) {
  75 + this.currentValue = val === null ? "" : val;
  76 + if (this.Quill) {
  77 + this.Quill.pasteHTML(this.currentValue);
  78 + }
  79 + }
  80 + },
  81 + immediate: true,
  82 + },
  83 + },
  84 + mounted() {
  85 + this.init();
  86 + },
  87 + beforeDestroy() {
  88 + this.Quill = null;
  89 + },
  90 + methods: {
  91 + init() {
  92 + const editor = this.$refs.editor;
  93 + this.Quill = new Quill(editor, this.options);
  94 + if(this.isReadOnly){
  95 + this.Quill.enable(false);
  96 + }
  97 + this.Quill.pasteHTML(this.currentValue);
  98 + this.Quill.on("text-change", (delta, oldDelta, source) => {
  99 + const html = this.$refs.editor.children[0].innerHTML;
  100 + const text = this.Quill.getText();
  101 + const quill = this.Quill;
  102 + this.currentValue = html;
  103 + this.$emit("input", html);
  104 + this.$emit("on-change", { html, text, quill });
  105 + });
  106 + this.Quill.on("text-change", (delta, oldDelta, source) => {
  107 + this.$emit("on-text-change", delta, oldDelta, source);
  108 + });
  109 + this.Quill.on("selection-change", (range, oldRange, source) => {
  110 + this.$emit("on-selection-change", range, oldRange, source);
  111 + });
  112 + this.Quill.on("editor-change", (eventName, ...args) => {
  113 + this.$emit("on-editor-change", eventName, ...args);
  114 + });
  115 + },
  116 + },
  117 +};
  118 +</script>
  119 +
  120 +<style>
  121 +.editor, .ql-toolbar {
  122 + white-space: pre-wrap!important;
  123 + line-height: normal !important;
  124 +}
  125 +.quill-img {
  126 + display: none;
  127 +}
  128 +.ql-snow .ql-tooltip[data-mode="link"]::before {
  129 + content: "请输入链接地址:";
  130 +}
  131 +.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
  132 + border-right: 0px;
  133 + content: "保存";
  134 + padding-right: 0px;
  135 +}
  136 +
  137 +.ql-snow .ql-tooltip[data-mode="video"]::before {
  138 + content: "请输入视频地址:";
  139 +}
  140 +
  141 +.ql-snow .ql-picker.ql-size .ql-picker-label::before,
  142 +.ql-snow .ql-picker.ql-size .ql-picker-item::before {
  143 + content: "14px";
  144 +}
  145 +.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before,
  146 +.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before {
  147 + content: "10px";
  148 +}
  149 +.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before,
  150 +.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before {
  151 + content: "18px";
  152 +}
  153 +.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before,
  154 +.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
  155 + content: "32px";
  156 +}
  157 +
  158 +.ql-snow .ql-picker.ql-header .ql-picker-label::before,
  159 +.ql-snow .ql-picker.ql-header .ql-picker-item::before {
  160 + content: "文本";
  161 +}
  162 +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
  163 +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
  164 + content: "标题1";
  165 +}
  166 +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
  167 +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
  168 + content: "标题2";
  169 +}
  170 +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
  171 +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
  172 + content: "标题3";
  173 +}
  174 +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
  175 +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
  176 + content: "标题4";
  177 +}
  178 +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
  179 +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
  180 + content: "标题5";
  181 +}
  182 +.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
  183 +.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
  184 + content: "标题6";
  185 +}
  186 +
  187 +.ql-snow .ql-picker.ql-font .ql-picker-label::before,
  188 +.ql-snow .ql-picker.ql-font .ql-picker-item::before {
  189 + content: "标准字体";
  190 +}
  191 +.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before,
  192 +.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before {
  193 + content: "衬线字体";
  194 +}
  195 +.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before,
  196 +.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
  197 + content: "等宽字体";
  198 +}
  199 +</style>
... ...