部门添加类型

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -33,74 +33,105 @@ import java.util.Date;
 public class SysDeptDTO extends TreeNode implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty(value = "id")
-	@Null(message="{id.null}", groups = AddGroup.class)
-	@NotNull(message="{id.require}", groups = UpdateGroup.class)
-	private Long id;
-
-	@ApiModelProperty(value = "上级ID")
-	@NotNull(message="{sysdept.pid.require}", groups = DefaultGroup.class)
-	private Long pid;
-
-	@ApiModelProperty(value = "部门名称")
-	@NotBlank(message="{sysdept.name.require}", groups = DefaultGroup.class)
-	private String name;
-
-	@ApiModelProperty(value = "排序")
-	@Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
-	private Integer sort;
-
-	@ApiModelProperty(value = "创建时间")
-	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date createDate;
-
-	@ApiModelProperty(value = "上级部门名称")
-	private String parentName;
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setSort(Integer sort) {
-		this.sort = sort;
-	}
-	public Integer getSort() {
-		return sort;
-	}
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public String getParentName() {
-		return parentName;
-	}
-
-	public void setParentName(String parentName) {
-		this.parentName = parentName;
-	}
-
-	@Override
-	public Long getId() {
-		return id;
-	}
-
-	@Override
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	@Override
-	public Long getPid() {
-		return pid;
-	}
-
-	@Override
-	public void setPid(Long pid) {
-		this.pid = pid;
-	}
+    @ApiModelProperty(value = "id")
+    @Null(message = "{id.null}", groups = AddGroup.class)
+    @NotNull(message = "{id.require}", groups = UpdateGroup.class)
+    private Long id;
+
+    @ApiModelProperty(value = "上级ID")
+    @NotNull(message = "{sysdept.pid.require}", groups = DefaultGroup.class)
+    private Long pid;
+
+    @ApiModelProperty(value = "部门名称")
+    @NotBlank(message = "{sysdept.name.require}", groups = DefaultGroup.class)
+    private String name;
+
+    @ApiModelProperty(value = "排序")
+    @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+    private Integer sort;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Date createDate;
+
+    @ApiModelProperty(value = "上级部门名称")
+    private String parentName;
+
+    /**
+     * 部门类型键值
+     */
+    private String typeKey;
+
+    /**
+     * 部门类型名称
+     */
+    private String typeName;
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getTypeKey() {
+        return typeKey;
+    }
+
+    public void setTypeKey(String typeKey) {
+        this.typeKey = typeKey;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public Long getPid() {
+        return pid;
+    }
+
+    @Override
+    public void setPid(Long pid) {
+        this.pid = pid;
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDictController.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -39,7 +39,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("dict")
-@Api(tags="数据字典")
+@Api(tags = "数据字典")
 public class SysDictController {
     @Autowired
     private SysDictService sysDictService;
@@ -47,14 +47,14 @@ public class SysDictController {
     @GetMapping("page")
     @ApiOperation("字典分类")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
-        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
-        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
-        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") ,
-        @ApiImplicitParam(name = "dictType", value = "字典类型", paramType = "query", dataType="String"),
-        @ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
+            @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
+            @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "dictType", value = "字典类型", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType = "String")
     })
-    public Result<PageData<SysDictDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+    public Result<PageData<SysDictDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
         //字典分类
         PageData<SysDictDTO> page = sysDictService.page(params);
 
@@ -64,9 +64,9 @@ public class SysDictController {
 
     @GetMapping("sublist/{pid}")
     @ApiOperation("子列表")
-    public Result<List<SysDictDTO>> sublist(@PathVariable("pid") String pid){
+    public Result<List<SysDictDTO>> sublist(@PathVariable("pid") String pid) {
         Map map = new HashMap();
-        map.put("pid",pid);
+        map.put("pid", pid);
         List<SysDictDTO> list = sysDictService.subList(map);
         return new Result<List<SysDictDTO>>().ok(list);
     }
@@ -74,10 +74,10 @@ public class SysDictController {
     @GetMapping("list")
     @ApiOperation("字典分类数据")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType="String"),
-        @ApiImplicitParam(name = "dictValue", value = "字典值", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "dictValue", value = "字典值", paramType = "query", dataType = "String")
     })
-    public Result<List<SysDictDTO>> list(@ApiIgnore @RequestParam Map<String, Object> params){
+    public Result<List<SysDictDTO>> list(@ApiIgnore @RequestParam Map<String, Object> params) {
         //字典分类数据
         List<SysDictDTO> list = sysDictService.list(params);
 
@@ -86,7 +86,7 @@ public class SysDictController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    public Result<SysDictDTO> get(@PathVariable("id") Long id){
+    public Result<SysDictDTO> get(@PathVariable("id") Long id) {
         SysDictDTO data = sysDictService.get(id);
 
         return new Result<SysDictDTO>().ok(data);
@@ -95,7 +95,7 @@ public class SysDictController {
     @PostMapping
     @ApiOperation("保存")
     @LogOperation("Save Dict")
-    public Result save(@RequestBody SysDictDTO dto){
+    public Result save(@RequestBody SysDictDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, DefaultGroup.class);
 
@@ -107,7 +107,7 @@ public class SysDictController {
     @PutMapping
     @ApiOperation("修改")
     @LogOperation("Update Dict")
-    public Result update(@RequestBody SysDictDTO dto){
+    public Result update(@RequestBody SysDictDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
 
@@ -119,7 +119,7 @@ public class SysDictController {
     @DeleteMapping
     @ApiOperation("删除")
     @LogOperation("Delete Dict")
-    public Result delete(@RequestBody Long[] ids){
+    public Result delete(@RequestBody Long[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
 
@@ -138,10 +138,7 @@ public class SysDictController {
      */
     @GetMapping("listSimple/{dictType}")
     @ApiOperation("字典分类数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType = "String")
-    })
-    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@ApiIgnore @PathVariable("dictType") String dictType) {
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType) {
         //字典分类数据
         return sysDictService.listSimpleDictInfo(dictType);
     }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -24,47 +24,57 @@ import java.util.Date;
  * @since 1.0.0
  */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @TableName("sys_dept")
 public class SysDeptEntity extends BaseEntity {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 上级ID
+     */
+    private Long pid;
+    /**
+     * 所有上级ID，用逗号分开
+     */
+    private String pids;
+    /**
+     * 部门名称
+     */
+    private String name;
+    /**
+     * 排序
+     */
+    private Integer sort;
+    /**
+     * 删除标识  0：未删除    1：删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Integer delFlag;
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updater;
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateDate;
+
+    /**
+     * 上级部门名称
+     */
+    @TableField(exist = false)
+    private String parentName;
 
-	/**
-	 * 上级ID
-	 */
-	private Long pid;
-	/**
-	 * 所有上级ID，用逗号分开
-	 */
-	private String pids;
-	/**
-	 * 部门名称
-	 */
-	private String name;
-	/**
-	 * 排序
-	 */
-	private Integer sort;
-	/**
-	 * 删除标识  0：未删除    1：删除
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private Integer delFlag;
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Long updater;
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateDate;
+    /**
+     * 部门类型键值
+     */
+    private String typeKey;
 
-	/**
-	 * 上级部门名称
-	 */
-	@TableField(exist = false)
-	private String parentName;
+    /**
+     * 部门类型名称
+     */
+    private String typeName;
 
 }

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActIdController.java

@@ -0,0 +1,66 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.ActGroupFormDto;
+import com.elink.esua.epdc.dto.form.ActUserFormDto;
+import com.elink.esua.epdc.exception.ModuleErrorCode;
+import com.elink.esua.epdc.service.ActIdService;
+import com.elink.esua.epdc.service.ActProcessService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * 用户和用户组控制类
+ *
+ * @author rongchao
+ * @Date 19-9-6
+ */
+@RestController
+@RequestMapping("actId")
+public class ActIdController {
+
+    @Autowired
+    private ActIdService actIdService;
+
+    /**
+     * 添加流程用户
+     *
+     * @param actUserFormDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @author rongchao
+     * @since 2019-09-06
+     */
+    @PostMapping("addUser")
+    public Result<String> addUser(ActUserFormDto actUserFormDto) {
+        return actIdService.saveUser(actUserFormDto);
+    }
+
+    /**
+     * 添加用户组
+     *
+     * @param actGroupFormDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @author rongchao
+     * @since 2019-09-06
+     */
+    @PostMapping("addGroup")
+    public Result<String> addGroup(ActGroupFormDto actGroupFormDto) {
+        return actIdService.saveGroup(actGroupFormDto);
+    }
+
+}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActGroupFormDto.java

@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+/**
+ * 流程用户组表单DTO
+ *
+ * @author rongchao
+ * @Date 19-9-6
+ */
+@Data
+public class ActGroupFormDto {
+
+    /**
+     * 用户组ID
+     */
+    private long groupId;
+
+    /**
+     * 用户组名
+     */
+    private String groupName;
+}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActUserFormDto.java

@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+/**
+ * 流程用户表单DTO
+ *
+ * @author rongchao
+ * @Date 19-9-6
+ */
+@Data
+public class ActUserFormDto {
+
+    /**
+     * 用户ID
+     */
+    private long userId;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActIdService.java

@@ -0,0 +1,45 @@
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.ActGroupFormDto;
+import com.elink.esua.epdc.dto.form.ActUserFormDto;
+
+/**
+ * 流程用户服务接口类
+ *
+ * @author rongchao
+ * @Date 19-9-6
+ */
+public interface ActIdService {
+
+    /**
+     * 添加用户
+     *
+     * @param actUserFormDto 用户名
+     * @return boolean
+     * @author rongchao
+     * @since 2019-09-06
+     */
+    Result<String> saveUser(ActUserFormDto actUserFormDto);
+
+    /**
+     * 添加用户组
+     *
+     * @param actGroupFormDto 用户组名
+     * @return boolean
+     * @author rongchao
+     * @since 2019-09-06
+     */
+    Result<String> saveGroup(ActGroupFormDto actGroupFormDto);
+
+    /**
+     * 修改用户组名
+     *
+     * @param newGroupName
+     * @return boolean
+     * @author rongchao
+     * @since 2019-09-06
+     */
+    Result<String> modifyGroupName(String newGroupName);
+
+}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -42,28 +42,31 @@ public class ActProcessService {
 
     /**
      * 流程列表
+     *
+     * @param params
+     * @return
      */
     public PageData<Map<String, Object>> page(Map<String, Object> params) {
-        String key = (String)params.get("key");
-        String processName = (String)params.get("processName");
+        String key = (String) params.get("key");
+        String processName = (String) params.get("processName");
 
         //分页参数
         Integer curPage = 1;
         Integer limit = 10;
-        if(params.get(Constant.PAGE) != null){
-            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+        if (params.get(Constant.PAGE) != null) {
+            curPage = Integer.parseInt((String) params.get(Constant.PAGE));
         }
-        if(params.get(Constant.LIMIT) != null){
-            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+        if (params.get(Constant.LIMIT) != null) {
+            limit = Integer.parseInt((String) params.get(Constant.LIMIT));
         }
 
         ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion()
-            .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc();
+                .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc();
 
-        if(StringUtils.isNotEmpty(key)){
+        if (StringUtils.isNotEmpty(key)) {
             processDefinitionQuery.processDefinitionKeyLike(key);
         }
-        if(StringUtils.isNotEmpty(processName)){
+        if (StringUtils.isNotEmpty(processName)) {
             processDefinitionQuery.processDefinitionNameLike(processName);
         }
 
@@ -74,7 +77,7 @@ public class ActProcessService {
             objectList.add(processDefinitionConvert(processDefinition));
         }
 
-        return new PageData<>(objectList, (int)processDefinitionQuery.count());
+        return new PageData<>(objectList, (int) processDefinitionQuery.count());
     }
 
 
@@ -101,36 +104,39 @@ public class ActProcessService {
 
     /**
      * 部署
+     *
      * @param file 文件
      */
     public void deploy(MultipartFile file) throws IOException {
         String fileName = file.getOriginalFilename();
         String extension = FilenameUtils.getExtension(fileName);
-        if("zip".equalsIgnoreCase(extension) || "bar".equalsIgnoreCase(extension)) {
+        if ("zip".equalsIgnoreCase(extension) || "bar".equalsIgnoreCase(extension)) {
             ZipInputStream zip = new ZipInputStream(file.getInputStream());
             repositoryService.createDeployment().addZipInputStream(zip).deploy();
-        }else if(fileName.indexOf("bpmn20.xml") != -1){
+        } else if (fileName.indexOf("bpmn20.xml") != -1) {
             repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
-        }else if("bpmn".equalsIgnoreCase(extension)){
+        } else if ("bpmn".equalsIgnoreCase(extension)) {
             repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
-        }else{
+        } else {
             throw new RenException(ModuleErrorCode.ACT_DEPLOY_FORMAT_ERROR);
         }
     }
 
     /**
      * 激活流程
+     *
      * @param id 流程ID
      */
-    public void active(String id){
+    public void active(String id) {
         repositoryService.activateProcessDefinitionById(id, true, null);
     }
 
     /**
      * 挂起流程
+     *
      * @param id 流程ID
      */
-    public void suspend(String id){
+    public void suspend(String id) {
         repositoryService.suspendProcessDefinitionById(id, true, null);
     }
 
@@ -171,15 +177,17 @@ public class ActProcessService {
 
     /**
      * 删除部署
-     * @param deploymentId  部署ID
+     *
+     * @param deploymentId 部署ID
      */
-    public void deleteDeployment(String deploymentId){
+    public void deleteDeployment(String deploymentId) {
         repositoryService.deleteDeployment(deploymentId, true);
     }
 
     /**
      * 获取资源文件
-     * @param deploymentId  部署ID
+     *
+     * @param deploymentId 部署ID
      * @param resourceName 资源名称
      */
     public InputStream getResourceAsStream(String deploymentId, String resourceName) {

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActIdServiceImpl.java

@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.service.ActIdService;
+import org.activiti.engine.IdentityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 流程用户服务实现类
+ *
+ * @author rongchao
+ * @Date 19-9-6
+ */
+@Service
+public class ActIdServiceImpl implements ActIdService {
+
+    @Autowired
+    private IdentityService identityService;
+
+    @Override
+    public Result<String> saveUser(String userName) {
+        return new Result<String>().ok("success");
+    }
+
+    @Override
+    public Result<String> saveGroup(String groupName) {
+        return new Result<String>().ok("success");
+    }
+
+    @Override
+    public Result<String> modifyGroupName(String newGroupName) {
+        return new Result<String>().ok("success");
+    }
+}

esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml

@@ -17,7 +17,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
   activiti:
     check-process-definitions: true
-    database-schema-update: true
+    database-schema-update: false
     process-definition-location-prefix: classpath:/processes/
   redis:
     database: 2