PSSR确认人校验及支吊架添加模板

master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -436,6 +436,9 @@ public class CommonController extends BaseController
         }else if( type.equals("analyzer") ) {
             downloadname = "PSSR在线分析仪导入模板.xlsx";
             url = "static/template/pssr/analyzer.xlsx";
+        }else if( type.equals("pssrFrameTmpl") ) {
+            downloadname = "PSSR支（吊）架模板数据维护.xlsx";
+            url = "static/template/pssr/frameModel.xlsx";
         }
 
         InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(url);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameModelController.java

@@ -0,0 +1,202 @@
+package com.ruoyi.project.pssr.controller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.project.pssr.domain.TPssrRegion;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.pssr.domain.TPssrFrameModel;
+import com.ruoyi.project.pssr.service.ITPssrFrameModelService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 支（吊）架Controller
+ *
+ * @author ssy
+ * @date 2024-12-18
+ */
+@RestController
+@RequestMapping("/pssr/frameModel")
+public class TPssrFrameModelController extends BaseController
+{
+    @Autowired
+    private ITPssrFrameModelService tPssrFrameModelService;
+
+    /**
+     * 查询支（吊）架列表
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:frameModel:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPssrFrameModel tPssrFrameModel)
+    {
+        startPage();
+        List<TPssrFrameModel> list = tPssrFrameModelService.selectTPssrFrameModelList(tPssrFrameModel);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出支（吊）架列表
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:frameModel:export')")
+    @Log(title = "支（吊）架", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPssrFrameModel tPssrFrameModel)
+    {
+        List<TPssrFrameModel> list = tPssrFrameModelService.selectTPssrFrameModelList(tPssrFrameModel);
+        ExcelUtil<TPssrFrameModel> util = new ExcelUtil<TPssrFrameModel>(TPssrFrameModel.class);
+        return util.exportExcel(list, "frameModel");
+    }
+
+    /**
+     * 获取支（吊）架详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:frameModel:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tPssrFrameModelService.selectTPssrFrameModelById(id));
+    }
+
+    /**
+     * 新增支（吊）架
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:frameModel:add')")
+    @Log(title = "支（吊）架", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPssrFrameModel tPssrFrameModel)
+    {
+        return toAjax(insertOrUpdate(tPssrFrameModel));
+    }
+
+
+    private int insertOrUpdate(TPssrFrameModel tPssrFrameModel) {
+        TPssrFrameModel model = new TPssrFrameModel();
+        model.setRegion(tPssrFrameModel.getRegion());
+        model.setBracketNumber(tPssrFrameModel.getBracketNumber());
+        List<TPssrFrameModel> tPssrFrameModels = tPssrFrameModelService.selectTPssrFrameModelList(model);
+        if (CollectionUtils.isEmpty(tPssrFrameModels)) {
+            return tPssrFrameModelService.insertTPssrFrameModel(tPssrFrameModel);
+        } else {
+            tPssrFrameModel.setId(tPssrFrameModels.get(0).getId());
+            return tPssrFrameModelService.updateTPssrFrameModel(tPssrFrameModel);
+        }
+    }
+
+    /**
+     * 修改支（吊）架
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:frameModel:edit')")
+    @Log(title = "支（吊）架", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPssrFrameModel tPssrFrameModel)
+    {
+        return toAjax(tPssrFrameModelService.updateTPssrFrameModel(tPssrFrameModel));
+    }
+
+    /**
+     * 删除支（吊）架
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:frameModel:remove')")
+    @Log(title = "支（吊）架", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tPssrFrameModelService.deleteTPssrFrameModelByIds(ids));
+    }
+
+
+
+
+    @PreAuthorize("@ss.hasPermi('pssr:region:add')")
+    @Log(title = "分离培训模版", businessType = BusinessType.INSERT)
+    @PostMapping("/importData")
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException {
+        //获取操作人员ID
+        Long userId = getUserId();
+        //报错行数统计
+        List<Integer> failRow = new ArrayList<Integer>();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<TPssrFrameModel> list = new ArrayList<>();
+        int rowNum = sheet.getLastRowNum();
+        int failNumber = 0;
+        String topic = "";
+        boolean flag = false;
+        for (int i = 2; i <= rowNum; i++) {
+            try {
+                logger.info("读取行数：" + i);
+                Row row = sheet.getRow(i);
+                if (row == null) {
+                    sheet.removeRow(row);
+                    rowNum++;
+                    continue;
+                }
+                int cellNum = row.getLastCellNum();
+                TPssrFrameModel entity = new TPssrFrameModel();
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    if (cell == null) {
+                        continue;
+                    }
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    logger.info("cellValue:" + cellValue);
+                    if (j == 0) {
+                        entity.setRegion(cellValue);
+                    } else if (j == 1) {
+                        entity.setBracketNumber(cellValue);
+                    } else if (j == 2) {
+                        entity.setPipelineNumber(cellValue);
+                    } else if (j == 3) {
+                        entity.setDevNo(cellValue);
+                    } else if (j == 4) {
+                        entity.setUnit(cellValue);
+                    } else if (j == 5) {
+                        entity.setSupportType(cellValue);
+                    }
+                }
+                entity.setCreaterCode(userId.toString());
+                entity.setCreatedate(new Date());
+                logger.info("entity:" + entity);
+                list.add(entity);
+            } catch (Exception e) {
+                failNumber++;
+                failRow.add(i + 1);
+            }
+        }
+        int successNumber = 0;
+        int failNum = 0;
+        for (TPssrFrameModel t : list) {
+            failNum++;
+            try {
+                add(t);
+                successNumber++;
+            } catch (Exception e) {
+                e.printStackTrace();
+                failNumber++;
+                failRow.add(failNum + 1);
+            }
+        }
+        logger.info("list:" + JSON.toJSONString(list));
+        logger.info("successNumber:{}", successNumber);
+        logger.info("failNumber:{}", failNumber);
+        logger.info("failRow:{}", failRow);
+        return AjaxResult.success(String.valueOf(successNumber), failRow);
+    }
+}

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java

@@ -246,6 +246,9 @@ public class TPssrHygieneController extends BaseController {
     @Log(title = "现场卫生", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrHygiene tPssrHygiene) {
+        if (tPssrHygiene.getConfirm1().equals(tPssrHygiene.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrHygiene.setApproveStatus(0L);
         return toAjax(tPssrHygieneService.insertTPssrHygiene(tPssrHygiene));
     }
@@ -258,6 +261,9 @@ public class TPssrHygieneController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrHygiene tPssrHygiene)
     {
+        if (tPssrHygiene.getConfirm1().equals(tPssrHygiene.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrHygieneService.updateTPssrHygiene(tPssrHygiene));
     }
 
@@ -269,6 +275,9 @@ public class TPssrHygieneController extends BaseController {
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrHygiene tPssrHygiene)
     {
+        if (tPssrHygiene.getConfirm1().equals(tPssrHygiene.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrHygieneMapper.updateTPssrHygieneByIds(tPssrHygiene));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java

@@ -255,6 +255,9 @@ public class TPssrLaboratoryController extends BaseController {
     @Log(title = "实验室", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrLaboratory tPssrLaboratory) {
+        if (tPssrLaboratory.getConfirm1().equals(tPssrLaboratory.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrLaboratory.setApproveStatus(0L);
         return toAjax(tPssrLaboratoryService.insertTPssrLaboratory(tPssrLaboratory));
     }
@@ -267,6 +270,9 @@ public class TPssrLaboratoryController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrLaboratory tPssrLaboratory)
     {
+        if (tPssrLaboratory.getConfirm1().equals(tPssrLaboratory.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrLaboratoryService.updateTPssrLaboratory(tPssrLaboratory));
     }
 
@@ -278,6 +284,9 @@ public class TPssrLaboratoryController extends BaseController {
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrLaboratory tPssrLaboratory)
     {
+        if (tPssrLaboratory.getConfirm1().equals(tPssrLaboratory.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrLaboratoryMapper.updateTPssrLaboratoryByIds(tPssrLaboratory));
     }
 

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFrameModel.java

@@ -0,0 +1,231 @@
+package com.ruoyi.project.pssr.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 支（吊）架对象 t_pssr_frame_model
+ *
+ * @author ssy
+ * @date 2024-12-18
+ */
+public class TPssrFrameModel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 区域 */
+    @Excel(name = "区域")
+    private String region;
+
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
+    /** 支架编号 */
+    @Excel(name = "支架编号")
+    private String bracketNumber;
+
+    /** 管线号 */
+    @Excel(name = "管线号")
+    private String pipelineNumber;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devNo;
+
+    /** 支架形式 */
+    @Excel(name = "支架形式")
+    private String supportType;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setRegion(String region)
+    {
+        this.region = region;
+    }
+
+    public String getRegion()
+    {
+        return region;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setBracketNumber(String bracketNumber)
+    {
+        this.bracketNumber = bracketNumber;
+    }
+
+    public String getBracketNumber()
+    {
+        return bracketNumber;
+    }
+    public void setPipelineNumber(String pipelineNumber)
+    {
+        this.pipelineNumber = pipelineNumber;
+    }
+
+    public String getPipelineNumber()
+    {
+        return pipelineNumber;
+    }
+    public void setDevNo(String devNo)
+    {
+        this.devNo = devNo;
+    }
+
+    public String getDevNo()
+    {
+        return devNo;
+    }
+    public void setSupportType(String supportType)
+    {
+        this.supportType = supportType;
+    }
+
+    public String getSupportType()
+    {
+        return supportType;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("region", getRegion())
+            .append("unit", getUnit())
+            .append("bracketNumber", getBracketNumber())
+            .append("pipelineNumber", getPipelineNumber())
+            .append("devNo", getDevNo())
+            .append("supportType", getSupportType())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrFrameModelMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.pssr.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.pssr.domain.TPssrFrameModel;
+
+/**
+ * 支（吊）架Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-12-18
+ */
+public interface TPssrFrameModelMapper 
+{
+    /**
+     * 查询支（吊）架
+     * 
+     * @param id 支（吊）架ID
+     * @return 支（吊）架
+     */
+    public TPssrFrameModel selectTPssrFrameModelById(Long id);
+
+    /**
+     * 查询支（吊）架列表
+     * 
+     * @param tPssrFrameModel 支（吊）架
+     * @return 支（吊）架集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TPssrFrameModel> selectTPssrFrameModelList(TPssrFrameModel tPssrFrameModel);
+
+    /**
+     * 新增支（吊）架
+     * 
+     * @param tPssrFrameModel 支（吊）架
+     * @return 结果
+     */
+    public int insertTPssrFrameModel(TPssrFrameModel tPssrFrameModel);
+
+    /**
+     * 修改支（吊）架
+     * 
+     * @param tPssrFrameModel 支（吊）架
+     * @return 结果
+     */
+    public int updateTPssrFrameModel(TPssrFrameModel tPssrFrameModel);
+
+    /**
+     * 删除支（吊）架
+     * 
+     * @param id 支（吊）架ID
+     * @return 结果
+     */
+    public int deleteTPssrFrameModelById(Long id);
+
+    /**
+     * 批量删除支（吊）架
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPssrFrameModelByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/pssr/service/ITPssrFrameModelService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.pssr.service;
+
+import java.util.List;
+import com.ruoyi.project.pssr.domain.TPssrFrameModel;
+
+/**
+ * 支（吊）架Service接口
+ * 
+ * @author ssy
+ * @date 2024-12-18
+ */
+public interface ITPssrFrameModelService 
+{
+    /**
+     * 查询支（吊）架
+     * 
+     * @param id 支（吊）架ID
+     * @return 支（吊）架
+     */
+    public TPssrFrameModel selectTPssrFrameModelById(Long id);
+
+    /**
+     * 查询支（吊）架列表
+     * 
+     * @param tPssrFrameModel 支（吊）架
+     * @return 支（吊）架集合
+     */
+    public List<TPssrFrameModel> selectTPssrFrameModelList(TPssrFrameModel tPssrFrameModel);
+
+    /**
+     * 新增支（吊）架
+     * 
+     * @param tPssrFrameModel 支（吊）架
+     * @return 结果
+     */
+    public int insertTPssrFrameModel(TPssrFrameModel tPssrFrameModel);
+
+    /**
+     * 修改支（吊）架
+     * 
+     * @param tPssrFrameModel 支（吊）架
+     * @return 结果
+     */
+    public int updateTPssrFrameModel(TPssrFrameModel tPssrFrameModel);
+
+    /**
+     * 批量删除支（吊）架
+     * 
+     * @param ids 需要删除的支（吊）架ID
+     * @return 结果
+     */
+    public int deleteTPssrFrameModelByIds(Long[] ids);
+
+    /**
+     * 删除支（吊）架信息
+     * 
+     * @param id 支（吊）架ID
+     * @return 结果
+     */
+    public int deleteTPssrFrameModelById(Long id);
+}

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrFrameModelServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.pssr.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.pssr.mapper.TPssrFrameModelMapper;
+import com.ruoyi.project.pssr.domain.TPssrFrameModel;
+import com.ruoyi.project.pssr.service.ITPssrFrameModelService;
+
+/**
+ * 支（吊）架Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-12-18
+ */
+@Service
+public class TPssrFrameModelServiceImpl implements ITPssrFrameModelService
+{
+    @Autowired
+    private TPssrFrameModelMapper tPssrFrameModelMapper;
+
+    /**
+     * 查询支（吊）架
+     *
+     * @param id 支（吊）架ID
+     * @return 支（吊）架
+     */
+    @Override
+    public TPssrFrameModel selectTPssrFrameModelById(Long id)
+    {
+        return tPssrFrameModelMapper.selectTPssrFrameModelById(id);
+    }
+
+    /**
+     * 查询支（吊）架列表
+     *
+     * @param tPssrFrameModel 支（吊）架
+     * @return 支（吊）架
+     */
+    @Override
+    public List<TPssrFrameModel> selectTPssrFrameModelList(TPssrFrameModel tPssrFrameModel)
+    {
+        return tPssrFrameModelMapper.selectTPssrFrameModelList(tPssrFrameModel);
+    }
+
+    /**
+     * 新增支（吊）架
+     *
+     * @param tPssrFrameModel 支（吊）架
+     * @return 结果
+     */
+    @Override
+    public int insertTPssrFrameModel(TPssrFrameModel tPssrFrameModel)
+    {
+        return tPssrFrameModelMapper.insertTPssrFrameModel(tPssrFrameModel);
+    }
+
+    /**
+     * 修改支（吊）架
+     *
+     * @param tPssrFrameModel 支（吊）架
+     * @return 结果
+     */
+    @Override
+    public int updateTPssrFrameModel(TPssrFrameModel tPssrFrameModel)
+    {
+        return tPssrFrameModelMapper.updateTPssrFrameModel(tPssrFrameModel);
+    }
+
+    /**
+     * 批量删除支（吊）架
+     *
+     * @param ids 需要删除的支（吊）架ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrFrameModelByIds(Long[] ids)
+    {
+        return tPssrFrameModelMapper.deleteTPssrFrameModelByIds(ids);
+    }
+
+    /**
+     * 删除支（吊）架信息
+     *
+     * @param id 支（吊）架ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrFrameModelById(Long id)
+    {
+        return tPssrFrameModelMapper.deleteTPssrFrameModelById(id);
+    }
+}

master/src/main/resources/mybatis/pssr/TPssrFrameModelMapper.xml

@@ -0,0 +1,126 @@
+<?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.ruoyi.project.pssr.mapper.TPssrFrameModelMapper">
+    
+    <resultMap type="TPssrFrameModel" id="TPssrFrameModelResult">
+        <result property="id"    column="id"    />
+        <result property="region"    column="region"    />
+        <result property="unit"    column="unit"    />
+        <result property="bracketNumber"    column="bracket_number"    />
+        <result property="pipelineNumber"    column="pipeline_number"    />
+        <result property="devNo"    column="dev_no"    />
+        <result property="supportType"    column="support_type"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTPssrFrameModelVo">
+        select d.id, d.region, d.unit, d.bracket_number, d.pipeline_number, d.dev_no, d.support_type, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_frame_model d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTPssrFrameModelList" parameterType="TPssrFrameModel" resultMap="TPssrFrameModelResult">
+        <include refid="selectTPssrFrameModelVo"/>
+        <where>  
+            <if test="region != null  and region != ''"> and region = #{region}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="bracketNumber != null  and bracketNumber != ''"> and bracket_number = #{bracketNumber}</if>
+            <if test="pipelineNumber != null  and pipelineNumber != ''"> and pipeline_number = #{pipelineNumber}</if>
+            <if test="devNo != null  and devNo != ''"> and dev_no = #{devNo}</if>
+            <if test="supportType != null  and supportType != ''"> and support_type = #{supportType}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTPssrFrameModelById" parameterType="Long" resultMap="TPssrFrameModelResult">
+        <include refid="selectTPssrFrameModelVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTPssrFrameModel" parameterType="TPssrFrameModel">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_pssr_frame_model.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_pssr_frame_model
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="region != null">region,</if>
+            <if test="unit != null">unit,</if>
+            <if test="bracketNumber != null">bracket_number,</if>
+            <if test="pipelineNumber != null">pipeline_number,</if>
+            <if test="devNo != null">dev_no,</if>
+            <if test="supportType != null">support_type,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="region != null">#{region},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="bracketNumber != null">#{bracketNumber},</if>
+            <if test="pipelineNumber != null">#{pipelineNumber},</if>
+            <if test="devNo != null">#{devNo},</if>
+            <if test="supportType != null">#{supportType},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPssrFrameModel" parameterType="TPssrFrameModel">
+        update t_pssr_frame_model
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="region != null">region = #{region},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="bracketNumber != null">bracket_number = #{bracketNumber},</if>
+            <if test="pipelineNumber != null">pipeline_number = #{pipelineNumber},</if>
+            <if test="devNo != null">dev_no = #{devNo},</if>
+            <if test="supportType != null">support_type = #{supportType},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTPssrFrameModelById" parameterType="Long">
+        update t_pssr_frame_model set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTPssrFrameModelByIds" parameterType="String">
+        update t_pssr_frame_model set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/pssr/frameModel.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询支（吊）架列表
+export function listFrameModel(query) {
+  return request({
+    url: '/pssr/frameModel/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支（吊）架详细
+export function getFrameModel(id) {
+  return request({
+    url: '/pssr/frameModel/' + id,
+    method: 'get'
+  })
+}
+
+// 新增支（吊）架
+export function addFrameModel(data) {
+  return request({
+    url: '/pssr/frameModel',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支（吊）架
+export function updateFrameModel(data) {
+  return request({
+    url: '/pssr/frameModel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支（吊）架
+export function delFrameModel(id) {
+  return request({
+    url: '/pssr/frameModel/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出支（吊）架
+export function exportFrameModel(query) {
+  return request({
+    url: '/pssr/frameModel/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/pssr/frameModel/index.vue

@@ -0,0 +1,455 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="区域" prop="region">
+        <el-input
+          v-model="queryParams.region"
+          placeholder="请输入区域"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单元" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单元"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支架编号" prop="bracketNumber">
+        <el-input
+          v-model="queryParams.bracketNumber"
+          placeholder="请输入支架编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="管线号" prop="pipelineNumber">
+        <el-input
+          v-model="queryParams.pipelineNumber"
+          placeholder="请输入管线号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备位号" prop="devNo">
+        <el-input
+          v-model="queryParams.devNo"
+          placeholder="请输入设备位号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['pssr:frameModel:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['pssr:frameModel:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['pssr:frameModel:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['pssr:frameModel:edit']"
+        >导入
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['pssr:frameModel:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="frameModelList" @selection-change="handleSelectionChange"
+              :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="区域" align="center" prop="region" :show-overflow-tooltip="true"/>
+      <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
+      <el-table-column label="支架编号" align="center" prop="bracketNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="管线号" align="center" prop="pipelineNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备位号" align="center" prop="devNo" :show-overflow-tooltip="true"/>
+      <el-table-column label="支架形式" align="center" prop="supportType" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['pssr:frameModel:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['pssr:frameModel:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改支（吊）架对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="区域" prop="region">
+          <el-input v-model="form.region" placeholder="请输入区域"/>
+        </el-form-item>
+        <el-form-item label="单元" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单元"/>
+        </el-form-item>
+        <el-form-item label="支架编号" prop="bracketNumber">
+          <el-input v-model="form.bracketNumber" placeholder="请输入支架编号"/>
+        </el-form-item>
+        <el-form-item label="管线号" prop="pipelineNumber">
+          <el-input v-model="form.pipelineNumber" placeholder="请输入管线号"/>
+        </el-form-item>
+        <el-form-item label="设备位号" prop="devNo">
+          <el-input v-model="form.devNo" placeholder="请输入设备位号"/>
+        </el-form-item>
+        <el-form-item label="支架形式" prop="supportType">
+          <el-input v-model="form.supportType" placeholder="请输入支架形式"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog><!-- 用户导入对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
+               append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          {{ $t('将文件拖到此处，或') }}
+          <em>{{ $t('点击上传') }}</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <!--<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据-->
+          <el-link type="info" style="font-size:12px" @click="importTemplate">{{ $t('下载模板') }}</el-link>
+        </div>
+        <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+          <input name="type" :value="upload.type" hidden/>
+        </form>
+        <div class="el-upload__tip" style="color:red" slot="tip">{{ $t('提示：仅允许导入“xls”或“xlsx”格式文件！') }}</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  addFrameModel,
+  delFrameModel,
+  exportFrameModel,
+  getFrameModel,
+  listFrameModel,
+  updateFrameModel
+} from "@/api/pssr/frameModel";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "FrameModel",
+  components: {Treeselect},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 支（吊）架表格数据
+      frameModelList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight: 300,
+      // 是否显示弹出层
+      open: false,
+      // 用户导入参数
+      upload: {
+        downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+        //下载模板类型
+        type: "pssrFrameTmpl",
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/pssr/frameModel/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        region: null,
+        unit: null,
+        bracketNumber: null,
+        pipelineNumber: null,
+        devNo: null,
+        supportType: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {}
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 250
+    })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询支（吊）架列表 */
+    getList() {
+      this.loading = true;
+      listFrameModel(this.queryParams).then(response => {
+        this.frameModelList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        region: null,
+        unit: null,
+        bracketNumber: null,
+        pipelineNumber: null,
+        devNo: null,
+        supportType: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支（吊）架";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFrameModel(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改支（吊）架";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFrameModel(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFrameModel(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delFrameModel(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有支（吊）架数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportFrameModel(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.$refs['downloadFileForm'].submit()
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+  }
+};
+</script>