feat:会议部分接口,flow工作流新增业务表单路由详情

2025-03-25 13:29:52 +08:00
1 parent ab33a29662
commit 401c66c7f0
@@ -1,5 +1,7 @@
 package com.bsd.pjcloud.flow.task.dto;

+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import java.time.LocalDateTime;
@@ -94,4 +96,10 @@ public class TaskDto {
 	 */
 	private String processName;

+
+	/**
+	 * 表单详情路由
+	 */
+	private String formDetail;
+
 }
@@ -142,7 +142,7 @@ public class Process {
 	private String businessKey;


-//	@Schema(description = "表单详情路由")
-//	@TableField("form_detail")
-//	private String formDetail;
+	@Schema(description = "表单详情路由")
+	@TableField("form_detail")
+	private String formDetail;
 }
@@ -35,6 +35,7 @@ public class ProcessGroup {
 	@TableField("sort")
 	private Integer sort;

+
 	/**
 	 * 用户id
 	 */
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.flow.task.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.bsd.pjcloud.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -72,6 +73,10 @@ public class ProcessInstanceRecord {
 	@TableField("group_name")
 	private String groupName;

+
+	@TableField("form_detail")
+	private String formDetail;
+
 	/**
 	 * 状态
 	 */
@@ -46,7 +46,7 @@ public class ProcessInstanceController {

 	/**
 	 * 查询当前登录用户的待办任务
-	 * @param pageDto
+	 * @param queryParamDto
 	 * @return
 	 */
 	@SneakyThrows
@@ -132,6 +132,7 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService {

                record.setRootUserId(processInstanceRecord.getUserId());
                record.setGroupName(processInstanceRecord.getGroupName());
+                record.setFormDetail(processInstanceRecord.getFormDetail());
                record.setRootUserName(startUser.getUsername());
                record.setRootUserAvatarUrl(startUser.getAvatar());
                record.setStartTime(processInstanceRecord.getCreateTime());
@@ -199,7 +199,7 @@ public class RemoteServiceImpl implements IRemoteService {
 		entity.setGroupId(oaFormGroups.getId());
 		entity.setGroupName(oaFormGroups.getGroupName());
 		entity.setStatus(NodeStatusEnum.JXZ.getCode());
-
+		entity.setFormDetail(oaForms.getFormDetail());
 		processInstanceRecordService.save(entity);

 		return R.ok();
@@ -0,0 +1,15 @@
+package com.bsd.pjcloud.integrated.vo.common;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "下拉返回")
+public class SelectSimpleVo {
+
+    @Schema(description = "id")
+    private Long id;
+
+    @Schema(description = "名称")
+    private String name;
+}
@@ -61,7 +61,7 @@
        <!--必备: 依赖api模块-->
        <dependency>
            <groupId>com.bsd</groupId>
-            <artifactId>pjcloud-supermarket-erp-api</artifactId>
+            <artifactId>pjcloud-integrated-api</artifactId>
            <version>5.7.0</version>
        </dependency>
        <!--必备: log 依赖-->
@@ -6,11 +6,13 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.integrated.entity.MeetingEquipmentEntity;
 import com.bsd.pjcloud.integrated.service.MeetingEquipmentService;
+import com.bsd.pjcloud.integrated.vo.common.SelectSimpleVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -124,4 +126,13 @@ public class MeetingEquipmentController {



+
+
+    @Operation(summary = "设备下拉数量" , description = "设备下拉数量,可根据参数设备名称模糊查询" )
+    @GetMapping("/simpleAll" )
+    public R getSimpleAll(@RequestParam(required = false,value = "name")String name) {
+        List<MeetingEquipmentEntity> list=meetingEquipmentService.listScope(name);
+        List<SelectSimpleVo> bean = BeanUtils.toBean(list, SelectSimpleVo.class);
+        return R.ok(bean);
+    }
 }
@@ -9,6 +9,8 @@ import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.integrated.entity.MeetingRoomEntity;
+import com.bsd.pjcloud.integrated.entity.MeetingRoomEquipmentEntity;
+import com.bsd.pjcloud.integrated.service.MeetingRoomEquipmentService;
 import com.bsd.pjcloud.integrated.service.MeetingRoomService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
@@ -18,6 +20,7 @@ import org.springframework.http.HttpHeaders;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@@ -38,6 +41,8 @@ public class MeetingRoomController {

    private final  MeetingRoomService meetingRoomService;

+    private final MeetingRoomEquipmentService meetingRoomEquipmentService;
+
    /**
     * 分页查询
     * @param page 分页对象
@@ -49,7 +54,7 @@ public class MeetingRoomController {
    @PreAuthorize("@pms.hasPermission('integrated_meetingRoom_view')" )
    public R getMeetingRoomPage(@ParameterObject Page page, @ParameterObject MeetingRoomEntity meetingRoom) {
        LambdaQueryWrapper<MeetingRoomEntity> wrapper = Wrappers.lambdaQuery();
-        return R.ok(meetingRoomService.page(page, wrapper));
+        return R.ok(meetingRoomService.pageScope(page, wrapper));
    }


@@ -74,8 +79,16 @@ public class MeetingRoomController {
    @SysLog("新增会议室信息表" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('integrated_meetingRoom_add')" )
+    @Transactional
    public R save(@RequestBody MeetingRoomEntity meetingRoom) {
        meetingRoom.setDeptId(SecurityUtils.getUser().getDeptId());
+        List<MeetingRoomEquipmentEntity> meetingRoomEquipmentEntityList = meetingRoom.getMeetingRoomEquipmentEntityList();
+        if (CollUtil.isNotEmpty(meetingRoomEquipmentEntityList)) {
+            meetingRoomEquipmentEntityList.forEach(meetingRoomEquipmentEntity -> {
+                meetingRoomEquipmentEntity.setRoomId(meetingRoom.getId());
+            });
+            meetingRoomEquipmentService.saveBatch(meetingRoomEquipmentEntityList);
+        }
        return R.ok(meetingRoomService.save(meetingRoom));
    }

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.bsd.pjcloud.common.core.util.TenantTable;
 import java.time.LocalDateTime;
+import java.util.List;

 /**
 * 会议室信息表
@@ -130,4 +131,9 @@ public class MeetingRoomEntity extends Model<MeetingRoomEntity> {
 	*/
    @Schema(description="租户编号")
    private Long tenantId;
+
+
+	@TableField(exist = false)
+	@Schema(description="设备会议室关联")
+	private List<MeetingRoomEquipmentEntity> meetingRoomEquipmentEntityList;
 }
@@ -1,8 +1,18 @@
 package com.bsd.pjcloud.integrated.service;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.integrated.entity.FeedbackEntity;

 public interface FeedbackService extends IService<FeedbackEntity> {

+
+    /**
+     * 分页查询
+     * @param page
+     * @param wrapper
+     * @return
+     */
+    Object pageScope(Page page, LambdaQueryWrapper<FeedbackEntity> wrapper);
 }
@@ -3,6 +3,15 @@ package com.bsd.pjcloud.integrated.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.integrated.entity.MeetingEquipmentEntity;

+import java.util.List;
+
 public interface MeetingEquipmentService extends IService<MeetingEquipmentEntity> {

+
+    /**
+     * 数据查询所有list
+     * @param name 设备名称
+     * @return
+     */
+    List<MeetingEquipmentEntity> listScope(String name);
 }
@@ -1,8 +1,18 @@
 package com.bsd.pjcloud.integrated.service;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.integrated.entity.MeetingRoomEntity;

 public interface MeetingRoomService extends IService<MeetingRoomEntity> {

+
+    /**
+     * 数据权限分页
+     * @param page
+     * @param wrapper
+     * @return
+     */
+    Object pageScope(Page page, LambdaQueryWrapper<MeetingRoomEntity> wrapper);
 }
@@ -1,6 +1,9 @@
 package com.bsd.pjcloud.integrated.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.integrated.entity.FeedbackEntity;
 import com.bsd.pjcloud.integrated.mapper.FeedbackMapper;
 import com.bsd.pjcloud.integrated.service.FeedbackService;
@@ -13,4 +16,8 @@ import org.springframework.stereotype.Service;
 */
@Service
 public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper, FeedbackEntity> implements FeedbackService {
+    @Override
+    public Object pageScope(Page page, LambdaQueryWrapper<FeedbackEntity> wrapper) {
+        return baseMapper.selectPageByScope(page, wrapper, DataScope.of());
+    }
 }
@@ -1,10 +1,16 @@
 package com.bsd.pjcloud.integrated.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.integrated.entity.MeetingEquipmentEntity;
 import com.bsd.pjcloud.integrated.mapper.MeetingEquipmentMapper;
 import com.bsd.pjcloud.integrated.service.MeetingEquipmentService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+
 /**
 * 设备表
 *
@@ -13,4 +19,11 @@ import org.springframework.stereotype.Service;
 */
@Service
 public class MeetingEquipmentServiceImpl extends ServiceImpl<MeetingEquipmentMapper, MeetingEquipmentEntity> implements MeetingEquipmentService {
+    @Override
+    public List<MeetingEquipmentEntity> listScope(String name) {
+        LambdaQueryWrapper<MeetingEquipmentEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(name),MeetingEquipmentEntity::getName, name);
+        List<MeetingEquipmentEntity> list = baseMapper.selectListByScope(wrapper, DataScope.of());
+        return list;
+    }
 }
@@ -1,6 +1,9 @@
 package com.bsd.pjcloud.integrated.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.integrated.entity.MeetingRoomEntity;
 import com.bsd.pjcloud.integrated.mapper.MeetingRoomMapper;
 import com.bsd.pjcloud.integrated.service.MeetingRoomService;
@@ -13,4 +16,8 @@ import org.springframework.stereotype.Service;
 */
@Service
 public class MeetingRoomServiceImpl extends ServiceImpl<MeetingRoomMapper, MeetingRoomEntity> implements MeetingRoomService {
+    @Override
+    public Object pageScope(Page page, LambdaQueryWrapper<MeetingRoomEntity> wrapper) {
+        return baseMapper.selectPageByScope(page, wrapper, DataScope.of());
+    }
 }
@@ -399,7 +399,7 @@ public class ThirdPartyOAuth2Service {
                    url, HttpMethod.GET, requestEntity, responseType
            );
            if (response.getBody().getCode().equals("-1")){
-                log.error("获取浙政钉用户信息失败");
+                log.error("获取浙政钉/诗画用户信息失败");
                log.error("token",zzdToken);
                log.error("response",response.getBody().getDescription());
                log.error("response",response.getBody());