提交

src/main/java/cn/ezhizao/project/business/inspectionChamber/controller/BizInspectionChamberController.java

@@ -0,0 +1,134 @@
+package cn.ezhizao.project.business.inspectionChamber.controller;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.inspectionChamber.domain.BizWorkshopChamber;
+import cn.ezhizao.project.business.inspectionChamber.service.IBizWorkshopChamberService;
+import cn.ezhizao.project.business.workshop.domain.BizWorkshop;
+import cn.ezhizao.project.business.workshop.service.IBizWorkshopService;
+import org.springframework.security.access.prepost.PreAuthorize;
+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 cn.ezhizao.project.business.inspectionChamber.domain.BizInspectionChamber;
+import cn.ezhizao.project.business.inspectionChamber.service.IBizInspectionChamberService;
+
+/**
+ * 检测室配置Controller
+ *
+ * @author ezhizao
+ * @date 2024-07-17
+ */
+@RestController
+@RequestMapping("/business/inspectionChamber")
+public class BizInspectionChamberController extends BaseController
+{
+    @Resource
+    private IBizInspectionChamberService bizInspectionChamberService;
+    @Resource
+    private IBizWorkshopChamberService bizWorkshopChamberService;
+    @Resource
+    private IBizWorkshopService bizWorkshopService;
+
+    /**
+     * 查询检测室配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:inspectionChamber:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizInspectionChamber);
+        startPage();
+        List<BizInspectionChamber> list = bizInspectionChamberService.getList(bizInspectionChamber);
+        List<BizWorkshopChamber> chambers = bizWorkshopChamberService.query().in("chamber_id", list.isEmpty() ? Collections.singletonList(0L) : list.stream().map(BizInspectionChamber::getId).collect(Collectors.toList())).list();
+        List<BizWorkshop> workshops = bizWorkshopService.query().in("id", chambers.isEmpty() ? Collections.singletonList(0L) : chambers.stream().map(BizWorkshopChamber::getWorkshopId).collect(Collectors.toList())).list();
+        list.forEach(l -> {
+            l.setWorkshopList(chambers.stream().filter(v -> v.getChamberId().equals(l.getId())).collect(Collectors.toList()));
+            l.setWorkShopIds(l.getWorkshopList().stream().map(BizWorkshopChamber::getWorkshopId).collect(Collectors.toList()));
+            l.setWorkShops(workshops.stream().filter(v -> l.getWorkShopIds().contains(v.getId())).map(BizWorkshop::getName).collect(Collectors.joining(",")));
+        });
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检测室配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:inspectionChamber:export')")
+    @Log(title = "检测室配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizInspectionChamber);
+        List<BizInspectionChamber> list = bizInspectionChamberService.getList(bizInspectionChamber);
+        ExcelUtil<BizInspectionChamber> util = new ExcelUtil<BizInspectionChamber>(BizInspectionChamber.class);
+        util.exportExcel(response, list, "检测室配置数据");
+    }
+
+    /**
+     * 获取检测室配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('business:inspectionChamber:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizInspectionChamberService.getById(id));
+    }
+
+    /**
+     * 新增检测室配置
+     */
+    @PreAuthorize("@ss.hasPermi('business:inspectionChamber:add')")
+    @Log(title = "检测室配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
+    {
+        // 判断仪器室名称不能重复
+        if (bizInspectionChamberService.query().eq("chamber_name", bizInspectionChamber.getChamberName()).count() > 0) {
+            return error("仪器室名称不可重复");
+        }
+        setTenantId(bizInspectionChamber);
+        return toAjax(bizInspectionChamberService.save(bizInspectionChamber, bizInspectionChamber.getWorkShopIds()));
+    }
+
+    /**
+     * 修改检测室配置
+     */
+    @PreAuthorize("@ss.hasPermi('business:inspectionChamber:edit')")
+    @Log(title = "检测室配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
+    {
+        // 判断仪器室名称不能重复
+        if (bizInspectionChamberService.query().eq("chamber_name", bizInspectionChamber.getChamberName()).ne("id", bizInspectionChamber.getId()).count() > 0) {
+            return error("仪器室名称不可重复");
+        }
+        setTenantId(bizInspectionChamber);
+        return toAjax(bizInspectionChamberService.updateById(bizInspectionChamber, bizInspectionChamber.getWorkShopIds()));
+    }
+
+    /**
+     * 删除检测室配置
+     */
+    @PreAuthorize("@ss.hasPermi('business:inspectionChamber:remove')")
+    @Log(title = "检测室配置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(bizInspectionChamberService.removeBatchByIds(ids));
+    }
+}

src/main/java/cn/ezhizao/project/business/inspectionChamber/domain/BizInspectionChamber.java

@@ -0,0 +1,45 @@
+package cn.ezhizao.project.business.inspectionChamber.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * 检测室配置对象 biz_inspection_chamber
+ *
+ * @author ezhizao
+ * @date 2024-07-17
+ */
+@Data
+@TableName(value = "biz_inspection_chamber")
+public class BizInspectionChamber extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 检查室名称 */
+    @Excel(name = "检查室名称")
+    @ApiModelProperty(value = "检查室名称")
+    private String chamberName;
+
+    /** 检查室编码 */
+    @Excel(name = "检查室编码")
+    @ApiModelProperty(value = "检查室编码")
+    private String chamberCode;
+
+    /** 所在车间 */
+    @ApiModelProperty(value = "检查室编码")
+    private Long workshopId;
+
+    @TableField(exist = false)
+    private String workShops;
+    @TableField(exist = false)
+    private List<Long> workShopIds;
+    @TableField(exist = false)
+    private List<BizWorkshopChamber> workshopList;
+
+}

src/main/java/cn/ezhizao/project/business/inspectionChamber/domain/BizWorkshopChamber.java

@@ -0,0 +1,39 @@
+package cn.ezhizao.project.business.inspectionChamber.domain;
+
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.Api;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import org.checkerframework.checker.units.qual.A;
+
+/**
+ * 检查室车间关联对象 biz_workshop_chamber
+ *
+ * @author ezhizao
+ * @date 2024-07-17
+ */
+@Data
+@TableName(value = "biz_workshop_chamber")
+public class BizWorkshopChamber extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 车间id */
+    @ApiModelProperty(value = "${comment}")
+    private Long workshopId;
+
+    /** 检测室id */
+    @ApiModelProperty(value = "${comment}")
+    private Long chamberId;
+
+    @ApiModelProperty("检查室名称")
+    @TableField(exist = false)
+    private String chamberName;
+
+    @ApiModelProperty("车间名称")
+    @TableField(exist = false)
+    private String workshopName;
+
+}

src/main/java/cn/ezhizao/project/business/inspectionChamber/mapper/BizInspectionChamberMapper.java

@@ -0,0 +1,29 @@
+package cn.ezhizao.project.business.inspectionChamber.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.inspectionChamber.domain.BizInspectionChamber;
+
+/**
+ * 检测室配置Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-07-17
+ */
+public interface BizInspectionChamberMapper extends BaseMapper<BizInspectionChamber>
+{
+    /**
+     * 查询检测室配置列表
+     *
+     * @param bizInspectionChamber 检测室配置
+     * @return 检测室配置集合
+     */
+    public List<BizInspectionChamber> getList(BizInspectionChamber bizInspectionChamber);
+
+    /**
+     * 物理删除
+     * @param bizInspectionChamber
+     * @return 删除结果
+    */
+    public int physicalDelete(BizInspectionChamber bizInspectionChamber);
+}

src/main/java/cn/ezhizao/project/business/inspectionChamber/mapper/BizWorkshopChamberMapper.java

@@ -0,0 +1,29 @@
+package cn.ezhizao.project.business.inspectionChamber.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.inspectionChamber.domain.BizWorkshopChamber;
+
+/**
+ * 检查室车间关联Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-07-17
+ */
+public interface BizWorkshopChamberMapper extends BaseMapper<BizWorkshopChamber>
+{
+    /**
+     * 查询检查室车间关联列表
+     *
+     * @param bizWorkshopChamber 检查室车间关联
+     * @return 检查室车间关联集合
+     */
+    public List<BizWorkshopChamber> getList(BizWorkshopChamber bizWorkshopChamber);
+
+    /**
+     * 物理删除
+     * @param bizWorkshopChamber
+     * @return 删除结果
+    */
+    public int physicalDelete(BizWorkshopChamber bizWorkshopChamber);
+}

src/main/java/cn/ezhizao/project/business/inspectionChamber/service/IBizInspectionChamberService.java

@@ -0,0 +1,33 @@
+package cn.ezhizao.project.business.inspectionChamber.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.inspectionChamber.domain.BizInspectionChamber;
+
+/**
+ * 检测室配置Service接口
+ *
+ * @author ezhizao
+ * @date 2024-07-17
+ */
+public interface IBizInspectionChamberService extends IService<BizInspectionChamber>
+{
+    /**
+     * 查询检测室配置列表
+     *
+     * @param bizInspectionChamber 检测室配置
+     * @return 检测室配置集合
+     */
+    public List<BizInspectionChamber> getList(BizInspectionChamber bizInspectionChamber);
+
+    /**
+     * 物理删除
+     * @param bizInspectionChamber
+     * @return 删除结果
+     */
+    public int physicalDelete(BizInspectionChamber bizInspectionChamber);
+
+    boolean save(BizInspectionChamber bizInspectionChamber, List<Long> workShopIds);
+
+    boolean updateById(BizInspectionChamber bizInspectionChamber, List<Long> workShopIds);
+}

src/main/java/cn/ezhizao/project/business/inspectionChamber/service/IBizWorkshopChamberService.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.inspectionChamber.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.inspectionChamber.domain.BizWorkshopChamber;
+
+/**
+ * 检查室车间关联Service接口
+ *
+ * @author ezhizao
+ * @date 2024-07-17
+ */
+public interface IBizWorkshopChamberService extends IService<BizWorkshopChamber>
+{
+    /**
+     * 查询检查室车间关联列表
+     *
+     * @param bizWorkshopChamber 检查室车间关联
+     * @return 检查室车间关联集合
+     */
+    public List<BizWorkshopChamber> getList(BizWorkshopChamber bizWorkshopChamber);
+
+    /**
+     * 物理删除
+     * @param bizWorkshopChamber
+     * @return 删除结果
+     */
+    public int physicalDelete(BizWorkshopChamber bizWorkshopChamber);
+
+}

src/main/java/cn/ezhizao/project/business/inspectionChamber/service/impl/BizInspectionChamberServiceImpl.java

@@ -0,0 +1,92 @@
+package cn.ezhizao.project.business.inspectionChamber.service.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Resource;
+
+import cn.ezhizao.project.business.inspectionChamber.domain.BizWorkshopChamber;
+import cn.ezhizao.project.business.inspectionChamber.service.IBizWorkshopChamberService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import cn.ezhizao.project.business.inspectionChamber.mapper.BizInspectionChamberMapper;
+import cn.ezhizao.project.business.inspectionChamber.domain.BizInspectionChamber;
+import cn.ezhizao.project.business.inspectionChamber.service.IBizInspectionChamberService;
+
+/**
+ * 检测室配置Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-07-17
+ */
+@Service
+public class BizInspectionChamberServiceImpl  extends ServiceImpl<BizInspectionChamberMapper, BizInspectionChamber> implements IBizInspectionChamberService
+{
+    @Resource
+    private BizInspectionChamberMapper bizInspectionChamberMapper;
+    @Resource
+    private IBizWorkshopChamberService bizWorkshopChamberService;
+
+    /**
+     * 查询检测室配置列表
+     *
+     * @param bizInspectionChamber 检测室配置
+     * @return 检测室配置
+     */
+    @Override
+    public List<BizInspectionChamber> getList(BizInspectionChamber bizInspectionChamber)
+    {
+        return bizInspectionChamberMapper.getList(bizInspectionChamber);
+    }
+
+    /**
+     * 物理删除
+     * @param bizInspectionChamber
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizInspectionChamber bizInspectionChamber){ return bizInspectionChamberMapper.physicalDelete(bizInspectionChamber); };
+
+    public boolean save(BizInspectionChamber entity, List<Long> workshopIds) {
+        boolean saveStatus = super.save(entity);
+        List<BizWorkshopChamber> chambers = new ArrayList<>();
+        workshopIds.forEach(l -> {
+            BizWorkshopChamber item = new BizWorkshopChamber();
+            item.setChamberId(entity.getId());
+            item.setWorkshopId(l);
+            item.setTenantId(entity.getTenantId());
+            chambers.add(item);
+        });
+        QueryWrapper<BizWorkshopChamber> bizWorkshopChamberQueryWrapper = new QueryWrapper<>();
+        bizWorkshopChamberQueryWrapper.eq("chamber_id", entity.getId());
+        bizWorkshopChamberService.remove(bizWorkshopChamberQueryWrapper);
+        saveStatus = saveStatus && (chambers.isEmpty() || bizWorkshopChamberService.saveBatch(chambers));
+        return saveStatus;
+    }
+
+    public boolean updateById(BizInspectionChamber entity, List<Long> workshopIds) {
+        boolean saveStatus = super.updateById(entity);
+        List<BizWorkshopChamber> chambers = new ArrayList<>();
+        workshopIds.forEach(l -> {
+            BizWorkshopChamber item = new BizWorkshopChamber();
+            item.setChamberId(entity.getId());
+            item.setWorkshopId(l);
+            item.setTenantId(entity.getTenantId());
+            chambers.add(item);
+        });
+        QueryWrapper<BizWorkshopChamber> bizWorkshopChamberQueryWrapper = new QueryWrapper<>();
+        bizWorkshopChamberQueryWrapper.eq("chamber_id", entity.getId());
+        bizWorkshopChamberService.remove(bizWorkshopChamberQueryWrapper);
+        saveStatus = saveStatus && (chambers.isEmpty() || bizWorkshopChamberService.saveBatch(chambers));
+        return saveStatus;
+    }
+
+    @Override
+    public boolean removeBatchByIds(Collection<?> list) {
+        QueryWrapper<BizWorkshopChamber> bizWorkshopChamberQueryWrapper = new QueryWrapper<>();
+        bizWorkshopChamberQueryWrapper.in("chamber_id", list);
+        bizWorkshopChamberService.remove(bizWorkshopChamberQueryWrapper);
+        return super.removeBatchByIds(list);
+    }
+}

src/main/java/cn/ezhizao/project/business/inspectionChamber/service/impl/BizWorkshopChamberServiceImpl.java

@@ -0,0 +1,43 @@
+package cn.ezhizao.project.business.inspectionChamber.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import cn.ezhizao.project.business.inspectionChamber.mapper.BizWorkshopChamberMapper;
+import cn.ezhizao.project.business.inspectionChamber.domain.BizWorkshopChamber;
+import cn.ezhizao.project.business.inspectionChamber.service.IBizWorkshopChamberService;
+
+/**
+ * 检查室车间关联Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-07-17
+ */
+@Service
+public class BizWorkshopChamberServiceImpl  extends ServiceImpl<BizWorkshopChamberMapper, BizWorkshopChamber> implements IBizWorkshopChamberService
+{
+    @Resource
+    private BizWorkshopChamberMapper bizWorkshopChamberMapper;
+
+    /**
+     * 查询检查室车间关联列表
+     *
+     * @param bizWorkshopChamber 检查室车间关联
+     * @return 检查室车间关联
+     */
+    @Override
+    public List<BizWorkshopChamber> getList(BizWorkshopChamber bizWorkshopChamber)
+    {
+        return bizWorkshopChamberMapper.getList(bizWorkshopChamber);
+    }
+
+    /**
+     * 物理删除
+     * @param bizWorkshopChamber
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizWorkshopChamber bizWorkshopChamber){ return bizWorkshopChamberMapper.physicalDelete(bizWorkshopChamber); };
+
+}

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -610,5 +610,4 @@ public String getPublicSeal(String code) {
         out.close();
     }
 
-
 }

src/main/resources/mybatis/business/inspectionChamber/BizInspectionChamberMapper.xml

@@ -0,0 +1,30 @@
+<?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="cn.ezhizao.project.business.inspectionChamber.mapper.BizInspectionChamberMapper">
+
+    <resultMap type="cn.ezhizao.project.business.inspectionChamber.domain.BizInspectionChamber" id="BizInspectionChamberResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizInspectionChamber" resultMap="BizInspectionChamberResult">
+        SELECT * FROM biz_inspection_chamber
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="chamberName != null  and chamberName != ''"> AND chamber_name like concat('%', #{chamberName}, '%')</if>
+            <if test="chamberCode != null  and chamberCode != ''"> AND chamber_code = #{chamberCode}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_inspection_chamber
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

src/main/resources/mybatis/business/inspectionChamber/BizWorkshopChamberMapper.xml

@@ -0,0 +1,28 @@
+<?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="cn.ezhizao.project.business.inspectionChamber.mapper.BizWorkshopChamberMapper">
+
+    <resultMap type="cn.ezhizao.project.business.inspectionChamber.domain.BizWorkshopChamber" id="BizWorkshopChamberResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizWorkshopChamber" resultMap="BizWorkshopChamberResult">
+        SELECT * FROM biz_workshop_chamber
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_workshop_chamber
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>