wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-11 14:33:40 +08:00
parent bbffe9a6e5 7a15f3ad92
commit 447760f509
6 changed files with 152 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java
View File

@ -88,83 +88,84 @@ public class AbilityCenterControllerV2 {
if (page.getTotal() <= 0) { // if (page.getTotal() <= 0) { //
return new Result().error("联系管理员添加流程"); return new Result().error("联系管理员添加流程");
} }
abilityBatchApplicationDTO.setApplyFlag(UUID.randomUUID().toString()); // 同一次的申请标识
final Optional<SysDeptDTO> deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName)); final Optional<SysDeptDTO> deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName));
final UserDetail user = SecurityUser.getUser(); final UserDetail user = SecurityUser.getUser();
List<TAbilityApplicationDTO> tAbilityApplicationDTOList = List<TAbilityApplicationDTO> tAbilityApplicationDTOList = abilityBatchApplicationDTO.getSystem().stream().map(index -> {
abilityBatchApplicationDTO.getSystem().stream().map(index -> { if (tAbilityApplicationService.countUserResourceApply(SecurityUser.getUserId(), Long.valueOf(index.get("resourceId"))) > 0) { // 防止重复发起申请
if (tAbilityApplicationService.countUserResourceApply(SecurityUser.getUserId(), Long.valueOf(index.get("resourceId"))) > 0) { // 防止重复发起申请 logger.error("重复发起申请");
logger.error("重复发起申请"); return null;
return null; }
} TAbilityApplicationDTO tAbilityApplicationDTO = new TAbilityApplicationDTO();
TAbilityApplicationDTO tAbilityApplicationDTO = new TAbilityApplicationDTO(); tAbilityApplicationDTO.setArea(abilityBatchApplicationDTO.getArea());
tAbilityApplicationDTO.setArea(abilityBatchApplicationDTO.getArea()); tAbilityApplicationDTO.setAttachment(abilityBatchApplicationDTO.getAttachment());
tAbilityApplicationDTO.setAttachment(abilityBatchApplicationDTO.getAttachment()); tAbilityApplicationDTO.setBasis(abilityBatchApplicationDTO.getBasis());
tAbilityApplicationDTO.setBasis(abilityBatchApplicationDTO.getBasis()); tAbilityApplicationDTO.setPhone(abilityBatchApplicationDTO.getPhone());
tAbilityApplicationDTO.setPhone(abilityBatchApplicationDTO.getPhone()); tAbilityApplicationDTO.setScene(abilityBatchApplicationDTO.getScene());
tAbilityApplicationDTO.setScene(abilityBatchApplicationDTO.getScene()); tAbilityApplicationDTO.setInstanceId(abilityBatchApplicationDTO.getInstanceId());
tAbilityApplicationDTO.setInstanceId(abilityBatchApplicationDTO.getInstanceId()); tAbilityApplicationDTO.setUnit(abilityBatchApplicationDTO.getUnit());
tAbilityApplicationDTO.setUnit(abilityBatchApplicationDTO.getUnit()); tAbilityApplicationDTO.setUser(abilityBatchApplicationDTO.getUser());
tAbilityApplicationDTO.setUser(abilityBatchApplicationDTO.getUser()); tAbilityApplicationDTO.setResourceId(index.get("resourceId"));
tAbilityApplicationDTO.setResourceId(index.get("resourceId")); tAbilityApplicationDTO.setUser(abilityBatchApplicationDTO.getUser());
tAbilityApplicationDTO.setUser(abilityBatchApplicationDTO.getUser()); tAbilityApplicationDTO.setSystem(index.get("resourceName"));
tAbilityApplicationDTO.setSystem(index.get("resourceName")); tAbilityApplicationDTO.setEnclosure(abilityBatchApplicationDTO.getEnclosure()); // 附件
tAbilityApplicationDTO.setEnclosure(abilityBatchApplicationDTO.getEnclosure()); // 附件 tAbilityApplicationDTO.setUserId(abilityBatchApplicationDTO.getUserId());
tAbilityApplicationDTO.setUserId(abilityBatchApplicationDTO.getUserId()); tAbilityApplicationDTO.setApproveStatus("审核中");
tAbilityApplicationDTO.setApproveStatus("审核中"); tAbilityApplicationDTO.setDelFlag(0);
tAbilityApplicationDTO.setDelFlag(0); // v2 新增字段
// v2 新增字段 tAbilityApplicationDTO.setCameraList(index.get("cameraId"));
tAbilityApplicationDTO.setCameraList(index.get("cameraId")); tAbilityApplicationDTO.setTitle(abilityBatchApplicationDTO.getTitle());
tAbilityApplicationDTO.setTitle(abilityBatchApplicationDTO.getTitle()); tAbilityApplicationDTO.setApplicationBackground(abilityBatchApplicationDTO.getApplicationBackground());
tAbilityApplicationDTO.setApplicationBackground(abilityBatchApplicationDTO.getApplicationBackground()); tAbilityApplicationDTO.setApplicationScene(abilityBatchApplicationDTO.getApplicationScene());
tAbilityApplicationDTO.setApplicationScene(abilityBatchApplicationDTO.getApplicationScene()); tAbilityApplicationDTO.setApplicationSystem(abilityBatchApplicationDTO.getApplicationSystem());
tAbilityApplicationDTO.setApplicationSystem(abilityBatchApplicationDTO.getApplicationSystem()); tAbilityApplicationDTO.setEffectWish(abilityBatchApplicationDTO.getEffectWish());
tAbilityApplicationDTO.setEffectWish(abilityBatchApplicationDTO.getEffectWish());
// 仿照请求接口 /processForm/tabilityapplication // 归为同一次申请
ValidatorUtils.validateEntity(tAbilityApplicationDTO, AddGroup.class, DefaultGroup.class); tAbilityApplicationDTO.setApplyFlag(abilityBatchApplicationDTO.getApplyFlag());
tAbilityApplicationService.save(tAbilityApplicationDTO); // 写能力申请数据
if (tAbilityApplicationDTO.getId() == null) { // 仿照请求接口 /processForm/tabilityapplication
return null; ValidatorUtils.validateEntity(tAbilityApplicationDTO, AddGroup.class, DefaultGroup.class);
} tAbilityApplicationService.save(tAbilityApplicationDTO); // 写能力申请数据
tAbilityApplicationDTO.setCompleteEntry(Boolean.TRUE); if (tAbilityApplicationDTO.getId() == null) {
return tAbilityApplicationDTO; return null;
}).filter(ObjectUtil::isNotNull).collect(Collectors.toList()); // 申请入库 }
tAbilityApplicationDTO.setCompleteEntry(Boolean.TRUE);
return tAbilityApplicationDTO;
}).filter(ObjectUtil::isNotNull).collect(Collectors.toList()); // 申请入库
if (!tAbilityApplicationDTOList.isEmpty()) { if (!tAbilityApplicationDTOList.isEmpty()) {
Map<Long, List<TAbilityApplicationDTO>> temp = Map<Long, List<TAbilityApplicationDTO>> temp = tAbilityApplicationDTOList.stream().filter(index -> StringUtils.isNotEmpty(index.getResourceId())).collect(Collectors.groupingBy(t -> {
tAbilityApplicationDTOList.stream().filter(index -> StringUtils.isNotEmpty(index.getResourceId())).collect(Collectors.groupingBy(t -> { ResourceDTO resourceDTO = resourceService.get(Long.valueOf(t.getResourceId()));
ResourceDTO resourceDTO = resourceService.get(Long.valueOf(t.getResourceId())); if (resourceDTO == null && deptDTO.isPresent()) { // 资源不存在时
if (resourceDTO == null && deptDTO.isPresent()) { // 资源不存在时 return deptDTO.get().getId();
return deptDTO.get().getId(); }
} return resourceDTO.getDeptId();
return resourceDTO.getDeptId(); })); // 按部门分组
})); // 按部门分组
temp.keySet().stream().distinct().forEach(deptId -> { temp.keySet().stream().distinct().forEach(deptId -> {
if (deptId == 0L) { // 部门id不存在时 if (deptId == 0L) { // 部门id不存在时
return; return;
} }
if (sysDeptService.get(deptId) == null) { // 部门不存在 final SysDeptDTO sysDeptDTO = sysDeptService.get(deptId);
if (sysDeptDTO == null) { // 部门不存在
return; return;
} }
List<TAbilityApplicationDTO> dtoList = temp.get(deptId); List<TAbilityApplicationDTO> dtoList = temp.get(deptId);
Boolean basic_facilities =
dtoList.stream().map(index -> { CompletableFuture.runAsync(() -> {
Optional<ResourceDTO> resourceDTOOptional = String[] sqls_ = dtoList.stream().map(index -> String.format("UPDATE t_ability_application SET resource_owner_dept = '%s' WHERE id = %s", JSON.toJSONString(sysDeptDTO), index.getId())).collect(Collectors.toList()).toArray(new String[dtoList.size()]);
Optional.ofNullable(resourceService.get(Long.valueOf(index.getResourceId()))); // 从本库内查不到 视为其它平台的基础设施资源 jdbcTemplate.batchUpdate(sqls_); // 批量更新资源所属部门信息
return !resourceDTOOptional.isPresent() || !"基础设施".equals(resourceDTOOptional.get().getType()); logger.info("批量更新申请的资源的部门信息完成");
} }, executor);
)
.filter(index -> !index).findAny().orElse(Boolean.TRUE); Boolean basic_facilities = dtoList.stream().map(index -> {
Optional<ResourceDTO> resourceDTOOptional = Optional.ofNullable(resourceService.get(Long.valueOf(index.getResourceId()))); // 从本库内查不到 视为其它平台的基础设施资源
return !resourceDTOOptional.isPresent() || !"基础设施".equals(resourceDTOOptional.get().getType());
}).filter(index -> !index).findAny().orElse(Boolean.TRUE);
logger.error("--------------------是否全是基础设施{}----------------------------------------------", basic_facilities); logger.error("--------------------是否全是基础设施{}----------------------------------------------", basic_facilities);
final List<Long> ids = dtoList.stream().map(TAbilityApplicationDTO::getId).collect(Collectors.toList()); // 发起申请的表单id final List<Long> ids = dtoList.stream().map(TAbilityApplicationDTO::getId).collect(Collectors.toList()); // 发起申请的表单id
// 仿照请求接口 /act/running/startOfBusinessKey // 仿照请求接口 /act/running/startOfBusinessKey
ProcessStartDTO processStartDTO = new ProcessStartDTO(); ProcessStartDTO processStartDTO = new ProcessStartDTO();
processStartDTO.setBusinessKey(basic_facilities ? processStartDTO.setBusinessKey(basic_facilities ? tAbilityApplicationDTOList.stream().filter(index -> StringUtils.isNotEmpty(index.getResourceId())).map(TAbilityApplicationDTO::getResourceId).findFirst().orElse(null) : JSON.toJSONString(ids)); // 申请的id列表 json字符 做businesskey
tAbilityApplicationDTOList.stream()
.filter(index -> StringUtils.isNotEmpty(index.getResourceId()))
.map(TAbilityApplicationDTO::getResourceId)
.findFirst()
.orElse(null)
: JSON.toJSONString(ids)); // 申请的id列表 json字符 做businesskey
processStartDTO.setProcessDefinitionKey(key); //限定 processStartDTO.setProcessDefinitionKey(key); //限定
AuditingBaseDTO auditingBaseDTO = new AuditingBaseDTO(); AuditingBaseDTO auditingBaseDTO = new AuditingBaseDTO();
auditingBaseDTO.setCompleteEntry(Boolean.TRUE); // 首次录入 auditingBaseDTO.setCompleteEntry(Boolean.TRUE); // 首次录入
@ -190,9 +191,7 @@ public class AbilityCenterControllerV2 {
// 仿照请求接口 /processForm/tabilityapplication/updateInstanceId // 仿照请求接口 /processForm/tabilityapplication/updateInstanceId
CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
if (dto.getBusinessKey() != null) { if (dto.getBusinessKey() != null) {
String[] sqls = String[] sqls = dtoList.stream().map(i -> String.format("UPDATE t_ability_application SET instance_id = %s WHERE id = %s", dto.getProcessInstanceId(), i.getId())).collect(Collectors.toList()).toArray(new String[dtoList.size()]);
dtoList.stream().map(i -> String.format("UPDATE t_ability_application SET instance_id = %s WHERE id = %s", dto.getProcessInstanceId(), i.getId()))
.collect(Collectors.toList()).toArray(new String[dtoList.size()]);
jdbcTemplate.batchUpdate(sqls); jdbcTemplate.batchUpdate(sqls);
} }
}, executor); }, executor);

8
renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java
View File

@ -1,7 +1,7 @@
package io.renren.modules.processForm.dto; package io.renren.modules.processForm.dto;
import io.renren.common.dto.AuditingBaseDTO; import io.renren.common.dto.AuditingBaseDTO;
import io.renren.modules.monitor.entity.CameraChannel; import io.renren.modules.sys.dto.SysDeptDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -72,4 +72,10 @@ public class TAbilityApplicationDTO extends AuditingBaseDTO implements Serializa
@ApiModelProperty(value = "能力应用期望效果") @ApiModelProperty(value = "能力应用期望效果")
private String effectWish; private String effectWish;
@ApiModelProperty(value = "申请单标识(同一次的申请标识)")
private String applyFlag;
@ApiModelProperty(value = "资源所属部门信息")
private SysDeptDTO resourceOwnerDept;
} }

8
renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java
View File

@ -1,7 +1,7 @@
package io.renren.modules.processForm.dto; package io.renren.modules.processForm.dto;
import io.renren.common.dto.AuditingBaseDTO; import io.renren.common.dto.AuditingBaseDTO;
import io.renren.modules.monitor.entity.CameraChannel; import io.renren.modules.sys.dto.SysDeptDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -66,4 +66,10 @@ public class TAbilityBatchApplicationDTO extends AuditingBaseDTO implements Seri
@ApiModelProperty(value = "能力应用期望效果") @ApiModelProperty(value = "能力应用期望效果")
private String effectWish; private String effectWish;
@ApiModelProperty(value = "申请单标识(同一次的申请标识)")
private String applyFlag;
@ApiModelProperty(value = "资源所属部门信息")
private SysDeptDTO resourceOwnerDept;
} }

12
renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import io.renren.modules.sys.dto.SysDeptDTO;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -126,4 +127,15 @@ public class TAbilityApplicationEntity implements Serializable {
* 能力应用期望效果 * 能力应用期望效果
*/ */
private String effectWish; private String effectWish;
/**
* 申请单标识(同一次的申请标识)
*/
private String applyFlag;
/**
* 资源所属部门信息
*/
private SysDeptDTO resourceOwnerDept;
} }

2
renren-admin/src/main/resources/db/V3.3__ability_application_add_col.sql Normal file
View File

@ -0,0 +1,2 @@
alter table `t_ability_application` ADD COLUMN `apply_flag` varchar(255) NULL comment '申请单标识';
alter table `t_ability_application` ADD COLUMN `resource_owner_dept` json NULL comment '资源所属部门信息';

117
renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
View File

@ -23,6 +23,9 @@
<result property="cameraList" column="camera_list"/> <result property="cameraList" column="camera_list"/>
<result property="applicationScene" column="application_scene" <result property="applicationScene" column="application_scene"
typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="applyFlag" column="apply_flag"/>
<result property="resourceOwnerDept" column="resource_owner_dept"
typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
</resultMap> </resultMap>
<update id="updateInstanceId"> <update id="updateInstanceId">
@ -49,73 +52,73 @@
<select id="countApplyAll" resultType="java.lang.Long"> <select id="countApplyAll" resultType="java.lang.Long">
SELECT SELECT
SUM( count ) SUM( count )
FROM FROM
( (
SELECT SELECT
COUNT( 1 ) AS count COUNT( 1 ) AS count
FROM FROM
( (
SELECT SELECT
COUNT( id ) COUNT( id )
FROM FROM
t_ability_application t_ability_application
WHERE WHERE
resource_id != 8888888880000000001 resource_id != 8888888880000000001
AND instance_id != '' AND instance_id != ''
AND instance_id IS NOT NULL AND instance_id IS NOT NULL
AND camera_list != '' AND camera_list != ''
AND camera_list IS NOT NULL AND camera_list IS NOT NULL
GROUP BY GROUP BY
instance_id instance_id
) temp UNION ) temp UNION
SELECT SELECT
COUNT( taa.id ) COUNT( taa.id )
FROM FROM
t_ability_application taa, t_ability_application taa,
tb_data_resource tdr tb_data_resource tdr
WHERE WHERE
1 = 1 1 = 1
AND taa.resource_id = tdr.id AND taa.resource_id = tdr.id
AND tdr.type != '赋能案例' AND tdr.type != '赋能案例'
AND tdr.del_flag = 0 AND tdr.del_flag = 0
GROUP BY GROUP BY
tdr.type tdr.type
) temp2 ) temp2
</select> </select>
<select id="getAmountGroupByType" resultType="java.util.Map"> <select id="getAmountGroupByType" resultType="java.util.Map">
SELECT SELECT
'基础设施' AS 'type', '基础设施' AS 'type',
COUNT( 1 ) AS 'amount' COUNT( 1 ) AS 'amount'
FROM FROM
( (
SELECT
COUNT( id )
FROM
t_ability_application
WHERE
resource_id != 8888888880000000001
AND instance_id != ''
AND instance_id IS NOT NULL
AND camera_list != ''
AND camera_list IS NOT NULL
GROUP BY
instance_id
) temp UNION
SELECT SELECT
tdr.type, COUNT( id )
COUNT( taa.id )
FROM FROM
t_ability_application taa, t_ability_application
tb_data_resource tdr
WHERE WHERE
1 = 1 resource_id != 8888888880000000001
AND taa.resource_id = tdr.id AND instance_id != ''
AND tdr.type != '赋能案例' AND instance_id IS NOT NULL
AND tdr.del_flag = 0 AND camera_list != ''
AND camera_list IS NOT NULL
GROUP BY GROUP BY
tdr.type instance_id
) temp UNION
SELECT
tdr.type,
COUNT( taa.id )
FROM
t_ability_application taa,
tb_data_resource tdr
WHERE
1 = 1
AND taa.resource_id = tdr.id
AND tdr.type != '赋能案例'
AND tdr.del_flag = 0
GROUP BY
tdr.type
</select> </select>
<select id="selectDeptApplyCount" resultType="java.util.Map"> <select id="selectDeptApplyCount" resultType="java.util.Map">