From 5bb13adb6ee18a6c787af293f2f63bbb4c272e30 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Thu, 2 Aug 2018 19:12:41 +0800 Subject: [PATCH] 提交 --- pom.xml | 13 +++++-------- src/main/java/com/zteits/oa/api/base/annotation/NoAuth.java | 2 +- src/main/java/com/zteits/oa/api/base/bean/PageUtil.java | 2 +- src/main/java/com/zteits/oa/api/base/constants/PageSizeEnum.java | 2 +- src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java | 4 ++-- src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailyQueryReq.java | 2 +- src/main/java/com/zteits/oa/api/dto/asraop/AsraOpDTO.java | 11 +++++------ src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java | 2 +- src/main/java/com/zteits/oa/report/domain/AsraDaily.java | 22 ++++++++++++++++++++++ src/main/resources/application.properties | 5 ++++- 10 files changed, 43 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 69e30c6..b14ef93 100644 --- a/pom.xml +++ b/pom.xml @@ -117,22 +117,19 @@ - com.zteits.oa + compile + zteits-oa org.springframework.boot spring-boot-maven-plugin - com.daily.report.DailyReportApplication + com.zteits.oa.DailyReportApplication 1.3.5.RELEASE - - org.apache.maven.plugins - maven-assembly-plugin - - - + + diff --git a/src/main/java/com/zteits/oa/api/base/annotation/NoAuth.java b/src/main/java/com/zteits/oa/api/base/annotation/NoAuth.java index 3d69fa9..7fa3d31 100644 --- a/src/main/java/com/zteits/oa/api/base/annotation/NoAuth.java +++ b/src/main/java/com/zteits/oa/api/base/annotation/NoAuth.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * Copyright: Copyright (c) 2017 zteits * - * @ClassName: com.clouds.common.annotation + * @ClassName: .annotation * @Description: 此注解为不进行权限校验的注解，标注到方法、类上 * @version: v1.0.0 * @author: atao diff --git a/src/main/java/com/zteits/oa/api/base/bean/PageUtil.java b/src/main/java/com/zteits/oa/api/base/bean/PageUtil.java index 862cda0..29e205b 100644 --- a/src/main/java/com/zteits/oa/api/base/bean/PageUtil.java +++ b/src/main/java/com/zteits/oa/api/base/bean/PageUtil.java @@ -5,7 +5,7 @@ import com.zteits.oa.api.base.constants.PageSizeEnum; /** * Copyright: Copyright (c) 2018 zteits * - * @ClassName: com.clouds.common.utils.page + * @ClassName: .utils.page * @Description: 分页工具类 * @version: v1.0.0 * @author: atao diff --git a/src/main/java/com/zteits/oa/api/base/constants/PageSizeEnum.java b/src/main/java/com/zteits/oa/api/base/constants/PageSizeEnum.java index 345221c..1709967 100644 --- a/src/main/java/com/zteits/oa/api/base/constants/PageSizeEnum.java +++ b/src/main/java/com/zteits/oa/api/base/constants/PageSizeEnum.java @@ -3,7 +3,7 @@ package com.zteits.oa.api.base.constants; /** * Copyright: Copyright (c) 2018 zteits * - * @ClassName: com.clouds.common.constants.pagequery + * @ClassName: .constants.pagequery * @Description: 分页查询最大查询的值 * @version: v1.0.0 * @author: atao diff --git a/src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java b/src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java index 507fc52..ecb7ea3 100644 --- a/src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java +++ b/src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java @@ -3,7 +3,7 @@ package com.zteits.oa.api.base.constants; /** * Copyright: Copyright (c) 2017 zteits * - * @ClassName: com.clouds.common.constants + * @ClassName: .constants * @Description: 存在session里面变量 * @version: v1.0.0 * @author: atao @@ -19,7 +19,7 @@ public enum SessionEnum { //user 与 session 关联关系 USER_SESSION_REL("user:session"), //user 对象 - USER_INFO("user:info"), + USER_INFO("userop:session"), //登录密码输错次数 PASS_WRONG_NUM("pass:wrong:num"); diff --git a/src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailyQueryReq.java b/src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailyQueryReq.java index 2db033c..115a018 100644 --- a/src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailyQueryReq.java +++ b/src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailyQueryReq.java @@ -1,8 +1,8 @@ package com.zteits.oa.api.dto.asradaily.param; -import com.sun.istack.internal.NotNull; import com.zteits.oa.api.base.bean.BaseRequest; +import javax.validation.constraints.NotNull; import java.util.Date; public class AsraDailyQueryReq extends BaseRequest{ diff --git a/src/main/java/com/zteits/oa/api/dto/asraop/AsraOpDTO.java b/src/main/java/com/zteits/oa/api/dto/asraop/AsraOpDTO.java index 78b471b..ad44f75 100644 --- a/src/main/java/com/zteits/oa/api/dto/asraop/AsraOpDTO.java +++ b/src/main/java/com/zteits/oa/api/dto/asraop/AsraOpDTO.java @@ -1,5 +1,6 @@ package com.zteits.oa.api.dto.asraop; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -19,13 +20,11 @@ import com.zteits.oa.api.base.bean.BaiscDTO; *---------------------------------------------------------* * 2018年7月30日 wangfs v1.0.0 创建 */ -public class AsraOpDTO extends BaiscDTO{ - /** - * - */ - private static final long serialVersionUID = -1744089914187990069L; +public class AsraOpDTO implements Serializable{ - /**主键*/ + + private static final long serialVersionUID = 6863271725018770175L; + /**主键*/ private Long id; /**登录工号*/ diff --git a/src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java b/src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java index 08be2f0..c3d9b82 100644 --- a/src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java +++ b/src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java @@ -25,7 +25,7 @@ import com.zteits.oa.api.dto.asraop.LoginOathRes; /** * Copyright: Copyright (c) 2017 zteits * - * @ClassName: com.clouds.common.web.auth + * @ClassName: .web.auth * @Description: * @version: v1.0.0 * @author: atao diff --git a/src/main/java/com/zteits/oa/report/domain/AsraDaily.java b/src/main/java/com/zteits/oa/report/domain/AsraDaily.java index 7e4ce0f..0d38914 100644 --- a/src/main/java/com/zteits/oa/report/domain/AsraDaily.java +++ b/src/main/java/com/zteits/oa/report/domain/AsraDaily.java @@ -210,4 +210,26 @@ public class AsraDaily { public void setDailyContent(String dailyContent) { this.dailyContent = dailyContent == null ? null : dailyContent.trim(); } + + @Override + public String toString() { + return "AsraDaily{" + + "id=" + id + + ", projectId=" + projectId + + ", asarOpId=" + asarOpId + + ", asarOpName='" + asarOpName + '\'' + + ", years=" + years + + ", weeks=" + weeks + + ", weeksNum=" + weeksNum + + ", dailyDate=" + dailyDate + + ", dataState=" + dataState + + ", createEmpid='" + createEmpid + '\'' + + ", createEmpName='" + createEmpName + '\'' + + ", createDate=" + createDate + + ", modfiyEmpid='" + modfiyEmpid + '\'' + + ", modfiyEmpName='" + modfiyEmpName + '\'' + + ", modfiyDate=" + modfiyDate + + ", dailyContent='" + dailyContent + '\'' + + '}'; + } } \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b464c3c..c8b3888 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.application.name=zteits_daily_report +spring.application.name=zteits-oa server.port=8100 #spring.profiles.active=prod @@ -15,6 +15,9 @@ druid.driverClass=com.mysql.jdbc.Driver druid.url=jdbc:mysql://192.168.1.167:3306/zt_asra?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true druid.username=root druid.password=root +#druid.url=jdbc:mysql://47.96.41.38:3306/zt_order_n?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +#druid.username=order +#druid.password=MySQL5.7@123 druid.initialSize=1 druid.minIdle=1 -- libgit2 0.21.4