提交

王富生
1 parent a128cae0
Showing 10 changed files with 43 additions and 22 deletions
pom.xml
src/main/java/com/zteits/oa/api/base/annotation/NoAuth.java
src/main/java/com/zteits/oa/api/base/bean/PageUtil.java
src/main/java/com/zteits/oa/api/base/constants/PageSizeEnum.java
src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java
src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailyQueryReq.java
src/main/java/com/zteits/oa/api/dto/asraop/AsraOpDTO.java
src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java
src/main/java/com/zteits/oa/report/domain/AsraDaily.java
src/main/resources/application.properties
@@ -117,22 +117,19 @@
 	</dependencies>
 	<build>
-	   <finalName>com.zteits.oa</finalName>
+		<defaultGoal>compile</defaultGoal>
+	   <finalName>zteits-oa</finalName>
 		<plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.daily.report.DailyReportApplication</mainClass>
+                    <mainClass>com.zteits.oa.DailyReportApplication</mainClass>
                 </configuration>
                 <version>1.3.5.RELEASE</version>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                
-            </plugin>
-        </plugins>
+
+		</plugins>
 	</build>
@@ -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
@@ -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
@@ -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
@@ -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");
 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{
 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;
     /**登录工号*/
@@ -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
@@ -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
-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