From abe4248abae5ce0de90371439f04487d30218bac Mon Sep 17 00:00:00 2001 From: ybak Date: Tue, 11 Feb 2020 15:59:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=20=E5=8D=87=E7=BA=A7=E4=BA=86mysqlbatis?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=20=E5=BC=95=E5=85=A5jsonhandler?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=95=B0=E7=BB=84=E5=AD=97=E6=AE=B5=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=202.=20=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9post=E7=9A=84form?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E8=AF=81springmvc=20form=20=E5=92=8C=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=95=B0=E7=BB=84form=E7=90=86=E8=A7=A3?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E8=87=B4=E3=80=82=203.=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93flow=5Fstudentapply=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BA=86=E7=BC=BA=E5=A4=B1=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 6 +----- camunda/pom.xml | 6 ++++++ common/pom.xml | 4 ++-- doc/sql/sunFlow.sql | 6 ++++++ .../server/flowexample/bean/StudentApply.java | 12 +++++++++--- webApp/src/api/flow/studentApply.js | 5 +++++ 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index dd3e5a7..e94d2f2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,4 @@ buildNumber.properties .idea/ webApp/src/test/ upms-server/src/test/ -/upms-server/upms-server.iml -/camunda/camunda.iml -/common/common.iml -/flowclient/flowclient.iml -/onlyofficeclient/onlyofficeclient.iml +*.iml diff --git a/camunda/pom.xml b/camunda/pom.xml index dfdd21c..de8eae4 100644 --- a/camunda/pom.xml +++ b/camunda/pom.xml @@ -16,6 +16,12 @@ org.camunda.bpm.springboot camunda-bpm-spring-boot-starter-rest 3.2.0 + + + mybatis + org.mybatis + + org.camunda.bpm.springboot diff --git a/common/pom.xml b/common/pom.xml index b5ae220..6e43826 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -51,7 +51,7 @@ com.baomidou mybatis-plus-boot-starter - 3.1.0 + 3.3.1 mysql @@ -67,7 +67,7 @@ com.baomidou mybatis-plus-generator - 3.1.0 + 3.3.1 org.apache.velocity diff --git a/doc/sql/sunFlow.sql b/doc/sql/sunFlow.sql index 10684cd..cbcb496 100644 --- a/doc/sql/sunFlow.sql +++ b/doc/sql/sunFlow.sql @@ -29,6 +29,12 @@ CREATE TABLE `flow_studentapply` ( `desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '备注' ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic; +ALTER TABLE `sunflow`.`flow_studentapply` +ADD COLUMN `applyer` varchar(255) COMMENT '申请人' AFTER `desc`, +ADD COLUMN `resource` varchar(255) COMMENT '报名类型' AFTER `applyer`; +ALTER TABLE `sunflow`.`flow_studentapply` +CHANGE COLUMN `desc` `descript` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '备注' AFTER `bmtype`; + -- ---------------------------- -- Table structure for supms_dept -- ---------------------------- diff --git a/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/bean/StudentApply.java b/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/bean/StudentApply.java index 9d241f3..36d3fbb 100644 --- a/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/bean/StudentApply.java +++ b/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/bean/StudentApply.java @@ -1,8 +1,10 @@ package net.qqxh.sunflow.server.flowexample.bean; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,6 +34,7 @@ public class StudentApply implements Serializable { /** * 学校名称 */ + @TableField("name") private String schoolname; /** * 年级 @@ -51,10 +54,13 @@ public class StudentApply implements Serializable { /** * 时间 */ - private String datetime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date datetime; /** * 报名性质 */ + @TableField(typeHandler = FastjsonTypeHandler.class) private String[] bmtype; /** * 报名类型 @@ -105,11 +111,11 @@ public class StudentApply implements Serializable { this.dateday = dateday; } - public String getDatetime() { + public Date getDatetime() { return datetime; } - public void setDatetime(String datetime) { + public void setDatetime(Date datetime) { this.datetime = datetime; } diff --git a/webApp/src/api/flow/studentApply.js b/webApp/src/api/flow/studentApply.js index af8f612..1798b76 100644 --- a/webApp/src/api/flow/studentApply.js +++ b/webApp/src/api/flow/studentApply.js @@ -1,4 +1,6 @@ import request from '@/utils/flowRequest' +import qs from 'qs' + export const studentApplyService = { list: function(params) { return request({ @@ -18,6 +20,9 @@ export const studentApplyService = { return request({ url: '/studentApply/saveinfo', method: 'post', + paramsSerializer: function(params) { + return qs.stringify(params, { arrayFormat: 'repeat' }) + }, params }) }, -- Gitee From 006a3f8c25ce8ea30d9ed3422b616cddc53d6caa Mon Sep 17 00:00:00 2001 From: ybak Date: Tue, 11 Feb 2020 23:56:50 +0800 Subject: [PATCH 2/3] add swagger ui --- .../net/qqxh/sunflow/swagger/Swagger2.java | 29 +++ common/common.iml | 59 ------ common/pom.xml | 10 ++ sunFlow.iml | 12 -- .../qqxh/sunflow/server/swagger/Swagger2.java | 29 +++ upms-server/upms-server.iml | 169 ------------------ 6 files changed, 68 insertions(+), 240 deletions(-) create mode 100644 camunda/src/main/java/net/qqxh/sunflow/swagger/Swagger2.java delete mode 100644 common/common.iml delete mode 100644 sunFlow.iml create mode 100644 upms-server/src/main/java/net/qqxh/sunflow/server/swagger/Swagger2.java delete mode 100644 upms-server/upms-server.iml diff --git a/camunda/src/main/java/net/qqxh/sunflow/swagger/Swagger2.java b/camunda/src/main/java/net/qqxh/sunflow/swagger/Swagger2.java new file mode 100644 index 0000000..7b34a6f --- /dev/null +++ b/camunda/src/main/java/net/qqxh/sunflow/swagger/Swagger2.java @@ -0,0 +1,29 @@ +package net.qqxh.sunflow.swagger; + +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +public class Swagger2 { + + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .paths(PathSelectors.any()) + .build(); + } + + public ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("camunda") + .version("1.0") + .build(); + } +} diff --git a/common/common.iml b/common/common.iml deleted file mode 100644 index 8000883..0000000 --- a/common/common.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index 6e43826..1a10b4b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -46,6 +46,16 @@ 1.9 + + io.springfox + springfox-swagger2 + 2.9.2 + + + com.github.xiaoymin + knife4j-spring-ui + 1.9.6 + diff --git a/sunFlow.iml b/sunFlow.iml deleted file mode 100644 index f409c0e..0000000 --- a/sunFlow.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/upms-server/src/main/java/net/qqxh/sunflow/server/swagger/Swagger2.java b/upms-server/src/main/java/net/qqxh/sunflow/server/swagger/Swagger2.java new file mode 100644 index 0000000..5116367 --- /dev/null +++ b/upms-server/src/main/java/net/qqxh/sunflow/server/swagger/Swagger2.java @@ -0,0 +1,29 @@ +package net.qqxh.sunflow.server.swagger; + +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +public class Swagger2 { + + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .paths(PathSelectors.any()) + .build(); + } + + public ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("upms-server") + .version("1.0") + .build(); + } +} diff --git a/upms-server/upms-server.iml b/upms-server/upms-server.iml deleted file mode 100644 index bcd7212..0000000 --- a/upms-server/upms-server.iml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- Gitee From 093a33e44d494452f5f2a8d3d1e32f9e49361449 Mon Sep 17 00:00:00 2001 From: ybak Date: Wed, 12 Feb 2020 16:26:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84=E5=86=85=E9=83=A8=E5=BC=82=E5=B8=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sunflow/controller/ProjectController.java | 8 +- camunda/src/main/resources/project.bpmn | 106 +++++++++--------- .../controller/StudentApplyController.java | 2 +- 3 files changed, 57 insertions(+), 59 deletions(-) diff --git a/camunda/src/main/java/net/qqxh/sunflow/controller/ProjectController.java b/camunda/src/main/java/net/qqxh/sunflow/controller/ProjectController.java index 083adba..afcd6b2 100644 --- a/camunda/src/main/java/net/qqxh/sunflow/controller/ProjectController.java +++ b/camunda/src/main/java/net/qqxh/sunflow/controller/ProjectController.java @@ -26,11 +26,11 @@ public class ProjectController { private static class ProjectParticipateRequestRecord { Long studentId; - Long projectParticipateId; + String projectParticipateId; String taskId; - public Long getProjectParticipateId() { + public String getProjectParticipateId() { return projectParticipateId; } @@ -38,7 +38,7 @@ public class ProjectController { return studentId; } - public void setProjectParticipateId(Long projectParticipateId) { + public void setProjectParticipateId(String projectParticipateId) { this.projectParticipateId = projectParticipateId; } @@ -158,7 +158,7 @@ public class ProjectController { Map variables = taskService.getVariables(taskId); Long studentId = Long.valueOf ( (String)variables.get(ProjectProcessConstant.VAR_NAME_STUDENT) ); - Long recordId = (Long) variables.get(ProjectProcessConstant.FORM_RECORD_ID); + String recordId = ""+ variables.get(ProjectProcessConstant.FORM_RECORD_ID); record.setStudentId(studentId); record.setProjectParticipateId(recordId); record.setTaskId(taskId); diff --git a/camunda/src/main/resources/project.bpmn b/camunda/src/main/resources/project.bpmn index a376c92..f25bceb 100644 --- a/camunda/src/main/resources/project.bpmn +++ b/camunda/src/main/resources/project.bpmn @@ -1,10 +1,10 @@ - + - + SequenceFlow_0896wbg @@ -13,8 +13,8 @@ - - + + SequenceFlow_0896wbg @@ -56,8 +56,8 @@ - - + + SequenceFlow_1d807sw @@ -93,113 +93,111 @@ - + - + - - + + - + - + - + - - + + - - + + - - - + + + - + - + - + - - + + - + - + - - + + - - + + - + - + - + - - + + - - + + - - - + + + - + - + - + - - + + - - - + + + - - + + - + - - diff --git a/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/controller/StudentApplyController.java b/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/controller/StudentApplyController.java index 4decbe2..e2818aa 100644 --- a/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/controller/StudentApplyController.java +++ b/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/controller/StudentApplyController.java @@ -41,7 +41,7 @@ public class StudentApplyController extends BaseController { String url="http://localhost:8080/projects/project"; Map params=new HashMap(); params.put("school",studentApply.getSchoolname()); - params.put("student",studentApply.getApplyer()); + params.put("student", user.getId()); params.put("recordId",studentApply.getRecordid()); try { String response= FlowClient.sendPostDataByMap(url,params,"utf-8"); -- Gitee