planTypeMapExport) {
+ this.planTypeMapExport = planTypeMapExport;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SarConformStateEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/SarConformStateEnum.java
new file mode 100644
index 00000000..bc301e51
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SarConformStateEnum.java
@@ -0,0 +1,28 @@
+package com.adc.da.common;
+
+/**
+ * @Description: 项目库标准符合性枚举类
+ * @Author: yangxuenan
+ * date: 2020/11/5 14:14
+ */
+public enum SarConformStateEnum {
+
+ CHECK(1,"待验证"),FIT(2,"符合"),
+ UNFIT(3,"不符合"),PART_FIT(4,"部分符合"),
+ NOT_INVOLVE(5,"不涉及"),ASSESS(6,"评估中"),
+ RESET(7,"整改中"),NOT_EVAL(8,"未评估");
+
+ private Integer value;
+ private String lable;
+
+ private SarConformStateEnum(Integer value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public Integer getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SarNumberTypeEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/SarNumberTypeEnum.java
new file mode 100644
index 00000000..14f48c72
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SarNumberTypeEnum.java
@@ -0,0 +1,30 @@
+package com.adc.da.common;
+
+/**
+ * 编号类型分类
+ * @author gaoyan
+ * date 2018/09/19
+ */
+public enum SarNumberTypeEnum {
+
+ STAND_NUMBER("STAND_NUMBER","标准编号"),LAWS_NUMBER("LAWS_NUMBER","文件号"),
+ STAND_REPLACE_NUMBER("STAND_REPLACE_NUMBER","代替标准号"),LAWS_REPLACE_NUMBER("LAWS_REPLACE_NUMBER","代替文件号");
+
+ private String value;
+ private String lable;
+
+ private SarNumberTypeEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+
+
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SarPutTimeEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/SarPutTimeEnum.java
new file mode 100644
index 00000000..d417d4e8
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SarPutTimeEnum.java
@@ -0,0 +1,26 @@
+package com.adc.da.common;
+
+/**
+ * @Description: 预警实施日期种类
+ * @Author: yangxuenan
+ * date: 2020/10/19 15:59
+ */
+public enum SarPutTimeEnum {
+ XDXCSSRQ("XDXCSSRQ","新定型车实施日期"),ZCCSSRQ("ZCCSSRQ","在产车实施日期"),
+ XSCCSSRQ("XSCCSSRQ","新生产车实施日期");
+
+ private String value;
+ private String lable;
+
+ private SarPutTimeEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SarStandStateEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/SarStandStateEnum.java
new file mode 100644
index 00000000..cd43a94a
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SarStandStateEnum.java
@@ -0,0 +1,42 @@
+package com.adc.da.common;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/12/18 13:51
+ */
+public enum SarStandStateEnum {
+
+ DRAFT("DRAFT","草稿"),ADVICE("ADVICE","征求意见稿"),
+ SUBMIT("SUBMIT","送审稿"),RADYSUBMIT("RADYSUBMIT","报批稿"),
+ FJNVYX9Q7J("FJNVYX9Q7J","发布稿"),ZTXXYX("ZTXXYX","计划修订"),
+ ZTJJSS("ZTJJSS","修订中"),TOVOID("TOVOID","已作废"),
+ N5KLTFLNRC("N5KLTFLNRC","已修订"),QBXDZ("XB2USRPXY5","企标修订中"),
+ QBYZF("AY9L9FMSEW","企标已作废"),QBYXD("7ZT7YWXFPK","企标已修订"),
+ QBJHYQR("4VKQX3V2QU","企标计划已确认"),QBYFB("N75QKJ5MWB","企标已发布");
+
+ private String value;
+ private String lable;
+
+ private SarStandStateEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+
+ public static String getLableByVal(String val){
+ for (SarStandStateEnum stateEnum : SarStandStateEnum.values()) {
+ if (stateEnum.getValue() == val) {
+ return stateEnum.getLable();
+ }
+ }
+ return "";
+ }
+
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SarStateColorEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/SarStateColorEnum.java
new file mode 100644
index 00000000..b53d4ca2
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SarStateColorEnum.java
@@ -0,0 +1,26 @@
+package com.adc.da.common;
+
+/**
+ * @Description: 合规性分级颜色枚举
+ * @Author: yangxuenan
+ * date: 2021/3/10 15:45
+ */
+public enum SarStateColorEnum {
+
+ GREEN("green","绿色"),RED("red","红色"),BLUE("blue","蓝色"),
+ YELLOW("yellow","黄色"),NA("grey","灰色"),NOT("notSure","未反馈");
+
+ private String value;
+ private String lable;
+
+ private SarStateColorEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SarSychronEO.java b/adc-da-activiti/src/main/java/com/adc/da/common/SarSychronEO.java
new file mode 100644
index 00000000..0edfc679
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SarSychronEO.java
@@ -0,0 +1,54 @@
+package com.adc.da.common;
+
+public class SarSychronEO {
+
+ private String sychronId;
+
+ private String sarId;
+
+ private String sarNumber;
+
+ private String conflictType;
+
+ private String standName;
+
+ public String getSychronId() {
+ return sychronId;
+ }
+
+ public void setSychronId(String sychronId) {
+ this.sychronId = sychronId;
+ }
+
+ public String getSarId() {
+ return sarId;
+ }
+
+ public void setSarId(String sarId) {
+ this.sarId = sarId;
+ }
+
+ public String getSarNumber() {
+ return sarNumber;
+ }
+
+ public void setSarNumber(String sarNumber) {
+ this.sarNumber = sarNumber;
+ }
+
+ public String getConflictType() {
+ return conflictType;
+ }
+
+ public void setConflictType(String conflictType) {
+ this.conflictType = conflictType;
+ }
+
+ public String getStandName() {
+ return standName;
+ }
+
+ public void setStandName(String standName) {
+ this.standName = standName;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SarSynInputEO.java b/adc-da-activiti/src/main/java/com/adc/da/common/SarSynInputEO.java
new file mode 100644
index 00000000..68de1874
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SarSynInputEO.java
@@ -0,0 +1,72 @@
+package com.adc.da.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+public class SarSynInputEO {
+ private String id;
+ private String standSort;
+ private String standNumber;
+ private String standYear;
+ private String standType;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+ private String standName;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getStandSort() {
+ return standSort;
+ }
+
+ public void setStandSort(String standSort) {
+ this.standSort = standSort;
+ }
+
+ public String getStandNumber() {
+ return standNumber;
+ }
+
+ public void setStandNumber(String standNumber) {
+ this.standNumber = standNumber;
+ }
+
+ public String getStandYear() {
+ return standYear;
+ }
+
+ public void setStandYear(String standYear) {
+ this.standYear = standYear;
+ }
+
+ public String getStandType() {
+ return standType;
+ }
+
+ public void setStandType(String standType) {
+ this.standType = standType;
+ }
+
+ public Date getModifyTime() {
+ return modifyTime;
+ }
+
+ public void setModifyTime(Date modifyTime) {
+ this.modifyTime = modifyTime;
+ }
+
+ public String getStandName() {
+ return standName;
+ }
+
+ public void setStandName(String standName) {
+ this.standName = standName;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SarTypeEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/SarTypeEnum.java
new file mode 100644
index 00000000..cc804198
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SarTypeEnum.java
@@ -0,0 +1,43 @@
+package com.adc.da.common;
+
+/**
+ * 标准法规分类
+ * @author gaoyan
+ * date 2018/09/19
+ */
+public enum SarTypeEnum {
+
+ INLAND_STAND("INLAND_STAND","国内标准法规"),INLAND_LAWS("INLAND_LAWS","国内政策"),
+ FOREIGN_STAND("FOREIGN_STAND","国外标准法规"),FOREIGN_LAWS("FOREIGN_LAWS","国外政策"),
+ STAND("STAND","国内外标准法规"),
+ LAWS("LAWS","国内外政策"),
+ BUSINESS("BUSINESS","企业标准"),
+ BUSS("BUSS","企业标准"),
+ SPLIT("SPLIT","标准拆分"),
+ ACCESS("ACCESS","标准法规清单"),
+ // 增加清单临时分类代码 后续通过同步按钮同步时切换类型
+ INLAND_STAND_ACCESS("INLAND_STAND_ACCESS","国内标准法规清单"),
+ FOREIGN_STAND_ACCESS("FOREIGN_STAND_ACCESS","国外标准法规清单"),
+ FOREIGN_LAWS_ACCESS("FOREIGN_LAWS_ACCESS","国内外政策清单"),
+ BUSS_ACCESS("BUSS","企业标准清单"),
+ PRODUCT("PRODUCT","车型/项目库"),
+ RECORDS("RECORDS","企标备案库");
+
+ private String value;
+ private String lable;
+
+ private SarTypeEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+
+
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SelectionTypeEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/SelectionTypeEnum.java
new file mode 100644
index 00000000..562d8ebf
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SelectionTypeEnum.java
@@ -0,0 +1,26 @@
+package com.adc.da.common;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/12/17 11:23
+ */
+public enum SelectionTypeEnum {
+
+ ORGLIST("ORGLIST","组织机构"),USERLIST("USERLIST","用户"),
+ ROLELIST("ROLELIST","角色"),SVPPS("SVPPS","SVPPS"),GZZXX("GZZXX","工作组信息");
+
+ private String value;
+ private String lable;
+
+ private SelectionTypeEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SorDivideEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/SorDivideEnum.java
new file mode 100644
index 00000000..204c1b2c
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SorDivideEnum.java
@@ -0,0 +1,31 @@
+package com.adc.da.common;
+
+/**
+ * 标准法规分类
+ * @author gaoyan
+ * date 2018/09/19
+ */
+public enum SorDivideEnum {
+
+ INLAND_STAND("INLAND_STAND","国内标准法规"),INLAND_LAWS("INLAND_LAWS","国内政策"),
+ FOREIGN_STAND("FOREIGN_STAND","国外标准法规"),FOREIGN_LAWS("FOREIGN_LAWS","国外政策"),
+ BUSINESS_STAND("BUSINESS_STAND","企业标准") ;
+
+ private String value;
+ private String lable;
+
+ private SorDivideEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+
+
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SplitFilePragraTypeEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/SplitFilePragraTypeEnum.java
new file mode 100644
index 00000000..9a7bfe56
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SplitFilePragraTypeEnum.java
@@ -0,0 +1,26 @@
+package com.adc.da.common;
+
+/**
+ * 标准库参数类型枚举设置
+ * @author gaoyan
+ * date 2018/09/03
+ */
+public enum SplitFilePragraTypeEnum {
+
+ TEXT("TEXT","文字"),IMG("IMG","图片"),TABLE("TABLE","表格");
+
+ private String value;
+ private String lable;
+
+ private SplitFilePragraTypeEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/SplitTableInfo.java b/adc-da-activiti/src/main/java/com/adc/da/common/SplitTableInfo.java
new file mode 100644
index 00000000..158e4d73
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/SplitTableInfo.java
@@ -0,0 +1,28 @@
+package com.adc.da.common;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/5/11 10:29
+ */
+public class SplitTableInfo {
+ private String tableName;
+
+ private String tableHtml;
+
+ public String getTableName() {
+ return tableName;
+ }
+
+ public void setTableName(String tableName) {
+ this.tableName = tableName;
+ }
+
+ public String getTableHtml() {
+ return tableHtml;
+ }
+
+ public void setTableHtml(String tableHtml) {
+ this.tableHtml = tableHtml;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/StandAttrTypeEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/StandAttrTypeEnum.java
new file mode 100644
index 00000000..24590d0f
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/StandAttrTypeEnum.java
@@ -0,0 +1,28 @@
+package com.adc.da.common;
+
+/**
+ * @Description: 属性类型枚举类
+ * @Author: yangxuenan
+ * date: 2020/8/17 17:02
+ */
+public enum StandAttrTypeEnum {
+
+ INPUT_STR("INPUT_STR","输入框（字符串）"),INPUT_NUM("INPUT_NUM","输入框（数字）"),
+ SELECT_OPTION("SEL_OPTION","单选下拉框"),SEL_OPTS("SEL_OPTS","多选下拉框"),DATE_PICKER("DATE_PICKER","日期选择"),
+ DATE_PIC_OPTS("DATE_PIC_OPTS","多日期选择"),FILE("FILE","文件"),
+ TEXTAREA("TEXTAREA","文本框") ;
+
+ private String value;
+ private String lable;
+
+ private StandAttrTypeEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/StandFileClassifyEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/StandFileClassifyEnum.java
new file mode 100644
index 00000000..88a7b26f
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/StandFileClassifyEnum.java
@@ -0,0 +1,32 @@
+package com.adc.da.common;
+
+/**
+ * 资源库文件分类枚举设置
+ * @author gaoyan
+ * date 2018/09/03
+ */
+public enum StandFileClassifyEnum {
+
+ STAND_FILE("STAND_FILE","标准文本/法规文件"),STAND_MODIFY_FILE("STAND_MODIFY_FILE","标准修改单"),
+ DRAFT_FILE("DRAFT_FILE","草案文件"),OPINION_FILE("OPINION_FILE","征求意见稿"),
+ SENT_SCREEN_FILE("SENT_SCREEN_FILE","送审稿"),APPROVAL_FILE("APPROVAL_FILE","报批稿"),
+ RELEVANCE_FILE("RELEVANCE_FILE","关联文件"),LAWS_FILE("LAWS_FILE","法规文件") ;
+
+ private String value;
+ private String lable;
+
+ private StandFileClassifyEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+
+
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/StandPlanSchedule.java b/adc-da-activiti/src/main/java/com/adc/da/common/StandPlanSchedule.java
new file mode 100644
index 00000000..48baf5ff
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/StandPlanSchedule.java
@@ -0,0 +1,54 @@
+package com.adc.da.common;
+
+public class StandPlanSchedule {
+
+ private String value;
+
+ private int countPlanSubmit = 0;
+
+ private int countRealSubmit = 0;
+
+ private int countPlanRelease = 0;
+
+ private int countRealRelease = 0;
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public int getCountPlanSubmit() {
+ return countPlanSubmit;
+ }
+
+ public void setCountPlanSubmit(int countPlanSubmit) {
+ this.countPlanSubmit = countPlanSubmit;
+ }
+
+ public int getCountRealSubmit() {
+ return countRealSubmit;
+ }
+
+ public void setCountRealSubmit(int countRealSubmit) {
+ this.countRealSubmit = countRealSubmit;
+ }
+
+ public int getCountPlanRelease() {
+ return countPlanRelease;
+ }
+
+ public void setCountPlanRelease(int countPlanRelease) {
+ this.countPlanRelease = countPlanRelease;
+ }
+
+ public int getCountRealRelease() {
+ return countRealRelease;
+ }
+
+ public void setCountRealRelease(int countRealRelease) {
+ this.countRealRelease = countRealRelease;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TaskCommonQuery.java b/adc-da-activiti/src/main/java/com/adc/da/common/TaskCommonQuery.java
new file mode 100644
index 00000000..926117d9
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/TaskCommonQuery.java
@@ -0,0 +1,40 @@
+package com.adc.da.common;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TaskCommonQuery {
+
+ @ApiModelProperty(value = "当前页")
+ private int current;
+ @ApiModelProperty(value = "数量")
+ private int size;
+ @ApiModelProperty(value = "名称")
+ private String name;
+ @ApiModelProperty(value = "开始时间从")
+ private String startTime;
+ @ApiModelProperty(value = "到")
+ private String endTime;
+ @ApiModelProperty(value = "结束时间从")
+ private String finishStartTime;
+ @ApiModelProperty(value = "到")
+ private String finishEndTime;
+ @ApiModelProperty(value = "流程分类")
+ private String category_id;
+
+ @ApiModelProperty(value = "用户Id")
+ private String userId;
+
+ @ApiModelProperty(value = "流程名称")
+ private String prcName;
+
+ @ApiModelProperty(value = "流程编号")
+ private String prcNum;
+
+ @ApiModelProperty(value = "流程类型")
+ private String prcType;
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TemplateOriData.java b/adc-da-activiti/src/main/java/com/adc/da/common/TemplateOriData.java
new file mode 100644
index 00000000..a2dcc2d4
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/TemplateOriData.java
@@ -0,0 +1,45 @@
+package com.adc.da.common;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/2/21 16:34
+ */
+public class TemplateOriData {
+ private String preMsg = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX。
本标准由广州汽车集团股份有限公司汽车工程研究院XXX提出。
本标准由广州汽车集团股份有限公司汽车工程研究院质量管理部归口。
本标准由广州汽车集团股份有限公司汽车工程研究院XXXX起草。
本标准由广州汽车集团股份有限公司汽车工程研究院XXXX解释。
本标准主要起草人：XXX、XXX、XXX。
本标准于20XX年XX月首次发布。
本标准于20XX年XX月进行第X次修订，标准修订人：XXX。
本次主要修订内容如下：
a) 增加内容的表述
——增加第X.X条XXXX的要求。
b）修改内容的表述
——第X.X条XXXX的要求由“XXX”改为“XXX”。
c）删除内容的表述
——删除原标准第X.X条XXXX的要求。
本标准所替代标准的历次版本发布情况为：
——QJ/GAC XXXX.XXX-XXXX。
";
+ private String titleOne = " 本标准规定了XXXX的术语和定义、技术要求、试验方法、检验规则和标志、包装、运输及贮存。
本标准适用于广汽研究院开发的乘用车用的XXXX。
";
+ private String titleTwo = " 下列文件对于本文件的应用是必不可少的。凡是注日期的引用文件，仅所注日期的版本适用于本文件。凡是不注日期的引用文件，其最新版本（包括所有的修改单）适用于本文件。
[国家标准]
[行业标准]
[地方标准]
[法规、规程、规范和其它有关文件]
[ISO标准]
[IEC标准]
[ISO、IEC有关文件]
[其它国际标准]
[其它国际有关文件]
[本企业已发布的院级标准]
";
+ private String titleThree = " 下列术语和定义适用于本标准。
";
+
+ public String getPreMsg() {
+ return preMsg;
+ }
+
+ public void setPreMsg(String preMsg) {
+ this.preMsg = preMsg;
+ }
+
+ public String getTitleOne() {
+ return titleOne;
+ }
+
+ public void setTitleOne(String titleOne) {
+ this.titleOne = titleOne;
+ }
+
+ public String getTitleTwo() {
+ return titleTwo;
+ }
+
+ public void setTitleTwo(String titleTwo) {
+ this.titleTwo = titleTwo;
+ }
+
+ public String getTitleThree() {
+ return titleThree;
+ }
+
+ public void setTitleThree(String titleThree) {
+ this.titleThree = titleThree;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TextCompare.java b/adc-da-activiti/src/main/java/com/adc/da/common/TextCompare.java
new file mode 100644
index 00000000..266a5916
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/TextCompare.java
@@ -0,0 +1,9 @@
+package com.adc.da.common;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2019/12/5 13:50
+ */
+public class TextCompare {
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/UploadFile.java b/adc-da-activiti/src/main/java/com/adc/da/common/UploadFile.java
new file mode 100644
index 00000000..6a96f877
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/UploadFile.java
@@ -0,0 +1,64 @@
+package com.adc.da.common;
+
+public class UploadFile {
+
+ private String id;
+
+ private String fileName;
+
+ private String oldFileName;
+
+ private String fileSuffix;
+
+ private String filePath;
+
+ private String attId;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public String getOldFileName() {
+ return oldFileName;
+ }
+
+ public void setOldFileName(String oldFileName) {
+ this.oldFileName = oldFileName;
+ }
+
+ public String getFileSuffix() {
+ return fileSuffix;
+ }
+
+ public void setFileSuffix(String fileSuffix) {
+ this.fileSuffix = fileSuffix;
+ }
+
+ public String getFilePath() {
+ return filePath;
+ }
+
+ public void setFilePath(String filePath) {
+ this.filePath = filePath;
+ }
+
+ public String getAttId() {
+ return attId;
+ }
+
+ public void setAttId(String attId) {
+ this.attId = attId;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/UploadFileInfo.java b/adc-da-activiti/src/main/java/com/adc/da/common/UploadFileInfo.java
new file mode 100644
index 00000000..983d526b
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/UploadFileInfo.java
@@ -0,0 +1,36 @@
+package com.adc.da.common;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/1/9 18:59
+ */
+public class UploadFileInfo {
+ private String id;
+ private String filePath;
+ private String name;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getFilePath() {
+ return filePath;
+ }
+
+ public void setFilePath(String filePath) {
+ this.filePath = filePath;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/UseModuleEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/UseModuleEnum.java
new file mode 100644
index 00000000..ea7125c7
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/UseModuleEnum.java
@@ -0,0 +1,26 @@
+package com.adc.da.common;
+
+/**
+ * 标准库参数类型枚举设置
+ * @author gaoyan
+ * date 2018/09/03
+ */
+public enum UseModuleEnum {
+
+ SOURCE_FILE("SOURCE_FILE","源文件"),WEB_FILE("WEB_FILE","PC预览文件"),MOBLE_FILE("MOBLE_FILE","手机预览文件");
+
+ private String value;
+ private String lable;
+
+ private UseModuleEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/WDWUtil.java b/adc-da-activiti/src/main/java/com/adc/da/common/WDWUtil.java
new file mode 100644
index 00000000..7abbc115
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/WDWUtil.java
@@ -0,0 +1,164 @@
+package com.adc.da.common;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Pattern;
+
+/**
+ * @des : excel版本判断类
+ * @author: duyunbao
+ * @email: 1114808306@qq.com
+ * @date 2017/10/27 16:59
+ **/
+public class WDWUtil {
+
+ /**
+ * @method_name: isExcel2003
+ * @des :是否是2003的excel，返回true是2003
+ * @author: duyunbao
+ * @param: [filePath]
+ * @return: boolean
+ * @date: 2017/10/27 16:57
+ **/
+ public static boolean isExcel2003(String filePath) {
+ return filePath.matches("^.+\\.(?i)(xls)$");
+ }
+
+ /**
+ * @method_name: isExcel2007
+ * @des : 是否是2007的excel，返回true是2007
+ * @author: duyunbao
+ * @param: [filePath]
+ * @return: boolean
+ * @date: 2017/10/27 16:57
+ **/
+ public static boolean isExcel2007(String filePath) {
+ return filePath.matches("^.+\\.(?i)(xlsx)$");
+ }
+
+
+ /**
+ * 判断字符串是否是整数
+ * @MethodName:isInteger
+ * @author: DuYunbao
+ * @date: 2018/5/22 18:00
+ */
+ public static boolean isNumeric(String str){
+ for (int i = str.length();--i>=0;){
+ if (!Character.isDigit(str.charAt(i))){
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**方法二：推荐，速度最快
+ * 判断是否为整数
+ * @param str 传入的字符串
+ * @return 是整数返回true,否则返回false
+ */
+ public static boolean isInteger(String str) {
+ Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+ return pattern.matcher(str).matches();
+ }
+
+ /**
+ * 字母或数字
+ *
+ * @MethodName:isLetterDigitOrChinese
+ * @author: DuYunbao
+ * @date: 2018/5/30 15:26
+ */
+ public static boolean isLetterOrNumber(String str) {
+ String regex = "^(\\d|[a-zA-Z])+$";
+ return !str.matches(regex);
+ }
+
+ /**
+ * 汉字、字母、（）
+ *
+ * @MethodName:isLetterOrChineseOrChar1
+ * @author: DuYunbao
+ * @date: 2018/5/30 15:53
+ */
+ public static boolean isLetterOrChineseOrChar1(String str) {
+ String regex = "[^\\a-\\z\\A-\\Z\\u4E00-\\u9FA5\\（）\\()]";
+ return str.matches(regex);
+ }
+
+ /**
+ * 汉字、字母、数字
+ *
+ * @MethodName:isLetterOrChineseOrNumber
+ * @author: DuYunbao
+ * @date: 2018/5/30 15:56
+ */
+ public static boolean isLetterOrChineseOrNumber(String str) {
+ String regex = "^[\\u4E00-\\u9FA5A-Za-z0-9]+$";
+ return !str.matches(regex);
+ }
+
+ /**
+ * 汉字、字母、（）、-、下划线
+ *
+ * @MethodName:isChineseOrLetterOrUnderlineOrChar1
+ * @author: DuYunbao
+ * @date: 2018/5/30 16:03
+ */
+ public static boolean isChineseOrLetterOrUnderlineOrChar1(String str) {
+ String regex = "^[\\u4E00-\\u9FA5A-Za-z_\\-\\（）\\()]+$";
+ return !str.matches(regex);
+ }
+
+ /**
+ * 数字
+ *
+ * @MethodName:isNumbee
+ * @author: DuYunbao
+ * @date: 2018/5/30 16:09
+ */
+ public static boolean isNumber(String str) {
+ String regex = "\\D";
+ return str.matches(regex);
+ }
+
+ /**
+ * 数字、大写字母、-
+ *
+ * @MethodName:isNumberOrLowerLetterOrChar1
+ * @author: DuYunbao
+ * @date: 2018/5/30 16:41
+ */
+ public static boolean isNumberOrLowerLetterOrChar1(String str) {
+ String regex = "^[A-Z0-9\\-]+$";
+ return !str.matches(regex);
+ }
+
+ /**
+ * 汉字、数字、字母、（）、-、下划线
+ *
+ * @MethodName:isChineseOrNumberOrLetterOrUnderlineOrChar
+ * @author: DuYunbao
+ * @date: 2018/5/30 16:45
+ */
+ public static boolean isChineseOrNumberOrLetterOrUnderlineOrChar(String str) {
+ String regex = "^[\\u4E00-\\u9FA5A-Za-z0-9_\\-\\（）\\()]+$";
+ return !str.matches(regex);
+ }
+
+
+ /**
+ * 去除整数含有小数点
+ * @MethodName:subStr
+ * @author: DuYunbao
+ * @date: 2018/5/31 11:19
+ */
+ public static String subStr(String text) {
+ if (StringUtils.isNotEmpty(text)) {
+ if(text.contains(".0") && text.substring(text.length()-2,text.length()).equals(".0")) {
+ text = text.substring(0,text.length()-2);
+ }
+ }
+ return text;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/WarnPutTypeEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/WarnPutTypeEnum.java
new file mode 100644
index 00000000..b670c489
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/WarnPutTypeEnum.java
@@ -0,0 +1,30 @@
+package com.adc.da.common;
+
+/**
+ * 标准法规分类
+ * @author gaoyan
+ * date 2018/09/19
+ */
+public enum WarnPutTypeEnum {
+
+ NEWCAR("NEWCAR","新定车型"),NEWPRODUCT("NEWPRODUCT","新生产车型"),
+ PRODUCT("PRODUCT","在产车型");
+
+ private String value;
+ private String lable;
+
+ private WarnPutTypeEnum(String value, String lable) {
+ this.value = value;
+ this.lable = lable;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+
+
+
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/WarnTimeEnum.java b/adc-da-activiti/src/main/java/com/adc/da/common/WarnTimeEnum.java
new file mode 100644
index 00000000..9a8e3725
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/WarnTimeEnum.java
@@ -0,0 +1,33 @@
+package com.adc.da.common;
+
+/**
+ * 预警时间间隔
+ * @author syt
+ * date 2018/09/19
+ */
+public enum WarnTimeEnum {
+
+ THREEMONTH("THREEMONTH","三个月",3),SIXMONTH("SIXMONTH","六个月",6),
+ ONEYEAR("ONEYEAR","一年",12),TWOYEAR("TWOYEAR","两年",24);
+
+ private String value;
+ private String lable;
+ private int month;
+
+ private WarnTimeEnum(String value, String lable,int month) {
+ this.value = value;
+ this.lable = lable;
+ this.month = month;
+ }
+ public String getValue() {
+ return value;
+ }
+ public String getLable() {
+ return lable;
+ }
+
+
+ public int getMonth() {
+ return month;
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/Wrapper.java b/adc-da-activiti/src/main/java/com/adc/da/common/Wrapper.java
new file mode 100644
index 00000000..ebf1743f
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/Wrapper.java
@@ -0,0 +1,94 @@
+package com.adc.da.common;
+
+import java.io.Serializable;
+
+public class Wrapper implements Serializable {
+ private static final long serialVersionUID = 1L;
+ public static final int SUCCESS_CODE = 200;
+ public static final String SUCCESS_MESSAGE = "操作成功";
+ public static final int ERROR_CODE = 500;
+ public static final String ERROR_MESSAGE = "内部异常";
+ public static final int ILLEGAL_ARGUMENT_CODE_ = 100;
+ public static final String ILLEGAL_ARGUMENT_MESSAGE = "参数非法";
+ private boolean success;
+ private int code;
+ private String message;
+ private T result;
+
+ Wrapper() {
+ this(200, "操作成功");
+ }
+
+ Wrapper(int code, String message) {
+ this(code, message, (T) null);
+ }
+
+ Wrapper(int code, String message, T result) {
+ this.success = true;
+ this.code(code).message(message).result(result);
+ }
+
+ private Wrapper code(int code) {
+ this.setCode(code);
+ return this;
+ }
+
+ private Wrapper message(String message) {
+ this.setMessage(message);
+ return this;
+ }
+
+ public Wrapper result(T result) {
+ this.setResult(result);
+ return this;
+ }
+
+ public boolean success() {
+ return 200 == this.code;
+ }
+
+ public boolean error() {
+ return !this.success();
+ }
+
+ public boolean isSuccess() {
+ return this.success;
+ }
+
+ public int getCode() {
+ return this.code;
+ }
+
+ public String getMessage() {
+ return this.message;
+ }
+
+ public T getResult() {
+ return this.result;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public void setResult(T result) {
+ this.result = result;
+ }
+
+ protected boolean canEqual(Object other) {
+ return other instanceof Wrapper;
+ }
+
+
+ public String toString() {
+ return "Wrapper(success=" + this.isSuccess() + ", code=" + this.getCode() + ", message=" + this.getMessage() + ", result=" + this.getResult() + ")";
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
new file mode 100644
index 00000000..45c2ab16
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
@@ -0,0 +1,628 @@
+package com.adc.da.workFlow.controller;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import com.adc.da.FeignClientImpl.workFlowFeignClientImpl;
+import com.adc.da.Timer.ProcessTimer;
+import com.adc.da.common.*;
+import com.adc.da.exception.AdcDaBaseException;
+import com.adc.da.http.PageInfo;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.common.Page;
+import com.adc.da.sys.common.EmailUtils;
+import com.adc.da.sys.entity.UserEO;
+import com.adc.da.sys.service.IUserEOService;
+import com.adc.da.util.LoginUserUtil;
+import com.adc.da.workFlow.entity.ProcessDetailExport;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.util.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/${restPath}/lawss/activiti")
+@Api(tags = "福田标准法规-工作流管理")
+public class WorkFlowController {
+
+ @Autowired
+ private workFlowFeignClientImpl workFlowFeignClient;
+
+ @ApiOperation(value = "启动流程-以流程定义id")
+ @GetMapping("/activiti_define_start")
+ public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId",required = false) String bpnId){
+ return workFlowFeignClient.activiti_define_start(id,userId,bpnId);
+ }
+ @ApiOperation(value = "启动流程-以流程定义id")
+ @GetMapping("/activiti_define_start1")
+ public Map activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName){
+ return workFlowFeignClient.activiti_define_start1(id,userId,standName);
+ }
+
+ @ApiOperation(value = "启动流程-以流程定义id")
+ @GetMapping("/startProcess")
+ public ResponseMessage startProcess(@RequestParam("type") String type, @RequestParam(value="id",required = false) String id){
+ if(type.equals("1")){
+ return this.activiti_define_start("fgrk", LoginUserUtil.getUserId(),id);
+ }else if(type.equals("2")){
+ return this.activiti_define_start("fgjspglc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("3")){
+ return this.activiti_define_start("projectreview",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("4")){
+ return this.activiti_define_start("qbzxd",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("5")){
+ return this.activiti_define_start("whgxgllc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("6")){
+ return this.activiti_define_start("qbzxdsqlc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("9")){
+ return this.activiti_define_start("bzcgsqlc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("8")){
+ return this.activiti_define_start("zxdyqsplc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("10")){
+ return this.activiti_define_start("bzhyhqsqlc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("11")){
+ return this.activiti_define_start("qbzxdpglc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("12")){
+ return this.activiti_define_start("qbkwlc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("13")){
+ return this.activiti_define_start("xzyqpglc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("7")){
+ return this.activiti_define_start("qbfzlc",LoginUserUtil.getUserId(),id);
+ }
+ else if(type.equals("15")){
+ return this.activiti_define_start("bzfysqlc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("16")){
+ return this.activiti_define_start("bzhyhhgllc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("17")){
+ return this.activiti_define_start("qbbalc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("18")){
+ return this.activiti_define_start("hwfgqdfbjgxlc",LoginUserUtil.getUserId(),id);
+ }else if(type.equals("19")){
+ return this.activiti_define_start("qbfslc","3U5F8UJJVPZB4B4BKN3P",id);
+ }else if(type.equals("14")){
+ return this.activiti_define_start("zcrkjpglc",LoginUserUtil.getUserId(),id);
+ }else{
+ return null;
+ }
+ }
+
+ @ApiOperation(value = "待办任务详情")
+ @GetMapping("/todotask")
+ public PageInfo todotask(@RequestParam("userId") String userId, @RequestParam("pId") String pId){
+ workFlowFeignClient.todotask(userId, pId);
+ return null;
+ }
+
+ @ApiOperation(value = "详情")
+ @GetMapping("/queryDetail")
+ public BusProcessNew queryDetail(@RequestParam("taskIds") String taskIds){
+ return workFlowFeignClient.queryDetail(taskIds);
+ }
+
+ @ApiOperation(value = "入库联络人详情")
+ @GetMapping("/inboundLiaisonDetail")
+ public BusProcessNew inboundLiaisonDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId) {
+ return workFlowFeignClient.inboundLiaisonDetail(taskIds,pId);
+ }
+
+ @ApiOperation(value = "入库联络人详情")
+ @GetMapping("/nonconformity")
+ public String nonconformity(@RequestParam("taskIds") String taskIds){
+ return workFlowFeignClient.nonconformity(taskIds);
+ }
+
+ @ApiOperation(value = "国内法规入库评估流程详情")
+ @GetMapping("/inboundLiaisonDetailForLawsAss")
+ public String inboundLiaisonDetailForLawsAss(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.inboundLiaisonDetailForLawsAss(taskIds);
+ }
+
+ @ApiOperation(value = "项目评估流程详情")
+ @GetMapping("/projectAssessDetail")
+ public BusProcessNew projectAssessDetail(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.projectAssessDetail(taskIds);
+ }
+
+ @ApiOperation(value = "企标制修订申请流程详情")
+ @GetMapping("/qbzxdsqlcDetail")
+ public String qbzxdsqlcDetail(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.qbzxdsqlcDetail(taskIds);
+ }
+
+ @ApiOperation(value = "企标废止流程详情")
+ @GetMapping("/qbfzlcDetail")
+ public String qbfzlcDetail(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.qbfzDetail(taskIds);
+ }
+
+ @ApiOperation(value = "企标制修订流程详情")
+ @GetMapping("/qbzxdlcDetail")
+ public String qbzxdlcDetail(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.qbzxdDetail(taskIds);
+ }
+
+ @ApiOperation(value = "政策法规入库发起人查看流程详情")
+ @GetMapping("/zcfgrklcFqrDetail")
+ public String zcfgrklcFqrDetail(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.zcfgrklcFqrDetail(taskIds);
+ }
+
+ @ApiOperation(value = "政策法规入库流程详情")
+ @GetMapping("/zcfgrklcDetail")
+ public String zcfgrklcDetail(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.zcfgrklcDetail(taskIds);
+ }
+
+ @ApiOperation(value = "政策法规入库流程联络人选择FO详情")
+ @GetMapping("/zcfgrklcLlrDetail")
+ public String zcfgrklcLlrDetail(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.zcfgrklcLlrDetail(taskIds);
+ }
+
+ @ApiOperation(value = "企标制修订评估详情")
+ @GetMapping("/qbzxdpgDetail")
+ public String qbzxdpgDetail(@RequestParam("taskIds")String taskIds){
+ return workFlowFeignClient.qbzxdpgDetail(taskIds);
+ }
+
+ @ApiOperation(value = "采购申请流程详情")
+ @GetMapping("/cgsqDetail")
+ public String cgsqDetail(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.cgsqDetail(taskIds);
+ }
+
+ @ApiOperation(value = "复审流程详情")
+ @GetMapping("/fsDetail")
+ public String fsDetail(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.fsDetail(taskIds);
+ }
+
+ @ApiOperation(value = "保存任务")
+ @PostMapping("/saveTask")
+ public Wrapper saveTask(@RequestBody BusMes busMes){
+ return workFlowFeignClient.saveTask(busMes);
+ }
+
+ @ApiOperation(value = "行政管理要求评估流程保存")
+ @PostMapping("/saveTaskForXZYQ")
+ public Wrapper saveTaskForXZYQ(BusMes busMes){
+ return workFlowFeignClient.saveTaskForXZYQ(busMes);
+ }
+
+ /**
+ * 复审流程使用
+ * @param busMes
+ * @return
+ */
+ @ApiOperation(value = "保存到代办")
+ @PostMapping("/autoSaveFirst1")
+ public Wrapper autoSaveFirst1(@RequestBody BusMes busMes){
+ return workFlowFeignClient.autoSaveFirst1(busMes);
+ }
+
+ @ApiOperation(value = "改派")
+ @GetMapping("/changeAssigneeNew")
+ public Wrapper run(@RequestParam("taskId")String taskId, @RequestParam("assignee") String assignee,
+ @RequestParam("userId")String userId, @RequestParam("pId") String pId) {
+ return workFlowFeignClient.run(taskId,assignee,userId,pId);
+ }
+
+ @ApiOperation(value = "我的已办任务列表")
+ @PostMapping("/hastodoTasksList")
+ public Wrapper> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery){
+ return workFlowFeignClient.HastodoTasksListByUserId(taskCommonQuery);
+ }
+
+ @ApiOperation(value = "我的待办任务列表")
+ @PostMapping("/todoTaskList")
+ public PageInfo todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery){
+ List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
+ List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
+ PageInfo pageInfo= new PageInfo();
+ if(busProcessNames!=null){
+ pageInfo.setList(list1);
+ pageInfo.setPageNo(taskCommonQuery.getCurrent());
+ pageInfo.setCount(Long.valueOf(busProcessNames.size()));
+ pageInfo.setPageSize(taskCommonQuery.getSize());
+ }else{
+ List list = new ArrayList<>();
+ pageInfo.setList(list);
+ pageInfo.setPageNo(taskCommonQuery.getCurrent());
+ pageInfo.setCount(Long.valueOf(0));
+ pageInfo.setPageSize(taskCommonQuery.getSize());
+ }
+ return pageInfo;
+ }
+
+ @ApiOperation(value = "完成任务")
+ @PostMapping("/completeTask")
+ public Wrapper completeTaskByUserId(BusMes busMes){
+ Wrapper str = workFlowFeignClient.completeTaskByUserId(busMes);
+ if(str.getCode() == 500){
+ str.setSuccess(false);
+ }
+ return str;
+ }
+
+ @ApiOperation(value = "保存标准入库流程")
+ @PostMapping("/saveinboundTask")
+ public Wrapper saveinboundTask(BusMes busMes){
+ return workFlowFeignClient.saveinboundTask(busMes);
+ }
+
+ @ApiOperation(value = "整改流程保存")
+ @PostMapping("/saveUnqualified")
+ public Wrapper saveUnqualified(BusMes busMes){
+ return workFlowFeignClient.saveUnqualified(busMes);
+ }
+
+ @ApiOperation(value = "国内法规入库技术评估流程保存")
+ @PostMapping("/saveInboundLiaisonDetailForLawsAss")
+ public Wrapper saveInboundLiaisonDetailForLawsAss(BusMes busMes){
+ return workFlowFeignClient.saveInboundLiaisonDetailForLawsAss(busMes);
+ }
+
+ @ApiOperation(value = "国内法规入库项目评估流程保存")
+ @PostMapping("/saveProjectAssessDetail2")
+ public Wrapper saveProjectAssessDetail2(BusMes busMes){
+ return workFlowFeignClient.saveProjectAssessDetail2(busMes);
+ }
+
+ @ApiOperation(value = "国内法规入库项目评估流程保存")
+ @PostMapping("/saveProjectAssessDetail3")
+ public Wrapper saveProjectAssessDetail3(BusMes busMes){
+ return workFlowFeignClient.saveProjectAssessDetail3(busMes);
+ }
+
+ @ApiOperation(value = "国内法规入库项目评估流程保存")
+ @PostMapping("/saveProjectAssessDetail4")
+ public Wrapper saveProjectAssessDetail4(BusMes busMes){
+ return workFlowFeignClient.saveProjectAssessDetail4(busMes);
+ }
+
+ @ApiOperation(value = "国内法规入库项目评估流程保存")
+ @PostMapping("/saveProjectAssessDetail5")
+ public Wrapper saveProjectAssessDetail5(BusMes busMes){
+ return workFlowFeignClient.saveProjectAssessDetail5(busMes);
+ }
+
+ @ApiOperation(value = "政策法规评估流程保存")
+ @PostMapping("/saveZcfgpg")
+ public Wrapper saveZcfgpg(BusMes busMes){
+ return workFlowFeignClient.saveZcfgpg(busMes);
+ }
+
+
+ @ApiOperation(value = "国内法规入库评估流程保存")
+ @PostMapping("/saveTaskForPub")
+ public Wrapper saveTaskForPub(BusMes busMes){
+ return workFlowFeignClient.saveTaskForPub(busMes);
+ }
+
+ @ApiOperation(value = "保存任务第一步")
+ @PostMapping("/saveTaskFirst")
+ public Wrapper saveTaskFirst(BusMes busMes){
+
+ return workFlowFeignClient.saveTaskFirst(busMes);
+ }
+
+ @ApiOperation(value = "查询任务第一步")
+ @GetMapping("/queryTaskFirst")
+ public BusProcessName queryTaskFirst(@RequestParam("bpnId")String bpnId) {
+ return workFlowFeignClient.queryTaskFirst(bpnId);
+ }
+
+ @ApiOperation(value = "查询草稿")
+ @PostMapping("/queryTaskDraft")
+ public PageInfo queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){
+ List busProcessNames = workFlowFeignClient.queryTaskDraft(taskCommonQuery);
+ List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
+ PageInfo pageInfo= new PageInfo();
+ if(busProcessNames!=null){
+ pageInfo.setList(list1);
+ pageInfo.setPageNo(taskCommonQuery.getCurrent());
+ pageInfo.setCount(Long.valueOf(busProcessNames.size()));
+ pageInfo.setPageSize(taskCommonQuery.getSize());
+ }else{
+ List list = new ArrayList();
+ pageInfo.setList(list);
+ pageInfo.setPageNo(taskCommonQuery.getCurrent());
+ pageInfo.setCount(Long.valueOf(0));
+ pageInfo.setPageSize(taskCommonQuery.getSize());
+ }
+ return pageInfo;
+ }
+
+ @ApiOperation(value = "定时任务发起流程")
+ @PostMapping("/autoSaveFirst")
+ public Wrapper autoSaveFirst(@RequestBody BusMes busMes){
+ return workFlowFeignClient.autoSaveFirst(busMes);
+ }
+
+ @ApiOperation(value = "查询流程是否结束")
+ @GetMapping("/isEnd")
+ public String isEnd(@RequestParam("pId")String pId){
+ return workFlowFeignClient.isEnd(pId);
+ }
+
+ @ApiOperation(value = "删除流程")
+ @GetMapping("/deleteProcessInstance")
+ public Wrapper deleteProcessInstance(@RequestParam("pId")String pId){
+ return workFlowFeignClient.deleteProcessInstance(pId);
+ }
+
+ @ApiOperation(value = "删除草稿")
+ @GetMapping("/deleteDraft")
+ public Wrapper deleteDraft(@RequestParam("id")String id){
+ return workFlowFeignClient.deleteDraft(id);
+ }
+
+ @ApiOperation(value = "已发流程")
+ @PostMapping("/IssuedProcess")
+ public PageInfo IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery){
+ Page page = workFlowFeignClient.issuedProcess(taskCommonQuery);
+ PageInfo pageInfo= new PageInfo();
+ pageInfo.setList(page.getList());
+ pageInfo.setPageNo(taskCommonQuery.getCurrent());
+ pageInfo.setCount(Long.valueOf(page.getCount()));
+ pageInfo.setPageSize(page.getPageSize());
+ return pageInfo;
+ }
+
+ @ApiOperation(value = "已办流程")
+ @PostMapping("/doneProcess")
+ public PageInfo doneProcess(@RequestBody TaskCommonQuery taskCommonQuery){
+ Page page = workFlowFeignClient.doneProcess(taskCommonQuery);
+ PageInfo pageInfo= new PageInfo();
+ pageInfo.setList(page.getList());
+ pageInfo.setPageNo(page.getPageNo());
+ pageInfo.setCount(page.getCount());
+ pageInfo.setPageSize(page.getPageSize());
+ return pageInfo;
+ }
+
+ /**
+ * 开始分页
+ * @param list
+ * @param pageNum 页码
+ * @param pageSize 每页多少条数据
+ * @return
+ */
+ public static List startPage(List list, Integer pageNum,
+ Integer pageSize) {
+ if (list == null) {
+ return null;
+ }
+ if (list.size() == 0) {
+ return null;
+ }
+
+ Integer count = list.size(); // 记录总数
+ Integer pageCount = 0; // 页数
+ if (count % pageSize == 0) {
+ pageCount = count / pageSize;
+ } else {
+ pageCount = count / pageSize + 1;
+ }
+
+ int fromIndex = 0; // 开始索引
+ int toIndex = 0; // 结束索引
+
+ if (pageNum != pageCount) {
+ fromIndex = (pageNum - 1) * pageSize;
+ toIndex = fromIndex + pageSize;
+ } else {
+ fromIndex = (pageNum - 1) * pageSize;
+ toIndex = count;
+ }
+
+ List pageList = list.subList(fromIndex, toIndex);
+
+ return pageList;
+ }
+
+ @ApiOperation(value = "流程实例明细列表")
+ @GetMapping("/get_list_by_instance")
+ public List> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
+ return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu);
+ }
+
+ @ApiOperation(value = "获取图片")
+ @GetMapping("/getImg")
+ public void getImg(@RequestParam("prcNum")String prcNum, HttpServletResponse response) throws IOException {
+ OutputStream os = null;
+ response.setContentType("image/jpg");
+ response.flushBuffer();
+ os = response.getOutputStream();
+ os.write(workFlowFeignClient.getImg(prcNum));
+ os.flush();
+ os.close();
+ }
+
+ @ApiOperation(value = "监控流程列表")
+ @PostMapping("/allProcess")
+ public PageInfo allProcess(@RequestBody TaskCommonQuery taskCommonQuery){
+ Page page= workFlowFeignClient.allProcess(taskCommonQuery);
+ PageInfo pageInfo= new PageInfo();
+ pageInfo.setPageNo(taskCommonQuery.getCurrent());
+ pageInfo.setList(page.getList());
+ pageInfo.setCount(page.getCount());
+ pageInfo.setPageSize(page.getPageSize());
+ return pageInfo;
+ }
+
+ @ApiOperation(value = "|exportProcessDetailInfo|导出excel")
+ @GetMapping(value = "/exportProcessDetailInfo")
+ public void exportProcessDetailInfo(String idAndSartypeList, String prcNum, HttpServletResponse response,
+ HttpServletRequest request, String exportName) throws Exception {
+ if (StringUtils.isEmpty(exportName)) {
+ exportName = "流程明细清单";
+ }
+ OutputStream os = null;
+ Workbook workbook = null;
+ try {
+ response.setHeader("Content-Disposition",
+ "attachment; filename=" + ReadExcel.encodeFileName(exportName + ".xlsx", request));
+ response.setContentType("application/force-download");
+ ExportParams exportParams = new ExportParams();
+ exportParams.setType(ExcelType.XSSF);
+ List> list = workFlowFeignClient.get_list_by_instance(prcNum,null,null);
+ List exportDatas=new ArrayList<>();
+ List listId = Arrays.asList(idAndSartypeList.split(","));
+ for(Map map:list){
+ for(String id:listId){
+ if(id.equals(map.get("id").toString())){
+ if(map.get("endTime")!=null){
+ map.put("flag","已完成");
+ }else{
+ map.put("flag","未完成");
+ }
+ if(map.get("comment")!=null && !map.get("comment").toString().equals("")){
+ if(map.get("comment").toString().equals("0")){
+ map.put("comment","同意");
+ }else if(map.get("comment").toString().equals("1")){
+ map.put("comment","不同意");
+ }else{
+ map.put("comment",map.get("commentText").toString());
+ }
+ }
+ ProcessDetailExport user = JSON.parseObject(JSON.toJSONString(map), ProcessDetailExport.class);
+ exportDatas.add(user);
+ }
+ }
+ }
+
+ workbook = ExcelExportUtil.exportExcel(exportParams, ProcessDetailExport.class, exportDatas);
+ os = response.getOutputStream();
+ workbook.write(os);
+ os.flush();
+ } catch (IOException e) {
+ throw new AdcDaBaseException("下载文件失败，请重试");
+ } finally {
+ IOUtils.closeQuietly(os);
+ if (workbook != null) {
+ workbook.close();
+ }
+ }
+ }
+
+ @ApiOperation(value = "强制撤回")
+ @GetMapping("/forceRecall")
+ public Wrapper forceRecall(@RequestParam("prcId") String prcId){
+ return workFlowFeignClient.forceRecall(prcId);
+ }
+
+ @ApiOperation(value = "流程分类列表")
+ @GetMapping("/categoryList")
+ public Wrapper> categoryList(){
+ return workFlowFeignClient.categoryList();
+ }
+
+ @ApiOperation(value = "添加流程分类")
+ @PostMapping("/addCategory")
+ public Wrapper addCategory(@RequestBody Category category){
+ return workFlowFeignClient.addCategory(category);
+ }
+
+ @ApiOperation(value = "删除流程分类")
+ @GetMapping("/deleteCategory")
+ public Wrapper deleteCategory(@RequestParam("objectId") String objectId){
+ return workFlowFeignClient.deleteCategory(objectId);
+ }
+
+ @ApiOperation(value = "编辑流程分类")
+ @PostMapping("/editCategory")
+ public Wrapper editCategory(@RequestBody Category category){
+ return workFlowFeignClient.editCategory(category);
+ }
+
+ @ApiOperation(value = "查询流程")
+ @GetMapping("/modelListPage")
+ public Wrapper> modelListPage(@RequestParam(value="name",required = false)String name, @RequestParam(value="category_id ",required = false)String category_id,
+ @RequestParam("current")int current, @RequestParam("size")int size){
+ return workFlowFeignClient.modelListPage(name,category_id,current,size);
+ }
+
+ @ApiOperation(value = "政策法规入库评估查看最后数据")
+ @GetMapping("/zcfgrkpgDetail")
+ public List zcfgrkpgDetail(@RequestParam("pId") String pId){
+ return workFlowFeignClient.zcfgrkpgDetail(pId);
+ }
+
+ @ApiOperation(value = "修改流程所属分类")
+ @GetMapping("/updatModel")
+ public Wrapper updatModel(@RequestParam("modelId")String modelId, @RequestParam("categoryId")String categoryId){
+ return workFlowFeignClient.updatModel(modelId,categoryId);
+ }
+
+ @ApiOperation(value = "查询流程编号")
+ @GetMapping("/findPrcNumByPid")
+ public Wrapper findPrcNumByPid(@RequestParam("pId")String pId){
+ return workFlowFeignClient.findPrcNumByPid(pId);
+ }
+
+ @ApiOperation(value = "行政管理要求评估流程详情")
+ @GetMapping("/inboundLiaisonDetailForXZYQ")
+ public BusProcessNew inboundLiaisonDetailForXZYQ(@RequestParam("taskIds") String taskIds) {
+ return workFlowFeignClient.inboundLiaisonDetailForXZYQ(taskIds);
+ }
+
+ @ApiOperation(value = "采购保存接口")
+ @PostMapping("/saveCgSq")
+ public Wrapper saveCgSq(BusMes busMes) {
+ return workFlowFeignClient.saveTaskForPub(busMes);
+ }
+
+ @Autowired
+ ProcessTimer processTimer;
+ @ApiOperation(value = "自动催办，任务截至时间前3天开始每天催办")
+ @PostMapping("/send123")
+ public String send123() {
+ processTimer.urging();
+ return "0";
+ }
+
+ @Autowired
+ private IUserEOService userEOService;
+
+ @Autowired
+ private EmailUtils mailUtil;
+
+ @ApiOperation(value = "手动催办")
+ @PostMapping("/sendEmailByHands")
+ private ResponseMessage sendEmailByHands(String taskId) {
+ List busProcessNames = workFlowFeignClient.queryBusProcessNameForEnd(taskId);
+ if (null != busProcessNames && 0 < busProcessNames.size()) {
+ for (BusProcessName busProcessName : busProcessNames) {
+ String type = busProcessName.getPrcType();
+ Integer typeInt = 99;
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(type)) {
+ typeInt = Integer.valueOf(type);
+ }
+ type = processTimer.chooseType(typeInt, type);
+ UserEO userEO = userEOService.selectByPrimaryKey(busProcessName.getCreatUserName());
+ String[] array = userEO.getEmail().split(",");
+
+ String msg = "您好，[" + busProcessName.getPrcNum() + "]-[" + busProcessName.getPrcName() + "] 您有待办任务未及时办理 ，请登录全球标准法规管理系统( http://39.98.140.126:10005/#/login )办理：链接( http://39.98.140.126:10005/#/processCenter?tabsName=ProcessCenter )。如有问题请联系发起人[" + userEO.getUname() + "][" + userEO.getEmail() + "]\n" +
+ " ——来自 全球标准法规管理系统";
+ String title = "GSRM——【待办任务】[" + type + "] 您有未完成的待办任务";
+ mailUtil.sendMsgFeign(array, title, msg);
+ }
+ }
+ return Result.success("发送成功");
+ }
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java
new file mode 100644
index 00000000..348a6ce5
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java
@@ -0,0 +1,22 @@
+package com.adc.da.workFlow.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProcessDetailExport {
+ @Excel(name = "任务步骤", orderNum = "1",width = 15)
+ private String name;
+ @Excel(name = "任务受理人", orderNum = "2",width = 15)
+ private String assignee;
+ @Excel(name = "创建时间", orderNum = "3",exportFormat = "yyyy/MM/dd",width = 15)
+ private Date startTime;
+ @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15)
+ private Date endTime;
+ @Excel(name = "审批意见", orderNum = "5",width = 15)
+ private String comment;
+ @Excel(name = "状态", orderNum = "6",width = 15)
+ private String flag;
+}
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/WorkFlowService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/WorkFlowService.java
new file mode 100644
index 00000000..81c27557
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/WorkFlowService.java
@@ -0,0 +1,34 @@
+package com.adc.da.workFlow.service;
+
+import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.att.service.IAttFileEOService;
+import com.adc.da.common.SarConformStateEnum;
+import com.adc.da.common.SelectionTypeEnum;
+import com.adc.da.slrs.otSvpps.dao.OtSvppsDao;
+import com.adc.da.slrs.sarGroupMenu.dao.SarGroupMenuDao;
+import com.adc.da.sys.dao.DicTypeEODao;
+import com.adc.da.sys.dao.OrgEODao;
+import com.adc.da.sys.dao.RoleEODao;
+import com.adc.da.sys.dao.UserEODao;
+import com.adc.da.sys.entity.DicTypeEO;
+import com.adc.da.sys.page.DicTypeEOPage;
+import com.adc.da.utils.util.InitStandAttrUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @Author: super_liu
+ * date: 2020/06/02 9:43
+ */
+@Service("workFlowService")
+public class WorkFlowService {
+
+ /**
+ * 后续优化工作流
+ */
+}
diff --git a/adc-da-base/src/main/java/com/adc/da/exception/ServiceException.java b/adc-da-base/src/main/java/com/adc/da/exception/ServiceException.java
new file mode 100644
index 00000000..a9af4441
--- /dev/null
+++ b/adc-da-base/src/main/java/com/adc/da/exception/ServiceException.java
@@ -0,0 +1,20 @@
+package com.adc.da.exception;
+
+public class ServiceException extends Exception {
+
+
+ /**
+ * Instantiates a new Service exception.
+ */
+ public ServiceException() {
+ }
+
+ /**
+ * Instantiates a new Service exception.
+ *
+ * @param message the message
+ */
+ public ServiceException(String message) {
+ super(message);
+ }
+}
diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml
index b0803634..3da00433 100644
--- a/adc-da-main/pom.xml
+++ b/adc-da-main/pom.xml
@@ -29,6 +29,11 @@
adc-da-slrs
3.0.0
+
+ com.adc
+ adc-da-activiti
+ 3.0.0
+
com.adc
adc-da-sys
diff --git a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java
index 8353b814..f2d62d02 100644
--- a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java
+++ b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java
@@ -5,7 +5,11 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+@EnableEurekaClient
+@EnableFeignClients
@ServletComponentScan
@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
@MapperScan(value = {"com.adc.da.file.store"})
diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties
index 1976a88d..457d9b84 100644
--- a/adc-da-main/src/main/resources/application.properties
+++ b/adc-da-main/src/main/resources/application.properties
@@ -1,6 +1,7 @@
##############################################
# 项目启动模式
##############################################
+spring.application.name=FotonLAWSSystem
spring.profiles.active=dev
##############################################
@@ -87,6 +88,24 @@ spring.activiti.check-process-definitions=false
spring.activiti.job-executor-activate=false
spring.activiti.process-definition-location-prefix=classpath:/mybatis/mapper/activiti/
+# =============================================================================
+# 邮箱配置
+# =============================================================================
+mail.valid=false
+spring.mail.host=smtp.163.com
+spring.mail.protocol=smtp
+spring.mail.username=xxx@163.com
+spring.mail.password=xxx
+spring.mail.properties.smtp.auth=true
+spring.mail.properties.smtp.starttls.enable=true
+spring.mail.properties.smtp.starttls.required=true
+spring.mail.properties.mail.smtp.ssl.enable=true
+spring.mail.port=465
+#全球标准法规管理系统 十六进制码
+mail.personName=E585A8E79083E6A087E58786E6B395E8A784E7AEA1E79086E7B3BBE7BB9F
+#邮箱内容中嵌入的系统地址
+Lawss.address =http://standard.gacrnd.com:60090
+
# =========================================
# login value
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/common/EmailUtils.java b/adc-da-sys/src/main/java/com/adc/da/sys/common/EmailUtils.java
new file mode 100644
index 00000000..cbc37150
--- /dev/null
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/common/EmailUtils.java
@@ -0,0 +1,296 @@
+package com.adc.da.sys.common;
+
+import com.adc.da.exception.ServiceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.MailException;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+
+@Component
+public class EmailUtils {
+
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+ /**
+ * The Mail sender.
+ */
+ @Autowired
+ JavaMailSender mailSender;
+
+ @Value("${mail.valid}")
+ private boolean mailValid;
+
+ @Value("${spring.mail.username}")
+ private String userName;
+
+ /**
+ * Send simple email.
+ *
+ * @param deliver the deliver
+ * @param receiver the receiver
+ * @param subject the subject
+ * @param content the content
+ * @throws ServiceException the service exception
+ */
+ public void sendSimpleEmail(String deliver,String personName, String receiver, String subject, String content) throws ServiceException {
+ if(mailValid){
+ String[] receivers = {receiver};
+ sendSimpleEmail(deliver,personName, receivers, null, subject, content);
+ }
+ }
+
+
+
+ /**
+ * Send simple email.
+ *
+ * @param deliver the deliver
+ * @param receiver the receiver
+ * @param carbonCopy the carbon copy
+ * @param subject the subject
+ * @param content the content
+ * @throws ServiceException the service exception
+ */
+ public void sendSimpleEmail(String deliver,String personName, String[] receiver, String[] carbonCopy, String subject, String content) throws ServiceException {
+
+ long startTimestamp = System.currentTimeMillis();
+ logger.info("Start send mail ... ");
+
+ try {
+ SimpleMailMessage message = new SimpleMailMessage();
+ personName=javax.mail.internet.MimeUtility.encodeText(personName);
+ message.setFrom(personName + "<"+deliver+">");
+ message.setTo(receiver);
+ if(carbonCopy!=null && carbonCopy.length>0){
+ message.setCc(carbonCopy);
+ }
+ message.setSubject(subject);
+ message.setText(content);
+ mailSender.send(message);
+ logger.info("Send mail success, cost {} million seconds", System.currentTimeMillis() - startTimestamp);
+ } catch (MailException e) {
+ logger.error("Send mail failed, error message is : {} \n", e.getMessage());
+ logger.error(e.getMessage(),e);
+ throw new ServiceException(e.getMessage());
+ } catch (UnsupportedEncodingException e) {
+ logger.error("Send mail failed, error message is : {} \n", e.getMessage());
+ logger.error(e.getMessage(),e);
+ throw new ServiceException(e.getMessage());
+ }
+ }
+
+
+
+ /**
+ * Send html email.
+ *
+ * @param deliver the deliver
+ * @param receiver the receiver
+ * @param subject the subject
+ * @param content the content
+ * @throws ServiceException the service exception
+ */
+ public void sendHtmlEmail(String deliver, String receiver, String subject, String content) throws ServiceException {
+ String[] receivers = {receiver};
+ sendHtmlEmail(deliver, receivers, null, subject, content, true);
+ }
+
+ /**
+ * Send html email.
+ *
+ * @param deliver the deliver
+ * @param receiver the receiver
+ * @param carbonCopy the carbon copy
+ * @param subject the subject
+ * @param content the content
+ * @param isHtml the is html
+ * @throws ServiceException the service exception
+ */
+ public void sendHtmlEmail(String deliver, String[] receiver, String[] carbonCopy, String subject, String content, boolean isHtml) throws ServiceException {
+ long startTimestamp = System.currentTimeMillis();
+ logger.info("Start send email ...");
+
+ try {
+ MimeMessage message = mailSender.createMimeMessage();
+ MimeMessageHelper messageHelper = new MimeMessageHelper(message);
+
+ messageHelper.setFrom(deliver);
+ messageHelper.setTo(receiver);
+ messageHelper.setCc(carbonCopy);
+ messageHelper.setSubject(subject);
+ messageHelper.setText(content, isHtml);
+
+ mailSender.send(message);
+ logger.info("Send email success, cost {} million seconds", System.currentTimeMillis() - startTimestamp);
+ } catch (MessagingException e) {
+ logger.error("Send email failed, error message is {} \n", e.getMessage());
+ logger.error(e.getMessage(),e);
+ throw new ServiceException(e.getMessage());
+ }
+ }
+
+ /**
+ * Send attachment file email.
+ *
+ * @param deliver the deliver
+ * @param receiver the receiver
+ * @param subject the subject
+ * @param content the content
+ * @param fileName the file name
+ * @param file the file
+ * @throws ServiceException the service exception
+ */
+ public void sendAttachmentFileEmail(String deliver, String receiver, String subject, String content, String fileName, File file) throws ServiceException {
+ String[] receivers = {receiver};
+ sendAttachmentFileEmail(deliver, receivers, null, subject, content, true, fileName, file);
+ }
+
+ /**
+ * Send attachment file mail.
+ *
+ * @param deliver the deliver
+ * @param receiver the receiver
+ * @param carbonCopy the carbon copy
+ * @param subject the subject
+ * @param content the content
+ * @param isHtml the is html
+ * @param fileName the file name
+ * @param file the file
+ * @throws ServiceException the service exception
+ */
+ public void sendAttachmentFileEmail(String deliver, String[] receiver, String[] carbonCopy, String subject, String content, boolean isHtml, String fileName, File file) throws ServiceException {
+ long startTimestamp = System.currentTimeMillis();
+ logger.info("Start send mail ...");
+
+ try {
+ MimeMessage message = mailSender.createMimeMessage();
+ MimeMessageHelper messageHelper = new MimeMessageHelper(message, true);
+
+ messageHelper.setFrom(deliver);
+ messageHelper.setTo(receiver);
+ messageHelper.setCc(carbonCopy);
+ messageHelper.setSubject(subject);
+ messageHelper.setText(content, isHtml);
+ messageHelper.addAttachment(fileName, file);
+
+ mailSender.send(message);
+ logger.info("Send mail success, cost {} million seconds", System.currentTimeMillis() - startTimestamp);
+ } catch (MessagingException e) {
+ logger.error("Send mail failed, error message is {}\n", e.getMessage());
+ logger.error(e.getMessage(),e);
+ throw new ServiceException(e.getMessage());
+ }
+ }
+
+ /* *//**
+ * Send template email.
+ *
+ * @param deliver the deliver
+ * @param receiver the receiver
+ * @param subject the subject
+ * @param template the template
+ * @param context the context
+ * @throws ServiceException the service exception
+ *//*
+ public void sendTemplateEmail(String deliver, String receiver, String subject, String template, Context context) throws ServiceException {
+ String[] receivers = {receiver};
+ sendTemplateEmail(deliver, receivers, null, subject, template, context);
+ }*/
+
+ /* *//**
+ * Send template mail.
+ * @throws ServiceException the service exception
+ *//*
+ public void sendTemplateEmail(String deliver, String[] receiver, String[] carbonCopy, String subject, String template, Context context) throws ServiceException {
+ long startTimestamp = System.currentTimeMillis();
+ logger.info("Start send mail ...");
+
+ try {
+ MimeMessage message = mailSender.createMimeMessage();
+ MimeMessageHelper messageHelper = new MimeMessageHelper(message);
+
+ String content = templateEngine.process(template, context);
+ messageHelper.setFrom(deliver);
+ messageHelper.setTo(receiver);
+ messageHelper.setCc(carbonCopy);
+ messageHelper.setSubject(subject);
+ messageHelper.setText(content, true);
+
+ mailSender.send(message);
+ logger.info("Send mail success, cost {} million seconds", System.currentTimeMillis() - startTimestamp);
+ } catch (MessagingException e) {
+ logger.error("Send mail failed, error message is {} \n", e.getMessage());
+ e.printStackTrace();
+ throw new ServiceException(e.getMessage());
+ }
+ }*/
+
+ @Async
+ public void sendMsg(String[] tos,String msg){
+ //创建简单邮件消息
+ SimpleMailMessage message = new SimpleMailMessage();
+ //谁发的
+ message.setFrom(userName);
+ //谁要接收
+ message.setTo(tos);
+ //邮件标题
+ message.setSubject(msg);
+ //邮件内容
+ message.setText(msg);
+ try {
+ mailSender.send(message);
+ } catch (MailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Async
+ public void sendMsgFeign(String[] tos,String title, String msg){
+ //创建简单邮件消息
+ SimpleMailMessage message = new SimpleMailMessage();
+ //谁发的
+ message.setFrom(userName);
+ //谁要接收
+ message.setTo(tos);
+ //邮件标题
+ message.setSubject(title);
+ //邮件内容
+ message.setText(msg);
+ try {
+ mailSender.send(message);
+ } catch (MailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Async
+ public void sendMsgWithCC(String[] tos,String[] cc,String msg){
+ //创建简单邮件消息
+ SimpleMailMessage message = new SimpleMailMessage();
+ //谁发的
+ message.setFrom(userName);
+ //谁要接收
+ message.setTo(tos);
+ //抄送
+ message.setCc(cc);
+ //邮件标题
+ message.setSubject(msg);
+ //邮件内容
+ message.setText(msg);
+ try {
+ mailSender.send(message);
+ } catch (MailException e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/pom.xml b/pom.xml
index d1b21577..a44dee79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
adc-da-sys
adc-da-jwtLogin
adc-da-slrs
+ adc-da-activiti