Skip to content

N
notes2.0
提交 14ef9a15 authored 作者: gongwenjie's avatar gongwenjie
浏览文件
操作

接口注释，人员部分代码

上级 e79fb1ec 610af9b4
隐藏空白字符变更
内嵌 并排
正在显示 包含 108 行增加 和 35 行删除
notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/WorkController.java
浏览文件 @ 14ef9a15
......@@ -8,9 +8,7 @@ import com.zjty.tynotes.job.basic.service.WorkService;
import com.zjty.tynotes.job.common.Action;
import com.zjty.tynotes.job.status.service.BusinessTreeManagement;
import com.zjty.tynotes.misc.config.AutoDocument;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
......@@ -82,6 +80,13 @@ public class WorkController {
@PutMapping(value = "/delete")
@ApiOperation(value = "根据id删除工作.", notes = "本次删除选择是否要把个人工作量以及任务工作量纳入统计中.")
@ApiImplicitParams({
@ApiImplicitParam(name="workId",value="任务id",dataType="String", paramType = "query",required = true),
@ApiImplicitParam(name="personalWorkload",value="是否统计个人工作量",dataType="int", paramType = "query",required = true),
@ApiImplicitParam(name="userId",value="人员id",dataType="String", paramType = "query",required = true),
@ApiImplicitParam(name="workloadCount",value="是否统计任务工作量",dataType="int", paramType = "query",required = true),
@ApiImplicitParam(name="msg",value="消息",dataType="String", paramType = "query",required = true)
})
public ResponseEntity<JobResponse> delete(@RequestParam String workId,
@RequestParam int personalWorkload,
@RequestParam String userId,
......@@ -104,6 +109,13 @@ public class WorkController {
@PutMapping(value = "/upDate/Workload")
@ApiOperation(value = "修改任务的工作量、考评系数.")
@ApiImplicitParams({
@ApiImplicitParam(name="workId",value="任务id",dataType="String", paramType = "query",required = true),
@ApiImplicitParam(name="workload",value="工作量",dataType="int", paramType = "query",required = true),
@ApiImplicitParam(name="userId",value="人员id",dataType="String", paramType = "query",required = true),
@ApiImplicitParam(name="workCoefficient",value="考评系数",dataType="int", paramType = "query",required = true),
@ApiImplicitParam(name="msg",value="消息",dataType="String", paramType = "query",required = true)
})
public ResponseEntity<JobResponse> updateWorkload(@RequestParam String workId,
@RequestParam String userId,
@RequestParam int workCoefficient,
......@@ -118,6 +130,12 @@ public class WorkController {
@PutMapping(value = "/status")
@ApiOperation(value = "修改工作状态")
@ApiImplicitParams({
@ApiImplicitParam(name="workId",value="任务id",dataType="String", paramType = "query",required = true),
@ApiImplicitParam(name="userId",value="人员id",dataType="String", paramType = "query",required = true),
@ApiImplicitParam(name="status",value="状态",dataType="String", paramType = "query",required = true),
@ApiImplicitParam(name="msg",value="消息",dataType="String", paramType = "query",required = true)
})
public ResponseEntity alterTaskStatus(@RequestParam String workId,
@RequestParam String userId,
@RequestParam String status,
......
notes-misc/pom.xml
浏览文件 @ 14ef9a15
......@@ -27,25 +27,25 @@
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<!--<version>${swagger.version}</version>-->
<version>2.9.0</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>com.github.caspar-chen</groupId>
<artifactId>swagger-ui-layer</artifactId>
<version>0.0.4</version>
<version>0.0.5</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-bean-validators</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
</dependency>
</dependencies>
......
notes-misc/src/main/java/com/zjty/tynotes/misc/config/Swagger2Config.java
浏览文件 @ 14ef9a15
......@@ -47,11 +47,11 @@ public class Swagger2Config {
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
// 文档标题
.title("工作薄本平台接口文档")
.title("工作薄2.0平台接口文档")
// 文档描述
.description("工作薄平台的接口文档与测试页面")
.description("工作薄2.0平台的接口文档与测试页面")
.termsOfServiceUrl("http://192.168.1.249:8080/ty-note/ty-note-blackend.git")
.version("v 0.1.0")
.version("v 0.2.0")
.contact(new Contact("ty-note", "http://localhost:8080/tynotes", "ty@example.com"))
.build();
}
......
notes-pas/src/main/java/com/zjty/tynotes/pas/dao/PasUserDao.java
浏览文件 @ 14ef9a15
......@@ -21,6 +21,45 @@ public interface PasUserDao extends MongoRepository<User, String> {
*/
User findByUsername(String username);
// /**
// * 根据用户姓名查询用户对象
// * @param name 用户姓名
// * @param status 删除状态
// * @return User
// */
// List<User> findAllByNameEqualsAndStatusEquals(String name,Integer status);
//
// /**
// * 根据用户名查询用户对象
// * @param status 状态
// * @return User
// */
// List<User> findAllByStatusEquals(Integer status);
//
// /**
// * 根据id集合搜索用户
// * @param ids id集合
// * @param status 删除状态
// * @return list
// */
// List<User> findAllByIdInAndStatusEquals(List<String> ids,Integer status);
//
// /**
// * 根据部门id查询用户
// * @param ids 部门id
// * @param status 删除状态
// * @return User
// */
// List<User> findAllByDepartIdInAndStatusEquals(List<String> ids,Integer status);
//
// /**
// * 查询未删除的人员
// * @param id 用户id
// * @param status 删除状态
// * @return User
// */
// User findAllByIdEqualsAndStatusEquals(String id,Integer status);
/**
* 根据id列表查询
* @param ids id列表
......
notes-union/pom.xml
浏览文件 @ 14ef9a15
......@@ -19,9 +19,7 @@
<properties>
<activatedProperties>simc</activatedProperties>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<!--生产环境-->
......
notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java
浏览文件 @ 14ef9a15
......@@ -27,7 +27,7 @@ public class UnionApplication {
public static void main(String[] args) {
SpringApplication.run(UnionApplication.class, args);
}
// 开始支持http
//// 开始支持http
// @Bean
// public ServletWebServerFactory servletContainer() {
// TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
......@@ -41,7 +41,7 @@ public class UnionApplication {
// connector.setScheme("http");
// connector.setSecure(false);
// connector.setPort(8084);
// connector.setRedirectPort(8090);
// connector.setRedirectPort(8290);
// return connector;
//}
......
notes-union/src/main/resources/application-prod.properties
浏览文件 @ 14ef9a15
spring.application.name=workbook
# port
server.port=8090
# mongodb configuration
spring.data.mongodb.uri=mongodb://192.168.1.244:27017/workbook
# https端口号.
server.port=8289
## 证书的路径.
#server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
## 证书密码，请修改为您自己证书的密码.
#server.ssl.key-store-password=bMEPW9BG
## 秘钥库类型
#server.ssl.keyStoreType=PKCS12
## 证书别名
#server.ssl.keyAlias= alias
#mongodb configuration
spring.data.mongodb.uri=mongodb://localhost:27017/notes
# servlet configuration
spring.servlet.multipart.max-file-size=100MB
spring.servlet.multipart.max-request-size=1000MB
spring.redis.timeout=5000
spring.redis.host=localhost
spring.redis.port=6379
spring.redis.timeout=5000ms
# es configuraiton
es.ip=192.168.1.244
es.ip=localhost
logging.file=./log/note.log
notes-union/src/main/resources/application-simc.properties
浏览文件 @ 14ef9a15
spring.application.name=simc
spring.application.name=workbook
# port
server.port=8082
# mongodb configuration
# https端口号.
server.port=8289
## 证书的路径.
#server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
## 证书密码，请修改为您自己证书的密码.
#server.ssl.key-store-password=bMEPW9BG
## 秘钥库类型
#server.ssl.keyStoreType=PKCS12
## 证书别名
#server.ssl.keyAlias= alias
#mongodb configuration
spring.data.mongodb.uri=mongodb://localhost:27017/notes
# servlet configuration
spring.servlet.multipart.max-file-size=100MB
spring.servlet.multipart.max-request-size=1000MB
spring.redis.timeout=5000
spring.redis.host=localhost
spring.redis.port=6379
spring.redis.timeout=5000ms
# es configuraiton
es.ip=localhost
es.prefix=event_list
logging.file=./log/note.log
logging.file=./log/note.log
\ No newline at end of file
notes-union/src/main/resources/application.properties
浏览文件 @ 14ef9a15
......@@ -3,9 +3,9 @@ spring.application.name=workbook
# https端口号.
server.port=8082
server.port=8289
## 证书的路径.
#server.ssl.key-store= classpath:2586377_workbook.zjtys.com.cn.pfx
#server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
## 证书密码，请修改为您自己证书的密码.
#server.ssl.key-store-password=bMEPW9BG
## 秘钥库类型
......@@ -13,8 +13,6 @@ server.port=8082
## 证书别名
#server.ssl.keyAlias= alias
#mongodb configuration
spring.data.mongodb.uri=mongodb://localhost:27017/note
# servlet configuration
spring.servlet.multipart.max-file-size=100MB
spring.servlet.multipart.max-request-size=1000MB
......@@ -24,5 +22,5 @@ spring.redis.port=6379
spring.redis.timeout=5000ms
# es configuraiton
es.ip=192.168.1.248
es.ip=localhost
logging.file=./log/note.log
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论