BJ_ZTEITS-Developers / zteits-oa

Commit 5bb13adb6ee18a6c787af293f2f63bbb4c272e30

Authored by 王富生
1 parent a128cae0

提交

Inline Side-by-side
Showing 10 changed files with 43 additions and 22 deletions
... ... @@ -117,22 +117,19 @@
117 117 </dependencies>
118 118  
119 119 <build>
120   - <finalName>com.zteits.oa</finalName>
  120 + <defaultGoal>compile</defaultGoal>
  121 + <finalName>zteits-oa</finalName>
121 122 <plugins>
122 123 <plugin>
123 124 <groupId>org.springframework.boot</groupId>
124 125 <artifactId>spring-boot-maven-plugin</artifactId>
125 126 <configuration>
126   - <mainClass>com.daily.report.DailyReportApplication</mainClass>
  127 + <mainClass>com.zteits.oa.DailyReportApplication</mainClass>
127 128 </configuration>
128 129 <version>1.3.5.RELEASE</version>
129 130 </plugin>
130   - <plugin>
131   - <groupId>org.apache.maven.plugins</groupId>
132   - <artifactId>maven-assembly-plugin</artifactId>
133   -
134   - </plugin>
135   - </plugins>
  131 +
  132 + </plugins>
136 133 </build>
137 134  
138 135  
... ...
src/main/java/com/zteits/oa/api/base/annotation/NoAuth.java
  View file @5bb13ad
... ... @@ -9,7 +9,7 @@ import java.lang.annotation.Target;
9 9 /**
10 10 * Copyright: Copyright (c) 2017 zteits
11 11 *
12   - * @ClassName: com.clouds.common.annotation
  12 + * @ClassName: .annotation
13 13 * @Description: 此注解为不进行权限校验的注解，标注到方法、类上
14 14 * @version: v1.0.0
15 15 * @author: atao
... ...
src/main/java/com/zteits/oa/api/base/bean/PageUtil.java
  View file @5bb13ad
... ... @@ -5,7 +5,7 @@ import com.zteits.oa.api.base.constants.PageSizeEnum;
5 5 /**
6 6 * Copyright: Copyright (c) 2018 zteits
7 7 *
8   - * @ClassName: com.clouds.common.utils.page
  8 + * @ClassName: .utils.page
9 9 * @Description: 分页工具类
10 10 * @version: v1.0.0
11 11 * @author: atao
... ...
src/main/java/com/zteits/oa/api/base/constants/PageSizeEnum.java
  View file @5bb13ad
... ... @@ -3,7 +3,7 @@ package com.zteits.oa.api.base.constants;
3 3 /**
4 4 * Copyright: Copyright (c) 2018 zteits
5 5 *
6   - * @ClassName: com.clouds.common.constants.pagequery
  6 + * @ClassName: .constants.pagequery
7 7 * @Description: 分页查询最大查询的值
8 8 * @version: v1.0.0
9 9 * @author: atao
... ...
src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java
  View file @5bb13ad
... ... @@ -3,7 +3,7 @@ package com.zteits.oa.api.base.constants;
3 3 /**
4 4 * Copyright: Copyright (c) 2017 zteits
5 5 *
6   - * @ClassName: com.clouds.common.constants
  6 + * @ClassName: .constants
7 7 * @Description: 存在session里面变量
8 8 * @version: v1.0.0
9 9 * @author: atao
... ... @@ -19,7 +19,7 @@ public enum SessionEnum {
19 19 //user 与 session 关联关系
20 20 USER_SESSION_REL("user:session"),
21 21 //user 对象
22   - USER_INFO("user:info"),
  22 + USER_INFO("userop:session"),
23 23 //登录密码输错次数
24 24 PASS_WRONG_NUM("pass:wrong:num");
25 25  
... ...
src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailyQueryReq.java
  View file @5bb13ad
1 1 package com.zteits.oa.api.dto.asradaily.param;
2 2  
3   -import com.sun.istack.internal.NotNull;
4 3 import com.zteits.oa.api.base.bean.BaseRequest;
5 4  
  5 +import javax.validation.constraints.NotNull;
6 6 import java.util.Date;
7 7  
8 8 public class AsraDailyQueryReq extends BaseRequest{
... ...
src/main/java/com/zteits/oa/api/dto/asraop/AsraOpDTO.java
  View file @5bb13ad
1 1 package com.zteits.oa.api.dto.asraop;
2 2  
  3 +import java.io.Serializable;
3 4 import java.util.Date;
4 5 import java.util.List;
5 6  
... ... @@ -19,13 +20,11 @@ import com.zteits.oa.api.base.bean.BaiscDTO;
19 20 *---------------------------------------------------------*
20 21 * 2018年7月30日 wangfs v1.0.0 创建
21 22 */
22   -public class AsraOpDTO extends BaiscDTO{
23   - /**
24   - *
25   - */
26   - private static final long serialVersionUID = -1744089914187990069L;
  23 +public class AsraOpDTO implements Serializable{
27 24  
28   - /**主键*/
  25 +
  26 + private static final long serialVersionUID = 6863271725018770175L;
  27 + /**主键*/
29 28 private Long id;
30 29  
31 30 /**登录工号*/
... ...
src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java
  View file @5bb13ad
... ... @@ -25,7 +25,7 @@ import com.zteits.oa.api.dto.asraop.LoginOathRes;
25 25 /**
26 26 * Copyright: Copyright (c) 2017 zteits
27 27 *
28   - * @ClassName: com.clouds.common.web.auth
  28 + * @ClassName: .web.auth
29 29 * @Description:
30 30 * @version: v1.0.0
31 31 * @author: atao
... ...
src/main/java/com/zteits/oa/report/domain/AsraDaily.java
  View file @5bb13ad
... ... @@ -210,4 +210,26 @@ public class AsraDaily {
210 210 public void setDailyContent(String dailyContent) {
211 211 this.dailyContent = dailyContent == null ? null : dailyContent.trim();
212 212 }
  213 +
  214 + @Override
  215 + public String toString() {
  216 + return "AsraDaily{" +
  217 + "id=" + id +
  218 + ", projectId=" + projectId +
  219 + ", asarOpId=" + asarOpId +
  220 + ", asarOpName='" + asarOpName + '\'' +
  221 + ", years=" + years +
  222 + ", weeks=" + weeks +
  223 + ", weeksNum=" + weeksNum +
  224 + ", dailyDate=" + dailyDate +
  225 + ", dataState=" + dataState +
  226 + ", createEmpid='" + createEmpid + '\'' +
  227 + ", createEmpName='" + createEmpName + '\'' +
  228 + ", createDate=" + createDate +
  229 + ", modfiyEmpid='" + modfiyEmpid + '\'' +
  230 + ", modfiyEmpName='" + modfiyEmpName + '\'' +
  231 + ", modfiyDate=" + modfiyDate +
  232 + ", dailyContent='" + dailyContent + '\'' +
  233 + '}';
  234 + }
213 235 }
214 236 \ No newline at end of file
... ...
src/main/resources/application.properties
  View file @5bb13ad
1   -spring.application.name=zteits_daily_report
  1 +spring.application.name=zteits-oa
2 2 server.port=8100
3 3  
4 4 #spring.profiles.active=prod
... ... @@ -15,6 +15,9 @@ druid.driverClass=com.mysql.jdbc.Driver
15 15 druid.url=jdbc:mysql://192.168.1.167:3306/zt_asra?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
16 16 druid.username=root
17 17 druid.password=root
  18 +#druid.url=jdbc:mysql://47.96.41.38:3306/zt_order_n?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
  19 +#druid.username=order
  20 +#druid.password=MySQL5.7@123
18 21  
19 22 druid.initialSize=1
20 23 druid.minIdle=1
... ...