@@ -2,7 +2,6 @@ package com.ningdatech.pmapi.organization.controller; | |||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.wflow.bean.dto.WflowOrgProcdefDto; | import com.wflow.bean.dto.WflowOrgProcdefDto; | ||||
import com.wflow.bean.entity.WflowOrgModelHistorys; | |||||
import com.wflow.bean.vo.OrgProcdefVo; | import com.wflow.bean.vo.OrgProcdefVo; | ||||
import com.wflow.service.OrgProcdefService; | import com.wflow.service.OrgProcdefService; | ||||
import com.wflow.workflow.service.OrgProcessModelService; | import com.wflow.workflow.service.OrgProcessModelService; | ||||
@@ -10,7 +9,6 @@ import io.swagger.annotations.Api; | |||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
import org.springframework.beans.BeanUtils; | |||||
import org.springframework.validation.annotation.Validated; | import org.springframework.validation.annotation.Validated; | ||||
import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
@@ -26,7 +24,7 @@ import org.springframework.web.bind.annotation.*; | |||||
@RequestMapping("/api/v1/organization/procdef") | @RequestMapping("/api/v1/organization/procdef") | ||||
@Api(value = "OrganizationProcdef", tags = "单位配置-流程配置") | @Api(value = "OrganizationProcdef", tags = "单位配置-流程配置") | ||||
@RequiredArgsConstructor | @RequiredArgsConstructor | ||||
public class OrganizationProcdefController { | |||||
public class ProcDefController { | |||||
private final OrgProcdefService orgProcdefService; | private final OrgProcdefService orgProcdefService; | ||||
@@ -4,15 +4,12 @@ import com.ningdatech.basic.model.PageVo; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.req.AdjustmentListReq; | import com.ningdatech.pmapi.projectdeclared.model.req.AdjustmentListReq; | ||||
import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage; | import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | |||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | ||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
import org.springframework.beans.BeanUtils; | |||||
import org.springframework.validation.annotation.Validated; | import org.springframework.validation.annotation.Validated; | ||||
import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
@@ -34,8 +31,6 @@ public class ProjectAdjustmentController { | |||||
private final ProjectAdjustmentManage projectAdjustmentManage; | private final ProjectAdjustmentManage projectAdjustmentManage; | ||||
private final ProjectLibManage projectLibManage; | |||||
@ApiOperation(value = "可做项目内容调整的列表", notes = "可做项目内容调整的列表") | @ApiOperation(value = "可做项目内容调整的列表", notes = "可做项目内容调整的列表") | ||||
@GetMapping("/list") | @GetMapping("/list") | ||||
public PageVo<ProjectLibListItemVO> list(@Validated @ModelAttribute AdjustmentListReq preReq) { | public PageVo<ProjectLibListItemVO> list(@Validated @ModelAttribute AdjustmentListReq preReq) { | ||||
@@ -102,10 +102,27 @@ logging: | |||||
root: info | root: info | ||||
file: | file: | ||||
path: logs | path: logs | ||||
nd: | nd: | ||||
log: | log: | ||||
enabled: true | enabled: true | ||||
type: DB | type: DB | ||||
cache: | |||||
type: REDIS | |||||
serializerType: ProtoStuff | |||||
cacheNullVal: true | |||||
def: | |||||
keyPrefix: pm | |||||
# 文件存储 | |||||
file: | |||||
storage-type: ALI_OSS | |||||
ali: | |||||
protocol: https:// | |||||
bucket: devplat | |||||
urlPrefix: oss-cn-hangzhou.aliyuncs.com | |||||
endpoint: oss-cn-hangzhou.aliyuncs.com | |||||
accessKeyId: LTAI4GL7uypycnBjiRn55rMG | |||||
accessKeySecret: qwYC7bW9bkStsko7qkLVnToAzj0Y98 | |||||
# 日志文件配置 | # 日志文件配置 | ||||
log: | log: | ||||
path: ./logs | path: ./logs | ||||