Merge remote-tracking branch 'origin/master'

master
chen 4 years ago
commit ccf3f6b3ed
  1. 86
      dq-financial-crms/src/main/resources/bootstrap.properties
  2. 48
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java
  3. 26
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgFormDesignMapper.java
  4. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgProcessManageMapper.java
  5. 34
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgFormDesignRequest.java
  6. 40
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgFormDesignListResponse.java
  7. 19
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgFormDesignService.java
  8. 82
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgFormDesignServiceImpl.java
  9. 22
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgFormerDesignMapper.xml
  10. 3
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgProcessManageMapper.xml
  11. 84
      dq-financial-hrms-auth/src/main/resources/bootstrap.properties
  12. 86
      dq-financial-hrms/src/main/resources/bootstrap.properties
  13. 67
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgFormDesign.java
  14. 5
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java
  15. 49
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgFormDesignPO.java
  16. 66
      dq-govern-gateway/src/main/resources/bootstrap.properties

@ -1,20 +1,20 @@
##服务名称
#spring.application.name=dq-financial-crms
##配置中心地址
#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
#spring.cloud.nacos.config.file-extension=yml
##redis配置
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0
#服务名称
spring.application.name=dq-financial-crms
#配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848
spring.cloud.nacos.config.file-extension=yml
#redis配置
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0
#本地测试环境
#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@ -29,30 +29,30 @@ ribbon.ConnectTimeout: 120000
# 正式环境(prod)
#服务名称
spring.application.name=dq-financial-crms
##配置中心地址
spring.cloud.nacos.config.server-addr=120.78.127.12:8848
spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
#spring.cloud.nacos.config.group=prod
spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
spring.cloud.nacos.config.ext-config[0].group=prod
spring.cloud.nacos.config.ext-config[0].refresh=true
spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
spring.cloud.nacos.config.ext-config[1].group=prod
spring.cloud.nacos.config.ext-config[1].refresh=true
spring.cloud.nacos.config.ext-config[2].data-id=other.yml
spring.cloud.nacos.config.ext-config[2].group=prod
spring.cloud.nacos.config.ext-config[2].refresh=true
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=dq123456
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0
#spring.application.name=dq-financial-crms
###配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
##spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true
#
#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true
#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0

@ -0,0 +1,48 @@
package com.daqing.financial.guarantee.controller;
import com.daqing.financial.guarantee.model.request.DgFormDesignRequest;
import com.daqing.financial.guarantee.model.response.DgFormDesignListResponse;
import com.daqing.financial.guarantee.service.IDgFormDesignService;
import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* 表单设计控制层
*
* @auther River
* @date 2021/1/15 10:38
*/
@RestController
@RequestMapping("/form/design")
@Api(value = "表单设计", tags = "后台表单设计")
public class DgFormDesignController {
@Autowired
private IDgFormDesignService dgFormDesignService;
/**
* 列表
*/
@GetMapping("/list")
@ApiOperation(value = "根据节点id返回当前节点的表单字段", response = DgFormDesignListResponse.class)
public ResponseResult list(@RequestParam("processId") Integer processId) {
return ResponseResult.SUCCESS(dgFormDesignService.list(processId));
}
/**
* 修改
*/
@PostMapping("/update")
@ApiOperation(value = "修改操作")
public ResponseResult update(@RequestBody DgFormDesignRequest dgFormDesignRequest) {
Boolean result = dgFormDesignService.update(dgFormDesignRequest);
return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
}
}

@ -0,0 +1,26 @@
package com.daqing.financial.guarantee.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.daqing.financial.guarantee.model.request.DgFormDesignRequest;
import com.daqing.framework.domain.guarantee.DgFormDesign;
import com.daqing.framework.domain.guarantee.po.DgFormDesignPO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 表单设计持久层接口
*
* @auther River
* @date 2021/1/15 10:57
*/
@Mapper
public interface DgFormDesignMapper extends BaseMapper<DgFormDesign> {
List<DgFormDesignPO> list(Integer processId);
Boolean update(@Param("fd") DgFormDesignRequest dgFormDesignRequest);
Integer getOperationProcessIdById(Integer id);
}

@ -6,6 +6,7 @@ import com.daqing.framework.domain.guarantee.DgProcessManage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
@ -20,4 +21,6 @@ import java.util.List;
public interface DgProcessManageMapper extends BaseMapper<DgProcessManage> {
List<DgProcessManage> processManageList(@Param("usrId") int usrId);
Boolean updateTimeByModelId(@Param("modelId") Integer modelId, @Param("date") Date date);
}

@ -0,0 +1,34 @@
package com.daqing.financial.guarantee.model.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
import java.io.Serializable;
/**
* 表单设计请求类
*
* @auther River
* @date 2021/1/15 15:28
*/
@Data
@ToString
public class DgFormDesignRequest implements Serializable {
@ApiModelProperty("id")
private Integer id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("是否可以隐藏,0:可以但没隐藏,1:不可以,2:可以并已隐藏")
private Integer ifConceal;
@ApiModelProperty("是否必填,0:是,1:否")
private Integer ifRequired;
@ApiModelProperty("提示信息")
private String prompt;
}

@ -0,0 +1,40 @@
package com.daqing.financial.guarantee.model.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
import java.io.Serializable;
/**
* 表单设计返回列表实体类
*
* @auther River
* @date 2021/1/15 14:32
*/
@Data
@ToString
public class DgFormDesignListResponse implements Serializable {
@ApiModelProperty("id")
private Integer id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("是否可以隐藏,0:可以但没隐藏,1:不可以,2:可以并已隐藏")
private Integer ifConceal;
@ApiModelProperty("是否必填,0:是,1:否")
private Integer ifRequired;
@ApiModelProperty("是否可以操作,0:是,1:否")
private Integer ifOperation;
@ApiModelProperty("原本名称")
private String formerName;
@ApiModelProperty("提示信息")
private String prompt;
}

@ -0,0 +1,19 @@
package com.daqing.financial.guarantee.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.financial.guarantee.model.request.DgFormDesignRequest;
import com.daqing.financial.guarantee.model.response.DgFormDesignListResponse;
import com.daqing.framework.domain.guarantee.DgFormDesign;
import java.util.List;
/**
* @auther River
* @date 2021/1/15 10:39
*/
public interface IDgFormDesignService extends IService<DgFormDesign> {
List<DgFormDesignListResponse> list(Integer processId);
Boolean update(DgFormDesignRequest dgFormDesignRequest);
}

@ -0,0 +1,82 @@
package com.daqing.financial.guarantee.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.daqing.financial.guarantee.mapper.DgFormDesignMapper;
import com.daqing.financial.guarantee.mapper.DgProcessManageMapper;
import com.daqing.financial.guarantee.model.request.DgFormDesignRequest;
import com.daqing.financial.guarantee.model.response.DgFormDesignListResponse;
import com.daqing.financial.guarantee.service.IDgFormDesignService;
import com.daqing.framework.domain.guarantee.DgFormDesign;
import com.daqing.framework.domain.guarantee.GuaranteeCode;
import com.daqing.framework.domain.guarantee.po.DgFormDesignPO;
import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.model.response.CommonCode;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 表单设计业务层实现类
*
* @auther River
* @date 2021/1/15 10:40
*/
@Service
public class DgFormDesignServiceImpl extends ServiceImpl<DgFormDesignMapper, DgFormDesign> implements IDgFormDesignService {
@Autowired
private DgProcessManageMapper dgProcessManageMapper;
/**
* 列表
*/
@Override
public List<DgFormDesignListResponse> list(Integer processId) {
if (processId == null) {
ExceptionCast.cast(GuaranteeCode.FROM_DESIGN_PROCESS_ERROR);
}
List<DgFormDesignListResponse> responseList = new ArrayList<>();
List<DgFormDesignPO> list = this.getBaseMapper().list(processId);
for (DgFormDesignPO dgFormDesignPO : list) {
DgFormDesignListResponse dgFormDesignListResponse = new DgFormDesignListResponse();
// 当可操作节点与当前节点相同时表示可以操作
if (processId.equals(dgFormDesignPO.getOperationProcessId())) {
dgFormDesignListResponse.setIfOperation(0);
} else {
dgFormDesignListResponse.setIfOperation(1);
}
BeanUtils.copyProperties(dgFormDesignPO, dgFormDesignListResponse);
responseList.add(dgFormDesignListResponse);
}
return responseList;
}
/**
* 修改
*/
@Transactional
@Override
public Boolean update(DgFormDesignRequest dgFormDesignRequest) {
if (dgFormDesignRequest.getId() == null || dgFormDesignRequest.getIfConceal() == null
|| dgFormDesignRequest.getIfRequired() == null) {
ExceptionCast.cast(CommonCode.INVALID_PARAM);
}
if (dgFormDesignRequest.getName() == null || dgFormDesignRequest.getName().length() == 0) {
ExceptionCast.cast(GuaranteeCode.FROM_DESIGN_NAME_NOT_NULL);
}
// 获取当前字段的操作节点id
Integer operationProcessId = this.getBaseMapper().getOperationProcessIdById(dgFormDesignRequest.getId());
if (operationProcessId != null) {
Boolean result = dgProcessManageMapper.updateTimeByModelId(operationProcessId, new Date());
if (result) {
return this.getBaseMapper().update(dgFormDesignRequest);
}
}
return false;
}
}

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.daqing.financial.guarantee.mapper.DgFormDesignMapper">
<!-- 根据节点id查询对应的表单字段 -->
<select id="list" parameterType="integer" resultType="com.daqing.framework.domain.guarantee.po.DgFormDesignPO">
SELECT id,name,if_conceal,operation_process_id,if_required,former_name,prompt
FROM dg_form_design
WHERE FIND_IN_SET(#{processId},process_id)
</select>
<update id="update" parameterType="com.daqing.financial.guarantee.model.request.DgFormDesignRequest">
UPDATE dg_form_design SET name = #{fd.name},if_conceal = #{fd.ifConceal},if_required = #{fd.ifRequired},prompt = #{fd.prompt}
WHERE id = #{fd.id}
</update>
<!-- 根据节点id获取当前操作节点id -->
<select id="getOperationProcessIdById" parameterType="integer" resultType="integer">
SELECT operation_process_id FROM dg_form_design WHERE id = #{id}
</select>
</mapper>

@ -22,4 +22,7 @@
</where>
</select>
<update id="updateTimeByModelId">
UPDATE dg_process_manage SET update_time = #{date} WHERE model_id = #{modelId}
</update>
</mapper>

@ -1,21 +1,21 @@
#服务名称
#spring.application.name=dq-financial-hrms-auth
##配置中心地址
#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
#spring.cloud.nacos.config.file-extension=yml
##redis配置
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0
spring.application.name=dq-financial-hrms-auth
#配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848
spring.cloud.nacos.config.file-extension=yml
#redis配置
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0
#本地测试环境
#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@ -30,30 +30,30 @@ ribbon.ConnectTimeout: 30000
#正式环境(prod)
spring.application.name=dq-financial-hrms-auth
spring.cloud.nacos.config.server-addr=120.78.127.12:8848
spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
#spring.cloud.nacos.config.group=prod
spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
spring.cloud.nacos.config.ext-config[0].group=prod
spring.cloud.nacos.config.ext-config[0].refresh=true
spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
spring.cloud.nacos.config.ext-config[1].group=prod
spring.cloud.nacos.config.ext-config[1].refresh=true
spring.cloud.nacos.config.ext-config[2].data-id=other.yml
spring.cloud.nacos.config.ext-config[2].group=prod
spring.cloud.nacos.config.ext-config[2].refresh=true
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=dq123456
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0
#spring.application.name=dq-financial-hrms-auth
#
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
##spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true
#
#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true
#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0

@ -1,21 +1,21 @@
##服务名称
#spring.application.name=dq-financial-hrms
##配置中心地址
#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
#spring.cloud.nacos.config.file-extension=yml
##redis配置
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0
#服务名称
spring.application.name=dq-financial-hrms
#配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848
spring.cloud.nacos.config.file-extension=yml
#redis配置
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0
#本地测试环境
#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@ -33,30 +33,30 @@ spring.servlet.multipart.max-request-size=10MB
# 正式环境(prod)
#服务名称
spring.application.name=dq-financial-hrms
#配置中心地址
spring.cloud.nacos.config.server-addr=120.78.127.12:8848
spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
#spring.cloud.nacos.config.group=prod
spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
spring.cloud.nacos.config.ext-config[0].group=prod
spring.cloud.nacos.config.ext-config[0].refresh=true
spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
spring.cloud.nacos.config.ext-config[1].group=prod
spring.cloud.nacos.config.ext-config[1].refresh=true
spring.cloud.nacos.config.ext-config[2].data-id=other.yml
spring.cloud.nacos.config.ext-config[2].group=prod
spring.cloud.nacos.config.ext-config[2].refresh=true
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=dq123456
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0
#spring.application.name=dq-financial-hrms
##配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
##spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true
#
#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true
#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0

@ -0,0 +1,67 @@
package com.daqing.framework.domain.guarantee;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.ToString;
import java.io.Serializable;
import java.util.Date;
/**
* 表单设计实体类
*
* @auther River
* @date 2021/1/15 10:47
*/
@Data
@ToString
@TableName("dg_form_design")
public class DgFormDesign implements Serializable {
private Integer id;
/**
* 姓名
*/
private String name;
/**
* 属于节点
*/
private String processId;
/**
* 是否可以隐藏
*/
private Integer ifConceal;
/**
* 可操作节点
*/
private Integer operationProcessId;
/**
* 是否必填
*/
private Integer ifRequired;
/**
* 原本名称
*/
private String formerName;
/**
* 提示信息
*/
private String prompt;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
}

@ -29,7 +29,10 @@ public enum GuaranteeCode implements ResultCode {
EXCEL_ID_NOT_NULL(false, 120001, "导出的数据不能为空,请选择要导出的数据!"),
EFFICIENCY_TIME_ERROR(false, 130001,"时间格式错误!");
EFFICIENCY_TIME_ERROR(false, 130001,"时间格式错误!"),
FROM_DESIGN_PROCESS_ERROR(false,140001,"当前节点数据不存在!"),
FROM_DESIGN_NAME_NOT_NULL(false,140002,"字段名称不能为空!");
/**
* 操作是否成功
*/

@ -0,0 +1,49 @@
package com.daqing.framework.domain.guarantee.po;
import lombok.Data;
import lombok.ToString;
import java.io.Serializable;
/**
* 表单设计
*
* @auther River
* @date 2021/1/15 14:12
*/
@Data
@ToString
public class DgFormDesignPO implements Serializable {
private Integer id;
/**
* 名称
*/
private String name;
/**
* 是否隐藏
*/
private Integer ifConceal;
/**
* 是否必填
*/
private Integer ifRequired;
/**
* 可操作节点
*/
private Integer operationProcessId;
/**
* 原本名称
*/
private String formerName;
/**
* 提示信息
*/
private String prompt;
}

@ -1,21 +1,21 @@
#服务名称
#spring.application.name=dq-govern-gateway
##配置中心地址
#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
#spring.cloud.nacos.config.file-extension=yml
##redis配置
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0
spring.application.name=dq-govern-gateway
#配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848
spring.cloud.nacos.config.file-extension=yml
#redis配置
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0
#本地测试环境
#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@ -28,21 +28,21 @@ spring.servlet.multipart.max-request-size=10MB
# 正式环境(prod)
#服务名称
spring.application.name=dq-govern-gateway
#配置中心地址
spring.cloud.nacos.config.server-addr=120.78.127.12:8848
spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
spring.cloud.nacos.config.ext-config[0].group=prod
spring.cloud.nacos.config.ext-config[0].refresh=true
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=dq123456
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0
#spring.application.name=dq-govern-gateway
##配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
#
#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
#spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0
Loading…
Cancel
Save