diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java new file mode 100644 index 0000000..10310fe --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.status; + +import com.casic.missiles.model.status.EquipmentStatusRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 受检设备-延用申请设备关联表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +public interface EquipmentStatusRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java new file mode 100644 index 0000000..10310fe --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.status; + +import com.casic.missiles.model.status.EquipmentStatusRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 受检设备-延用申请设备关联表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +public interface EquipmentStatusRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml new file mode 100644 index 0000000..0233c79 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, approval_id, equipment_id, create_time, update_time + + + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java new file mode 100644 index 0000000..10310fe --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.status; + +import com.casic.missiles.model.status.EquipmentStatusRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 受检设备-延用申请设备关联表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +public interface EquipmentStatusRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml new file mode 100644 index 0000000..0233c79 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, approval_id, equipment_id, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java new file mode 100644 index 0000000..d42c5cc --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class EqptFileQueryForm { + + @ApiModelProperty("文件号") + private String fileNo; + + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类别") + private String fileType; + + @ApiModelProperty("实施状态") + private String implementationStatus; + + @ApiModelProperty("创建单位id") + private Long createCompanyId; + + @ApiModelProperty("发布人") + private String createUserName; + + @ApiModelProperty("发布开始时间") + private Date updateTimeStart; + + @ApiModelProperty("发布结束时间") + private Date updateTimeEnd; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java new file mode 100644 index 0000000..10310fe --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.status; + +import com.casic.missiles.model.status.EquipmentStatusRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 受检设备-延用申请设备关联表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +public interface EquipmentStatusRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml new file mode 100644 index 0000000..0233c79 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, approval_id, equipment_id, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java new file mode 100644 index 0000000..d42c5cc --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class EqptFileQueryForm { + + @ApiModelProperty("文件号") + private String fileNo; + + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类别") + private String fileType; + + @ApiModelProperty("实施状态") + private String implementationStatus; + + @ApiModelProperty("创建单位id") + private Long createCompanyId; + + @ApiModelProperty("发布人") + private String createUserName; + + @ApiModelProperty("发布开始时间") + private Date updateTimeStart; + + @ApiModelProperty("发布结束时间") + private Date updateTimeEnd; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusRelation.java new file mode 100644 index 0000000..ae9362d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusRelation.java @@ -0,0 +1,54 @@ +package com.casic.missiles.model.status; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * 受检设备-延用申请设备关联表 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +@Getter +@Setter +@TableName("eqpt_equipment_status_relation") +public class EquipmentStatusRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 延用申请id + */ + @TableField("approval_id") + private Long approvalId; + + /** + * 设备id + */ + @TableField("equipment_id") + private Long equipmentId; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java new file mode 100644 index 0000000..10310fe --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.status; + +import com.casic.missiles.model.status.EquipmentStatusRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 受检设备-延用申请设备关联表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +public interface EquipmentStatusRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml new file mode 100644 index 0000000..0233c79 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, approval_id, equipment_id, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java new file mode 100644 index 0000000..d42c5cc --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class EqptFileQueryForm { + + @ApiModelProperty("文件号") + private String fileNo; + + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类别") + private String fileType; + + @ApiModelProperty("实施状态") + private String implementationStatus; + + @ApiModelProperty("创建单位id") + private Long createCompanyId; + + @ApiModelProperty("发布人") + private String createUserName; + + @ApiModelProperty("发布开始时间") + private Date updateTimeStart; + + @ApiModelProperty("发布结束时间") + private Date updateTimeEnd; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusRelation.java new file mode 100644 index 0000000..ae9362d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusRelation.java @@ -0,0 +1,54 @@ +package com.casic.missiles.model.status; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * 受检设备-延用申请设备关联表 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +@Getter +@Setter +@TableName("eqpt_equipment_status_relation") +public class EquipmentStatusRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 延用申请id + */ + @TableField("approval_id") + private Long approvalId; + + /** + * 设备id + */ + @TableField("equipment_id") + private Long equipmentId; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java new file mode 100644 index 0000000..86cfabe --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java @@ -0,0 +1,55 @@ +package com.casic.missiles.service.impl.status; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.plan.PlanEquipmentRelation; +import com.casic.missiles.model.status.EquipmentStatusRelation; +import com.casic.missiles.mapper.status.EquipmentStatusRelationMapper; +import com.casic.missiles.service.status.IEquipmentStatusRelationService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 受检设备-延用申请设备关联表 服务实现类 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +@Service +public class EquipmentStatusRelationServiceImpl extends ServiceImpl implements IEquipmentStatusRelationService { + + + @Override + public boolean saveByApproval(Long approvalId, List equipmentIds) { + this.deleteApproval(approvalId); + if(CollUtil.isNotEmpty(equipmentIds)){ + List relations = new ArrayList<>(); + equipmentIds.forEach(equipmentId->{ + EquipmentStatusRelation relation = new EquipmentStatusRelation(); + relation.setApprovalId(approvalId); + relation.setEquipmentId(equipmentId); + relations.add(relation); + }); + return this.saveBatch(relations); + } + return true; + } + + @Override + public boolean deleteApproval(Long approvalId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("approval_id",approvalId); + return this.remove(wrapper); + } + + @Override + public List selectEquipmentIdsByApproval(Long approvalId) { + return null; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java new file mode 100644 index 0000000..10310fe --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/status/EquipmentStatusRelationMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.status; + +import com.casic.missiles.model.status.EquipmentStatusRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 受检设备-延用申请设备关联表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +public interface EquipmentStatusRelationMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml new file mode 100644 index 0000000..0233c79 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/status/EquipmentStatusRelationMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + id, approval_id, equipment_id, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java new file mode 100644 index 0000000..d42c5cc --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/file/EqptFileQueryForm.java @@ -0,0 +1,35 @@ +package com.casic.missiles.dto.file; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class EqptFileQueryForm { + + @ApiModelProperty("文件号") + private String fileNo; + + @ApiModelProperty("文件名称") + private String fileName; + + @ApiModelProperty("文件类别") + private String fileType; + + @ApiModelProperty("实施状态") + private String implementationStatus; + + @ApiModelProperty("创建单位id") + private Long createCompanyId; + + @ApiModelProperty("发布人") + private String createUserName; + + @ApiModelProperty("发布开始时间") + private Date updateTimeStart; + + @ApiModelProperty("发布结束时间") + private Date updateTimeEnd; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusRelation.java new file mode 100644 index 0000000..ae9362d --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/status/EquipmentStatusRelation.java @@ -0,0 +1,54 @@ +package com.casic.missiles.model.status; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * 受检设备-延用申请设备关联表 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +@Getter +@Setter +@TableName("eqpt_equipment_status_relation") +public class EquipmentStatusRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 延用申请id + */ + @TableField("approval_id") + private Long approvalId; + + /** + * 设备id + */ + @TableField("equipment_id") + private Long equipmentId; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java new file mode 100644 index 0000000..86cfabe --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusRelationServiceImpl.java @@ -0,0 +1,55 @@ +package com.casic.missiles.service.impl.status; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.model.plan.PlanEquipmentRelation; +import com.casic.missiles.model.status.EquipmentStatusRelation; +import com.casic.missiles.mapper.status.EquipmentStatusRelationMapper; +import com.casic.missiles.service.status.IEquipmentStatusRelationService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 受检设备-延用申请设备关联表 服务实现类 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +@Service +public class EquipmentStatusRelationServiceImpl extends ServiceImpl implements IEquipmentStatusRelationService { + + + @Override + public boolean saveByApproval(Long approvalId, List equipmentIds) { + this.deleteApproval(approvalId); + if(CollUtil.isNotEmpty(equipmentIds)){ + List relations = new ArrayList<>(); + equipmentIds.forEach(equipmentId->{ + EquipmentStatusRelation relation = new EquipmentStatusRelation(); + relation.setApprovalId(approvalId); + relation.setEquipmentId(equipmentId); + relations.add(relation); + }); + return this.saveBatch(relations); + } + return true; + } + + @Override + public boolean deleteApproval(Long approvalId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("approval_id",approvalId); + return this.remove(wrapper); + } + + @Override + public List selectEquipmentIdsByApproval(Long approvalId) { + return null; + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentStatusRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentStatusRelationService.java new file mode 100644 index 0000000..b4801bf --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/status/IEquipmentStatusRelationService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.service.status; + +import com.casic.missiles.model.status.EquipmentStatusRelation; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 受检设备-延用申请设备关联表 服务类 + *

+ * + * @author zhangyingjie + * @since 2024-01-22 + */ +public interface IEquipmentStatusRelationService extends IService { + + boolean saveByApproval(Long approvalId, List equipmentIds); + + boolean deleteApproval(Long approvalId); + + List selectEquipmentIdsByApproval(Long approvalId); + +}