Commit 9cfb97a6 authored by 鲍德's avatar 鲍德
Browse files

现状巡查岗位巡查清单

parent 2000f671

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskPostController.java

+44 −2
Original line number Diff line number Diff line 
package com.censoft.censoftrongtong.controller;



import java.util.ArrayList;

import java.util.Date;

import java.util.List;

import javax.servlet.http.HttpServletResponse;



import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

import com.censoft.censoftrongtong.domain.CurrentRiskPostList;

import com.censoft.censoftrongtong.domain.CurrentRiskPostListSaveVO;

import com.censoft.censoftrongtong.service.ICurrentRiskPostListService;

import lombok.AllArgsConstructor;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.util.CollectionUtils;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.PutMapping;
@@ -28,11 +37,12 @@ import com.ruoyi.common.core.page.TableDataInfo; 
 * @date 2023-12-01

 */

@RestController

@AllArgsConstructor

@RequestMapping("/system/currentRiskPost")

public class CurrentRiskPostController extends BaseController

{

    @Autowired

    private ICurrentRiskPostService currentRiskPostService;

    private ICurrentRiskPostListService currentRiskPostListService;



    /**

     * 查询现状风险岗位列表
@@ -77,10 +87,42 @@ public class CurrentRiskPostController extends BaseController 
    @PostMapping("save")

    public AjaxResult add(@RequestBody CurrentRiskPost currentRiskPost)

    {

        if(currentRiskPost.getId() == null){

        Long currentRiskPostId = currentRiskPost.getId();

        if(currentRiskPostId == null){

            currentRiskPostService.insertCurrentRiskPost(currentRiskPost);

            currentRiskPostId = currentRiskPost.getId();

        }else{

            currentRiskPostService.updateCurrentRiskPost(currentRiskPost);

            //删除原有岗位用户信息

            QueryWrapper<CurrentRiskPostList> queryWrapper = new QueryWrapper<>();

            queryWrapper.eq("post_id",currentRiskPostId);

            currentRiskPostListService.remove(queryWrapper);

        }

        //新增清单列表

        List<CurrentRiskPostListSaveVO> list = currentRiskPost.getList();

        if(!CollectionUtils.isEmpty(list)){

            String userIds = currentRiskPost.getUserId();

            for(String userId :userIds.split(",")){

                List<CurrentRiskPostList> currentRiskPostLists = new ArrayList<>();

                Long finalCurrentRiskPostId = currentRiskPostId;

                list.forEach(vo ->{

                    //0 一岗一人 1 一岗多人

                    if("1".equals(currentRiskPost.getType()) && Long.parseLong(userId) != vo.getUserId()){

                        return;

                    }

                    CurrentRiskPostList currentRiskPostList = new CurrentRiskPostList();

                    currentRiskPostList.setProjectId(currentRiskPost.getProjectId());

                    currentRiskPostList.setPostId(finalCurrentRiskPostId);

                    currentRiskPostList.setUserId(Long.parseLong(userId));

                    currentRiskPostList.setCurrentRiskId(vo.getId());

                    currentRiskPostList.setPatrolType(vo.getPatrolType());

                    currentRiskPostList.setCreateTime(new Date());

                    currentRiskPostLists.add(currentRiskPostList);

                });

                if(!CollectionUtils.isEmpty(currentRiskPostLists)){

                    currentRiskPostListService.saveBatch(currentRiskPostLists);

                }

            }

        }

        return AjaxResult.success();

    }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskPostListController.java

0 → 100644
+104 −0
Original line number Diff line number Diff line 
package com.censoft.censoftrongtong.controller;



import java.util.List;

import javax.servlet.http.HttpServletResponse;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.PutMapping;

import org.springframework.web.bind.annotation.DeleteMapping;

import org.springframework.web.bind.annotation.PathVariable;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.enums.BusinessType;

import com.censoft.censoftrongtong.domain.CurrentRiskPostList;

import com.censoft.censoftrongtong.service.ICurrentRiskPostListService;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.common.core.page.TableDataInfo;



/**

 * 现状风险岗位用户巡查清单Controller

 * 

 * @author bobbao

 * @date 2023-12-07

 */

@RestController

@RequestMapping("/risk/riskPostList")

public class CurrentRiskPostListController extends BaseController

{

    @Autowired

    private ICurrentRiskPostListService currentRiskPostListService;



    /**

     * 查询现状风险岗位用户巡查清单列表

     */

    @PreAuthorize("@ss.hasPermi('system:riskPostList:list')")

    @GetMapping("/list")

    public TableDataInfo list(CurrentRiskPostList currentRiskPostList)

    {

        startPage();

        List<CurrentRiskPostList> list = currentRiskPostListService.selectCurrentRiskPostListList(currentRiskPostList);

        return getDataTable(list);

    }



    /**

     * 导出现状风险岗位用户巡查清单列表

     */

    @PreAuthorize("@ss.hasPermi('system:riskPostList:export')")

    @Log(title = "现状风险岗位用户巡查清单", businessType = BusinessType.EXPORT)

    @PostMapping("/export")

    public void export(HttpServletResponse response, CurrentRiskPostList currentRiskPostList)

    {

        List<CurrentRiskPostList> list = currentRiskPostListService.selectCurrentRiskPostListList(currentRiskPostList);

        ExcelUtil<CurrentRiskPostList> util = new ExcelUtil<CurrentRiskPostList>(CurrentRiskPostList.class);

        util.exportExcel(response, list, "现状风险岗位用户巡查清单数据");

    }



    /**

     * 获取现状风险岗位用户巡查清单详细信息

     */

    @PreAuthorize("@ss.hasPermi('system:riskPostList:query')")

    @GetMapping(value = "/{id}")

    public AjaxResult getInfo(@PathVariable("id") Long id)

    {

        return success(currentRiskPostListService.selectCurrentRiskPostListById(id));

    }



    /**

     * 新增现状风险岗位用户巡查清单

     */

    @PreAuthorize("@ss.hasPermi('system:riskPostList:add')")

    @Log(title = "现状风险岗位用户巡查清单", businessType = BusinessType.INSERT)

    @PostMapping

    public AjaxResult add(@RequestBody CurrentRiskPostList currentRiskPostList)

    {

        return toAjax(currentRiskPostListService.insertCurrentRiskPostList(currentRiskPostList));

    }



    /**

     * 修改现状风险岗位用户巡查清单

     */

    @PreAuthorize("@ss.hasPermi('system:riskPostList:edit')")

    @Log(title = "现状风险岗位用户巡查清单", businessType = BusinessType.UPDATE)

    @PutMapping

    public AjaxResult edit(@RequestBody CurrentRiskPostList currentRiskPostList)

    {

        return toAjax(currentRiskPostListService.updateCurrentRiskPostList(currentRiskPostList));

    }



    /**

     * 删除现状风险岗位用户巡查清单

     */

    @PreAuthorize("@ss.hasPermi('system:riskPostList:remove')")

    @Log(title = "现状风险岗位用户巡查清单", businessType = BusinessType.DELETE)

	@DeleteMapping("/{ids}")

    public AjaxResult remove(@PathVariable Long[] ids)

    {

        return toAjax(currentRiskPostListService.deleteCurrentRiskPostListByIds(ids));

    }

}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskUserPatrolController.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class CurrentRiskUserPatrolController extends BaseController 
     */

    @PreAuthorize("@ss.hasPermi('risk:riskUserPatrol:add')")

    @Log(title = "巡查执行管理", businessType = BusinessType.INSERT)

    @PostMapping

    @PostMapping("save")

    public AjaxResult add(@RequestBody CurrentRiskUserPatrol currentRiskUserPatrol)

    {

        return toAjax(currentRiskUserPatrolService.insertCurrentRiskUserPatrol(currentRiskUserPatrol));

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskUserPatrolDetailController.java

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class CurrentRiskUserPatrolDetailController extends BaseController 
     */

    @PreAuthorize("@ss.hasPermi('risk:currentRiskPatrolDetail:add')")

    @Log(title = "现状风险用户巡查明细", businessType = BusinessType.INSERT)

    @PostMapping

    @PostMapping("save")

    public AjaxResult add(@RequestBody CurrentRiskUserPatrolDetail currentRiskUserPatrolDetail)

    {

        return toAjax(currentRiskUserPatrolDetailService.insertCurrentRiskUserPatrolDetail(currentRiskUserPatrolDetail));

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/CurrentRiskPost.java

+8 −108
Original line number Diff line number Diff line 
package com.censoft.censoftrongtong.domain;



import com.ruoyi.common.core.domain.BaseEntityClean;

import io.swagger.annotations.ApiModelProperty;

import lombok.Data;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.core.domain.BaseEntity;



import java.util.List;



/**

 * 现状风险岗位对象 current_risk_post

 * 

 * @author ruoyi

 * @date 2023-12-01

 */

@Data

public class CurrentRiskPost extends BaseEntityClean

{

    private static final long serialVersionUID = 1L;
@@ -52,113 +57,8 @@ public class CurrentRiskPost extends BaseEntityClean 


    private String nickName;



    public String getNickName() {

        return nickName;

    }



    public void setNickName(String nickName) {

        this.nickName = nickName;

    }



    public void setId(Long id)

    {

        this.id = id;

    }



    public Long getId() 

    {

        return id;

    }

    public void setProjectId(Long projectId) 

    {

        this.projectId = projectId;

    }



    public Long getProjectId() 

    {

        return projectId;

    }

    public void setRiskPostCode(String riskPostCode) 

    {

        this.riskPostCode = riskPostCode;

    }

    @ApiModelProperty("0 一岗一人 1 一岗多人")

    private String type;



    public String getRiskPostCode() 

    {

        return riskPostCode;

    }

    public void setRiskPostName(String riskPostName) 

    {

        this.riskPostName = riskPostName;

    }



    public String getRiskPostName() 

    {

        return riskPostName;

    }

    public void setPatrolType(String patrolType) 

    {

        this.patrolType = patrolType;

    }



    public String getPatrolType() 

    {

        return patrolType;

    }

    public void setRiskPostDesc(String riskPostDesc) 

    {

        this.riskPostDesc = riskPostDesc;

    }



    public String getRiskPostDesc() 

    {

        return riskPostDesc;

    }

    public void setUserId(String userId) 

    {

        this.userId = userId;

    }



    public String getUserId() 

    {

        return userId;

    }

    public void setSortNum(Long sortNum) 

    {

        this.sortNum = sortNum;

    }



    public Long getSortNum() 

    {

        return sortNum;

    }

    public void setDelFlag(String delFlag) 

    {

        this.delFlag = delFlag;

    }



    public String getDelFlag() 

    {

        return delFlag;

    }



    @Override

    public String toString() {

        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

            .append("id", getId())

            .append("projectId", getProjectId())

            .append("riskPostCode", getRiskPostCode())

            .append("riskPostName", getRiskPostName())

            .append("patrolType", getPatrolType())

            .append("riskPostDesc", getRiskPostDesc())

            .append("userId", getUserId())

            .append("sortNum", getSortNum())

            .append("delFlag", getDelFlag())

            .append("createBy", getCreateBy())

            .append("createTime", getCreateTime())

            .append("updateBy", getUpdateBy())

            .append("updateTime", getUpdateTime())

            .append("remark", getRemark())

            .toString();

    }

    private List<CurrentRiskPostListSaveVO> list;

}