whycxzp
2021-11-05 4152826d31276137544ecd11548c20a6275002ae
更新
1个文件已添加
5个文件已修改
68 ■■■■ 已修改文件
src/main/java/com/whyc/controller/BaoJiGroupUserController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/WorkflowActionController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BaoJiGroupUserMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/BaoJiGroup.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BaoJiGroupUserService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/WorkflowActionService.java 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/BaoJiGroupUserController.java
@@ -23,8 +23,7 @@
    @GetMapping("groupAndUser")
    @ApiOperation(value = "查询所有的包机组和对应用户")
    public Response getGroupAndUserList(){
        //return new Response().set(1,service.getGroupAndUserList());
        return null;
        return new Response().set(1,service.getGroupAndUserList());
    }
src/main/java/com/whyc/controller/WorkflowActionController.java
@@ -29,8 +29,8 @@
    @PutMapping
    @ApiOperation(value = "更新动作规则")
    public Response update(@RequestBody WorkflowAction workflowAction){
        service.update(workflowAction);
    public Response update(@RequestBody List<WorkflowAction> workflowActionList){
        service.update(workflowActionList);
        return new Response().setII(1,"更新成功");
    }
src/main/java/com/whyc/mapper/BaoJiGroupUserMapper.java
New file
@@ -0,0 +1,5 @@
package com.whyc.mapper;
public interface BaoJiGroupUserMapper {
    Object getGroupList();
}
src/main/java/com/whyc/pojo/BaoJiGroup.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.ToString;
import java.util.List;
/**
 * 包机组
 */
@@ -16,6 +18,9 @@
    @TableField("baoji_group_name")
    private String baoJiGroupName;
    @TableField(exist = false)
    private List<UserInf> userList;
    public Integer getBaoJiGroupId() {
        return baoJiGroupId;
@@ -32,4 +37,12 @@
    public void setBaoJiGroupName(String baoJiGroupName) {
        this.baoJiGroupName = baoJiGroupName;
    }
    public List<UserInf> getUserList() {
        return userList;
    }
    public void setUserList(List<UserInf> userList) {
        this.userList = userList;
    }
}
src/main/java/com/whyc/service/BaoJiGroupUserService.java
@@ -1,8 +1,16 @@
package com.whyc.service;
import com.whyc.mapper.BaoJiGroupUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class BaoJiGroupUserService {
    @Autowired
    private BaoJiGroupUserMapper mapper;
    public Object getGroupAndUserList() {
        return mapper.getGroupList();
    }
}
src/main/java/com/whyc/service/WorkflowActionService.java
@@ -36,25 +36,28 @@
        mapper.insertBatchSomeColumn(actionList);
    }
    public void update(WorkflowAction workflowAction) {
        //先删除
        UpdateWrapper<WorkflowAction> wrapper = Wrappers.update();
        wrapper.eq("type",workflowAction.getType())
                .eq("link_type",workflowAction.getLinkType())
                .eq("role_type",workflowAction.getRoleType());
        mapper.delete(wrapper);
        //再新增
    public void update(List<WorkflowAction> workflowActionList) {
        List<WorkflowAction> actionList = new LinkedList<>();
        List<Integer> actionTypeList = workflowAction.getActionTypeList();
        actionTypeList.stream().forEach(actionType -> {
            WorkflowAction actionTemp = new WorkflowAction();
            actionTemp.setLinkType(workflowAction.getLinkType());
            actionTemp.setRoleType(workflowAction.getRoleType());
            actionTemp.setType(workflowAction.getType());
            actionTemp.setActionType(actionType);
        workflowActionList.stream().forEach(workflowAction -> {
            //先删除
            UpdateWrapper<WorkflowAction> wrapper = Wrappers.update();
            wrapper.eq("type",workflowAction.getType())
                    .eq("link_type",workflowAction.getLinkType())
                    .eq("role_type",workflowAction.getRoleType());
            mapper.delete(wrapper);
            //再新增
            List<Integer> actionTypeList = workflowAction.getActionTypeList();
            actionTypeList.stream().forEach(actionType -> {
                WorkflowAction actionTemp = new WorkflowAction();
                actionTemp.setLinkType(workflowAction.getLinkType());
                actionTemp.setRoleType(workflowAction.getRoleType());
                actionTemp.setType(workflowAction.getType());
                actionTemp.setActionType(actionType);
            actionList.add(actionTemp);
                actionList.add(actionTemp);
            });
        });
        mapper.insertBatchSomeColumn(actionList);
    }